✨ 简化事件日志输出并过滤 UNSET fix #38 (#68)

Author: shoucandanghehe

nonebot/adapters/discord/event.py

@@ -7,7 +7,7 @@
 
 from nonebot.adapters import Event as BaseEvent
 
-from nonebot.compat import PYDANTIC_V2, model_dump
+from nonebot.compat import PYDANTIC_V2
 from nonebot.utils import escape_tag
 from pydantic import BaseModel, Field
 
@@ -93,7 +93,7 @@
 )
 from .api.types import UNSET, InteractionType, Missing, is_unset
 from .message import Message
-from .utils import log
+from .utils import log, model_dump
 
 
 class EventType(str, Enum):
@@ -238,7 +238,7 @@ def get_event_name(self) -> str:
 
     @override
     def get_event_description(self) -> str:
-        return escape_tag(str(model_dump(self)))
+        return escape_tag(str(model_dump(self, omit_unset_values=True)))
 
     @override
     def get_message(self) -> Message:
@@ -303,6 +303,32 @@ def original_message(self) -> Message:
     def get_type(self) -> str:
         return "message"
 
+    @staticmethod
+    def _format_preview(content: str, max_length: int = 120) -> str:
+        normalized = content.replace("\r\n", "\n").replace("\r", "\n")
+        normalized = normalized.replace("\n", "\\n").strip()
+        if not normalized:
+            return "<empty>"
+        if len(normalized) > max_length:
+            return normalized[: max_length - 3] + "..."
+        return normalized
+
+    @override
+    def get_event_description(self) -> str:
+        guild_id = getattr(self, "guild_id", UNSET)
+        location = (
+            f"Guild {guild_id}, Channel {self.channel_id}"
+            if not is_unset(guild_id)
+            else f"Channel {self.channel_id}"
+        )
+        preview = self._format_preview(
+            self.get_message().extract_content() or self.content
+        )
+        return escape_tag(
+            f"Message {self.id} from {self.author.id}({self.author.username})"
+            f"@[{location}] {preview}"
+        )
+
     @override
     def get_user_id(self) -> str:
         return str(self.author.id)

tests/test_event_description_logging.py

@@ -0,0 +1,55 @@
+from nonebot.adapters.discord.event import (
+    DirectMessageDeleteEvent,
+    GuildMessageCreateEvent,
+)
+
+from nonebot.compat import type_validate_python
+
+
+def _build_message_create_payload() -> dict[str, object]:
+    return {
+        "id": "1",
+        "channel_id": "100",
+        "guild_id": "300",
+        "author": {
+            "id": "2",
+            "username": "tester",
+            "discriminator": "0",
+            "global_name": None,
+            "avatar": None,
+        },
+        "content": "hello\nworld",
+        "timestamp": "2026-02-14T00:00:00+00:00",
+        "edited_timestamp": None,
+        "tts": False,
+        "mention_everyone": False,
+        "mentions": [],
+        "mention_roles": [],
+        "attachments": [],
+        "embeds": [],
+        "pinned": False,
+        "type": 0,
+    }
+
+
+def test_message_event_description_is_simplified() -> None:
+    event = type_validate_python(
+        GuildMessageCreateEvent, _build_message_create_payload()
+    )
+
+    desc = event.get_event_description()
+
+    assert "Message 1 from 2(tester)@[Guild 300, Channel 100]" in desc
+    assert "hello\\nworld" in desc
+    assert "<UNSET>" not in desc
+
+
+def test_non_message_event_description_omits_unset_fields() -> None:
+    event = type_validate_python(
+        DirectMessageDeleteEvent, {"id": "1", "channel_id": "100"}
+    )
+
+    desc = event.get_event_description()
+
+    assert "<UNSET>" not in desc
+    assert "guild_id" not in desc