From 57cf8e9bd81c7faea07839aaff163ca24751e380 Mon Sep 17 00:00:00 2001
From: yanyongyu <yanyongyu_1@126.com>
Date: Sat, 29 May 2021 19:32:05 +0800
Subject: [PATCH] :bug: fix cqhttp event session id mismatch for group

---
 .../nonebot/adapters/cqhttp/event.py          | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py
index e0551279..e5ba6f36 100644
--- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py
+++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py
@@ -232,7 +232,7 @@ class GroupUploadNoticeEvent(NoticeEvent):
 
     @overrides(NoticeEvent)
     def get_session_id(self) -> str:
-        return str(self.user_id)
+        return f"group_{self.group_id}_{self.user_id}"
 
 
 class GroupAdminNoticeEvent(NoticeEvent):
@@ -253,7 +253,7 @@ class GroupAdminNoticeEvent(NoticeEvent):
 
     @overrides(NoticeEvent)
     def get_session_id(self) -> str:
-        return str(self.user_id)
+        return f"group_{self.group_id}_{self.user_id}"
 
 
 class GroupDecreaseNoticeEvent(NoticeEvent):
@@ -275,7 +275,7 @@ class GroupDecreaseNoticeEvent(NoticeEvent):
 
     @overrides(NoticeEvent)
     def get_session_id(self) -> str:
-        return str(self.user_id)
+        return f"group_{self.group_id}_{self.user_id}"
 
 
 class GroupIncreaseNoticeEvent(NoticeEvent):
@@ -297,7 +297,7 @@ class GroupIncreaseNoticeEvent(NoticeEvent):
 
     @overrides(NoticeEvent)
     def get_session_id(self) -> str:
-        return str(self.user_id)
+        return f"group_{self.group_id}_{self.user_id}"
 
 
 class GroupBanNoticeEvent(NoticeEvent):
@@ -320,7 +320,7 @@ class GroupBanNoticeEvent(NoticeEvent):
 
     @overrides(NoticeEvent)
     def get_session_id(self) -> str:
-        return str(self.user_id)
+        return f"group_{self.group_id}_{self.user_id}"
 
 
 class FriendAddNoticeEvent(NoticeEvent):
@@ -357,7 +357,7 @@ class GroupRecallNoticeEvent(NoticeEvent):
 
     @overrides(NoticeEvent)
     def get_session_id(self) -> str:
-        return str(self.user_id)
+        return f"group_{self.group_id}_{self.user_id}"
 
 
 class FriendRecallNoticeEvent(NoticeEvent):
@@ -390,7 +390,7 @@ class NotifyEvent(NoticeEvent):
 
     @overrides(NoticeEvent)
     def get_session_id(self) -> str:
-        return str(self.user_id)
+        return f"group_{self.group_id}_{self.user_id}"
 
 
 class PokeNotifyEvent(NotifyEvent):
@@ -404,6 +404,12 @@ class PokeNotifyEvent(NotifyEvent):
     def is_tome(self) -> bool:
         return self.target_id == self.self_id
 
+    @overrides(NotifyEvent)
+    def get_session_id(self) -> str:
+        if not self.group_id:
+            return str(self.user_id)
+        return super().get_session_id()
+
 
 class LuckyKingNotifyEvent(NotifyEvent):
     """群红包运气王提醒事件"""
@@ -421,7 +427,7 @@ class LuckyKingNotifyEvent(NotifyEvent):
 
     @overrides(NotifyEvent)
     def get_session_id(self) -> str:
-        return str(self.target_id)
+        return f"group_{self.group_id}_{self.target_id}"
 
 
 class HonorNotifyEvent(NotifyEvent):
@@ -490,7 +496,7 @@ class GroupRequestEvent(RequestEvent):
 
     @overrides(RequestEvent)
     def get_session_id(self) -> str:
-        return str(self.user_id)
+        return f"group_{self.group_id}_{self.user_id}"
 
     async def approve(self, bot: "Bot"):
         return await bot.set_group_add_request(flag=self.flag,