From cafe5d8c85949c4d9cd309d445cc78546c0e3556 Mon Sep 17 00:00:00 2001 From: Big_Cake <2577117205@qq.com> Date: Sat, 23 Dec 2023 15:54:47 +0000 Subject: [PATCH 1/3] bump icqq to 0.6.6 --- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a9877f4..9b79719 100644 --- 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 index dfbc55a..25cad3d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,8 +36,8 @@ dependencies: specifier: ^2.1.2 version: 2.1.2 icqq: - specifier: ^0.6.3 - version: 0.6.3 + specifier: ^0.6.6 + version: 0.6.6 image-size: specifier: ^1.0.2 version: 1.0.2 @@ -1754,8 +1754,8 @@ packages: safer-buffer: 2.1.2 dev: false - /icqq@0.6.3: - resolution: {integrity: sha512-E5raVPlKbrNvVyTbn+jyET4+F1xz8DShBKnooaFzBLo14a7Sjwa89fdUUaTrApUaSiChz017nNzFMc62zIr2Kw==} + /icqq@0.6.6: + resolution: {integrity: sha512-AYJEhHIQFWK46dYnoiHpucvHSRCoWSg8iXc2Kr5Vw+3qBCf38Ul3910GoUDtyfNTgUdgzd9mbiKSfUle9fSiUA==} engines: {node: '>= v14'} dependencies: axios: 1.6.0 From 6c1727d432a2eb6692ccbb1acf5c349e81bb9d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=87=8C=E8=8E=9E=7E=28=3D=5E=E2=96=BD=5E=3D=29?= Date: Tue, 26 Dec 2023 19:35:48 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ed4e021..18d0ddd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # Q2TG QQ 群与 Telegram 群相互转发的 bot +交流 https://t.me/+XkF-96lLnFU3ZTM1 + ## 安装方法 请看 [Wiki](https://github.com/Clansty/Q2TG/wiki/%E5%AE%89%E8%A3%85%E9%83%A8%E7%BD%B2) From efd74084ea2062eb2e14077ea6b8500b414862ac Mon Sep 17 00:00:00 2001 From: Clansty Date: Thu, 28 Dec 2023 17:00:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E8=83=BD=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=20#153?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml | 2 ++ src/services/ForwardService.ts | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index ed3ce01..77c2c59 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -57,6 +57,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/src/services/ForwardService.ts b/src/services/ForwardService.ts index 6de2881..e1d1bfd 100644 --- a/src/services/ForwardService.ts +++ b/src/services/ForwardService.ts @@ -368,7 +368,7 @@ export default class ForwardService { public async forwardFromTelegram(message: Api.Message, pair: Pair): Promise> { try { const tempFiles: FileResult[] = []; - const chain: Sendable = []; + let chain: Sendable = []; const senderId = Number(message.senderId || message.sender?.id); // 这条消息在 tg 中被回复的时候显示的 let brief = '', isSpoilerPhoto = false; @@ -529,6 +529,9 @@ export default class ForwardService { } } brief += '[文件]'; + if (process.env.DISABLE_FILE_UPLOAD_TIP) { + chain = []; + } } if (message.message && !isSpoilerPhoto) {