feat: メッセージの変更差分の改善 (#669)

approvers · Jan 24, 2023 · e3950be · e3950be
1 parent 8cf8bc1
commit e3950be
Show file tree

Hide file tree

Showing 8 changed files with 500 additions and 828 deletions.
diff --git a/package.json b/package.json
@@ -35,9 +35,9 @@
     "@discordjs/voice": "^0.14.0",
     "cli-argparse": "^1.1.2",
     "date-fns": "^2.29.3",
-    "difflib-ts": "^1.0.3",
     "discord.js": "^14.7.1",
     "dotenv": "^16.0.3",
+    "fast-diff": "^1.2.0",
     "nanoid": "^4.0.0",
     "tweetnacl": "^1.0.3",
     "yaml": "^2.1.3"

diff --git a/src/model/judging-status.ts b/src/model/judging-status.ts
@@ -9,7 +9,7 @@ export const judgingStatuses = [
   'AC'
 ] as const;
 
-export type JudgingStatus = typeof judgingStatuses[number];
+export type JudgingStatus = (typeof judgingStatuses)[number];
 
 export function isJudgingStatus(str: string): str is JudgingStatus {
   return (judgingStatuses as readonly string[]).includes(str);

diff --git a/src/service/command/meme/ojaru.ts b/src/service/command/meme/ojaru.ts
@@ -2,7 +2,7 @@ import type { MemeTemplate } from '../../../model/meme-template.js';
 
 const ojaruFlags = ['g'] as const;
 
-export const ojaru: MemeTemplate<typeof ojaruFlags[number], never> = {
+export const ojaru: MemeTemplate<(typeof ojaruFlags)[number], never> = {
   commandNames: ['ojaru'],
   description:
     'あっぱれおじゃる様！見事ミーム構文を使いこなされました！`-g`オプションを使用なさってデンボの口調の変更も可能でございます！',

diff --git a/src/service/command/meme/takopi.ts b/src/service/command/meme/takopi.ts
@@ -4,8 +4,8 @@ const takopiFlags = ['f'] as const;
 const takopiOptions = ['c'] as const;
 
 export const takopi: MemeTemplate<
-  typeof takopiFlags[number],
-  typeof takopiOptions[number]
+  (typeof takopiFlags)[number],
+  (typeof takopiOptions)[number]
 > = {
   commandNames: ['takopi'],
   description:

diff --git a/src/service/command/party.ts b/src/service/command/party.ts
@@ -25,7 +25,7 @@ const assetKeys = [
   'POTATO'
 ] as const;
 
-export type AssetKey = typeof assetKeys[number];
+export type AssetKey = (typeof assetKeys)[number];
 
 export interface RandomGenerator {
   /**

diff --git a/src/service/difference-detector.test.ts b/src/service/difference-detector.test.ts
@@ -15,10 +15,7 @@ it('react to edited message', async () => {
       content: 'LGTM',
       sendEphemeralToSameChannel: (message) => {
         expect(message).toEqual(`見てたぞ
-\`\`\`diff
-- LGBT
-+ LGTM
-\`\`\``);
+> LG~~B~~T*M*`);
         return Promise.resolve();
       }
     }
@@ -38,9 +35,10 @@ poka
 `,
       sendEphemeralToSameChannel: (message) => {
         expect(message).toEqual(`見てたぞ
-\`\`\`diff
-+ poka
-\`\`\``);
+> pika
+> peka
+> *poka*
+> `);
         return Promise.resolve();
       }
     }
@@ -56,9 +54,8 @@ poka
       content: `草`,
       sendEphemeralToSameChannel: (message) => {
         expect(message).toEqual(`見てたぞ
-\`\`\`diff
-- 草
-\`\`\``);
+> 草
+> ~~草~~`);
         return Promise.resolve();
       }
     }
@@ -81,12 +78,41 @@ poka
 サイゼリヤ(鳥取にはある)`,
       sendEphemeralToSameChannel: (message) => {
         expect(message).toEqual(`見てたぞ
-\`\`\`diff
-+ サイゼリヤ(鳥取にはある)
-\`\`\``);
+> 山陰に無い店
+> 松屋
+> やよい軒
+> ロッテリア ロイヤルホスト
+> *サイゼリヤ(鳥取にはある)*`);
         return Promise.resolve();
       }
     }
   );
+
+  await responder.on(
+    'UPDATE',
+    {
+      content: `waw
+wiw
+wuw
+wew
+wow`,
+      sendEphemeralToSameChannel: fn
+    },
+    {
+      content: `waw
+wuw
+wow`,
+      sendEphemeralToSameChannel: (message) => {
+        expect(message).toEqual(`見てたぞ
+> waw
+> w~~i~~*u*w
+> w~~u~~*o*w
+> ~~wew~~
+> ~~wow~~`);
+        return Promise.resolve();
+      }
+    }
+  );
+
   expect(fn).not.toHaveBeenCalled();
 });
diff --git a/src/service/difference-detector.ts b/src/service/difference-detector.ts
@@ -1,4 +1,4 @@
-import { Differ } from 'difflib-ts';
+import diff from 'fast-diff';
 
 import type { MessageUpdateEventResponder } from '../runner/index.js';
 
@@ -28,18 +28,26 @@ export interface EditingObservable {
 }
 
 const diffComposer = (before: string, after: string): string => {
-  const differ = new Differ();
-  const changes = differ.compare(before.split('\n'), after.split('\n'));
   let composed = '';
-  for (const change of changes) {
-    if (change.startsWith('-')) {
-      if (composed !== '') {
-        composed += '---------------------------------\n';
-      }
-      composed += `${change.trimEnd()}\n`;
+  const beforeLines: (string | undefined)[] = before.split('\n');
+  const afterLines: (string | undefined)[] = after.split('\n');
+  for (let i = 0; i < Math.max(beforeLines.length, afterLines.length); ++i) {
+    if (i != 0) {
+      composed += '\n';
     }
-    if (change.startsWith('+')) {
-      composed += `${change.trimEnd()}\n`;
+    const changes = diff(beforeLines[i] ?? '', afterLines[i] ?? '');
+    for (const [type, diff] of changes) {
+      switch (type) {
+        case -1:
+          composed += `~~${diff}~~`;
+          break;
+        case 0:
+          composed += diff;
+          break;
+        case 1:
+          composed += `*${diff}*`;
+          break;
+      }
     }
   }
   return composed;
@@ -57,8 +65,8 @@ export class DifferenceDetector
     if (composed === '') {
       return;
     }
-    await after.sendEphemeralToSameChannel(`見てたぞ
-\`\`\`diff
-${composed}\`\`\``);
+    await after.sendEphemeralToSameChannel(
+      `見てたぞ\n${composed}`.replaceAll('\n', '\n> ')
+    );
   }
 }