fix: 修复GUILD_DELETE事件监听不到的问题 (#59)

* fix: 修复GUILD_DELETE事件监听不到的问题 * fix: 修复重连会报错的问题 Co-authored-by: jichendai <jichendai@tencent.com>
tencent-connect · May 8, 2022 · 843f285 · 843f285
1 parent 6a676dc
commit 843f285
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/qqbot/core/network/ws/ws_handler.py b/qqbot/core/network/ws/ws_handler.py
@@ -22,9 +22,17 @@ class DefaultHandler:
 
     @classmethod
     def get_handler_by_type(cls, event_type: str):
-        if event_type in (WsEvent.EventGuildCreate, WsEvent.EventGuildUpdate, WsEvent.EventGuildUpdate):
+        if event_type in (
+                WsEvent.EventGuildCreate,
+                WsEvent.EventGuildUpdate,
+                WsEvent.EventGuildDelete
+        ):
             return cls.guild
-        elif event_type in (WsEvent.EventChannelCreate, WsEvent.EventChannelUpdate, WsEvent.EventChannelDelete):
+        elif event_type in (
+                WsEvent.EventChannelCreate,
+                WsEvent.EventChannelUpdate,
+                WsEvent.EventChannelDelete
+        ):
             return cls.channel
         elif event_type in (
             WsEvent.EventGuildMemberAdd,

diff --git a/qqbot/core/network/ws_async/ws_async_handler.py b/qqbot/core/network/ws_async/ws_async_handler.py
@@ -18,7 +18,7 @@
 
 
 async def parse_and_handle(ws_event, data):
-    event_id = ws_event["id"]
+    event_id = ws_event["id"] if "id" in ws_event.keys() else ""
     event_type = ws_event["t"]
     context = WsContext(event_type, event_id)
     callback = DefaultHandler.get_handler_by_type(event_type)

diff --git a/qqbot/core/network/ws_sync/ws_event_handler.py b/qqbot/core/network/ws_sync/ws_event_handler.py
@@ -18,7 +18,7 @@
 
 
 def parse_and_handle(ws_event, data):
-    event_id = ws_event["id"]
+    event_id = ws_event["id"] if "id" in ws_event.keys() else ""
     event_type = ws_event["t"]
     context = WsContext(event_type, event_id)
     callback = DefaultHandler.get_handler_by_type(event_type)