From 22b7e23d02d4d7fb5475f97ad51cb2ff1af8a8c5 Mon Sep 17 00:00:00 2001 From: KimigaiiWuyi <444835641@qq.com> Date: Sun, 27 Apr 2025 05:58:34 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=20(#680)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GenshinUID/genshinuid_abyss/__init__.py | 2 +- GenshinUID/genshinuid_achievement/__init__.py | 2 +- GenshinUID/genshinuid_ann/__init__.py | 2 +- GenshinUID/genshinuid_cale/__init__.py | 2 +- GenshinUID/genshinuid_collection/__init__.py | 2 +- GenshinUID/genshinuid_compute/__init__.py | 2 +- GenshinUID/genshinuid_config/__init__.py | 2 +- GenshinUID/genshinuid_enka/__init__.py | 2 +- GenshinUID/genshinuid_enka/to_data.py | 2 +- GenshinUID/genshinuid_gachalog/__init__.py | 2 +- GenshinUID/genshinuid_gcg/__init__.py | 2 +- GenshinUID/genshinuid_note/__init__.py | 2 +- GenshinUID/genshinuid_poetry_abyss/__init__.py | 2 +- GenshinUID/genshinuid_postdraw/__init__.py | 2 +- GenshinUID/genshinuid_resin/__init__.py | 2 +- GenshinUID/genshinuid_roleinfo/__init__.py | 2 +- GenshinUID/genshinuid_signin/__init__.py | 2 +- GenshinUID/utils/message.py | 3 +++ 18 files changed, 20 insertions(+), 17 deletions(-) diff --git a/GenshinUID/genshinuid_abyss/__init__.py b/GenshinUID/genshinuid_abyss/__init__.py index 951d2471..65ce7af7 100644 --- a/GenshinUID/genshinuid_abyss/__init__.py +++ b/GenshinUID/genshinuid_abyss/__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.convert import get_uid +from ..utils.message import UID_HINT from .draw_abyss_card import draw_abyss_img from ..utils.message import GButton as Button diff --git a/GenshinUID/genshinuid_achievement/__init__.py b/GenshinUID/genshinuid_achievement/__init__.py index 4bfd27f6..e6950934 100644 --- a/GenshinUID/genshinuid_achievement/__init__.py +++ b/GenshinUID/genshinuid_achievement/__init__.py @@ -2,9 +2,9 @@ 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 ..utils.convert import get_uid +from ..utils.message import UID_HINT from .draw_achi import draw_achi_img from .get_achi_desc import get_achi, get_daily_achi diff --git a/GenshinUID/genshinuid_ann/__init__.py b/GenshinUID/genshinuid_ann/__init__.py index c9aa0d71..95e67b39 100644 --- a/GenshinUID/genshinuid_ann/__init__.py +++ b/GenshinUID/genshinuid_ann/__init__.py @@ -8,10 +8,10 @@ from gsuid_core.models import Event from gsuid_core.aps import scheduler from gsuid_core.logger import logger from gsuid_core.subscribe import gs_subscribe -from gsuid_core.utils.error_reply import UID_HINT from .util import black_ids from ..utils.convert import get_uid +from ..utils.message import UID_HINT from .main import ann, consume_remind from ..utils.image.convert import convert_img from ..genshinuid_config.gs_config import gsconfig diff --git a/GenshinUID/genshinuid_cale/__init__.py b/GenshinUID/genshinuid_cale/__init__.py index 40e9010a..260b884d 100644 --- a/GenshinUID/genshinuid_cale/__init__.py +++ b/GenshinUID/genshinuid_cale/__init__.py @@ -2,9 +2,9 @@ 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 ..utils.convert import get_uid +from ..utils.message import UID_HINT from .draw_cale_pic import draw_cale_img from ..utils.buttons import a, b, c, s, t, u, v, x, y diff --git a/GenshinUID/genshinuid_collection/__init__.py b/GenshinUID/genshinuid_collection/__init__.py index 01cc128c..e00325fd 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.message import UID_HINT from ..utils.message import GButton as Button from .draw_new_collection_card import draw_explore from .draw_collection_card import draw_explora_img, draw_collection_img diff --git a/GenshinUID/genshinuid_compute/__init__.py b/GenshinUID/genshinuid_compute/__init__.py index ba54f0df..2c467cd8 100644 --- a/GenshinUID/genshinuid_compute/__init__.py +++ b/GenshinUID/genshinuid_compute/__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.message import UID_HINT from .get_my_pack import draw_my_pack sv_pack = SV('查询背包') diff --git a/GenshinUID/genshinuid_config/__init__.py b/GenshinUID/genshinuid_config/__init__.py index 90c57aca..5fb392bf 100644 --- a/GenshinUID/genshinuid_config/__init__.py +++ b/GenshinUID/genshinuid_config/__init__.py @@ -4,9 +4,9 @@ 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 gsuid_core.utils.database.models import GsBind +from ..utils.message 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 4067bdbe..e94d18d0 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.message import UID_HINT from .get_akasha_data import get_rank from .start import refresh_player_list from .to_data_by_mys import mys_to_card diff --git a/GenshinUID/genshinuid_enka/to_data.py b/GenshinUID/genshinuid_enka/to_data.py index b63a2e0f..b8c42755 100644 --- a/GenshinUID/genshinuid_enka/to_data.py +++ b/GenshinUID/genshinuid_enka/to_data.py @@ -7,10 +7,10 @@ from typing import Dict, List, Union, Literal, Optional import aiofiles from httpx import ReadTimeout -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 ..utils.message import UID_HINT from .mono.Character import Character from ..utils.api.cv.request import _CvApi from .draw_normal import get_artifact_score_data diff --git a/GenshinUID/genshinuid_gachalog/__init__.py b/GenshinUID/genshinuid_gachalog/__init__.py index b5d1151d..232d6e28 100644 --- a/GenshinUID/genshinuid_gachalog/__init__.py +++ b/GenshinUID/genshinuid_gachalog/__init__.py @@ -3,10 +3,10 @@ from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.logger import logger from gsuid_core.segment import MessageSegment -from gsuid_core.utils.error_reply import UID_HINT from gsuid_core.utils.database.models import GsBind from ..utils.convert import get_uid +from ..utils.message import UID_HINT from ..utils.message import GButton as Button from .draw_gachalogs import draw_gachalogs_img from .get_gachalogs import save_gachalogs, get_full_gachalog diff --git a/GenshinUID/genshinuid_gcg/__init__.py b/GenshinUID/genshinuid_gcg/__init__.py index abd75890..5ea81c11 100644 --- a/GenshinUID/genshinuid_gcg/__init__.py +++ b/GenshinUID/genshinuid_gcg/__init__.py @@ -2,9 +2,9 @@ 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 ..utils.convert import get_uid +from ..utils.message import UID_HINT from .draw_gcgdesk import draw_deck_img from .draw_gcginfo import draw_gcg_info from ..utils.message import GButton as Button diff --git a/GenshinUID/genshinuid_note/__init__.py b/GenshinUID/genshinuid_note/__init__.py index 5f88a378..613875ee 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 gsuid_core.utils.database.models import GsBind from .note_text import award from ..utils.convert import get_uid +from ..utils.message import UID_HINT from .draw_note_card import draw_note_img sv_get_monthly_data = SV('查询札记') diff --git a/GenshinUID/genshinuid_poetry_abyss/__init__.py b/GenshinUID/genshinuid_poetry_abyss/__init__.py index 1bf8e104..786744d2 100644 --- a/GenshinUID/genshinuid_poetry_abyss/__init__.py +++ b/GenshinUID/genshinuid_poetry_abyss/__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.convert import get_uid +from ..utils.message import UID_HINT from .draw_poetry_abyss import draw_poetry_abyss_img sv_poetry_abyss = SV('查询幻想真境剧诗') diff --git a/GenshinUID/genshinuid_postdraw/__init__.py b/GenshinUID/genshinuid_postdraw/__init__.py index 5e4c9b2c..8c92c17f 100644 --- a/GenshinUID/genshinuid_postdraw/__init__.py +++ b/GenshinUID/genshinuid_postdraw/__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.aps import scheduler -from gsuid_core.utils.error_reply import UID_HINT from gsuid_core.utils.database.models import GsBind from .get_draw import post_my_draw +from ..utils.message import UID_HINT from .daily_check_draw import daily_get_draw from ..genshinuid_config.gs_config import gsconfig diff --git a/GenshinUID/genshinuid_resin/__init__.py b/GenshinUID/genshinuid_resin/__init__.py index 8836a673..7341ff35 100644 --- a/GenshinUID/genshinuid_resin/__init__.py +++ b/GenshinUID/genshinuid_resin/__init__.py @@ -8,9 +8,9 @@ from gsuid_core.aps import scheduler from gsuid_core.logger import logger from gsuid_core.models import Event, Message from gsuid_core.segment import MessageSegment -from gsuid_core.utils.error_reply import UID_HINT from ..utils.convert import get_uid +from ..utils.message import UID_HINT from .resin_text import get_resin_text from .draw_resin_card import get_resin_img from .notice import MR_NOTICE, get_notice_list diff --git a/GenshinUID/genshinuid_roleinfo/__init__.py b/GenshinUID/genshinuid_roleinfo/__init__.py index c77ee5e1..67f340c2 100644 --- a/GenshinUID/genshinuid_roleinfo/__init__.py +++ b/GenshinUID/genshinuid_roleinfo/__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.convert import get_uid +from ..utils.message import UID_HINT from .get_regtime import calc_reg_time from .draw_all_char import draw_char_pic from .draw_roleinfo_card import draw_pic diff --git a/GenshinUID/genshinuid_signin/__init__.py b/GenshinUID/genshinuid_signin/__init__.py index c4a3eb01..0d17d322 100644 --- a/GenshinUID/genshinuid_signin/__init__.py +++ b/GenshinUID/genshinuid_signin/__init__.py @@ -3,11 +3,11 @@ from gsuid_core.bot import Bot 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 gsuid_core.utils.database.models import GsBind from gsuid_core.utils.sign.sign import sign_in, daily_sign from gsuid_core.utils.boardcast.send_msg import send_board_cast_msg +from ..utils.message import UID_HINT from ..genshinuid_config.gs_config import gsconfig SIGN_TIME = gsconfig.get_config('SignTime').data diff --git a/GenshinUID/utils/message.py b/GenshinUID/utils/message.py index 1449f707..318f0dd4 100644 --- a/GenshinUID/utils/message.py +++ b/GenshinUID/utils/message.py @@ -31,3 +31,6 @@ async def send_diff_msg( return await bot.send_option( data[retcode], option_list, False, '\n' ) + + +UID_HINT = f'你还没有绑定过uid哦!\n请使用[{PREFIX}绑定uid123456]命令绑定!'