修复部分事件接收报错的问题

Tian-que · Apr 6, 2023 · a330392 · a330392
1 parent cd14c71
commit a330392
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/nonebot/adapters/kaiheila/event.py b/nonebot/adapters/kaiheila/event.py
@@ -77,8 +77,11 @@ class Extra(BaseModel):
     attachments: Optional[Attachment] = Field(None)
     code: Optional[str] = Field(None)
 
-    @validator("body")
+    @validator("body", pre=True)
     def convert_body(cls, v):
+        if v is None:
+            return None
+
         if not isinstance(v, dict):
             raise TypeError('body must be dict')
         if not isinstance(v, AttrDict):

diff --git a/nonebot/adapters/kaiheila/utils.py b/nonebot/adapters/kaiheila/utils.py
@@ -96,8 +96,13 @@ def get_sn(cls, self_id: str) -> int:
 
 
 class AttrDict(UserDict):
-    def __init__(self, initial=None):
+    def __init__(self, data=None):
+        initial = dict(data)
+        for k in initial:
+            if isinstance(initial[k], dict):
+                initial[k] = AttrDict(initial[k])
+
         super().__init__(initial)
 
     def __getattr__(self, name):
-        return self['name']
+        return self[name]