From 9f58d5c46d15ffaf0c86f9669dc25d17e169f501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E8=90=BD?=
 <34079036+jiluoQAQ@users.noreply.github.com>
Date: Sun, 3 Dec 2023 17:34:58 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=B7=BB=E5=8A=A0Villa=E7=9A=84nic?=
 =?UTF-8?q?kname=E4=B8=8Eat=E5=88=97=E8=A1=A8=20(#612)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 添加Villa的nickname与at列表

* 🚨 `pre-commit-ci`修复格式错误

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 GenshinUID/__init__.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/GenshinUID/__init__.py b/GenshinUID/__init__.py
index 9415012f..f1b4d483 100644
--- a/GenshinUID/__init__.py
+++ b/GenshinUID/__init__.py
@@ -455,7 +455,9 @@ async def get_all_message(bot: Bot, ev: Event):
     elif bot.adapter.get_name() == 'Villa':
         from nonebot.adapters.villa import SendMessageEvent
 
-        sender = {}
+        sender = {
+            'nickname': ev.nickname,
+        }
         if isinstance(ev, SendMessageEvent):
             user_type = 'group'
             msg_id = ev.msg_uid
@@ -463,6 +465,13 @@ async def get_all_message(bot: Bot, ev: Event):
         else:
             logger.debug('[gsuid] 不支持该 Villa 事件...')
             return
+        for contentinfo in ev.content:
+            if contentinfo[0] == 'mentioned_info':
+                if len(contentinfo[1].user_id_list) > 1:
+                    at_list = [
+                        Message('at', i) for i in contentinfo[1].user_id_list
+                    ]
+                    message.extend(at_list)
     elif bot.adapter.get_name() == 'Discord':
         from nonebot.adapters.discord import (
             GuildMessageCreateEvent,