✨ 新增PREFIX配置项

StarRailUID/starrailuid_abyss/__init__.py

@@ -6,13 +6,22 @@ from gsuid_core.models import Event
 from gsuid_core.utils.error_reply import UID_HINT
 
 from ..utils.convert import get_uid
+from ..utils.sr_prefix import PREFIX
 from .draw_abyss_card import draw_abyss_img
 
 sv_srabyss = SV('sr查询深渊')
 
 
 @sv_srabyss.on_command(
-    ('sr查询深渊', 'srsy', 'sr查询上期深渊', 'srsqsy', 'sr上期深渊', 'sr深渊'), block=True
+    (
+        f'{PREFIX}查询深渊',
+        f'{PREFIX}sy',
+        f'{PREFIX}查询上期深渊',
+        f'{PREFIX}sqsy',
+        f'{PREFIX}上期深渊',
+        f'{PREFIX}深渊',
+    ),
+    block=True,
 )
 async def send_srabyss_info(bot: Bot, ev: Event):
     name = ''.join(re.findall('[\u4e00-\u9fa5]', ev.text))

StarRailUID/starrailuid_charinfo/__init__.py

@@ -10,6 +10,7 @@ from gsuid_core.models import Event
 
 from .to_card import api_to_card
 from ..utils.convert import get_uid
+from ..utils.sr_prefix import PREFIX
 from ..utils.error_reply import UID_HINT
 from ..utils.image.convert import convert_img
 from .draw_char_img import draw_char_info_img
@@ -20,7 +21,7 @@ sv_get_char_info = SV('sr面板查询', priority=10)
 sv_get_sr_original_pic = SV('sr查看面板原图', priority=5)
 
 
-@sv_get_char_info.on_prefix('sr查询')
+@sv_get_char_info.on_prefix(f'{PREFIX}查询')
 async def send_char_info(bot: Bot, ev: Event):
     im = await _get_char_info(bot, ev, ev.text)
     if isinstance(im, str):
@@ -60,7 +61,7 @@ async def _get_char_info(bot: Bot, ev: Event, text: str):
     return im
 
 
-@sv_get_char_info.on_command('sr强制刷新')
+@sv_get_char_info.on_command(f'{PREFIX}强制刷新')
 async def send_card_info(bot: Bot, ev: Event):
     uid = await get_uid(bot, ev)
     if uid is None:

StarRailUID/starrailuid_config/config_default.py

@@ -2,6 +2,7 @@ from typing import Dict
 
 from gsuid_core.utils.plugins_config.models import (
     GSC,
+    GsStrConfig,
     GsBoolConfig,
     GsListStrConfig,
 )
@@ -23,4 +24,14 @@ CONIFG_DEFAULT: Dict[str, GSC] = {
         '开启后当达到推送阈值将会一直推送',
         False,
     ),
+    'CrazyNotice': GsBoolConfig(
+        '催命模式',
+        '开启后当达到推送阈值将会一直推送',
+        False,
+    ),
+    'StarRailPrefix': GsStrConfig(
+        '插件命令前缀(确认无冲突再修改)',
+        '用于本插件的前缀设定',
+        'sr',
+    ),
 }

StarRailUID/starrailuid_gachalog/__init__.py

@@ -3,6 +3,7 @@ from gsuid_core.bot import Bot
 from gsuid_core.models import Event
 
 from ..utils.convert import get_uid
+from ..utils.sr_prefix import PREFIX
 from ..utils.error_reply import UID_HINT
 from .get_gachalogs import save_gachalogs
 from .draw_gachalogs import draw_gachalogs_img
@@ -11,7 +12,7 @@ sv_gacha_log = SV('sr抽卡记录')
 sv_get_gachalog_by_link = SV('sr导入抽卡链接', area='DIRECT')
 
 
-@sv_gacha_log.on_fullmatch(('sr抽卡记录'))
+@sv_gacha_log.on_fullmatch((f'{PREFIX}抽卡记录'))
 async def send_gacha_log_card_info(bot: Bot, ev: Event):
     await bot.logger.info('开始执行[sr抽卡记录]')
     uid, user_id = await get_uid(bot, ev, True)
@@ -21,7 +22,7 @@ async def send_gacha_log_card_info(bot: Bot, ev: Event):
     await bot.send(im)
 
 
-@sv_get_gachalog_by_link.on_command(('sr导入抽卡链接'))
+@sv_get_gachalog_by_link.on_command((f'{PREFIX}导入抽卡链接'))
 async def get_gachalog_by_link(bot: Bot, ev: Event):
     await bot.logger.info('开始执行[sr导入抽卡链接]')
     uid = await get_uid(bot, ev, only_uid=True)

