From 382a9b6e125f6c126d96e1291e4767852b81e316 Mon Sep 17 00:00:00 2001
From: Mix <admin@yami.im>
Date: Sun, 7 Feb 2021 12:40:31 +0800
Subject: [PATCH] :loud_sound: improve message logging

---
 nonebot/adapters/mirai/bot.py     |  1 -
 nonebot/adapters/mirai/message.py |  5 +++--
 nonebot/adapters/mirai/utils.py   | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nonebot/adapters/mirai/bot.py b/nonebot/adapters/mirai/bot.py
index 900e3ec5..4f5cb196 100644
--- a/nonebot/adapters/mirai/bot.py
+++ b/nonebot/adapters/mirai/bot.py
@@ -253,7 +253,6 @@ class Bot(BaseBot):
           * ``message: Union[MessageChain, MessageSegment, str]``: 要发送的消息
           * ``at_sender: bool``: 是否 @ 事件主体
         """
-        print(event, message, at_sender)
         if not isinstance(message, MessageChain):
             message = MessageChain(message)
         if isinstance(event, FriendMessage):
diff --git a/nonebot/adapters/mirai/message.py b/nonebot/adapters/mirai/message.py
index f6af1ab6..d2a3ec39 100644
--- a/nonebot/adapters/mirai/message.py
+++ b/nonebot/adapters/mirai/message.py
@@ -44,8 +44,9 @@ class MessageSegment(BaseMessageSegment):
 
     @overrides(BaseMessageSegment)
     def __str__(self) -> str:
-        if self.is_text():
-            return self.data.get('text', '')
+        return self.data['text'] if self.is_text() else repr(self)
+
+    def __repr__(self) -> str:
         return '[mirai:%s]' % ','.join([
             self.type.value,
             *map(
diff --git a/nonebot/adapters/mirai/utils.py b/nonebot/adapters/mirai/utils.py
index c9c9c143..385bd3c6 100644
--- a/nonebot/adapters/mirai/utils.py
+++ b/nonebot/adapters/mirai/utils.py
@@ -23,27 +23,26 @@ _AnyCallable = TypeVar("_AnyCallable", bound=Callable)
 class Log:
 
     @staticmethod
-    def _log(level: str, message: Any, exception: Optional[Exception] = None):
+    def log(level: str, message: str, exception: Optional[Exception] = None):
         logger = logger_wrapper('MIRAI')
-        logger(level=level,
-               message=escape_tag(str(message)),
-               exception=exception)
+        message = '<e>' + escape_tag(message) + '</e>'
+        logger(level=level.upper(), message=message, exception=exception)
 
     @classmethod
     def info(cls, message: Any):
-        cls._log('INFO', escape_tag(str(message)))
+        cls.log('INFO', str(message))
 
     @classmethod
     def debug(cls, message: Any):
-        cls._log('DEBUG', escape_tag(str(message)))
+        cls.log('DEBUG', str(message))
 
     @classmethod
     def warn(cls, message: Any):
-        cls._log('WARNING', escape_tag(str(message)))
+        cls.log('WARNING', str(message))
 
     @classmethod
     def error(cls, message: Any, exception: Optional[Exception] = None):
-        cls._log('ERROR', escape_tag(str(message)), exception=exception)
+        cls.log('ERROR', str(message), exception=exception)
 
 
 class ActionFailed(exception.ActionFailed):
@@ -169,6 +168,7 @@ def process_reply(bot: "Bot", event: GroupMessage) -> GroupMessage:
 
 async def process_event(bot: "Bot", event: Event) -> None:
     if isinstance(event, MessageEvent):
+        Log.debug(event.message_chain)
         event = process_source(bot, event)
         if isinstance(event, GroupMessage):
             event = process_nick(bot, event)