✏️ update code style

This commit is contained in:
yanyongyu 2020-12-30 20:08:22 +08:00
parent 380977bc67
commit 55f1bd1f2d
4 changed files with 19 additions and 12 deletions

View File

@ -98,7 +98,7 @@ class Bot(BaseBot):
await handle_event(self, event) await handle_event(self, event)
except Exception as e: except Exception as e:
logger.opt(colors=True, exception=e).error( logger.opt(colors=True, exception=e).error(
f"<r><bg #f8bbd0>Failed to handle event. Raw: {event}</bg #f8bbd0></r>" f"<r><bg #f8bbd0>Failed to handle event. Raw: {message}</bg #f8bbd0></r>"
) )
return return

View File

@ -100,27 +100,27 @@ class MessageEvent(Event):
def get_type(self) -> Literal["message", "notice", "request", "meta_event"]: def get_type(self) -> Literal["message", "notice", "request", "meta_event"]:
return "message" return "message"
@overrides(BaseEvent) @overrides(Event)
def get_event_name(self) -> str: def get_event_name(self) -> str:
return f"{self.get_type()}.{self.conversationType.name}" return f"{self.get_type()}.{self.conversationType.name}"
@overrides(BaseEvent) @overrides(Event)
def get_event_description(self) -> str: def get_event_description(self) -> str:
return f'Message[{self.msgtype}] {self.msgId} from {self.senderId} "{self.text.content}"' return f'Message[{self.msgtype}] {self.msgId} from {self.senderId} "{self.text.content}"'
@overrides(BaseEvent) @overrides(Event)
def get_message(self) -> Message: def get_message(self) -> Message:
return self.message return self.message
@overrides(BaseEvent) @overrides(Event)
def get_plaintext(self) -> str: def get_plaintext(self) -> str:
return self.text.content return self.text.content
@overrides(BaseEvent) @overrides(Event)
def get_user_id(self) -> str: def get_user_id(self) -> str:
return self.senderId return self.senderId
@overrides(BaseEvent) @overrides(Event)
def get_session_id(self) -> str: def get_session_id(self) -> str:
return self.senderId return self.senderId

View File

@ -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 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): class MessageSegment(BaseMessageSegment):
@ -9,9 +10,11 @@ class MessageSegment(BaseMessageSegment):
钉钉 协议 MessageSegment 适配具体方法参考协议消息段类型或源码 钉钉 协议 MessageSegment 适配具体方法参考协议消息段类型或源码
""" """
@overrides(BaseMessageSegment)
def __init__(self, type_: str, data: Dict[str, Any]) -> None: def __init__(self, type_: str, data: Dict[str, Any]) -> None:
super().__init__(type=type_, data=data) super().__init__(type=type_, data=data)
@overrides(BaseMessageSegment)
def __str__(self): def __str__(self):
if self.type == "text": if self.type == "text":
return str(self.data["content"]) return str(self.data["content"])
@ -19,12 +22,15 @@ class MessageSegment(BaseMessageSegment):
return str(self.data["text"]) return str(self.data["text"])
return "" return ""
@overrides(BaseMessageSegment)
def __add__(self, other) -> "Message": def __add__(self, other) -> "Message":
return Message(self) + other return Message(self) + other
@overrides(BaseMessageSegment)
def __radd__(self, other) -> "Message": def __radd__(self, other) -> "Message":
return Message(other) + self return Message(other) + self
@overrides(BaseMessageSegment)
def is_text(self) -> bool: def is_text(self) -> bool:
return self.type == "text" return self.type == "text"
@ -126,6 +132,7 @@ class Message(BaseMessage):
""" """
@staticmethod @staticmethod
@overrides(BaseMessage)
def _construct(msg: Union[str, dict, list]) -> Iterable[MessageSegment]: def _construct(msg: Union[str, dict, list]) -> Iterable[MessageSegment]:
if isinstance(msg, dict): if isinstance(msg, dict):
yield MessageSegment(msg["type"], msg.get("data") or {}) yield MessageSegment(msg["type"], msg.get("data") or {})

View File

@ -464,7 +464,7 @@ class Matcher(metaclass=MatcherMeta):
BotType = ((params["bot"] is not inspect.Parameter.empty) and BotType = ((params["bot"] is not inspect.Parameter.empty) and
inspect.isclass(params["bot"]) and params["bot"]) inspect.isclass(params["bot"]) and params["bot"])
if BotType and not isinstance(bot, BotType): if BotType and not isinstance(bot, BotType):
logger.info( logger.debug(
f"Matcher {self} bot type {type(bot)} not match annotation {BotType}, ignored" f"Matcher {self} bot type {type(bot)} not match annotation {BotType}, ignored"
) )
return return
@ -472,7 +472,7 @@ class Matcher(metaclass=MatcherMeta):
EventType = ((params["event"] is not inspect.Parameter.empty) and EventType = ((params["event"] is not inspect.Parameter.empty) and
inspect.isclass(params["event"]) and params["event"]) inspect.isclass(params["event"]) and params["event"])
if EventType and not isinstance(event, EventType): if EventType and not isinstance(event, EventType):
logger.info( logger.debug(
f"Matcher {self} event type {type(event)} not match annotation {EventType}, ignored" f"Matcher {self} event type {type(event)} not match annotation {EventType}, ignored"
) )
return return