From 55f1bd1f2dcc23734c87260df7cbfad5331b9015 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 30 Dec 2020 20:08:22 +0800 Subject: [PATCH] :pencil2: update code style --- nonebot/adapters/ding/bot.py | 2 +- nonebot/adapters/ding/event.py | 12 ++++++------ nonebot/adapters/ding/message.py | 13 ++++++++++--- nonebot/matcher.py | 4 ++-- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/nonebot/adapters/ding/bot.py b/nonebot/adapters/ding/bot.py index a736dc09..e46febc5 100644 --- a/nonebot/adapters/ding/bot.py +++ b/nonebot/adapters/ding/bot.py @@ -98,7 +98,7 @@ class Bot(BaseBot): await handle_event(self, event) except Exception as e: logger.opt(colors=True, exception=e).error( - f"Failed to handle event. Raw: {event}" + f"Failed to handle event. Raw: {message}" ) return diff --git a/nonebot/adapters/ding/event.py b/nonebot/adapters/ding/event.py index a049a079..c9cd76dc 100644 --- a/nonebot/adapters/ding/event.py +++ b/nonebot/adapters/ding/event.py @@ -100,27 +100,27 @@ class MessageEvent(Event): def get_type(self) -> Literal["message", "notice", "request", "meta_event"]: return "message" - @overrides(BaseEvent) + @overrides(Event) def get_event_name(self) -> str: return f"{self.get_type()}.{self.conversationType.name}" - @overrides(BaseEvent) + @overrides(Event) def get_event_description(self) -> str: return f'Message[{self.msgtype}] {self.msgId} from {self.senderId} "{self.text.content}"' - @overrides(BaseEvent) + @overrides(Event) def get_message(self) -> Message: return self.message - @overrides(BaseEvent) + @overrides(Event) def get_plaintext(self) -> str: return self.text.content - @overrides(BaseEvent) + @overrides(Event) def get_user_id(self) -> str: return self.senderId - @overrides(BaseEvent) + @overrides(Event) def get_session_id(self) -> str: return self.senderId diff --git a/nonebot/adapters/ding/message.py b/nonebot/adapters/ding/message.py index ad4aa198..2c0fa336 100644 --- a/nonebot/adapters/ding/message.py +++ b/nonebot/adapters/ding/message.py @@ -1,7 +1,8 @@ -from typing import Any, Dict, Union, Iterable -from nonebot.adapters import Message as BaseMessage, MessageSegment as BaseMessageSegment - from copy import copy +from typing import Any, Dict, Union, Iterable + +from nonebot.typing import overrides +from nonebot.adapters import Message as BaseMessage, MessageSegment as BaseMessageSegment class MessageSegment(BaseMessageSegment): @@ -9,9 +10,11 @@ class MessageSegment(BaseMessageSegment): 钉钉 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 """ + @overrides(BaseMessageSegment) def __init__(self, type_: str, data: Dict[str, Any]) -> None: super().__init__(type=type_, data=data) + @overrides(BaseMessageSegment) def __str__(self): if self.type == "text": return str(self.data["content"]) @@ -19,12 +22,15 @@ class MessageSegment(BaseMessageSegment): return str(self.data["text"]) return "" + @overrides(BaseMessageSegment) def __add__(self, other) -> "Message": return Message(self) + other + @overrides(BaseMessageSegment) def __radd__(self, other) -> "Message": return Message(other) + self + @overrides(BaseMessageSegment) def is_text(self) -> bool: return self.type == "text" @@ -126,6 +132,7 @@ class Message(BaseMessage): """ @staticmethod + @overrides(BaseMessage) def _construct(msg: Union[str, dict, list]) -> Iterable[MessageSegment]: if isinstance(msg, dict): yield MessageSegment(msg["type"], msg.get("data") or {}) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 1045973b..ca40123d 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -464,7 +464,7 @@ class Matcher(metaclass=MatcherMeta): BotType = ((params["bot"] is not inspect.Parameter.empty) and inspect.isclass(params["bot"]) and params["bot"]) if BotType and not isinstance(bot, BotType): - logger.info( + logger.debug( f"Matcher {self} bot type {type(bot)} not match annotation {BotType}, ignored" ) return @@ -472,7 +472,7 @@ class Matcher(metaclass=MatcherMeta): EventType = ((params["event"] is not inspect.Parameter.empty) and inspect.isclass(params["event"]) and params["event"]) if EventType and not isinstance(event, EventType): - logger.info( + logger.debug( f"Matcher {self} event type {type(event)} not match annotation {EventType}, ignored" ) return