feat: 只撤回一端的消息

clansty · Sep 17, 2024 · b39490c · b39490c
1 parent a2b4808
commit b39490c
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 8 deletions.
diff --git a/main/prisma/schema.prisma b/main/prisma/schema.prisma
@@ -83,6 +83,7 @@ model Message {
   nick           String? // /抱 的时候会用到
   tgSenderId     BigInt?  @db.BigInt
   richHeaderUsed Boolean  @default(false)
+  ignoreDelete   Boolean  @default(false) // rmq rmt
 
   @@index([qqRoomId, qqSenderId, seq, rand, pktnum, time, instanceId])
   @@index([tgChatId, tgMsgId, instanceId])

diff --git a/main/src/client/QQClient/entity.ts b/main/src/client/QQClient/entity.ts
@@ -14,7 +14,7 @@ export interface QQEntity {
 
   getVideoUrl(fid: string, md5: string | Buffer): Promise<string>;
 
-  recallMsg(paramOrMessageId: number, rand?: number, timeOrPktNum?: number): Promise<boolean>;
+  recallMsg(seqOrMessageId: number, rand?: number, timeOrPktNum?: number): Promise<boolean>;
 
   sendMsg(content: Sendable, source?: Quotable): Promise<MessageRet>;
 

diff --git a/main/src/constants/commands.ts b/main/src/constants/commands.ts
@@ -61,6 +61,18 @@ const inChatCommands = [
     command: 'q',
     description: '生成 QuotLy 图片',
   }),
+  new Api.BotCommand({
+    command: 'rm',
+    description: '在双端撤回被回复的消息',
+  }),
+  new Api.BotCommand({
+    command: 'rmt',
+    description: '在 TG 撤回被回复的消息',
+  }),
+  new Api.BotCommand({
+    command: 'rmq',
+    description: '在 QQ 撤回被回复的消息',
+  }),
 ];
 
 const groupInChatCommands = [

diff --git a/main/src/controllers/DeleteMessageController.ts b/main/src/controllers/DeleteMessageController.ts
@@ -22,7 +22,7 @@ export default class DeleteMessageController {
   private onTelegramMessage = async (message: Api.Message) => {
     const pair = this.instance.forwardPairs.find(message.chat);
     if (!pair) return false;
-    if (message.message?.startsWith('/rm')) {
+    if (message.message?.split('@')?.[0] === '/rm') {
       // 撤回消息
       await this.deleteMessageService.handleTelegramMessageRm(message, pair);
       return true;

diff --git a/main/src/controllers/InChatCommandsController.ts b/main/src/controllers/InChatCommandsController.ts
@@ -102,6 +102,12 @@ export default class InChatCommandsController {
           message: '设置' + (result ? '成功' : '失败'),
         });
         return true;
+      case '/rmt':
+        await this.service.rmt(message, pair);
+        return true;
+      case '/rmq':
+        await this.service.rmq(message, pair);
+        return true;
     }
   };
 }
diff --git a/main/src/services/DeleteMessageService.ts b/main/src/services/DeleteMessageService.ts
@@ -70,6 +70,7 @@ export default class DeleteMessageService {
       if (messageInfo) {
         try {
           if (this.lock(`qq-${pair.qqRoomId}-${messageInfo.seq}`)) return;
+          if (messageInfo.ignoreDelete) return;
           const mapQq = pair.instanceMapForTg[messageInfo.tgSenderId.toString()];
           mapQq && this.recallQqMessage(mapQq, messageInfo.seq, Number(messageInfo.rand), messageInfo.pktnum, pair, false, true);
           // 假如 mapQQ 是普通成员，机器人是管理员，上面撤回失败了也可以由机器人撤回
@@ -78,9 +79,7 @@ export default class DeleteMessageService {
           this.recallQqMessage(pair.qq, messageInfo.seq, Number(messageInfo.rand),
             pair.qq.dm ? messageInfo.time : messageInfo.pktnum,
             pair, isOthersMsg, !!mapQq);
-          await db.message.delete({
-            where: { id: messageInfo.id },
-          });
+          // 有 lock 了，这里不需要删除数据库了
         }
         catch (e) {
           this.log.error(e);
@@ -164,6 +163,7 @@ export default class DeleteMessageService {
       });
       if (!message) return;
       if (this.lock(`tg-${pair.tgId}-${message.tgMsgId}`)) return;
+      if (message.ignoreDelete) return;
       if ((pair.flags | this.instance.flags) & flags.DISABLE_DELETE_MESSAGE) {
         await pair.tg.editMessages({
           message: message.tgMsgId,
@@ -173,9 +173,7 @@ export default class DeleteMessageService {
       }
       else {
         await pair.tg.deleteMessages(message.tgMsgId);
-        await db.message.delete({
-          where: { id: message.id },
-        });
+        // 有 lock 了，这里不需要删除数据库了
       }
     }
     catch (e) {

diff --git a/main/src/services/InChatCommandsService.ts b/main/src/services/InChatCommandsService.ts
@@ -198,4 +198,57 @@ export default class InChatCommandsService {
       });
     }
   }
+
+  public async rmt(message: Api.Message, pair: Pair) {
+    if (!message.replyToMsgId) {
+      const reply = await message.reply({
+        message: '<i>请回复一条消息</i>',
+      });
+      setTimeout(() => {
+        reply.delete({ revoke: true });
+        message.delete({ revoke: true });
+      }, 5000);
+      return;
+    }
+    await db.message.updateMany({
+      where: {
+        tgChatId: pair.tgId,
+        tgMsgId: message.replyToMsgId,
+      },
+      data: {
+        ignoreDelete: true,
+      },
+    });
+    await message.delete({ revoke: true });
+    await pair.tg.deleteMessages([message.replyToMsgId]);
+  }
+
+  public async rmq(message: Api.Message, pair: Pair) {
+    if (!message.replyToMsgId) {
+      const reply = await message.reply({
+        message: '<i>请回复一条消息</i>',
+      });
+      setTimeout(() => {
+        reply.delete({ revoke: true });
+        message.delete({ revoke: true });
+      }, 5000);
+      return;
+    }
+    const dbEntry = await db.message.findFirst({
+      where: {
+        tgChatId: pair.tgId,
+        tgMsgId: message.replyToMsgId,
+      },
+    });
+    await db.message.update({
+      where: {
+        id: dbEntry.id,
+      },
+      data: {
+        ignoreDelete: true,
+      },
+    });
+    await message.delete({ revoke: true });
+    await pair.qq.recallMsg(dbEntry.seq, Number(dbEntry.rand), pair.qq.dm ? dbEntry.time : dbEntry.pktnum);
+  }
 }