mirror of https://github.com/Nofated095/Q2TG.git
Merge branch 'rainbowcat' of github.com:clansty/Q2TG into clansty-rainbowcat
This commit is contained in:
commit
635b8353de
|
@ -2,7 +2,9 @@
|
||||||
|
|
||||||
A **fork** of [Clansty/Q2TG](https://github.com/Clansty/Q2TG). Deleted UserBot function.
|
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
|
## 为什么不需要 User Bot
|
||||||
|
|
||||||
|
|
|
@ -58,6 +58,8 @@ services:
|
||||||
- SIGN_API=http://sign:8080/sign?key=114514
|
- SIGN_API=http://sign:8080/sign?key=114514
|
||||||
- SIGN_VER=8.9.71 # 与上方 sign 容器的配置同步
|
- SIGN_VER=8.9.71 # 与上方 sign 容器的配置同步
|
||||||
- TG_CONNECTION=tcp # 连接 Telegram 的方式,也可以改成 websocket
|
- TG_CONNECTION=tcp # 连接 Telegram 的方式,也可以改成 websocket
|
||||||
|
# 要关闭文件上传提示,请取消注释以下变量 https://github.com/clansty/Q2TG/issues/153
|
||||||
|
#- DISABLE_FILE_UPLOAD_TIP=1
|
||||||
# 要支持转发时自动识别语音,请设置以下参数
|
# 要支持转发时自动识别语音,请设置以下参数
|
||||||
- BAIDU_APP_ID=
|
- BAIDU_APP_ID=
|
||||||
- BAIDU_API_KEY=
|
- BAIDU_API_KEY=
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
"eviltransform": "^0.2.2",
|
"eviltransform": "^0.2.2",
|
||||||
"file-type": "^17.1.4",
|
"file-type": "^17.1.4",
|
||||||
"fluent-ffmpeg": "^2.1.2",
|
"fluent-ffmpeg": "^2.1.2",
|
||||||
"icqq": "^0.6.3",
|
"icqq": "^0.6.6",
|
||||||
"image-size": "^1.0.2",
|
"image-size": "^1.0.2",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"log4js": "^6.6.1",
|
"log4js": "^6.6.1",
|
||||||
|
|
|
@ -36,8 +36,8 @@ dependencies:
|
||||||
specifier: ^2.1.2
|
specifier: ^2.1.2
|
||||||
version: 2.1.2
|
version: 2.1.2
|
||||||
icqq:
|
icqq:
|
||||||
specifier: ^0.6.3
|
specifier: ^0.6.6
|
||||||
version: 0.6.3
|
version: 0.6.6
|
||||||
image-size:
|
image-size:
|
||||||
specifier: ^1.0.2
|
specifier: ^1.0.2
|
||||||
version: 1.0.2
|
version: 1.0.2
|
||||||
|
@ -1754,8 +1754,8 @@ packages:
|
||||||
safer-buffer: 2.1.2
|
safer-buffer: 2.1.2
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
/icqq@0.6.3:
|
/icqq@0.6.6:
|
||||||
resolution: {integrity: sha512-E5raVPlKbrNvVyTbn+jyET4+F1xz8DShBKnooaFzBLo14a7Sjwa89fdUUaTrApUaSiChz017nNzFMc62zIr2Kw==}
|
resolution: {integrity: sha512-AYJEhHIQFWK46dYnoiHpucvHSRCoWSg8iXc2Kr5Vw+3qBCf38Ul3910GoUDtyfNTgUdgzd9mbiKSfUle9fSiUA==}
|
||||||
engines: {node: '>= v14'}
|
engines: {node: '>= v14'}
|
||||||
dependencies:
|
dependencies:
|
||||||
axios: 1.6.0
|
axios: 1.6.0
|
||||||
|
|
|
@ -364,7 +364,7 @@ export default class ForwardService {
|
||||||
public async forwardFromTelegram(message: Api.Message, pair: Pair): Promise<Array<QQMessageSent>> {
|
public async forwardFromTelegram(message: Api.Message, pair: Pair): Promise<Array<QQMessageSent>> {
|
||||||
try {
|
try {
|
||||||
const tempFiles: FileResult[] = [];
|
const tempFiles: FileResult[] = [];
|
||||||
const chain: Sendable = [];
|
let chain: Sendable = [];
|
||||||
const senderId = Number(message.senderId || message.sender?.id);
|
const senderId = Number(message.senderId || message.sender?.id);
|
||||||
// 这条消息在 tg 中被回复的时候显示的
|
// 这条消息在 tg 中被回复的时候显示的
|
||||||
let brief = '', isSpoilerPhoto = false;
|
let brief = '', isSpoilerPhoto = false;
|
||||||
|
@ -525,6 +525,9 @@ export default class ForwardService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
brief += '[文件]';
|
brief += '[文件]';
|
||||||
|
if (process.env.DISABLE_FILE_UPLOAD_TIP) {
|
||||||
|
chain = [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (message.message && !isSpoilerPhoto) {
|
if (message.message && !isSpoilerPhoto) {
|
||||||
|
|
Loading…
Reference in New Issue