summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyomotoi <[email protected]>2022-02-04 00:09:04 +0800
committerKyomotoi <[email protected]>2022-02-04 00:09:04 +0800
commit1c7e93b6b2e94dfe698adc0b077d1bbaf01498ec (patch)
tree1f2c592ef485c6f82610c4e6533c0f110a583fdc
parente3167b1db03ecda1d92dc73a88905dce52209ee2 (diff)
downloadATRI-1c7e93b6b2e94dfe698adc0b077d1bbaf01498ec.tar.gz
ATRI-1c7e93b6b2e94dfe698adc0b077d1bbaf01498ec.tar.bz2
ATRI-1c7e93b6b2e94dfe698adc0b077d1bbaf01498ec.zip
🐛 适配不同的协议端传回的信息
-rw-r--r--ATRI/plugins/essential.py22
1 files changed, 18 insertions, 4 deletions
diff --git a/ATRI/plugins/essential.py b/ATRI/plugins/essential.py
index fa73a3c..6ec5401 100644
--- a/ATRI/plugins/essential.py
+++ b/ATRI/plugins/essential.py
@@ -281,9 +281,16 @@ async def _recall_group_event(bot: Bot, event: GroupRecallNoticeEvent):
user = event.user_id
group = event.group_id
- repo: dict = repo["message"]
+ repo = repo["message"]
- m = recall_msg_dealer(repo)
+ try:
+ m = recall_msg_dealer(repo)
+ except:
+ check = MessageChecker(repo).check_cq_code
+ if not check:
+ m = repo
+ else:
+ return
msg = f"主人,咱拿到了一条撤回信息!\n{user}@[群:{group}]\n撤回了\n{m}"
for superuser in BotSelfConfig.superusers:
@@ -304,9 +311,16 @@ async def _recall_private_event(bot: Bot, event: FriendRecallNoticeEvent):
return
user = event.user_id
- repo: dict = repo["message"]
+ repo = repo["message"]
- m = recall_msg_dealer(repo)
+ try:
+ m = recall_msg_dealer(repo)
+ except:
+ check = MessageChecker(repo).check_cq_code
+ if not check:
+ m = repo
+ else:
+ return
msg = f"主人,咱拿到了一条撤回信息!\n{user}@[私聊]撤回了\n{m}"
for superuser in BotSelfConfig.superusers: