✨ support new qq openid

Author: yanyongyu

nonebot/adapters/qq/event.py

@@ -14,12 +14,14 @@
     RichText,
     QQMessage,
     AudioAction,
+    FriendAuthor,
     MessageDelete,
     MessageAudited,
     ForumSourceInfo,
     MessageReaction,
     ForumAuditResult,
     ButtonInteraction,
+    GroupMemberAuthor,
 )
 
 E = TypeVar("E", bound="Event")
@@ -348,14 +350,6 @@ class DirectMessageDeleteEvent(MessageDeleteEvent):
 class QQMessageEvent(MessageEvent, QQMessage):
     _reply_seq: int = -1
 
-    @override
-    def get_user_id(self) -> str:
-        return self.author.id
-
-    @override
-    def get_session_id(self) -> str:
-        return self.author.id
-
     @override
     def get_message(self) -> Message:
         if not hasattr(self, "_message"):
@@ -367,37 +361,48 @@ def get_message(self) -> Message:
 class C2CMessageCreateEvent(QQMessageEvent):
     __type__ = EventType.C2C_MESSAGE_CREATE
 
+    author: FriendAuthor
     to_me: bool = True
 
+    @override
+    def get_user_id(self) -> str:
+        return self.author.user_openid
+
+    @override
+    def get_session_id(self) -> str:
+        return f"friend_{self.author.user_openid}"
+
     @override
     def get_event_description(self) -> str:
         return escape_tag(
             f"Message {self.id} from {self.author.id}: {self.get_message()!r}"
         )
 
-    @override
-    def get_session_id(self) -> str:
-        return f"friend_{self.author.id}"
-
 
 @register_event_class
 class GroupAtMessageCreateEvent(QQMessageEvent):
     __type__ = EventType.GROUP_AT_MESSAGE_CREATE
 
+    author: GroupMemberAuthor
     group_id: str
     to_me: bool = True
 
+    @override
+    def get_user_id(self) -> str:
+        return self.author.member_openid
+
+    @override
+    def get_session_id(self) -> str:
+        return f"group_{self.group_id}_{self.author.member_openid}"
+
     @override
     def get_event_description(self) -> str:
         return escape_tag(
-            f"Message {self.id} from {self.author.id}@[Group:{self.group_id}]: "
+            f"Message {self.id} from "
+            f"{self.author.member_openid}@[Group:{self.group_id}]: "
             f"{self.get_message()!r}"
         )
 
-    @override
-    def get_session_id(self) -> str:
-        return f"group_{self.group_id}_{self.author.id}"
-
 
 @register_event_class
 class InteractionCreateEvent(NoticeEvent, ButtonInteraction):

nonebot/adapters/qq/models/qq.py

@@ -5,8 +5,14 @@
 from pydantic import BaseModel, validator
 
 
-class Author(BaseModel):
+class FriendAuthor(BaseModel):
     id: str
+    user_openid: str
+
+
+class GroupMemberAuthor(BaseModel):
+    id: str
+    member_openid: str
 
 
 class Attachment(BaseModel):
@@ -30,7 +36,6 @@ class Media(BaseModel):
 
 class QQMessage(BaseModel):
     id: str
-    author: Author
     content: str
     timestamp: str
     attachments: Optional[List[Attachment]] = None
@@ -94,7 +99,8 @@ class ButtonInteraction(BaseModel):
 
 
 __all__ = [
-    "Author",
+    "FriendAuthor",
+    "GroupMemberAuthor",
     "Attachment",
     "Media",
     "QQMessage",