修复 Actions 错误

GenshinUID/genshinuid_config/__init__.py

@@ -13,8 +13,8 @@
     PrivateMessageEvent,
 )
 
-from .draw_config_card import draw_config_img
 from ..genshinuid_meta import register_menu
+from .draw_config_card import draw_config_img
 from ..utils.message.error_reply import UID_HINT
 from ..utils.db_operation.db_operation import select_db
 from ..utils.message.get_image_and_at import ImageAndAt

GenshinUID/genshinuid_enka/mono/Enemy.py

@@ -1,4 +1,4 @@
-from typing import List, Dict
+from typing import Dict, List
 
 from .Element import Element, reactable_elements_dict
 

GenshinUID/genshinuid_enka/mono/Fight.py

@@ -1,4 +1,4 @@
-from typing import List, Tuple, Dict
+from typing import Dict, List, Tuple
 
 from .Enemy import Enemy
 from .Element import Element

GenshinUID/genshinuid_mys/__init__.py

@@ -36,7 +36,7 @@
     detail_des=(
         '介绍：\n'
         '查询指定任务或指定地区的攻略\n'
-        ' \n' 
+        ' \n'
         '指令：\n'
         '- <ft color=(238,120,0)>{原神任务|任务|任务详情|任务攻略}</ft>'
         '<ft color=(238,120,0)>{</ft>'
@@ -76,7 +76,7 @@ async def send_task_adv(
     detail_des=(
         '介绍：\n'
         '随机发送一张札记角色表情\n'
-        ' \n' 
+        ' \n'
         '指令：\n'
         '- <ft color=(238,120,0)>抽表情</ft>'
     ),
@@ -94,11 +94,7 @@ async def send_meme_card(matcher: Matcher):
     '御神签',
     '鸣神大社御神签',
     detail_des=(
-        '介绍：\n'
-        '抽一签鸣神大社御神签\n'
-        ' \n' 
-        '指令：\n'
-        '- <ft color=(238,120,0)>御神签</ft>'
+        '介绍：\n' '抽一签鸣神大社御神签\n' ' \n' '指令：\n' '- <ft color=(238,120,0)>御神签</ft>'
     ),
 )
 async def send_lots_data(matcher: Matcher, event: MessageEvent):

GenshinUID/genshinuid_note/__init__.py

@@ -26,11 +26,7 @@
     '每月统计',
     '文字形式米游社札记',
     detail_des=(
-        '介绍：\n'
-        '文字形式米游社札记\n'
-        ' \n' 
-        '指令：\n'
-        '- <ft color=(238,120,0)>每月统计</ft>'
+        '介绍：\n' '文字形式米游社札记\n' ' \n' '指令：\n' '- <ft color=(238,120,0)>每月统计</ft>'
     ),
 )
 async def send_monthly_data(
@@ -58,7 +54,7 @@ async def send_monthly_data(
     detail_des=(
         '介绍：\n'
         '图片形式米游社札记\n'
-        ' \n' 
+        ' \n'
         '指令：\n'
         '- <ft color=(238,120,0)>当前信息</ft>\n'
         '- <ft color=(125,125,125)>(原石)</ft><ft color=(238,120,0)>札记</ft>\n'

GenshinUID/genshinuid_resin/__init__.py

@@ -43,7 +43,7 @@
     detail_des=(
         '介绍：\n'
         '米游社实时便笺文字版\n'
-        ' \n' 
+        ' \n'
         '指令：\n'
         '- <ft color=(238,120,0)>当前状态</ft>'
     ),
@@ -111,7 +111,7 @@ async def notice_job():
     detail_des=(
         '介绍：\n'
         '图片形式米游社实时便笺\n'
-        ' \n' 
+        ' \n'
         '指令：\n'
         '- <ft color=(238,120,0)>每日</ft>\n'
         '- <ft color=(238,120,0)>mr</ft>\n'

GenshinUID/genshinuid_resource/__init__.py

@@ -32,7 +32,7 @@
     detail_des=(
         '介绍：\n'
         '手动下载插件正常运行所需的资源（一般每次启动会自动检查并下载）\n'
-        ' \n' 
+        ' \n'
         '指令：\n'
         '- <ft color=(238,120,0)>下载全部资源</ft>'
     ),

GenshinUID/genshinuid_roleinfo/__init__.py

@@ -36,7 +36,7 @@
         '介绍：\n'
         '查询帐号探索度、声望、宝箱收集、角色总览等等基础数据\n'
         '未绑定CK时最多只能查询8个角色信息\n'
-        ' \n' 
+        ' \n'
         '指令：\n'
         '- <ft color=(238,120,0)>{查询|uid}</ft>'
         '<ft color=(125,125,125)>({@某人|[UID]})</ft>\n'

GenshinUID/genshinuid_update/__init__.py

@@ -78,11 +78,7 @@ async def send_updatelog_msg(
     '重启Bot框架',
     trigger_method='超级用户指令',
     detail_des=(
-        '介绍：\n'
-        '重启Bot框架\n'
-        ' \n'
-        '指令：\n'
-        '- <ft color=(238,120,0)>gs重启</ft>'
+        '介绍：\n' '重启Bot框架\n' ' \n' '指令：\n' '- <ft color=(238,120,0)>gs重启</ft>'
     ),
 )
 async def send_restart_msg(

GenshinUID/genshinuid_user/add_ck.py

@@ -83,7 +83,7 @@ async def _deal_ck(mes, qid) -> str:
             if i['game_id'] == 2:
                 uid = i['game_role_id']
                 break
-        #else:
+        # else:
         #    return f'你的米游社账号{account_id}尚未绑定原神账号，请前往米游社操作！'
     except:
         print('Null mys_data')

GenshinUID/utils/db_operation/database/CookiesDAL.py

@@ -1,11 +1,11 @@
 from typing import List, Optional
 
-from sqlalchemy.future import select
+from nonebot.log import logger
 from sqlalchemy.sql import text
+from sqlalchemy.future import select
 from sqlalchemy import delete, update
 from sqlalchemy.sql.expression import func
 from sqlalchemy.ext.asyncio import AsyncSession
-from nonebot.log import logger
 
 from ..database.models import CookiesCache, NewCookiesTable
 
@@ -146,11 +146,27 @@ async def get_random_ck(self, uid: str) -> str:
 
             if regioncode < 6:
                 # cn server
-                sql = select(NewCookiesTable).where(text("cast(substr(newcookiestable.uid,1,1) as int) < 6")).order_by(func.random())
+                sql = (
+                    select(NewCookiesTable)
+                    .where(
+                        text(
+                            "cast(substr(newcookiestable.uid,1,1) as int) < 6"
+                        )
+                    )
+                    .order_by(func.random())
+                )
             else:
                 # os server
-                sql = select(NewCookiesTable).where(text("cast(substr(newcookiestable.uid,1,1) as int) >= 6")).order_by(func.random())
-
+                sql = (
+                    select(NewCookiesTable)
+                    .where(
+                        text(
+                            "cast(substr(newcookiestable.uid,1,1) as int) >= 6"
+                        )
+                    )
+                    .order_by(func.random())
+                )
+
             a = await self.db_session.execute(sql)
             random_data: List[NewCookiesTable] = a.scalars().all()
             if random_data:

GenshinUID/utils/mhy_api/get_mhy_data.py

@@ -13,33 +13,33 @@
     random_hex,
     random_text,
     get_ds_token,
-    old_version_get_ds_token,
     generate_dynamic_secret,
+    old_version_get_ds_token,
 )
 from ..mhy_api.mhy_api import (
     SIGN_URL,
-    SIGN_URL_OS,
     GT_TEST_URL,
+    SIGN_URL_OS,
     SIGN_INFO_URL,
-    SIGN_INFO_URL_OS,
     SIGN_LIST_URL,
-    SIGN_LIST_URL_OS,
     DAILY_NOTE_URL,
-    DAILY_NOTE_URL_OS,
     GET_STOKEN_URL,
     GET_AUTHKEY_URL,
     PLAYER_INFO_URL,
-    PLAYER_INFO_URL_OS,
+    SIGN_INFO_URL_OS,
+    SIGN_LIST_URL_OS,
+    DAILY_NOTE_URL_OS,
     GET_GACHA_LOG_URL,
-    GET_GACHA_LOG_URL_OS,
     MONTHLY_AWARD_URL,
-    MONTHLY_AWARD_URL_OS,
     CALCULATE_INFO_URL,
-    CALCULATE_INFO_URL_OS,
+    PLAYER_INFO_URL_OS,
     GET_COOKIE_TOKEN_URL,
+    GET_GACHA_LOG_URL_OS,
+    MONTHLY_AWARD_URL_OS,
+    CALCULATE_INFO_URL_OS,
     PLAYER_ABYSS_INFO_URL,
-    PLAYER_ABYSS_INFO_URL_OS,
     PLAYER_DETAIL_INFO_URL,
+    PLAYER_ABYSS_INFO_URL_OS,
     PLAYER_DETAIL_INFO_URL_OS,
     MIHOYO_BBS_PLAYER_INFO_URL,
 )
@@ -81,6 +81,7 @@
     "9": "os_cht",
 }
 
+
 async def get_gacha_log_by_authkey(
     uid: str, old_data: Optional[dict] = None
 ) -> Optional[dict]:
@@ -277,7 +278,11 @@ async def get_sign_info(uid) -> dict:
             url=SIGN_INFO_URL,
             method='GET',
             header=HEADER,
-            params={'act_id': 'e202009291139501', 'region': server_id, 'uid': uid},
+            params={
+                'act_id': 'e202009291139501',
+                'region': server_id,
+                'uid': uid,
+            },
         )
     else:
         HEADER = copy.deepcopy(_HEADER_OS)
@@ -316,7 +321,11 @@ async def mihoyo_bbs_sign(uid, Header={}, server_id='cn_gf01') -> dict:
             url=SIGN_URL,
             method='POST',
             header=HEADER,
-            data={'act_id': 'e202009291139501', 'uid': uid, 'region': server_id},
+            data={
+                'act_id': 'e202009291139501',
+                'uid': uid,
+                'region': server_id,
+            },
         )
     else:
         HEADER = copy.deepcopy(_HEADER_OS)
@@ -326,7 +335,11 @@ async def mihoyo_bbs_sign(uid, Header={}, server_id='cn_gf01') -> dict:
             url=SIGN_URL_OS,
             method='POST',
             header=HEADER,
-            data={'act_id': 'e202009291139501', 'uid': uid, 'region': server_id},
+            data={
+                'act_id': 'e202009291139501',
+                'uid': uid,
+                'region': server_id,
+            },
         )
     return data
 
