From 6290edf0b0a09ff7c99cdfce4d02fdc55202cf05 Mon Sep 17 00:00:00 2001
From: Clansty <i@gao4.pw>
Date: Mon, 12 Feb 2024 23:08:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BD=AC=E5=8F=91=20tg=20=E4=B8=AD?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=20bot=20=E7=9A=84=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/flags.ts               |  1 +
 src/controllers/ForwardController.ts | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/constants/flags.ts b/src/constants/flags.ts
index 62ba5b1..3b665cc 100644
--- a/src/constants/flags.ts
+++ b/src/constants/flags.ts
@@ -8,6 +8,7 @@ enum flags {
   COLOR_EMOJI_PREFIX = 1 << 6,
   RICH_HEADER = 1 << 7,
   NO_QUOTE_PIN = 1 << 8,
+  NO_FORWARD_OTHER_BOT = 1 << 9,
 }
 
 export default flags;
diff --git a/src/controllers/ForwardController.ts b/src/controllers/ForwardController.ts
index 3eed952..9cb7964 100644
--- a/src/controllers/ForwardController.ts
+++ b/src/controllers/ForwardController.ts
@@ -17,7 +17,6 @@ import { getAvatar } from '../utils/urls';
 import { CustomFile } from 'telegram/client/uploads';
 import forwardHelper from '../helpers/forwardHelper';
 import helper from '../helpers/forwardHelper';
-import ZincSearch from 'zincsearch-node';
 import flags from '../constants/flags';
 
 export default class ForwardController {
@@ -37,6 +36,7 @@ export default class ForwardController {
     oicq.on('notice.friend.poke', this.onQqPoke);
     oicq.on('notice.group.poke', this.onQqPoke);
     tgBot.addNewMessageEventHandler(this.onTelegramMessage);
+    tgUser.addNewMessageEventHandler(this.onTelegramUserMessage);
     tgBot.addEditedMessageEventHandler(this.onTelegramMessage);
     instance.workMode === 'group' && tgBot.addChannelParticipantEventHandler(this.onTelegramParticipant);
   }
@@ -93,10 +93,16 @@ export default class ForwardController {
     }
   };
 
-  private onTelegramMessage = async (message: Api.Message) => {
+  private onTelegramUserMessage = async (message: Api.Message) => {
+    if (!('bot' in message.sender) || !message.sender.bot) return;
+    const pair = this.instance.forwardPairs.find(message.chat);
+    if ((pair.flags | this.instance.flags) & flags.NO_FORWARD_OTHER_BOT) return;
+    await this.onTelegramMessage(message, pair);
+  };
+
+  private onTelegramMessage = async (message: Api.Message, pair = this.instance.forwardPairs.find(message.chat)) => {
     try {
       if (message.senderId?.eq(this.instance.botMe.id)) return true;
-      const pair = this.instance.forwardPairs.find(message.chat);
       if (!pair) return false;
       if ((pair.flags | this.instance.flags) & flags.DISABLE_TG2Q) return;
       const qqMessagesSent = await this.forwardService.forwardFromTelegram(message, pair);