From 379cf3f0998d9777f446301d6e941049575c60c4 Mon Sep 17 00:00:00 2001
From: xtaodada <xtao@xtaolink.cn>
Date: Wed, 27 Mar 2024 10:45:20 +0800
Subject: [PATCH] :bento: Update 2.1 pool

---
 metadata/pool/pool_11.py        | 7 +++++++
 metadata/pool/pool_12.py        | 7 +++++++
 metadata/shortname.py           | 8 +++++++-
 modules/wiki/models/material.py | 2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/metadata/pool/pool_11.py b/metadata/pool/pool_11.py
index a73115c..ba4dc2a 100644
--- a/metadata/pool/pool_11.py
+++ b/metadata/pool/pool_11.py
@@ -1,4 +1,11 @@
 POOL_11 = [
+    {
+        "five": ["黄泉", "罗刹"],
+        "four": ["加拉赫", "佩拉", "丹恒"],
+        "from": "2024-03-27 06:00:00",
+        "to": "2024-04-17 11:59:59",
+        "name": "远辞畴昔|寻索世间",
+    },
     {
         "five": ["花火", "景元"],
         "four": ["桑博", "青雀", "寒鸦"],
diff --git a/metadata/pool/pool_12.py b/metadata/pool/pool_12.py
index 9ac2a48..c6a7530 100644
--- a/metadata/pool/pool_12.py
+++ b/metadata/pool/pool_12.py
@@ -1,4 +1,11 @@
 POOL_12 = [
+    {
+        "five": ["行于流逝的岸", "棺的回响"],
+        "four": ["晚安与睡颜", "一场术后对话", "点个关注吧！"],
+        "from": "2024-03-27 06:00:00",
+        "to": "2024-04-17 11:59:59",
+        "name": "流光定影|溯回忆象",
+    },
     {
         "five": ["游戏尘寰", "拂晓之前"],
         "four": ["与行星相会", "在蓝天下", "天才们的休憩"],
diff --git a/metadata/shortname.py b/metadata/shortname.py
index 163933d..c903dbb 100644
--- a/metadata/shortname.py
+++ b/metadata/shortname.py
@@ -70,14 +70,17 @@ roles = {
     1214: ["雪衣", "xueyi", "下雪大衣"],
     1215: ["寒鸦", "hanya", "寒冷乌鸦"],
     1217: ["藿藿", "huohuo", "尾巴大爷", "霍霍", "尾巴小跟班"],
+    1301: ["加拉赫", "gallagher"],
     1302: ["银枝", "argenti", "开捍", "开焊", "骑士"],
     1303: ["阮•梅", "ruanmei", "阮·梅", "阮梅", "阮", "梅", "阮妈"],
+    1304: ["砂金", "aventurine"],
     1305: ["真理医生", "drratio", "Dr.Ratio", "真理博士", "真理", "拉帝奥", "义父", "真理义父"],
     1306: ["花火", "sparkle", "hanabi"],
     1307: ["黑天鹅", "blackswan", "黑天", "天鹅"],
+    1308: ["黄泉", "acheron"],
     1312: ["米沙", "misha"],
 }
-not_real_roles = []
+not_real_roles = [1304]
 light_cones = {
     20000: ["锋镝"],
     20001: ["物穰"],
@@ -143,6 +146,7 @@ light_cones = {
     21040: ["银河沦陷日"],
     21041: ["好戏开演"],
     21042: ["铭记于心的约定"],
+    21043: ["两个人的演唱会"],
     22000: ["新手任务开始前"],
     22001: ["嘿，我在这儿"],
     23000: ["银河铁道之夜"],
@@ -168,6 +172,8 @@ light_cones = {
     23020: ["纯粹思维的洗礼"],
     23021: ["游戏尘寰"],
     23022: ["重塑时光之忆"],
+    23023: ["命运从未公平"],
+    23024: ["行于流逝的岸"],
     24000: ["记一位星神的陨落"],
     24001: ["星海巡航"],
     24002: ["记忆的质料"],
diff --git a/modules/wiki/models/material.py b/modules/wiki/models/material.py
index bd8a884..07d1e02 100644
--- a/modules/wiki/models/material.py
+++ b/modules/wiki/models/material.py
@@ -20,7 +20,7 @@ class YattaMaterial(BaseModel):
     """名称"""
     description: str
     """描述"""
-    story: str
+    story: Optional[str] = None
     """故事"""
     rank: int
     """稀有度"""