@@ -397,9 +410,7 @@ async def get_info(uid, ck, ) -> dict:
     return data
 
 
-async def get_spiral_abyss_info(
-    uid, ck, schedule_type='1'
-) -> dict:
+async def get_spiral_abyss_info(uid, ck, schedule_type='1') -> dict:
     server_id = RECOGNIZE_SERVER.get(str(uid)[0])
     if int(uid[0]) < 6:
         HEADER = copy.deepcopy(_HEADER)
@@ -440,7 +451,11 @@ async def get_character(uid, character_ids, ck) -> dict:
         HEADER['Cookie'] = ck
         HEADER['DS'] = get_ds_token(
             '',
-            {'character_ids': character_ids, 'role_id': uid, 'server': server_id},
+            {
+                'character_ids': character_ids,
+                'role_id': uid,
+                'server': server_id,
+            },
         )
         data = await _mhy_request(
             url=PLAYER_DETAIL_INFO_URL,
@@ -468,9 +483,7 @@ async def get_character(uid, character_ids, ck) -> dict:
     return data
 
 
-async def get_calculate_info(
-    client: ClientSession, uid, char_id, ck, name
-):
+async def get_calculate_info(client: ClientSession, uid, char_id, ck, name):
     server_id = RECOGNIZE_SERVER.get(str(uid)[0])
     if int(uid[0]) < 6:
         HEADER = copy.deepcopy(_HEADER)

GenshinUID/utils/mhy_api/mhy_api_tools.py

@@ -47,6 +47,7 @@ def get_ds_token(q='', b=None, salt=None):
     c = md5('salt=' + s + '&t=' + t + '&r=' + r + '&b=' + br + '&q=' + q)
     return t + ',' + r + ',' + c
 
+
 def generate_dynamic_secret(salt=None) -> str:
     """Create a new overseas dynamic secret."""
     if salt:

tests/test_etc.py

@@ -41,17 +41,20 @@ async def test_primogems_version(app: App, load_etc: None):
     from utils import make_event
     from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment
 
+    from GenshinUID.version import Genshin_version
     from GenshinUID.genshinuid_etcimg import get_primogems_data
 
     with open(
-        Path("../GenshinUID/genshinuid_etcimg/primogems_data/3.0.png"),
+        Path(
+            f"../GenshinUID/genshinuid_etcimg/primogems_data/{Genshin_version[:3]}.png"
+        ),
         "rb",
     ) as f:
         data = f.read()
 
     async with app.test_matcher(get_primogems_data) as ctx:
         bot = ctx.create_bot(base=Bot)
-        event = make_event(message=Message("版本规划3.0"))
+        event = make_event(message=Message(f"版本规划{Genshin_version[:3]}"))
         ctx.receive_event(bot, event)
         ctx.should_call_send(
             event,