summaryrefslogtreecommitdiff
path: root/ATRI/plugins
diff options
context:
space:
mode:
authorRuoqi Yang <[email protected]>2022-11-12 18:56:50 +0800
committerRuoqi Yang <[email protected]>2022-11-12 19:19:12 +0800
commit8aba97ec5c4d9dd001e01427defd9bbd6bdb47cf (patch)
tree919e083c45f9dfd3c9e7771dc4bc3e69391d697a /ATRI/plugins
parent9775416cff368dc8acbf2615f05bb86c7196b009 (diff)
downloadATRI-8aba97ec5c4d9dd001e01427defd9bbd6bdb47cf.tar.gz
ATRI-8aba97ec5c4d9dd001e01427defd9bbd6bdb47cf.tar.bz2
ATRI-8aba97ec5c4d9dd001e01427defd9bbd6bdb47cf.zip
fix: add friend request handling
Diffstat (limited to 'ATRI/plugins')
-rw-r--r--ATRI/plugins/essential/__init__.py4
-rw-r--r--ATRI/plugins/manage/__init__.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/ATRI/plugins/essential/__init__.py b/ATRI/plugins/essential/__init__.py
index 4635583..020653e 100644
--- a/ATRI/plugins/essential/__init__.py
+++ b/ATRI/plugins/essential/__init__.py
@@ -45,7 +45,7 @@ friend_add_event = plugin.on_request("好友申请", "好友申请检测")
@friend_add_event.handle()
-async def _(event: FriendRequestEvent):
+async def _(bot: Bot, event: FriendRequestEvent):
path = __ESSENTIAL_DIR / "friend_add.json"
file = FileDealer(path)
if not path.is_file():
@@ -62,7 +62,7 @@ async def _(event: FriendRequestEvent):
user_id=user_id,
comment=apply_comment,
time=now_time,
- )
+ ).dict()
await file.write(json.dumps(data))
result = (
diff --git a/ATRI/plugins/manage/__init__.py b/ATRI/plugins/manage/__init__.py
index 0268ec9..03de2fe 100644
--- a/ATRI/plugins/manage/__init__.py
+++ b/ATRI/plugins/manage/__init__.py
@@ -290,6 +290,8 @@ async def _deal_approve_friend_add(
except Exception:
await approve_friend_add.finish("同意失败...尝试下手动?")
data = Manage().load_friend_apply_list()
+ if apply_code not in data:
+ await approve_friend_add.reject("申请码不存在...请检查是否输入正确")
data.pop(apply_code)
Manage().save_friend_apply_list(data)
await approve_friend_add.finish("好欸!申请已通过!")