From 81d015f3d8e2f547f4088bb2cd15ec87cb12e531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wuyi=E6=97=A0=E7=96=91?= <444835641@qq.com>
Date: Fri, 30 Jun 2023 00:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E`=E5=8E=9F=E7=A5=9E=E7=94=BB=E7=89=87?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3`=E5=AD=97=E6=AE=B5=20(KimigaiiWuyi/GenshinUI?=
 =?UTF-8?q?D#563)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gsuid_core/utils/api/mys/models.py  | 28 ++++++++++++++++------------
 gsuid_core/utils/database/dal.py    |  2 ++
 gsuid_core/utils/database/models.py |  1 +
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/gsuid_core/utils/api/mys/models.py b/gsuid_core/utils/api/mys/models.py
index d841e64..2dea2c3 100644
--- a/gsuid_core/utils/api/mys/models.py
+++ b/gsuid_core/utils/api/mys/models.py
@@ -761,20 +761,24 @@ class RoleCalendar(TypedDict):
     is_subscribe: bool
 
 
+class RoleCalendarList(TypedDict):
+    calendar_role: List[RoleCalendar]
+
+
 MonthlyRoleCalendar = TypedDict(
     'MonthlyRoleCalendar',
     {
-        '1': List[RoleCalendar],
-        '2': List[RoleCalendar],
-        '3': List[RoleCalendar],
-        '4': List[RoleCalendar],
-        '5': List[RoleCalendar],
-        '6': List[RoleCalendar],
-        '7': List[RoleCalendar],
-        '8': List[RoleCalendar],
-        '9': List[RoleCalendar],
-        '10': List[RoleCalendar],
-        '11': List[RoleCalendar],
-        '12': List[RoleCalendar],
+        '1': RoleCalendarList,
+        '2': RoleCalendarList,
+        '3': RoleCalendarList,
+        '4': RoleCalendarList,
+        '5': RoleCalendarList,
+        '6': RoleCalendarList,
+        '7': RoleCalendarList,
+        '8': RoleCalendarList,
+        '9': RoleCalendarList,
+        '10': RoleCalendarList,
+        '11': RoleCalendarList,
+        '12': RoleCalendarList,
     },
 )
diff --git a/gsuid_core/utils/database/dal.py b/gsuid_core/utils/database/dal.py
index 5925e6a..8f5288f 100644
--- a/gsuid_core/utils/database/dal.py
+++ b/gsuid_core/utils/database/dal.py
@@ -46,6 +46,7 @@ class SQLA:
             'ALTER TABLE GsUser ADD COLUMN device_id TEXT',
             'ALTER TABLE GsUser ADD COLUMN sr_sign_switch TEXT DEFAULT "off"',
             'ALTER TABLE GsUser ADD COLUMN sr_push_switch TEXT DEFAULT "off"',
+            'ALTER TABLE GsUser ADD COLUMN draw_switch TEXT DEFAULT "off"',
             'ALTER TABLE GsCache ADD COLUMN sr_uid TEXT',
         ]
         async with self.async_session() as session:
@@ -334,6 +335,7 @@ class SQLA:
                         sign_switch='off',
                         push_switch='off',
                         bbs_switch='off',
+                        draw_switch='off',
                         region=SERVER.get(uid[0], 'cn_gf01') if uid else None,
                         sr_region=SR_SERVER.get(sr_uid[0], None)
                         if sr_uid
diff --git a/gsuid_core/utils/database/models.py b/gsuid_core/utils/database/models.py
index 4d320c6..fe97724 100644
--- a/gsuid_core/utils/database/models.py
+++ b/gsuid_core/utils/database/models.py
@@ -28,6 +28,7 @@ class GsUser(SQLModel, table=True):
     push_switch: str = Field(title='全局推送开关')
     sign_switch: str = Field(title='自动签到')
     bbs_switch: str = Field(title='自动米游币')
+    draw_switch: str = Field(title='自动留影叙佳期')
     sr_push_switch: str = Field(title='星铁全局推送开关')
     sr_sign_switch: str = Field(title='星铁自动签到')
     status: Optional[str] = Field(default=None, title='状态')