diff --git a/nonebot/adapters/cqhttp/event.py b/nonebot/adapters/cqhttp/event.py index 678ce504..083d4d0c 100644 --- a/nonebot/adapters/cqhttp/event.py +++ b/nonebot/adapters/cqhttp/event.py @@ -219,6 +219,14 @@ class GroupUploadNoticeEvent(NoticeEvent): group_id: int file: File + @overrides(NoticeEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(NoticeEvent) + def get_session_id(self) -> str: + return str(self.user_id) + class GroupAdminNoticeEvent(NoticeEvent): """群管理员变动""" @@ -228,10 +236,18 @@ class GroupAdminNoticeEvent(NoticeEvent): user_id: int group_id: int - @overrides(Event) + @overrides(NoticeEvent) def is_tome(self) -> bool: return self.user_id == self.self_id + @overrides(NoticeEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(NoticeEvent) + def get_session_id(self) -> str: + return str(self.user_id) + class GroupDecreaseNoticeEvent(NoticeEvent): """群成员减少事件""" @@ -242,10 +258,18 @@ class GroupDecreaseNoticeEvent(NoticeEvent): group_id: int operator_id: int - @overrides(Event) + @overrides(NoticeEvent) def is_tome(self) -> bool: return self.user_id == self.self_id + @overrides(NoticeEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(NoticeEvent) + def get_session_id(self) -> str: + return str(self.user_id) + class GroupIncreaseNoticeEvent(NoticeEvent): """群成员增加事件""" @@ -256,10 +280,18 @@ class GroupIncreaseNoticeEvent(NoticeEvent): group_id: int operator_id: int - @overrides(Event) + @overrides(NoticeEvent) def is_tome(self) -> bool: return self.user_id == self.self_id + @overrides(NoticeEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(NoticeEvent) + def get_session_id(self) -> str: + return str(self.user_id) + class GroupBanNoticeEvent(NoticeEvent): """群禁言事件""" @@ -271,10 +303,18 @@ class GroupBanNoticeEvent(NoticeEvent): operator_id: int duration: int - @overrides(Event) + @overrides(NoticeEvent) def is_tome(self) -> bool: return self.user_id == self.self_id + @overrides(NoticeEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(NoticeEvent) + def get_session_id(self) -> str: + return str(self.user_id) + class FriendAddNoticeEvent(NoticeEvent): """好友添加事件""" @@ -282,6 +322,14 @@ class FriendAddNoticeEvent(NoticeEvent): notice_type: Literal["friend_add"] user_id: int + @overrides(NoticeEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(NoticeEvent) + def get_session_id(self) -> str: + return str(self.user_id) + class GroupRecallNoticeEvent(NoticeEvent): """群消息撤回事件""" @@ -296,6 +344,14 @@ class GroupRecallNoticeEvent(NoticeEvent): def is_tome(self) -> bool: return self.user_id == self.self_id + @overrides(NoticeEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(NoticeEvent) + def get_session_id(self) -> str: + return str(self.user_id) + class FriendRecallNoticeEvent(NoticeEvent): """好友消息撤回事件""" @@ -304,6 +360,14 @@ class FriendRecallNoticeEvent(NoticeEvent): user_id: int message_id: int + @overrides(NoticeEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(NoticeEvent) + def get_session_id(self) -> str: + return str(self.user_id) + class NotifyEvent(NoticeEvent): """提醒事件""" @@ -313,6 +377,14 @@ class NotifyEvent(NoticeEvent): user_id: int group_id: int + @overrides(NoticeEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(NoticeEvent) + def get_session_id(self) -> str: + return str(self.user_id) + class PokeNotifyEvent(NotifyEvent): """戳一戳提醒事件""" @@ -336,6 +408,14 @@ class LuckyKingNotifyEvent(NotifyEvent): def is_tome(self) -> bool: return self.target_id == self.self_id + @overrides(NotifyEvent) + def get_user_id(self) -> str: + return str(self.target_id) + + @overrides(NotifyEvent) + def get_session_id(self) -> str: + return str(self.target_id) + class HonorNotifyEvent(NotifyEvent): """群荣誉变更提醒事件""" @@ -370,6 +450,14 @@ class FriendRequestEvent(RequestEvent): comment: str flag: str + @overrides(RequestEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(RequestEvent) + def get_session_id(self) -> str: + return str(self.user_id) + class GroupRequestEvent(RequestEvent): """加群请求/邀请事件""" @@ -381,6 +469,14 @@ class GroupRequestEvent(RequestEvent): comment: str flag: str + @overrides(RequestEvent) + def get_user_id(self) -> str: + return str(self.user_id) + + @overrides(RequestEvent) + def get_session_id(self) -> str: + return str(self.user_id) + # Meta Events class MetaEvent(Event):