Merge branch 'clansty-rainbowcat' into rainbowcat

Nofated095 · Dec 30, 2023 · 0900325 · 0900325
2 parents 574771d + 635b835
commit 0900325
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,9 @@
 
 A **fork** of [Clansty/Q2TG](https://github.com/Clansty/Q2TG). Deleted UserBot function.
 
-QQ 群与 Telegram 群相互转发的 bot，但是去除了 _UserBot_ 模式，再也不用担心杜叔叔把 UserBot 封号啦！
+交流 <https://t.me/+XkF-96lLnFU3ZTM1>
+
+QQ 群与 Telegram 群相互转发的 bot，但是去除了 _UserBot_ 模式，再也不用担心杜叔叔封 UserBot 啦！
 
 ## 为什么不需要 User Bot
 

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -58,6 +58,8 @@ services:
       - SIGN_API=http://sign:8080/sign?key=114514
       - SIGN_VER=8.9.71 # 与上方 sign 容器的配置同步
       - TG_CONNECTION=tcp # 连接 Telegram 的方式，也可以改成 websocket
+      # 要关闭文件上传提示，请取消注释以下变量 https://github.com/clansty/Q2TG/issues/153
+      #- DISABLE_FILE_UPLOAD_TIP=1
       # 要支持转发时自动识别语音，请设置以下参数
       - BAIDU_APP_ID=
       - BAIDU_API_KEY=

diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "eviltransform": "^0.2.2",
     "file-type": "^17.1.4",
     "fluent-ffmpeg": "^2.1.2",
-    "icqq": "^0.6.3",
+    "icqq": "^0.6.6",
     "image-size": "^1.0.2",
     "lodash": "^4.17.21",
     "log4js": "^6.6.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/services/ForwardService.ts b/src/services/ForwardService.ts
@@ -364,7 +364,7 @@ export default class ForwardService {
   public async forwardFromTelegram(message: Api.Message, pair: Pair): Promise<Array<QQMessageSent>> {
     try {
       const tempFiles: FileResult[] = [];
-      const chain: Sendable = [];
+      let chain: Sendable = [];
       const senderId = Number(message.senderId || message.sender?.id);
       // 这条消息在 tg 中被回复的时候显示的
       let brief = '', isSpoilerPhoto = false;
@@ -525,6 +525,9 @@ export default class ForwardService {
           }
         }
         brief += '[文件]';
+        if (process.env.DISABLE_FILE_UPLOAD_TIP) {
+          chain = [];
+        }
       }
 
       if (message.message && !isSpoilerPhoto) {