🐛 fix event.description

resolve #23

nonebot/adapters/satori/bot.py

@@ -13,7 +13,7 @@
 from .utils import API, log
 from .config import ClientInfo
 from .event import Event, MessageEvent
-from .models import InnerMessage as SatoriMessage
+from .models import MessageObject as SatoriMessage
 from .message import Author, Message, RenderMessage, MessageSegment
 from .models import Role, User, Guild, Login, Member, Channel, PageResult
 from .exception import (

nonebot/adapters/satori/event.py

@@ -13,7 +13,7 @@
 from .compat import model_validator
 from .models import Event as SatoriEvent
 from .message import Message, RenderMessage
-from .models import InnerMessage as SatoriMessage
+from .models import MessageObject as SatoriMessage
 from .models import ArgvInteraction, ButtonInteraction
 from .models import Guild, Login, Member, Channel, ChannelType
 
@@ -334,7 +334,7 @@ class PublicMessageCreatedEvent(MessageCreatedEvent, PublicMessageEvent):
     def get_event_description(self) -> str:
         return escape_tag(
             f"Message {self.msg_id} from "
-            f"{self.user.name or ''}({self.channel.id})"
+            f"{self.member.name if self.member else (self.user.name or '')}({self.user.id})"
             f"@[{self.channel.name or ''}:{self.channel.id}]"
             f": {self.get_message()!r}"
         )
@@ -351,7 +351,7 @@ class PublicMessageDeletedEvent(MessageDeletedEvent, PublicMessageEvent):
     def get_event_description(self) -> str:
         return escape_tag(
             f"Message {self.msg_id} from "
-            f"{self.user.name or ''}({self.channel.id})"
+            f"{self.member.name if self.member else (self.user.name or '')}({self.user.id})"
             f"@[{self.channel.name or ''}:{self.channel.id}] deleted"
         )
 
@@ -371,7 +371,7 @@ class PublicMessageUpdatedEvent(MessageUpdatedEvent, PublicMessageEvent):
     def get_event_description(self) -> str:
         return escape_tag(
             f"Message {self.msg_id} from "
-            f"{self.user.name or ''}({self.channel.id})"
+            f"{self.member.name if self.member else (self.user.name or '')}({self.user.id})"
             f"@[{self.channel.name or ''}:{self.channel.id}] updated"
             f": {self.get_message()!r}"
         )

nonebot/adapters/satori/models.py

@@ -175,7 +175,7 @@ class PongPayload(Payload):
     op: Literal[Opcode.PONG] = Field(Opcode.PONG)
 
 
-class InnerMessage(BaseModel):
+class MessageObject(BaseModel):
     id: str
     content: str
     channel: Optional[Channel] = None
@@ -228,11 +228,6 @@ class Config:
             extra = "allow"
 
 
-class OuterMessage(InnerMessage):
-    channel: Channel
-    user: User
-
-
 class Event(BaseModel):
     id: int
     type: str
@@ -245,7 +240,7 @@ class Event(BaseModel):
     guild: Optional[Guild] = None
     login: Optional[Login] = None
     member: Optional[Member] = None
-    message: Optional[InnerMessage] = None
+    message: Optional[MessageObject] = None
     operator: Optional[User] = None
     role: Optional[Role] = None
     user: Optional[User] = None