Nofated095
/
Q2TG
mirror of https://github.com/Nofated095/Q2TG.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: 撤回消息的异常处理，以及每条消息撤回间隔一秒钟（否则可能失败但是返回成功）

This commit is contained in:
Clansty 2022-03-16 21:49:17 +08:00
parent 022672aa2f
commit 1f45d50067
No known key found for this signature in database
GPG Key ID: 3A6BE8BAF2EDE134
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/services/DeleteMessageService.ts
View File

@ -16,9 +16,24 @@ export default class DeleteMessageService {
}
// 500ms 内只撤回一条消息，防止频繁导致一部分消息没有成功撤回。不过这样的话，会得不到返回的结果
private recallQqMessage = consumer(async (qq: Friend | Group, seq: number, rand: number, timeOrPktnum: number) => {
await qq.recallMsg(seq, rand, timeOrPktnum);
}, 500);
private recallQqMessage = consumer(async (qq: Friend | Group, seq: number, rand: number, timeOrPktnum: number, pair: Pair, isOthersMsg: boolean) => {
try {
const result = await qq.recallMsg(seq, rand, timeOrPktnum);
this.log.info(seq, result);
if (!result) throw new Error('撤回失败');
}
catch (e) {
this.log.error('撤回失败', e);
const tipMsg = await pair.tg.sendMessage({
message: '撤回 QQ 中对应的消息失败' +
(this.instance.workMode === 'group' ? '，QQ Bot 需要是管理员' : '') +
(isOthersMsg ? '，而且无法撤回其他管理员的消息' : '') +
(e.message ? '\n' + e.message : ''),
silent: true,
});
this.instance.workMode === 'group' && setTimeout(async () => await tipMsg.delete({ revoke: true }), 5000);
}
}, 1000);
/**
* 删除 QQ 对应的消息
@ -39,20 +54,14 @@ export default class DeleteMessageService {
if (messageInfo) {
try {
this.recallQqMessage(pair.qq, messageInfo.seq, messageInfo.rand,
pair.qq instanceof Friend ? messageInfo.time : messageInfo.pktnum);
pair.qq instanceof Friend ? messageInfo.time : messageInfo.pktnum,
pair, isOthersMsg);
await db.message.delete({
where: { id: messageInfo.id },
});
}
catch (e) {
const tipMsg = await pair.tg.sendMessage({
message: '撤回 QQ 中对应的消息失败' +
(this.instance.workMode === 'group' ? '，QQ Bot 需要是管理员' : '') +
(isOthersMsg ? '，而且无法撤回其他管理员的消息' : '') +
(e.message ? '\n' + e.message : ''),
silent: true,
});
this.instance.workMode === 'group' && setTimeout(async () => await tipMsg.delete({ revoke: true }), 5000);
this.log.error(e);
}
}
}