StarRailUID/starrailuid_note/__init__.py

@@ -5,6 +5,7 @@ from gsuid_core.models import Event
 from .note_text import award
 from ..utils.api import get_sqla
 from ..utils.convert import get_uid
+from ..utils.sr_prefix import PREFIX
 from ..utils.error_reply import UID_HINT
 from .draw_note_card import draw_note_img
 
@@ -12,7 +13,7 @@ sv_get_monthly_data = SV('sr查询月历')
 
 
 # 群聊内 每月统计 功能
-@sv_get_monthly_data.on_fullmatch(('sr每月统计'))
+@sv_get_monthly_data.on_fullmatch((f'{PREFIX}每月统计'))
 async def send_monthly_data(bot: Bot, ev: Event):
     sqla = get_sqla(ev.bot_id)
     sr_uid = await sqla.get_bind_sruid(ev.user_id)
@@ -21,7 +22,9 @@ async def send_monthly_data(bot: Bot, ev: Event):
     await bot.send(await award(sr_uid))
 
 
-@sv_get_monthly_data.on_fullmatch(('sr开拓月历', 'srzj', 'sr月历'))
+@sv_get_monthly_data.on_fullmatch(
+    (f'{PREFIX}开拓月历', f'{PREFIX}zj', f'{PREFIX}月历')
+)
 async def send_monthly_pic(bot: Bot, ev: Event):
     await bot.logger.info('开始执行[sr开拓月历]')
     sr_uid = await get_uid(bot, ev)

StarRailUID/starrailuid_resin/__init__.py

@@ -10,6 +10,7 @@ from gsuid_core.segment import MessageSegment
 
 from ..utils.convert import get_uid
 from .notice import get_notice_list
+from ..utils.sr_prefix import PREFIX
 from .resin_text import get_resin_text
 from ..utils.error_reply import UID_HINT
 from .draw_resin_card import get_resin_img
@@ -18,7 +19,7 @@ sv_get_resin = SV('sr查询体力')
 sv_get_resin_admin = SV('sr强制推送', pm=1)
 
 
-@sv_get_resin.on_fullmatch(('sr当前状态'))
+@sv_get_resin.on_fullmatch((f'{PREFIX}当前状态'))
 async def send_daily_info(bot: Bot, ev: Event):
     await bot.logger.info('开始执行[sr每日信息文字版]')
     uid = await get_uid(bot, ev)
@@ -30,7 +31,7 @@ async def send_daily_info(bot: Bot, ev: Event):
     await bot.send(im)
 
 
-@sv_get_resin_admin.on_fullmatch(('sr强制推送体力提醒'))
+@sv_get_resin_admin.on_fullmatch((f'{PREFIX}强制推送体力提醒'))
 async def force_notice_job(bot: Bot, ev: Event):
     await bot.logger.info('开始执行[sr强制推送体力信息]')
     await sr_notice_job()
@@ -62,7 +63,15 @@ async def sr_notice_job():
             logger.info('[sr推送检查] 群聊推送完成')
 
 
-@sv_get_resin.on_fullmatch(('sr每日', 'srmr', 'sr实时便笺', 'sr便笺', 'sr便签'))
+@sv_get_resin.on_fullmatch(
+    (
+        f'{PREFIX}每日',
+        f'{PREFIX}mr',
+        f'{PREFIX}实时便笺',
+        f'{PREFIX}便笺',
+        f'{PREFIX}便签',
+    )
+)
 async def send_daily_info_pic(bot: Bot, ev: Event):
     await bot.logger.info('开始执行[sr每日信息]')
     user_id = ev.at if ev.at else ev.user_id

StarRailUID/starrailuid_resource/__init__.py

@@ -3,12 +3,13 @@ from gsuid_core.bot import Bot
 from gsuid_core.models import Event
 from gsuid_core.logger import logger
 
+from ..utils.sr_prefix import PREFIX
 from ..utils.resource.download_all_resource import download_all_resource
 
 sv_sr_download_config = SV('sr下载资源')
 
 
-@sv_sr_download_config.on_fullmatch(('sr下载全部资源'))
+@sv_sr_download_config.on_fullmatch((f'{PREFIX}下载全部资源'))
 async def send_download_resource_msg(bot: Bot, ev: Event):
     await bot.send('sr正在开始下载~可能需要较久的时间!')
     im = await download_all_resource()

StarRailUID/starrailuid_roleinfo/__init__.py

