modified: basic_plugins/admin_bot_manage/_data_source.py

modified: basic_plugins/admin_bot_manage/admin_config.py modified: basic_plugins/admin_bot_manage/custom_welcome_message.py modified: basic_plugins/admin_bot_manage/timing_task.py modified: basic_plugins/apscheduler/__init__.py modified: basic_plugins/ban/__init__.py modified: basic_plugins/ban/data_source.py modified: basic_plugins/chat_history/chat_message.py modified: basic_plugins/chat_history/chat_message_handle.py modified: basic_plugins/group_handle/__init__.py modified: basic_plugins/hooks/_utils.py modified: basic_plugins/hooks/ban_hook.py modified: basic_plugins/hooks/chkdsk_hook.py modified: basic_plugins/init_plugin_config/__init__.py deleted: basic_plugins/init_plugin_config/init_group_manager.py modified: basic_plugins/invite_manager/__init__.py new file: basic_plugins/invite_manager/utils.py modified: basic_plugins/nickname.py modified: basic_plugins/plugin_shop/__init__.py modified: basic_plugins/plugin_shop/data_source.py modified: basic_plugins/scripts.py modified: basic_plugins/shop/__init__.py modified: basic_plugins/shop/buy.py modified: basic_plugins/shop/gold.py modified: basic_plugins/shop/my_props/__init__.py deleted: basic_plugins/shop/reset_today_gold.py modified: basic_plugins/shop/shop_handle/__init__.py modified: basic_plugins/shop/shop_handle/data_source.py modified: basic_plugins/shop/use/__init__.py modified: basic_plugins/shop/use/data_source.py modified: basic_plugins/super_cmd/__init__.py modified: basic_plugins/super_cmd/bot_friend_group.py modified: basic_plugins/super_cmd/clear_data.py modified: basic_plugins/super_cmd/exec_sql.py modified: basic_plugins/super_cmd/manager_group.py modified: basic_plugins/super_cmd/reload_setting.py modified: basic_plugins/super_cmd/set_admin_permissions.py deleted: basic_plugins/super_cmd/super_task_switch.py modified: basic_plugins/super_cmd/update_friend_group_info.py modified: basic_plugins/super_help/__init__.py modified: basic_plugins/update_info.py modified: configs/config.py modified: configs/utils/__init__.py modified: models/bag_user.py modified: models/ban_user.py modified: models/chat_history.py modified: models/friend_user.py modified: models/goods_info.py modified: models/group_info.py modified: models/group_member_info.py modified: models/level_user.py modified: models/sign_group_user.py modified: models/user_shop_gold_log.py modified: plugins/aconfig/__init__.py modified: plugins/ai/__init__.py modified: plugins/ai/data_source.py modified: plugins/bilibili_sub/__init__.py modified: plugins/bilibili_sub/data_source.py modified: plugins/bilibili_sub/model.py modified: plugins/black_word/__init__.py modified: plugins/black_word/model.py modified: plugins/black_word/utils.py modified: plugins/bt/data_source.py modified: plugins/genshin/almanac/__init__.py modified: plugins/genshin/material_remind/__init__.py modified: plugins/genshin/query_user/_models/__init__.py modified: plugins/genshin/query_user/_utils/__init__.py modified: plugins/genshin/query_user/bind/__init__.py modified: plugins/genshin/query_user/genshin_sign/__init__.py modified: plugins/genshin/query_user/genshin_sign/data_source.py modified: plugins/genshin/query_user/genshin_sign/init_task.py modified: plugins/genshin/query_user/mihoyobbs_sign/__init__.py modified: plugins/genshin/query_user/query_memo/__init__.py modified: plugins/genshin/query_user/query_memo/data_source.py modified: plugins/genshin/query_user/query_role/__init__.py modified: plugins/genshin/query_user/query_role/data_source.py modified: plugins/genshin/query_user/reset_today_query_user_data/__init__.py modified: plugins/genshin/query_user/resin_remind/__init__.py modified: plugins/genshin/query_user/resin_remind/init_task.py modified: plugins/gold_redbag/model.py modified: plugins/image_management/send_image/__init__.py modified: plugins/my_info/__init__.py modified: plugins/open_cases/models/buff_prices.py modified: plugins/open_cases/models/open_cases_user.py modified: plugins/open_cases/open_cases_c.py modified: plugins/open_cases/utils.py modified: plugins/parse_bilibili_json.py modified: plugins/pid_search.py modified: plugins/pix_gallery/__init__.py modified: plugins/pix_gallery/_data_source.py modified: plugins/pix_gallery/_model/omega_pixiv_illusts.py modified: plugins/pix_gallery/_model/pixiv.py modified: plugins/pix_gallery/_model/pixiv_keyword_user.py modified: plugins/pix_gallery/pix_add_keyword.py modified: plugins/pix_gallery/pix_pass_del_keyword.py modified: plugins/pix_gallery/pix_show_info.py modified: plugins/pix_gallery/pix_update.py modified: plugins/pixiv_rank_search/data_source.py modified: plugins/poke/__init__.py modified: plugins/russian/__init__.py modified: plugins/russian/data_source.py modified: plugins/russian/model.py modified: plugins/send_dinggong_voice/__init__.py modified: plugins/send_setu_/_model.py modified: plugins/send_setu_/send_setu/__init__.py modified: plugins/send_setu_/send_setu/data_source.py modified: plugins/send_setu_/update_setu/data_source.py modified: plugins/sign_in/goods_register.py modified: plugins/sign_in/group_user_checkin.py modified: plugins/sign_in/random_event.py modified: plugins/sign_in/utils.py modified: plugins/statistics/_model.py modified: plugins/statistics/statistics_handle.py modified: plugins/statistics/statistics_hook.py modified: plugins/update_picture.py modified: plugins/web_ui/api/request.py modified: plugins/word_bank/_model.py deleted: plugins/word_bank/_old_model.py modified: plugins/word_bank/_rule.py modified: plugins/word_bank/word_handle.py modified: plugins/word_clouds/data_source.py modified: resources/image/sign/sign_res/bar.png modified: resources/image/sign/sign_res/bar_white.png modified: services/db_context.py modified: services/log.py modified: utils/browser.py modified: utils/data_utils.py modified: utils/depends/__init__.py modified: utils/http_utils.py modified: utils/image_utils.py modified: utils/manager/admin_manager.py modified: utils/message_builder.py modified: utils/utils.py
2026-10-04 03:10:01 +08:00 · 2023-02-18 18:46:54 +08:00
parent a6105e8a1b
commit 7685b95031
134 changed files with 5402 additions and 6033 deletions
@@ -1,11 +1,14 @@
-from typing import Optional, List, Dict, Union
-from .draw_image import init_image, get_genshin_image
+from typing import Dict, List, Optional, Tuple, Union
+
 from nonebot.adapters.onebot.v11 import MessageSegment
