修复了badge获取不到导致的错误

BalconyJH · Jan 18, 2023 · a779888 · a779888
1 parent aec2f2c
commit a779888
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/dynamicadaptor/DynamicConversion.py b/dynamicadaptor/DynamicConversion.py
@@ -145,12 +145,13 @@ async def get_grpc_text(message: dict) -> Union[dict, None]:
                     temp = {"type": rich_type_dict[j["type"]], "text": j["text"], "orig_text": j["origText"]}
                     try:
                         temp["emoji"] = {"icon_url": j["uri"], "type": j["emojiType"], "text": j["text"]}
-                    except KeyError as e:
+                    except Exception as e:
                         pass
                     rich_text_nodes.append(temp)
                 text["text"] = plain_text
                 text["rich_text_nodes"] = rich_text_nodes
-        except KeyError:
+        except Exception:
+            logger.exception("error")
             pass
     if text:
         return text
@@ -181,16 +182,16 @@ async def get_grpc_major(message: dict) -> Union[dict, None]:
             try:
 
                 i["moduleDynamic"]["dynArchive"]["duration_text"] = i["moduleDynamic"]["dynArchive"]["coverLeftText1"]
-
-                badge = {
-                    "text":i["moduleDynamic"]["dynArchive"]["badge"][0]["text"],
-                    "color":i["moduleDynamic"]["dynArchive"]["badge"][0]["textColor"],
-                    "bg_color": i["moduleDynamic"]["dynArchive"]["badge"][0]["bgColor"] 
-                }
-                i["moduleDynamic"]["dynArchive"]["badge"] = badge
+                if "badge" in i["moduleDynamic"]["dynArchive"]:
+                    badge = {
+                        "text":i["moduleDynamic"]["dynArchive"]["badge"][0]["text"],
+                        "color":i["moduleDynamic"]["dynArchive"]["badge"][0]["textColor"],
+                        "bg_color": i["moduleDynamic"]["dynArchive"]["badge"][0]["bgColor"] 
+                    }
+                    i["moduleDynamic"]["dynArchive"]["badge"] = badge
                 return {"type": "MAJOR_TYPE_ARCHIVE", "archive": i["moduleDynamic"]["dynArchive"]}
             except Exception as e:
-                # logger.exception("E")
+                logger.exception("E")
                 pass
             try:
                 return {"type": "MAJOR_TYPE_LIVE_RCMD", "live_rcmd": i["moduleDynamic"]["dynLiveRcmd"]}
@@ -377,9 +378,11 @@ async def web_formate(message: dict) -> RenderMessage:
         forward_additional = message["orig"]["modules"]["module_dynamic"]["additional"]
         forward_text = message["orig"]["modules"]["module_dynamic"]["desc"]
         if message["orig"]["modules"]["module_dynamic"]["topic"] is not None:
-            forward_text["topic"] = message["orig"]["modules"]["module_dynamic"]["topic"]
-
-
+            if forward_text:
+                forward_text["topic"] = message["orig"]["modules"]["module_dynamic"]["topic"]
+            else:
+                forward_text = {"topic":message["orig"]["modules"]["module_dynamic"]["topic"]}
+
 
         forward = Forward(header=forward_header, message_type=forward_type, major=forward_major,
                           additional=forward_additional, text=forward_text)

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "DynamicAdaptor"
-version = "0.3.0"
+version = "0.3.1"
 description = ""
 authors = ["DMC <lzxder@outlook.com>"]
 readme = "README.md"

diff --git a/tests/grpc_test.py b/tests/grpc_test.py
@@ -5,11 +5,12 @@
 import json
 
 async def run():
-    message = await get_dy_detail("751145855632801799")
+    message = await get_dy_detail("752197925088526336")
     result = await formate_message(message_type="grpc", message=json.loads(MessageToJson(message[0])))
     # with open("a.json","w") as f:
-    #     f.write(json.dumps(MessageToDict(message[0])))
-    print(result)
+    #     f.write(MessageToJson(message[0]))
+    print(result.forward)
+
 
 
 if __name__ == "__main__":

diff --git a/tests/web_test.py b/tests/web_test.py
@@ -3,13 +3,13 @@
 import asyncio
 
 async def run():
-    url = "https://api.bilibili.com/x/polymer/web-dynamic/v1/detail?timezone_offset=-480&id=744678498175549442"
+    url = "https://api.bilibili.com/x/polymer/web-dynamic/v1/detail?timezone_offset=-480&id=752409155838410753"
     headers = {
-        "Referer": "https://t.bilibili.com/744678498175549442"
+        "Referer": "https://t.bilibili.com/752409155838410753"
     }
     res = httpx.get(url, headers=headers).json()
     result = await formate_message("web", res["data"]["item"])
-    print(result)
+    # print(result)
 
 if __name__ == "__main__":