diff --git a/starbot/core/dynamic.py b/starbot/core/dynamic.py index 044ac4b..7672ba4 100644 --- a/starbot/core/dynamic.py +++ b/starbot/core/dynamic.py @@ -49,7 +49,7 @@ async def dynamic_spider(datasource: DataSource): if latest_dynamic is None: continue - if "new_num" not in latest_dynamic: + if "new_num" not in latest_dynamic or "cards" not in latest_dynamic: continue new_num = latest_dynamic["new_num"] diff --git a/starbot/core/room.py b/starbot/core/room.py index fa95fc5..0a918c6 100644 --- a/starbot/core/room.py +++ b/starbot/core/room.py @@ -73,7 +73,8 @@ class Up(BaseModel): return 6 if not self.__room else self.__room.get_status() def dispatch(self, event, data): - self.__room.dispatch(event, data) + if self.__room is not None: + self.__room.dispatch(event, data) def inject_bot(self, bot): self.__bot = bot @@ -179,7 +180,6 @@ class Up(BaseModel): 开播事件 """ logger.debug(f"{self.uname} (LIVE): {event}") - # logger.warning(f"{self.uname}: 开播事件") locked = False room_info = {} @@ -255,7 +255,6 @@ class Up(BaseModel): 下播事件 """ logger.debug(f"{self.uname} (PREPARING): {event}") - # logger.warning(f"{self.uname}: 下播事件") if await redis.get_live_status(self.room_id) == 0: return