-from .._utils import get_ds, element_mastery
+
+from configs.config import Config
 from services.log import logger
 from utils.http_utils import AsyncHttpx
-from configs.config import Config
+
 from .._models import Genshin
+from .._utils import element_mastery, get_ds
+from .draw_image import get_genshin_image, init_image

 try:
    import ujson as json
@@ -96,66 +99,66 @@ b=body q=query
 """


-async def get_info(uid_: str, server_id: str) -> "Optional[Union[dict, str]], int":
-    try:
-        req = await AsyncHttpx.get(
-            url=f"https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/index?server={server_id}&role_id={uid_}",
-            headers={
-                "Accept": "application/json, text/plain, */*",
-                "DS": get_ds(f"role_id={uid_}&server={server_id}"),
-                "Origin": "https://webstatic.mihoyo.com",
-                "x-rpc-app_version": Config.get_config("genshin", "mhyVersion"),
-                "User-Agent": "Mozilla/5.0 (Linux; Android 9; Unspecified Device) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 miHoYoBBS/2.2.0",
-                "x-rpc-client_type": Config.get_config("genshin", "client_type"),
-                "Referer": "https://webstatic.mihoyo.com/app/community-game-records/index.html?v=6",
-                "Accept-Encoding": "gzip, deflate",
-                "Accept-Language": "zh-CN,en-US;q=0.8",
-                "X-Requested-With": "com.mihoyo.hyperion",
-                "Cookie": await Genshin.get_user_cookie(int(uid_))
-            },
-        )
-        data = req.json()
-        if data["message"] == "OK":
-            return data["data"], 200
-        return data["message"], 999
-    except Exception as e:
-        logger.error(f"访问失败，请重试！ {type(e)}: {e}")
+async def get_info(uid_: str, server_id: str) -> Tuple[Optional[Union[dict, str]], int]:
+    # try:
+    req = await AsyncHttpx.get(
+        url=f"https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/index?server={server_id}&role_id={uid_}",
+        headers={
+            "Accept": "application/json, text/plain, */*",
+            "DS": get_ds(f"role_id={uid_}&server={server_id}"),
+            "Origin": "https://webstatic.mihoyo.com",
+            "x-rpc-app_version": Config.get_config("genshin", "mhyVersion"),
+            "User-Agent": "Mozilla/5.0 (Linux; Android 9; Unspecified Device) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36 miHoYoBBS/2.2.0",
+            "x-rpc-client_type": Config.get_config("genshin", "client_type"),
+            "Referer": "https://webstatic.mihoyo.com/app/community-game-records/index.html?v=6",
+            "Accept-Encoding": "gzip, deflate",
+            "Accept-Language": "zh-CN,en-US;q=0.8",
+            "X-Requested-With": "com.mihoyo.hyperion",
+            "Cookie": await Genshin.random_cookie(uid_),
+        },
+    )
+    data = req.json()
+    if data["message"] == "OK":
+        return data["data"], 200
+    return data["message"], 999
+    # except Exception as e:
+    #     logger.error(f"访问失败，请重试！ {type(e)}: {e}")
    return None, -1


 async def get_character(
    uid: str, character_ids: List[str], server_id="cn_gf01"
 ) -> Optional[dict]:
-    try:
-        req = await AsyncHttpx.post(
-            url="https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/character",
-            headers={
-                "Accept": "application/json, text/plain, */*",
-                "DS": get_ds(
-                    "",
-                    {
-                        "character_ids": character_ids,
-                        "role_id": uid,
-                        "server": server_id,
-                    },
-                ),
-                "Origin": "https://webstatic.mihoyo.com",
-                "Cookie": await Genshin.get_user_cookie(int(uid)),
-                "x-rpc-app_version": Config.get_config("genshin", "mhyVersion"),
-                "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.11.1",
-                "x-rpc-client_type": "5",
-                "Referer": "https://webstatic.mihoyo.com/",
-                "Accept-Encoding": "gzip, deflate",
-                "Accept-Language": "zh-CN,en-US;q=0.8",
-                "X-Requested-With": "com.mihoyo.hyperion",
-            },
-            json={"character_ids": character_ids, "role_id": uid, "server": server_id},
-        )
-        data = req.json()
-        if data["message"] == "OK":
-            return data["data"]
-    except Exception as e:
-        logger.error(f"访问失败，请重试！ {type(e)}: {e}")
+    # try:
+    req = await AsyncHttpx.post(
+        url="https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/character",
+        headers={
+            "Accept": "application/json, text/plain, */*",
+            "DS": get_ds(
+                "",
+                {
+                    "character_ids": character_ids,
+                    "role_id": uid,
+                    "server": server_id,
+                },
+            ),
+            "Origin": "https://webstatic.mihoyo.com",
+            "Cookie": await Genshin.random_cookie(uid),
+            "x-rpc-app_version": Config.get_config("genshin", "mhyVersion"),
+            "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.11.1",
+            "x-rpc-client_type": "5",
+            "Referer": "https://webstatic.mihoyo.com/",
+            "Accept-Encoding": "gzip, deflate",
+            "Accept-Language": "zh-CN,en-US;q=0.8",
+            "X-Requested-With": "com.mihoyo.hyperion",
+        },
+        json={"character_ids": character_ids, "role_id": uid, "server": server_id},
+    )
+    data = req.json()
+    if data["message"] == "OK":
+        return data["data"]
+    # except Exception as e:
+    #     logger.error(f"访问失败，请重试！ {type(e)}: {e}")
    return None


@@ -205,7 +208,7 @@ def parsed_data(
            "image": world["icon"],
            "name": world["name"],
            "offerings": world["offerings"],
-            "icon": world["icon"]
+            "icon": world["icon"],
        }
        world_data_dict[world["name"]] = _x
    home_data_list = []
@@ -231,21 +234,21 @@ async def get_mys_data(uid: str, mys_id: Optional[str]) -> Optional[List[Dict]]:
    :param mys_id: 米游社id
    """
    if mys_id:
-        try:
-            req = await AsyncHttpx.get(
-                url=f"https://api-takumi-record.mihoyo.com/game_record/card/wapi/getGameRecordCard?uid={mys_id}",
-                headers={
-                    "DS": get_ds(f"uid={mys_id}"),
-                    "x-rpc-app_version": Config.get_config("genshin", "mhyVersion"),
-                    "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.11.1",
-                    "x-rpc-client_type": "5",
-                    "Referer": "https://webstatic.mihoyo.com/",
-                    "Cookie": await Genshin.get_user_cookie(int(uid))
-                },
-            )
-            data = req.json()
-            if data["message"] == "OK":
-                return data["data"]["list"]
-        except Exception as e:
-            logger.error(f"访问失败，请重试！ {type(e)}: {e}")
+        # try:
+        req = await AsyncHttpx.get(
+            url=f"https://api-takumi-record.mihoyo.com/game_record/card/wapi/getGameRecordCard?uid={mys_id}",
+            headers={
+                "DS": get_ds(f"uid={mys_id}"),
+                "x-rpc-app_version": Config.get_config("genshin", "mhyVersion"),
+                "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.11.1",
+                "x-rpc-client_type": "5",
+                "Referer": "https://webstatic.mihoyo.com/",
+                "Cookie": await Genshin.random_cookie(uid),
+            },
+        )
+        data = req.json()
+        if data["message"] == "OK":
+            return data["data"]["list"]
+        # except Exception as e:
+        #     logger.error(f"访问失败，请重试！ {type(e)}: {e}")
    return None