@@ -5,12 +5,13 @@ from gsuid_core.bot import Bot
 from gsuid_core.models import Event
 
 from ..utils.convert import get_uid
+from ..utils.sr_prefix import PREFIX
 from .draw_roleinfo_card import get_role_img
 
 sv_get_info = SV('sr查询信息')
 
 
-@sv_get_info.on_command(('sruid'))
+@sv_get_info.on_command((f'{PREFIX}uid'))
 async def send_role_info(bot: Bot, ev: Event):
     name = ''.join(re.findall('[\u4e00-\u9fa5]', ev.text))
     if name:

StarRailUID/starrailuid_signin/__init__.py

@@ -9,6 +9,7 @@ from gsuid_core.aps import scheduler
 from gsuid_core.logger import logger
 
 from ..utils.api import get_sqla
+from ..utils.sr_prefix import PREFIX
 from .sign import sign_in, daily_sign
 from ..utils.error_reply import UID_HINT
 from ..starrailuid_config.sr_config import srconfig
@@ -27,7 +28,7 @@ async def sr_sign_at_night():
 
 
 # 群聊内 签到 功能
-@sv_sign.on_fullmatch('sr签到')
+@sv_sign.on_fullmatch(f'{PREFIX}签到')
 async def get_sign_func(bot: Bot, ev: Event):
     await bot.logger.info('[SR签到]QQ号: {}'.format(ev.user_id))
     sqla = get_sqla(ev.bot_id)
@@ -38,7 +39,7 @@ async def get_sign_func(bot: Bot, ev: Event):
     await bot.send(await sign_in(sr_uid))
 
 
-@sv_sign_config.on_fullmatch('sr全部重签')
+@sv_sign_config.on_fullmatch(f'{PREFIX}全部重签')
 async def recheck(bot: Bot, ev: Event):
     await bot.logger.info('开始执行[SR全部重签]')
     await bot.send('已开始执行')

StarRailUID/starrailuid_user/__init__.py

@@ -5,6 +5,7 @@ from gsuid_core.bot import Bot
 from gsuid_core.models import Event
 
 from ..utils.api import get_sqla
+from ..utils.sr_prefix import PREFIX
 from ..utils.message import send_diff_msg
 from .draw_user_card import get_user_card
 
@@ -14,7 +15,7 @@ sv_user_info = SV('sr用户信息')
 # sv_user_help = SV('sr绑定帮助')
 
 
-@sv_user_info.on_fullmatch(('sr绑定信息'))
+@sv_user_info.on_fullmatch((f'{PREFIX}绑定信息'))
 async def send_bind_card(bot: Bot, ev: Event):
     await bot.logger.info('sr开始执行[查询用户绑定状态]')
     uid_list = await get_user_card(ev.bot_id, ev.user_id)
@@ -22,7 +23,9 @@ async def send_bind_card(bot: Bot, ev: Event):
     await bot.send(uid_list)
 
 
-@sv_user_info.on_command(('sr绑定uid', 'sr切换uid', 'sr删除uid', 'sr解绑uid'))
+@sv_user_info.on_command(
+    (f'{PREFIX}绑定uid', f'{PREFIX}切换uid', f'{PREFIX}删除uid', f'{PREFIX}解绑uid')
+)
 async def send_link_uid_msg(bot: Bot, ev: Event):
     await bot.logger.info('sr开始执行[绑定/解绑用户信息]')
     qid = ev.user_id
@@ -33,9 +36,8 @@ async def send_link_uid_msg(bot: Bot, ev: Event):
     if sr_uid and not sr_uid.isdigit():
         return await bot.send('你输入了错误的格式!')
 
-    if ev.command.startswith('sr绑定'):
+    if '绑定' in ev.command:
         data = await sqla.insert_bind_data(qid, sr_uid=sr_uid)
-        print(data)
         return await send_diff_msg(
             bot,
             data,
@@ -46,7 +48,7 @@ async def send_link_uid_msg(bot: Bot, ev: Event):
                 -3: '你输入了错误的格式!',
             },
         )
-    elif ev.command.startswith('sr切换'):
+    elif '切换' in ev.command:
         data = await sqla.switch_uid(qid, uid=sr_uid)
         if isinstance(data, List):
             return await bot.send(f'切换SR_UID{sr_uid}成功！')

StarRailUID/utils/sr_prefix.py

@@ -0,0 +1,3 @@
+from ..starrailuid_config.sr_config import srconfig
+
+PREFIX = srconfig.get_config('StarRailPrefix').data