From c85e29b1dad4191420c2fcbb63fa0ee3928eae3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wuyi=E6=97=A0=E7=96=91?= <444835641@qq.com> Date: Sat, 6 May 2023 23:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E6=94=B9=E4=B8=BA=E8=B0=83?= =?UTF-8?q?=E7=94=A8core=E4=B8=AD=E7=9A=84`error=5Freply`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GenshinUID/genshinuid_abyss/__init__.py | 8 +++- .../genshinuid_abyss/draw_abyss_card.py | 2 +- GenshinUID/genshinuid_ann/__init__.py | 2 +- GenshinUID/genshinuid_collection/__init__.py | 2 +- GenshinUID/genshinuid_config/__init__.py | 2 +- GenshinUID/genshinuid_enka/__init__.py | 2 +- GenshinUID/genshinuid_enka/get_enka_img.py | 2 +- GenshinUID/genshinuid_enka/to_data.py | 2 +- GenshinUID/genshinuid_gachalog/__init__.py | 2 +- .../genshinuid_gachalog/get_gachalogs.py | 3 +- .../genshinuid_gachalog/lelaer_tools.py | 2 +- GenshinUID/genshinuid_gcg/__init__.py | 2 +- GenshinUID/genshinuid_gcg/draw_gcgdesk.py | 2 +- GenshinUID/genshinuid_gcg/draw_gcginfo.py | 2 +- GenshinUID/genshinuid_mysbbscoin/__init__.py | 2 +- GenshinUID/genshinuid_note/__init__.py | 2 +- GenshinUID/genshinuid_note/draw_note_card.py | 2 +- GenshinUID/genshinuid_note/note_text.py | 3 +- GenshinUID/genshinuid_postdraw/__init__.py | 2 +- GenshinUID/genshinuid_postdraw/get_draw.py | 3 +- GenshinUID/genshinuid_resin/__init__.py | 2 +- GenshinUID/genshinuid_resin/resin_text.py | 2 +- GenshinUID/genshinuid_roleinfo/__init__.py | 2 +- .../genshinuid_roleinfo/draw_roleinfo_card.py | 2 +- GenshinUID/genshinuid_roleinfo/get_regtime.py | 2 +- GenshinUID/genshinuid_signin/__init__.py | 2 +- GenshinUID/genshinuid_topup/gs_topup.py | 2 +- .../genshinuid_update/draw_update_log.py | 2 +- GenshinUID/genshinuid_user/add_ck.py | 3 +- .../genshinuid_wikitext/get_artifacts_pic.py | 2 +- .../get_constellation_pic.py | 2 +- .../genshinuid_wikitext/get_cost_pic.py | 2 +- .../genshinuid_wikitext/get_foods_pic.py | 2 +- .../genshinuid_wikitext/get_weapons_pic.py | 2 +- GenshinUID/utils/convert.py | 2 +- GenshinUID/utils/error_reply.py | 48 ------------------- 36 files changed, 45 insertions(+), 83 deletions(-) delete mode 100644 GenshinUID/utils/error_reply.py diff --git a/GenshinUID/genshinuid_abyss/__init__.py b/GenshinUID/genshinuid_abyss/__init__.py index ee3e71c5..94956d3b 100644 --- a/GenshinUID/genshinuid_abyss/__init__.py +++ b/GenshinUID/genshinuid_abyss/__init__.py @@ -1,9 +1,11 @@ +import re + from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event +from gsuid_core.utils.error_reply import UID_HINT from ..utils.convert import get_uid -from ..utils.error_reply import UID_HINT from .draw_abyss_card import draw_abyss_img sv_abyss = SV('查询深渊') @@ -13,6 +15,10 @@ sv_abyss = SV('查询深渊') ('查询深渊', 'sy', '查询上期深渊', 'sqsy', '上期深渊', '深渊'), block=True ) async def send_abyss_info(bot: Bot, ev: Event): + name = ''.join(re.findall('[\u4e00-\u9fa5]', ev.text)) + if name: + return + await bot.logger.info('开始执行[查询深渊信息]') uid = await get_uid(bot, ev) if uid is None: diff --git a/GenshinUID/genshinuid_abyss/draw_abyss_card.py b/GenshinUID/genshinuid_abyss/draw_abyss_card.py index a125674b..8e3a2adc 100644 --- a/GenshinUID/genshinuid_abyss/draw_abyss_card.py +++ b/GenshinUID/genshinuid_abyss/draw_abyss_card.py @@ -5,10 +5,10 @@ from typing import Union, Optional from PIL import Image, ImageDraw from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error from gsuid_core.utils.api.mys.models import AbyssBattleAvatar from ..utils.convert import GsCookie -from ..utils.error_reply import get_error from ..utils.image.convert import convert_img from ..utils.resource.download_url import download_file from ..utils.resource.generate_char_card import create_single_char_card diff --git a/GenshinUID/genshinuid_ann/__init__.py b/GenshinUID/genshinuid_ann/__init__.py index d5f61f87..a4c834a5 100644 --- a/GenshinUID/genshinuid_ann/__init__.py +++ b/GenshinUID/genshinuid_ann/__init__.py @@ -7,11 +7,11 @@ from gsuid_core.gss import gss from gsuid_core.models import Event from gsuid_core.aps import scheduler from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import UID_HINT from .util import black_ids from ..utils.convert import get_uid from .main import ann, consume_remind -from ..utils.error_reply import UID_HINT from ..utils.image.convert import convert_img from ..genshinuid_config.gs_config import gsconfig from .ann_card import sub_ann, unsub_ann, ann_list_card, ann_detail_card diff --git a/GenshinUID/genshinuid_collection/__init__.py b/GenshinUID/genshinuid_collection/__init__.py index 81b3d332..fe2af925 100644 --- a/GenshinUID/genshinuid_collection/__init__.py +++ b/GenshinUID/genshinuid_collection/__init__.py @@ -1,9 +1,9 @@ from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event +from gsuid_core.utils.error_reply import UID_HINT from ..utils.convert import get_uid -from ..utils.error_reply import UID_HINT from .draw_collection_card import draw_explora_img, draw_collection_img sv_sj = SV('查询收集') diff --git a/GenshinUID/genshinuid_config/__init__.py b/GenshinUID/genshinuid_config/__init__.py index a38615f6..0514df0e 100644 --- a/GenshinUID/genshinuid_config/__init__.py +++ b/GenshinUID/genshinuid_config/__init__.py @@ -3,9 +3,9 @@ import re from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event +from gsuid_core.utils.error_reply import UID_HINT from ..utils.database import get_sqla -from ..utils.error_reply import UID_HINT from .draw_config_card import draw_config_img from .set_config import set_push_value, set_config_func diff --git a/GenshinUID/genshinuid_enka/__init__.py b/GenshinUID/genshinuid_enka/__init__.py index 2b0dcacc..726f5530 100644 --- a/GenshinUID/genshinuid_enka/__init__.py +++ b/GenshinUID/genshinuid_enka/__init__.py @@ -8,11 +8,11 @@ from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import UID_HINT from .to_data import switch_api from .to_card import enka_to_card from ..utils.convert import get_uid -from ..utils.error_reply import UID_HINT from ..utils.image.convert import convert_img from ..utils.map.GS_MAP_PATH import alias_data from .draw_char_rank import draw_cahrcard_list diff --git a/GenshinUID/genshinuid_enka/get_enka_img.py b/GenshinUID/genshinuid_enka/get_enka_img.py index f69191f0..6bfc14ca 100644 --- a/GenshinUID/genshinuid_enka/get_enka_img.py +++ b/GenshinUID/genshinuid_enka/get_enka_img.py @@ -4,9 +4,9 @@ from typing import Dict, List, Tuple, Union, Optional from PIL import Image from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import CHAR_HINT from .to_card import draw_enka_card -from ..utils.error_reply import CHAR_HINT from .draw_char_card import draw_char_img from .draw_group_dmg import draw_group_dmg_img from .mono.Character import Character, get_char diff --git a/GenshinUID/genshinuid_enka/to_data.py b/GenshinUID/genshinuid_enka/to_data.py index 938d1c68..e12419ee 100644 --- a/GenshinUID/genshinuid_enka/to_data.py +++ b/GenshinUID/genshinuid_enka/to_data.py @@ -3,11 +3,11 @@ import time from typing import List, Union, Literal, Optional from httpx import ReadTimeout, ConnectTimeout +from gsuid_core.utils.error_reply import UID_HINT from gsuid_core.utils.api.enka.models import EnkaData from gsuid_core.utils.api.enka.request import get_enka_info from gsuid_core.utils.api.minigg.request import get_weapon_info -from ..utils.error_reply import UID_HINT from ..utils.resource.RESOURCE_PATH import PLAYER_PATH from ..utils.ambr_to_minigg import convert_ambr_to_weapon from ..utils.map.GS_MAP_PATH import ( diff --git a/GenshinUID/genshinuid_gachalog/__init__.py b/GenshinUID/genshinuid_gachalog/__init__.py index c18f8452..e0c61978 100644 --- a/GenshinUID/genshinuid_gachalog/__init__.py +++ b/GenshinUID/genshinuid_gachalog/__init__.py @@ -2,10 +2,10 @@ from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.segment import MessageSegment +from gsuid_core.utils.error_reply import UID_HINT from ..utils.convert import get_uid from ..utils.database import get_sqla -from ..utils.error_reply import UID_HINT from .get_gachalogs import save_gachalogs from .draw_gachalogs import draw_gachalogs_img from .export_and_import import export_gachalogs, import_gachalogs diff --git a/GenshinUID/genshinuid_gachalog/get_gachalogs.py b/GenshinUID/genshinuid_gachalog/get_gachalogs.py index 9061c9e4..acef3208 100644 --- a/GenshinUID/genshinuid_gachalog/get_gachalogs.py +++ b/GenshinUID/genshinuid_gachalog/get_gachalogs.py @@ -3,8 +3,9 @@ import asyncio from datetime import datetime from typing import Dict, Optional +from gsuid_core.utils.error_reply import SK_HINT + from ..utils.mys_api import mys_api -from ..utils.error_reply import SK_HINT from ..utils.resource.RESOURCE_PATH import PLAYER_PATH gacha_type_meta_data = { diff --git a/GenshinUID/genshinuid_gachalog/lelaer_tools.py b/GenshinUID/genshinuid_gachalog/lelaer_tools.py index a5b26971..d4f1ffc0 100644 --- a/GenshinUID/genshinuid_gachalog/lelaer_tools.py +++ b/GenshinUID/genshinuid_gachalog/lelaer_tools.py @@ -5,10 +5,10 @@ import httpx import aiofiles from gsuid_core.logger import logger from urllib3 import encode_multipart_formdata +from gsuid_core.utils.error_reply import get_error from gsuid_core.utils.api.mys.request import RECOGNIZE_SERVER from ..utils.mys_api import mys_api -from ..utils.error_reply import get_error from .export_and_import import export_gachalogs, import_gachalogs diff --git a/GenshinUID/genshinuid_gcg/__init__.py b/GenshinUID/genshinuid_gcg/__init__.py index 1d4335c2..f0710fbb 100644 --- a/GenshinUID/genshinuid_gcg/__init__.py +++ b/GenshinUID/genshinuid_gcg/__init__.py @@ -1,11 +1,11 @@ from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event +from gsuid_core.utils.error_reply import UID_HINT from ..utils.convert import get_uid from .draw_gcgdesk import draw_deck_img from .draw_gcginfo import draw_gcg_info -from ..utils.error_reply import UID_HINT sv_gcg = SV('查询七圣') diff --git a/GenshinUID/genshinuid_gcg/draw_gcgdesk.py b/GenshinUID/genshinuid_gcg/draw_gcgdesk.py index eeb71ea0..1cdc7a8c 100644 --- a/GenshinUID/genshinuid_gcg/draw_gcgdesk.py +++ b/GenshinUID/genshinuid_gcg/draw_gcgdesk.py @@ -3,9 +3,9 @@ from typing import Union from PIL import Image, ImageDraw from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error from ..utils.mys_api import mys_api -from ..utils.error_reply import get_error from ..utils.image.convert import convert_img from ..utils.resource.download_url import download from ..utils.resource.RESOURCE_PATH import CARD_PATH diff --git a/GenshinUID/genshinuid_gcg/draw_gcginfo.py b/GenshinUID/genshinuid_gcg/draw_gcginfo.py index 5fc4d665..14ac3814 100644 --- a/GenshinUID/genshinuid_gcg/draw_gcginfo.py +++ b/GenshinUID/genshinuid_gcg/draw_gcginfo.py @@ -3,9 +3,9 @@ from typing import Union from PIL import Image, ImageDraw from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error from ..utils.mys_api import mys_api -from ..utils.error_reply import get_error from ..utils.image.convert import convert_img from ..utils.resource.download_url import download from ..utils.resource.RESOURCE_PATH import CARD_PATH diff --git a/GenshinUID/genshinuid_mysbbscoin/__init__.py b/GenshinUID/genshinuid_mysbbscoin/__init__.py index 974a87bf..235f70d4 100644 --- a/GenshinUID/genshinuid_mysbbscoin/__init__.py +++ b/GenshinUID/genshinuid_mysbbscoin/__init__.py @@ -8,9 +8,9 @@ from gsuid_core.gss import gss from gsuid_core.models import Event from gsuid_core.aps import scheduler from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import CK_HINT, SK_HINT from ..utils.database import get_sqla -from ..utils.error_reply import CK_HINT, SK_HINT from ..genshinuid_config.gs_config import gsconfig from .daily_get import mihoyo_coin, all_daily_mihoyo_bbs_coin diff --git a/GenshinUID/genshinuid_note/__init__.py b/GenshinUID/genshinuid_note/__init__.py index b7d1a776..2350245b 100644 --- a/GenshinUID/genshinuid_note/__init__.py +++ b/GenshinUID/genshinuid_note/__init__.py @@ -1,11 +1,11 @@ from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event +from gsuid_core.utils.error_reply import UID_HINT from .note_text import award from ..utils.convert import get_uid from ..utils.database import get_sqla -from ..utils.error_reply import UID_HINT from .draw_note_card import draw_note_img sv_get_monthly_data = SV('查询札记') diff --git a/GenshinUID/genshinuid_note/draw_note_card.py b/GenshinUID/genshinuid_note/draw_note_card.py index 4f756ea7..cf55d04c 100644 --- a/GenshinUID/genshinuid_note/draw_note_card.py +++ b/GenshinUID/genshinuid_note/draw_note_card.py @@ -3,9 +3,9 @@ from typing import Union from PIL import Image, ImageDraw from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error from ..utils.mys_api import mys_api -from ..utils.error_reply import get_error from ..utils.image.convert import convert_img from ..utils.image.image_tools import get_color_bg from ..utils.fonts.genshin_fonts import gs_font_26, gs_font_38, gs_font_58 diff --git a/GenshinUID/genshinuid_note/note_text.py b/GenshinUID/genshinuid_note/note_text.py index 3e4e1868..ebeb7e93 100644 --- a/GenshinUID/genshinuid_note/note_text.py +++ b/GenshinUID/genshinuid_note/note_text.py @@ -1,5 +1,6 @@ +from gsuid_core.utils.error_reply import get_error + from ..utils.mys_api import mys_api -from ..utils.error_reply import get_error month_im = """ ============== diff --git a/GenshinUID/genshinuid_postdraw/__init__.py b/GenshinUID/genshinuid_postdraw/__init__.py index b161eb22..90eb6fc4 100644 --- a/GenshinUID/genshinuid_postdraw/__init__.py +++ b/GenshinUID/genshinuid_postdraw/__init__.py @@ -1,10 +1,10 @@ from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event +from gsuid_core.utils.error_reply import UID_HINT from .get_draw import post_my_draw from ..utils.database import get_sqla -from ..utils.error_reply import UID_HINT sv_post_my_draw = SV('留影叙佳期') diff --git a/GenshinUID/genshinuid_postdraw/get_draw.py b/GenshinUID/genshinuid_postdraw/get_draw.py index b54b2207..cd66239e 100644 --- a/GenshinUID/genshinuid_postdraw/get_draw.py +++ b/GenshinUID/genshinuid_postdraw/get_draw.py @@ -1,5 +1,6 @@ +from gsuid_core.utils.error_reply import get_error + from ..utils.mys_api import mys_api -from ..utils.error_reply import get_error async def post_my_draw(uid) -> str: diff --git a/GenshinUID/genshinuid_resin/__init__.py b/GenshinUID/genshinuid_resin/__init__.py index 390f9f1c..ef03070e 100644 --- a/GenshinUID/genshinuid_resin/__init__.py +++ b/GenshinUID/genshinuid_resin/__init__.py @@ -7,11 +7,11 @@ from gsuid_core.models import Event from gsuid_core.aps import scheduler from gsuid_core.logger import logger from gsuid_core.segment import MessageSegment +from gsuid_core.utils.error_reply import UID_HINT from ..utils.convert import get_uid from .notice import get_notice_list from .resin_text import get_resin_text -from ..utils.error_reply import UID_HINT from .draw_resin_card import get_resin_img sv_get_resin = SV('查询体力') diff --git a/GenshinUID/genshinuid_resin/resin_text.py b/GenshinUID/genshinuid_resin/resin_text.py index 33b33272..bad8af77 100644 --- a/GenshinUID/genshinuid_resin/resin_text.py +++ b/GenshinUID/genshinuid_resin/resin_text.py @@ -2,9 +2,9 @@ import math from typing import List from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error from ..utils.mys_api import mys_api -from ..utils.error_reply import get_error from ..utils.map.name_covert import avatar_id_to_name, enName_to_avatarId daily_im = """*数据刷新可能存在一定延迟,请以当前游戏实际数据为准 diff --git a/GenshinUID/genshinuid_roleinfo/__init__.py b/GenshinUID/genshinuid_roleinfo/__init__.py index b0c17caa..e36e3218 100644 --- a/GenshinUID/genshinuid_roleinfo/__init__.py +++ b/GenshinUID/genshinuid_roleinfo/__init__.py @@ -3,10 +3,10 @@ import re from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event +from gsuid_core.utils.error_reply import UID_HINT from ..utils.convert import get_uid from .get_regtime import calc_reg_time -from ..utils.error_reply import UID_HINT from .draw_roleinfo_card import draw_pic sv_get_regtime = SV('查询注册时间') diff --git a/GenshinUID/genshinuid_roleinfo/draw_roleinfo_card.py b/GenshinUID/genshinuid_roleinfo/draw_roleinfo_card.py index 2d2bb2fc..f059fa27 100644 --- a/GenshinUID/genshinuid_roleinfo/draw_roleinfo_card.py +++ b/GenshinUID/genshinuid_roleinfo/draw_roleinfo_card.py @@ -3,11 +3,11 @@ from pathlib import Path from PIL import Image, ImageDraw from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error from gsuid_core.utils.api.mys.models import MihoyoAvatar from ..utils.mys_api import mys_api from ..utils.convert import GsCookie -from ..utils.error_reply import get_error from ..utils.image.convert import convert_img from ..utils.resource.download_url import download_file from ..utils.fonts.genshin_fonts import genshin_font_origin diff --git a/GenshinUID/genshinuid_roleinfo/get_regtime.py b/GenshinUID/genshinuid_roleinfo/get_regtime.py index c07c6c82..0067792e 100644 --- a/GenshinUID/genshinuid_roleinfo/get_regtime.py +++ b/GenshinUID/genshinuid_roleinfo/get_regtime.py @@ -2,9 +2,9 @@ import json import time from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error from ..utils.mys_api import mys_api -from ..utils.error_reply import get_error async def calc_reg_time(uid: str) -> str: diff --git a/GenshinUID/genshinuid_signin/__init__.py b/GenshinUID/genshinuid_signin/__init__.py index e3c1cec0..d6529815 100644 --- a/GenshinUID/genshinuid_signin/__init__.py +++ b/GenshinUID/genshinuid_signin/__init__.py @@ -7,10 +7,10 @@ from gsuid_core.gss import gss from gsuid_core.models import Event from gsuid_core.aps import scheduler from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import UID_HINT from ..utils.database import get_sqla from .sign import sign_in, daily_sign -from ..utils.error_reply import UID_HINT from ..genshinuid_config.gs_config import gsconfig SIGN_TIME = gsconfig.get_config('SignTime').data diff --git a/GenshinUID/genshinuid_topup/gs_topup.py b/GenshinUID/genshinuid_topup/gs_topup.py index 919ecb1c..442440e8 100644 --- a/GenshinUID/genshinuid_topup/gs_topup.py +++ b/GenshinUID/genshinuid_topup/gs_topup.py @@ -10,11 +10,11 @@ from gsuid_core.bot import Bot from qrcode import ERROR_CORRECT_L from gsuid_core.logger import logger from gsuid_core.segment import MessageSegment +from gsuid_core.utils.error_reply import get_error from gsuid_core.utils.api.mys.models import MysOrder from ..utils.mys_api import mys_api from ..utils.database import get_sqla -from ..utils.error_reply import get_error from .draw_topup_img import draw_wx, draw_ali disnote = '''免责声明: diff --git a/GenshinUID/genshinuid_update/draw_update_log.py b/GenshinUID/genshinuid_update/draw_update_log.py index cc0a7930..55f5f7fb 100644 --- a/GenshinUID/genshinuid_update/draw_update_log.py +++ b/GenshinUID/genshinuid_update/draw_update_log.py @@ -2,9 +2,9 @@ from pathlib import Path from typing import List, Union from PIL import Image, ImageDraw +from gsuid_core.utils.error_reply import UPDATE_HINT from .update import update_from_git -from ..utils.error_reply import UPDATE_HINT from ..utils.image.convert import convert_img from ..utils.image.image_tools import get_color_bg from ..utils.fonts.genshin_fonts import genshin_font_origin diff --git a/GenshinUID/genshinuid_user/add_ck.py b/GenshinUID/genshinuid_user/add_ck.py index cdc37d7b..c4a2dde5 100644 --- a/GenshinUID/genshinuid_user/add_ck.py +++ b/GenshinUID/genshinuid_user/add_ck.py @@ -2,9 +2,10 @@ from pathlib import Path from typing import Dict, List from http.cookies import SimpleCookie +from gsuid_core.utils.error_reply import UID_HINT + from ..utils.mys_api import mys_api from ..utils.database import get_sqla -from ..utils.error_reply import UID_HINT pic_path = Path(__file__).parent / 'pic' id_list = [ diff --git a/GenshinUID/genshinuid_wikitext/get_artifacts_pic.py b/GenshinUID/genshinuid_wikitext/get_artifacts_pic.py index 31692a2a..f0c71a68 100644 --- a/GenshinUID/genshinuid_wikitext/get_artifacts_pic.py +++ b/GenshinUID/genshinuid_wikitext/get_artifacts_pic.py @@ -3,11 +3,11 @@ from typing import Tuple, Union import aiofiles from PIL import Image, ImageDraw +from gsuid_core.utils.error_reply import get_error from gsuid_core.utils.api.minigg.models import Artifact from gsuid_core.utils.api.minigg.request import get_others_info from .path import TEXT_PATH -from ..utils.error_reply import get_error from ..utils.image.image_tools import get_pic from ..utils.image.convert import str_lenth, convert_img from ..utils.resource.RESOURCE_PATH import REL_PATH, WIKI_REL_PATH diff --git a/GenshinUID/genshinuid_wikitext/get_constellation_pic.py b/GenshinUID/genshinuid_wikitext/get_constellation_pic.py index eb27305d..f61434b4 100644 --- a/GenshinUID/genshinuid_wikitext/get_constellation_pic.py +++ b/GenshinUID/genshinuid_wikitext/get_constellation_pic.py @@ -2,6 +2,7 @@ from typing import Dict, List, Tuple, Union import aiofiles from PIL import Image, ImageDraw +from gsuid_core.utils.error_reply import get_error from gsuid_core.utils.api.minigg.request import ( get_character_info, get_constellation_info, @@ -13,7 +14,6 @@ from gsuid_core.utils.api.minigg.models import ( ) from .path import TEXT_PATH -from ..utils.error_reply import get_error from ..utils.resource.download_url import download from ..utils.map.name_covert import name_to_avatar_id from ..utils.image.convert import str_lenth, convert_img diff --git a/GenshinUID/genshinuid_wikitext/get_cost_pic.py b/GenshinUID/genshinuid_wikitext/get_cost_pic.py index cf133fd5..014c6b3a 100644 --- a/GenshinUID/genshinuid_wikitext/get_cost_pic.py +++ b/GenshinUID/genshinuid_wikitext/get_cost_pic.py @@ -2,6 +2,7 @@ from typing import Dict, List, Tuple, Union import aiofiles from PIL import Image, ImageDraw +from gsuid_core.utils.error_reply import get_error from gsuid_core.utils.api.minigg.models import Character, CharacterTalents from gsuid_core.utils.api.minigg.request import ( get_others_info, @@ -11,7 +12,6 @@ from gsuid_core.utils.api.minigg.request import ( from .path import TEXT_PATH from ..utils.colors import white_color -from ..utils.error_reply import get_error from ..utils.get_assets import get_assets_from_ambr from ..utils.map.name_covert import name_to_avatar_id from ..utils.image.convert import str_lenth, convert_img diff --git a/GenshinUID/genshinuid_wikitext/get_foods_pic.py b/GenshinUID/genshinuid_wikitext/get_foods_pic.py index 59e297c8..70368e0f 100644 --- a/GenshinUID/genshinuid_wikitext/get_foods_pic.py +++ b/GenshinUID/genshinuid_wikitext/get_foods_pic.py @@ -2,12 +2,12 @@ from typing import List, Union import aiofiles from PIL import Image, ImageDraw +from gsuid_core.utils.error_reply import get_error from gsuid_core.utils.api.minigg.models import Food from gsuid_core.utils.api.minigg.request import get_others_info from .path import TEXT_PATH from ..utils.colors import white_color -from ..utils.error_reply import get_error from ..utils.get_assets import get_assets_from_ambr from ..utils.resource.RESOURCE_PATH import WIKI_FOOD_PATH from ..utils.image.convert import convert_img, get_str_size diff --git a/GenshinUID/genshinuid_wikitext/get_weapons_pic.py b/GenshinUID/genshinuid_wikitext/get_weapons_pic.py index f0e361f6..9680b6e2 100644 --- a/GenshinUID/genshinuid_wikitext/get_weapons_pic.py +++ b/GenshinUID/genshinuid_wikitext/get_weapons_pic.py @@ -3,6 +3,7 @@ from typing import Dict, List, Union import aiofiles from PIL import Image, ImageDraw +from gsuid_core.utils.error_reply import get_error from gsuid_core.utils.api.minigg.models import Weapon, WeaponStats from gsuid_core.utils.api.minigg.request import ( get_others_info, @@ -12,7 +13,6 @@ from gsuid_core.utils.api.minigg.request import ( from .path import TEXT_PATH from ..utils.colors import white_color -from ..utils.error_reply import get_error from ..utils.get_assets import get_assets_from_ambr from ..utils.image.convert import convert_img, get_str_size from ..utils.resource.RESOURCE_PATH import WIKI_WEAPON_PATH diff --git a/GenshinUID/utils/convert.py b/GenshinUID/utils/convert.py index 051e1f49..b099fcb4 100644 --- a/GenshinUID/utils/convert.py +++ b/GenshinUID/utils/convert.py @@ -3,11 +3,11 @@ from typing import Tuple, Union, Optional, overload from gsuid_core.bot import Bot from gsuid_core.models import Event +from gsuid_core.utils.error_reply import VERIFY_HINT from gsuid_core.utils.api.mys.models import AbyssData, IndexData from .mys_api import mys_api from .database import get_sqla -from .error_reply import VERIFY_HINT @overload diff --git a/GenshinUID/utils/error_reply.py b/GenshinUID/utils/error_reply.py deleted file mode 100644 index f4e6cf58..00000000 --- a/GenshinUID/utils/error_reply.py +++ /dev/null @@ -1,48 +0,0 @@ -from typing import Union - -UID_HINT = '你还没有绑定过uid哦!\n请使用[绑定uid123456]命令绑定!' -MYS_HINT = '你还没有绑定过mysid哦!\n请使用[绑定mys1234]命令绑定!' -CK_HINT = """你还没有绑定过Cookie哦!发送【ck帮助】获取帮助! -警告:绑定Cookie可能会带来未知的账号风险,请确保信任机器人管理员""" -CHAR_HINT = '你还没有{}的缓存噢!\n请先使用【强制刷新】命令来缓存数据! \n或者使用【查询展柜角色】命令查看已缓存角色!' -VERIFY_HINT = '''出现验证码! -如已绑定CK: 请至米游社软件->我的->我的角色处解锁验证码 -(可使用[gs关闭推送]命令关闭体力推送以减少出现验证码风险) -如未绑定CK: 可联系管理员使用[gs清除缓存]命令 -''' -SK_HINT = '你还没有绑定过Stoken或者Stoken已失效~\n请加好友私聊Bot\n [扫码登陆] 或 [添加]后跟SK格式 以绑定SK' -UPDATE_HINT = '''更新失败!更多错误信息请查看控制台... ->> 可以尝试使用 ->> [gs强制更新](危险) ->> [gs强行强制更新](超级危险)!''' - - -def get_error(retcode: Union[int, str]) -> str: - if retcode == -51: - return CK_HINT - elif retcode == -100: - return '您的cookie已经失效, 请重新获取!' - elif retcode == 10001: - return '您的cookie已经失效, 请重新获取!' - elif retcode == 10101: - return '当前查询CK已超过每日30次上限!' - elif retcode == 10102: - return '当前查询id已经设置了隐私, 无法查询!' - elif retcode == 1034: - return VERIFY_HINT - elif retcode == -10001: - return '请求体出错, 请检查具体实现代码...' - elif retcode == 10104: - return CK_HINT - elif retcode == -512009: - return '[留影叙佳期]已经获取过该内容~!' - elif retcode == -201: - return '你的账号可能已被封禁, 请联系米游社客服...' - elif retcode == -501101: - return '当前角色冒险等阶未达到10级, 暂时无法参加此活动...' - elif retcode == 400: - return '[MINIGG]暂未找到此内容...' - elif retcode == -400: - return '请输入更详细的名称...' - else: - return f'API报错, 错误码为{retcode}!'