From baceace292a29c146fadc3fb24bc59578d7c554c Mon Sep 17 00:00:00 2001
From: LittleMengBot <79637933+LittleMengBot@users.noreply.github.com>
Date: Mon, 13 Mar 2023 11:47:36 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Text=20correction=20and=20supple?=
 =?UTF-8?q?mentation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed the issue of unable to correctly retrieve traveler information in `/strategy`, `/player_card`, `/birthday`; added and corrected nicknames for several characters.
---
 metadata/shortname.py       | 15 ++++++---------
 plugins/genshin/birthday.py |  7 ++++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/metadata/shortname.py b/metadata/shortname.py
index 3c0d6e9..7aaca40 100644
--- a/metadata/shortname.py
+++ b/metadata/shortname.py
@@ -10,15 +10,11 @@ __all__ = ["roles", "weapons", "roleToId", "roleToName", "weaponToName", "weapon
 # noinspection SpellCheckingInspection
 roles = {
     20000000: [
-        "主角",
         "旅行者",
+        "主角",
         "卑鄙的外乡人",
         "荣誉骑士",
         "爷",
-        "风主",
-        "岩主",
-        "雷主",
-        "草主",
         "履刑者",
         "人之子",
         "命定之人",
@@ -31,7 +27,7 @@ roles = {
         "黄毛叔叔",
         "大黄倭瓜那菈",
     ],
-    10000002: ["神里绫华", "ayaka", "kamisato ayaka", "神里", "绫华", "神里凌华", "凌华", "白鹭公主", "神里大小姐", "冰骗骗花"],
+    10000002: ["神里绫华", "ayaka", "kamisato ayaka", "神里", "绫华", "神里凌华", "凌华", "白鹭公主", "神里大小姐", "冰骗骗花", "龟龟"],
     10000003: ["琴", "jean", "团长", "代理团长", "琴团长", "蒲公英骑士", "蒙德砍王", "骑士团的魂"],
     10000005: ["空", "aether", "男主", "男主角", "龙哥", "空哥", "王子"],
     10000006: ["丽莎", "lisa", "图书管理员", "图书馆管理员", "蔷薇魔女"],
@@ -128,7 +124,7 @@ roles = {
         "提瓦特枪王",
     ],
     10000024: ["北斗", "beidou", "大姐头", "大姐", "无冕的龙王", "稻妻人形继电石"],
-    10000025: ["行秋", "xingqiu", "秋秋人", "秋妹妹", "书呆子", "水神", "飞云商会二少爷", "秋秋人", "6星水神", "玉老师"],
+    10000025: ["行秋", "xingqiu", "秋秋人", "秋妹妹", "书呆子", "水神", "飞云商会二少爷", "秋秋人", "6星水神", "枕玉老师"],
     10000026: [
         "魈",
         "xiao",
@@ -153,7 +149,7 @@ roles = {
         "随叫随到真君",
         "成天冷着脸的帅气小哥",
     ],
-    10000027: ["凝光", "ningguang", "富婆", "天权星", "寻山见矿真君"],
+    10000027: ["凝光", "ningguang", "富婆", "天权", "天权星", "寻山见矿真君"],
     10000029: [
         "可莉",
         "klee",
@@ -218,7 +214,7 @@ roles = {
         "大貉妖处理专家",
     ],
     10000034: ["诺艾尔", "noelle", "女仆", "高达", "岩王帝姬", "山吹", "冰萤术士", "岩王帝姬"],
-    10000035: ["七七", "qiqi", "僵尸", "肚饿真君", "度厄真君", "77", "起死回骸童子", "救苦度厄真君", "椰羊创始人", "不卜庐砍王"],
+    10000035: ["七七", "qiqi", "僵尸", "肚饿真君", "度厄真君", "77", "起死回骸童子", "救苦度厄真君", "椰羊创始人", "不卜庐砍王", "不卜庐剑圣"],
     10000036: ["重云", "chongyun", "纯阳之体", "冰棍", "驱邪世家", "大外甥"],
     10000037: ["甘雨", "ganyu", "椰羊", "椰奶", "鸡腿猎人", "咕噜咕噜滚下山真君", "肝雨", "走路上山真君"],
     10000038: [
@@ -589,6 +585,7 @@ roles = {
         "黑主",
         "崩崩小圆帽",
         "七叶寂照秘密主",
+        "七彩阳光秘密主",
         "正机之神",
         "伪神",
     ],
diff --git a/plugins/genshin/birthday.py b/plugins/genshin/birthday.py
index c4e04de..000cad9 100644
--- a/plugins/genshin/birthday.py
+++ b/plugins/genshin/birthday.py
@@ -97,13 +97,14 @@ class BirthdayPlugin(Plugin, BasePlugin):
             else:
                 try:
                     if msg == "派蒙":
-                        name = "派蒙"
-                        birthday = [6, 1]
+                        text = "派蒙的生日是6月1日哦~"
+                    elif roleToName(msg) == "旅行者":
+                        text = "喂，旅行者！你该不会忘掉自己的生日了吧？"
                     else:
                         name = roleToName(msg)
                         aid = str(roleToId(msg))
                         birthday = AVATAR_DATA[aid]["birthday"]
-                    text = f"{name} 的生日是 {birthday[0]}月{birthday[1]}日 哦~"
+                        text = f"{name} 的生日是 {birthday[0]}月{birthday[1]}日 哦~"
                     reply_message = await message.reply_text(text)
                     if filters.ChatType.GROUPS.filter(reply_message):
                         self._add_delete_message_job(context, message.chat_id, message.message_id)