fix: import error

- username **IS NOT** user display name (nickname), **IS** user id (string not number)

Author: wyf9

drivers/kook.py

@@ -86,7 +86,7 @@ async def _on_message(self, msg: khl.PublicMessage):
         author = msg.author  # GuildUser
         user_id = str(author.id)
         # Prefer the per-guild nickname over the global username
-        username = author.nickname or author.username or user_id
+        username = author.username or ""
         avatar = author.avatar or ""
         text = msg.content or ""
 

drivers/qq.py

@@ -531,7 +531,7 @@ async def _on_group_message(self, event: dict):
             f"group={group_id} message_id={message_id} seq={message_seq}"
         )
         time = event.get("time")
-        # Use qid for username when available; fallback to QQ number.
+        # Use qid for username when available
         qid = (await self._get_qid(user_id, group_id)).strip()
 
         face_as_emoji: bool = self.config.cqface_mode == "emoji"
@@ -567,7 +567,7 @@ async def _on_group_message(self, event: dict):
             source_mentioned_self=source_mentioned_self,
             time=datetime.datetime.fromtimestamp(time).isoformat() if time else None,
             source_proxy=self._media_proxy,
-            username=qid or user_id,
+            username=qid,
         )
         await self.bridge.on_message(msg)
 

drivers/rocketchat.py

@@ -160,7 +160,7 @@ async def _handle_webhook(self, request: Request) -> JSONResponse:
 
         text: str = body.get("text", "").strip()
         room_id: str = body.get("channel_id") or body.get("rid", "")
-        username: str = body.get("user_name", sender_id)
+        username: str = body.get("user_name", "")
         avatar: str = body.get("user_avatar", "")
         server: str = self.config.server_url.rstrip("/")
 
@@ -194,7 +194,6 @@ async def _handle_webhook(self, request: Request) -> JSONResponse:
             attachments=attachments,
             mentions=mentions,
             source_proxy=self._media_proxy,
-            username=username,
         )
         asyncio.create_task(self.bridge.on_message(normalized))
         return JSONResponse({})

drivers/signal.py

@@ -199,7 +199,6 @@ async def _on_envelope(self, data: dict, api_url: str) -> None:
             attachments=attachments,
             source_proxy=self._media_proxy,
             mentions=mentions,
-            username=sender,
         )
         await self.bridge.on_message(normalized)
 

drivers/slack.py

@@ -270,7 +270,6 @@ async def _dispatch_event(self, event: dict) -> None:
             if event.get("thread_ts")
             else None,
             source_proxy=self._media_proxy,
-            username=display_name,
         )
         await self.bridge.on_message(normalized)
 

drivers/teams.py

@@ -202,7 +202,6 @@ async def _handle_activity(self, request: Request) -> PlainTextResponse:
             attachments=attachments,
             mentions=mentions,
             source_proxy=self._media_proxy,
-            username=from_name,
         )
         asyncio.create_task(self.bridge.on_message(normalized))
         return PlainTextResponse("ok", status_code=200)

services/logger.py

@@ -4,7 +4,7 @@
 from datetime import datetime
 
 import loguru
-from loguru import logger, Logger
+from loguru import logger
 
 # Global log configuration
 LOG_DIR = None  # Set to a directory path to enable file logging, or None to disable file logging
@@ -98,7 +98,7 @@ def _masking_filter(record: "loguru.Record") -> bool:
 # File sink will be added when set_log_dir() is called with a valid directory
 
 
-def get_logger() -> Logger:
+def get_logger() -> "loguru.Logger":
     return logger