Merge branch 'main' into dev

adapters/router.py

@@ -356,7 +356,8 @@ class DiscordToOneBotConverter:
         
         # 注入 Discord 特定信息（用于跨平台插件识别）
         discord_channel_id = discord_message.channel.id if not isinstance(discord_message.channel, discord.DMChannel) else None
-        discord_username = discord_message.author.name
+        # 使用 global_name (显示名称/昵称) 如果存在，否则使用 name (用户名)
+        discord_username = getattr(discord_message.author, 'global_name', None) or discord_message.author.name
         discord_discriminator = f"#{discord_message.author.discriminator}" if discord_message.author.discriminator != "0" else ""
         
         if is_private:

plugins/discord-cross/handlers.py

@@ -148,7 +148,7 @@ async def handle_qq_group_message(event: GroupMessageEvent):
             group_name = f"群{group_id}"
         
         await handle_qq_message(
-            nickname=event.sender.nickname or event.sender.card or str(event.user_id),
+            nickname=event.sender.card or event.sender.nickname or str(event.user_id),
             user_id=event.user_id,
             group_name=group_name,
             group_id=group_id,