standardized naming

config/config.toml.example

@@ -51,12 +51,12 @@ allow_request_private_ip = false
 allow_bot_auto_approve_group_invite = false
 slower_schedule = false
 enable_dirty_check = true
+enable_rickroll = true
 enable_urlmanager = true
 enable_tos = false
 tos_waring_counts = 5
 enable_analytics = true
 enable_eval = true
-enable_rickroll = true
 enable_get_petal = true
 gained_petal_limit = 10
 lost_petal_limit = 5

core/petal.py

@@ -20,9 +20,6 @@ PRICE_PER_1K_TOKEN = BASE_COST_GPT_3_5 * THIRD_PARTY_MULTIPLIER * PROFIT_MULTIPL
 USD_TO_CNY = Decimal('7.3')  # Assuming 1 USD = 7.3 CNY
 CNY_TO_PETAL = 100  # 100 petal = 1 CNY
 
-import json
-from datetime import datetime, timedelta
-
 
 async def get_petal_exchange_rate():
     api_key = Config('exchange_rate_api_key')
@@ -60,7 +57,6 @@ async def load_or_refresh_cache():
     return None
 
 
-
 async def count_petal(tokens):
     Logger.info(f'{tokens} tokens have been consumed while calling AI.')
     petal_exchange_rate = await load_or_refresh_cache()

modules/arcaea/__init__.py

@@ -16,10 +16,10 @@ class WithErrCode(Exception):
     pass
 
 
-@arc.command('<sb616>')
+@arc.command('b30')
 async def _(msg: Bot.MessageSession):
     await msg.send_message([Plain(msg.locale.t("arcaea.message.sb616")),
-                            Image(os.path.abspath('./assets/noc.jpg'))])
+                            Image(os.path.abspath('./assets/arcaea/noc.jpg'))])
 
 
 @arc.command('download {{arcaea.help.download}}')

modules/ask/__init__.py

@@ -74,7 +74,7 @@ async def _(msg: Bot.MessageSession):
 
         if await check_bool(res):
             if petal != 0:
-                await msg.sendMessage(msg.locale.t('petal.message.cost', count=petal))
+                await msg.send_message(msg.locale.t('petal.message.cost', count=petal))
             rickroll(msg)
         if petal != 0:
             chain.append(Plain(msg.locale.t('petal.message.cost', count=petal)))

modules/chemical_code/__init__.py

@@ -18,12 +18,10 @@ from core.utils.cache import random_cache_path
 from core.utils.http import get_url, download_to_cache
 from core.utils.text import remove_prefix
 
-csr_link = 'https://www.chemspider.com'  # ChemSpider 的链接
-special_id = ["22398", "140526", "4509317", "4509318", "4510681", "4510778", "4512975", "4514248", "4514266", "4514293",
-              "4514330", "4514408", "4514534", "4514586", "4514603", "4515054", "4573995", "4574465", "4575369",
-              "4575370",
-              "4575371", "4885606", "4885717", "4886482", "4886484", "20473555", "21865276",
-              "21865280"]  # 可能会导致识别问题的物质（如部分单质）ID，这些 ID 的图片将会在本地调用
+csr_link = 'https://www.chemspider.com'
+
+special_id_path = os.path.abspath(f'./assets/chemical_code/special_id') # 去掉文件扩展名并存储在special_id列表中
+special_id = [os.path.splitext(csid)[0] for csid in os.listdir(special_id_path)] # 可能会导致识别问题的物质（如部分单质）ID，这些 ID 的图片将会在本地调用
 
 element_lists = ['He', 'Li', 'Be', 'Ne', 'Na', 'Mg', 'Al', 'Si', 'Cl',
                  'Ar', 'Ca', 'Sc', 'Ti', 'Cr', 'Mn', 'Fe', 'Co', 'Ni',
@@ -98,9 +96,9 @@ ccode = module('chemical_code', alias={'cc': 'chemical_code',
 play_state = {}  # 创建一个空字典用于存放游戏状态
 
 
-@ccode.command('{{chemical_code.help}}')  # 直接使用 ccode 命令将触发此装饰器
+@ccode.command('{{chemical_code.help}}')  
 async def chemical_code_by_random(msg: Bot.MessageSession):
-    await chemical_code(msg)  # 将消息会话传入 chemical_code 函数
+    await chemical_code(msg)
 
 
 @ccode.command('captcha {{chemical_code.help.captcha}}')
@@ -111,12 +109,12 @@ async def _(msg: Bot.MessageSession):
 @ccode.command('stop {{game.help.stop}}')
 async def s(msg: Bot.MessageSession):
     state = play_state.get(msg.target.target_id, {})  # 尝试获取 play_state 中是否有此对象的游戏状态
-    if state:  # 若有
-        if state['active']:  # 检查是否为活跃状态
-            play_state[msg.target.target_id]['active'] = False  # 标记为非活跃状态
+    if state:
+        if state['active']:
+            play_state[msg.target.target_id]['active'] = False
             await msg.finish(
                 msg.locale.t('chemical_code.stop.message', answer=play_state[msg.target.target_id]["answer"]),
-                quote=False)  # 发送存储于 play_state 中的答案
+                quote=False)
         else:
             await msg.finish(msg.locale.t('game.message.stop.none'))
     else:
@@ -125,8 +123,8 @@ async def s(msg: Bot.MessageSession):
 
 @ccode.command('<csid> {{chemical_code.help.csid}}')
 async def chemical_code_by_id(msg: Bot.MessageSession):
-    id = msg.parsed_msg['<csid>']  # 从已解析的消息中获取 ChemSpider ID
-    if id.isdigit():  # 如果 ID 为纯数字
+    id = msg.parsed_msg['<csid>']
+    if id.isdigit():
         if int(id) == 0:
             await chemical_code(msg)
         else:
@@ -136,46 +134,44 @@ async def chemical_code_by_id(msg: Bot.MessageSession):
 
 
 async def chemical_code(msg: Bot.MessageSession, id=None, random_mode=True, captcha_mode=False):
-    # 要求传入消息会话和 ChemSpider ID，ID 留空将会使用缺省值 None
-    # 检查对象（群组或私聊）是否在 play_state 中有记录及是否为活跃状态
     if msg.target.target_id in play_state and play_state[msg.target.target_id]['active']:
         await msg.finish(msg.locale.t('game.message.running'))
-    play_state.update({msg.target.target_id: {'active': True}})  # 若无，则创建一个新的记录并标记为活跃状态
+    play_state.update({msg.target.target_id: {'active': True}})
     try:
-        csr = await search_csr(id)  # 尝试获取 ChemSpider ID 对应的化学式列表
-    except Exception as e:  # 意外情况
-        traceback.print_exc()  # 打印错误信息
-        play_state[msg.target.target_id]['active'] = False  # 将对象标记为非活跃状态
+        csr = await search_csr(id)
+    except Exception as e:
+        traceback.print_exc()
+        play_state[msg.target.target_id]['active'] = False
         return await msg.finish(msg.locale.t('chemical_code.message.error'))
     # print(csr)
     play_state[msg.target.target_id]['answer'] = csr['name']  # 将正确答案标记于 play_state 中存储的对象中
-    Logger.info(f'Answer: {csr["name"]}')  # 在日志中输出正确答案
-    Logger.info(f'Image: {csr["image"]}')  # 在日志中输出图片链接
+    Logger.info(f'Answer: {csr["name"]}')
+    Logger.info(f'Image: {csr["image"]}')
     download = False
     if csr["id"] in special_id:  # 如果正确答案在 special_id 中
         file_path = os.path.abspath(f'./assets/chemicalcode/special_id/{csr["id"]}.png')
-        Logger.info(f'File path: {file_path}')  # 在日志中输出文件路径
-        exists_file = os.path.exists(file_path)  # 尝试获取图片文件是否存在
+        Logger.info(f'File path: {file_path}')
+        exists_file = os.path.exists(file_path)
         if exists_file:
             download = file_path
     if not download:
-        download = await download_to_cache(csr['image'])  # 从结果中获取链接并下载图片
+        download = await download_to_cache(csr['image'])
 
-    with PILImage.open(download) as im:  # 打开下载的图片
-        im = im.convert("RGBA")  # 转换为 RGBA 格式
-        image = PILImage.new("RGBA", im.size, 'white')  # 创建新图片
-        image.alpha_composite(im, (0, 0))  # 将图片合并到新图片中
-        newpath = random_cache_path() + '.png'  # 创建新文件名
-        image.save(newpath)  # 保存新图片
+    with PILImage.open(download) as im:
+        im = im.convert("RGBA")
+        image = PILImage.new("RGBA", im.size, 'white')
+        image.alpha_composite(im, (0, 0))
+        newpath = random_cache_path() + '.png'
+        image.save(newpath)
 
     set_timeout = csr['length'] // 30
     if set_timeout < 2:
         set_timeout = 2
 
-    async def ans(msg: Bot.MessageSession, answer, random_mode):  # 定义回答函数的功能
-        wait = await msg.wait_anyone()  # 等待对象内的任意人回答
-        if play_state[msg.target.target_id]['active']:  # 检查对象是否为活跃状态
-            if (wait_text := wait.as_display(text_only=True)) != answer:  # 如果回答不正确
+    async def ans(msg: Bot.MessageSession, answer, random_mode):
+        wait = await msg.wait_anyone()
+        if play_state[msg.target.target_id]['active']:
+            if (wait_text := wait.as_display(text_only=True)) != answer:
                 if re.match(r'^[A-Za-z0-9]+$', wait_text):
                     try:
                         parse_ = parse_elements(wait_text)  # 解析消息中的化学元素
@@ -220,8 +216,8 @@ async def chemical_code(msg: Bot.MessageSession, id=None, random_mode=True, capt
                     except ValueError:
                         traceback.print_exc()
 
-                Logger.info(f'{wait_text} != {answer}')  # 输出日志
-                return await ans(wait, answer, random_mode)  # 进行下一轮检查
+                Logger.info(f'{wait_text} != {answer}')
+                return await ans(wait, answer, random_mode)
             else:
                 send_ = wait.locale.t('chemical_code.message.correct')
                 if random_mode:
@@ -230,27 +226,27 @@ async def chemical_code(msg: Bot.MessageSession, id=None, random_mode=True, capt
                 await wait.send_message(send_)
                 play_state[msg.target.target_id]['active'] = False  # 将对象标记为非活跃状态
 
-    async def timer(start):  # 计时器函数
-        if play_state[msg.target.target_id]['active']:  # 检查对象是否为活跃状态
-            if datetime.now().timestamp() - start > 60 * set_timeout:  # 如果超过2分钟
+    async def timer(start):
+        if play_state[msg.target.target_id]['active']: 
+            if datetime.now().timestamp() - start > 60 * set_timeout:
                 await msg.send_message(
                     msg.locale.t('chemical_code.message.timeup', answer=play_state[msg.target.target_id]["answer"]))
                 play_state[msg.target.target_id]['active'] = False
-            else:  # 如果未超时
-                await asyncio.sleep(1)  # 等待1秒
-                await timer(start)  # 重新调用计时器函数
+            else:
+                await asyncio.sleep(1)  # 防冲突
+                await timer(start)
 
     if not captcha_mode:
         await msg.send_message([Plain(msg.locale.t('chemical_code.message.showid', id=csr["id"])), Image(newpath),
                                 Plain(msg.locale.t('chemical_code.message', times=set_timeout))])
-        time_start = datetime.now().timestamp()  # 记录开始时间
+        time_start = datetime.now().timestamp()
 
-        await asyncio.gather(ans(msg, csr['name'], random_mode), timer(time_start))  # 同时启动回答函数和计时器函数
+        await asyncio.gather(ans(msg, csr['name'], random_mode), timer(time_start))
     else:
         result = await msg.wait_next_message([Plain(msg.locale.t('chemical_code.message.showid', id=csr["id"])),
                                               Image(newpath), Plain(msg.locale.t('chemical_code.message.captcha',
                                                                                  times=set_timeout))])
-        if play_state[msg.target.target_id]['active']:  # 检查对象是否为活跃状态
+        if play_state[msg.target.target_id]['active']: 
             if result.as_display(text_only=True) == csr['name']:
                 send_ = msg.locale.t('chemical_code.message.correct')
                 if (g_msg := await gained_petal(wait, 1)):

modules/core/su_utils.py

@@ -432,7 +432,7 @@ async def _(msg: Bot.MessageSession):
             raise NoReportException(e)
     if not e:
         e = msg.locale.t("core.message.raise")
-    raise Exception(e)
+    raise TestException(e)
 
 
 if Config('enable_eval'):

modules/core/utils.py

@@ -140,7 +140,7 @@ async def _(msg: Bot.MessageSession):
 async def config_gu(msg: Bot.MessageSession):
     lang = msg.parsed_msg['<lang>']
     if lang in get_available_locales() and BotDBUtil.TargetInfo(msg.target.target_id).edit('locale', lang):
-        await msg.sendMessage(Locale(lang).t('success'))
+        await msg.send_message(Locale(lang).t('success'))
         if lang not in completed_locales:
             await msg.finish(f"{Locale(lang).t('language')} {Locale(lang).t('core.message.locale.contribution')}")
     else:

modules/summary/__init__.py

@@ -81,7 +81,7 @@ async def _(msg: Bot.MessageSession):
         await wait_msg.delete()
         if await check_bool(output):
             if petal != 0:
-                await msg.sendMessage(msg.locale.t('petal.message.cost', count=petal))
+                await msg.send_message(msg.locale.t('petal.message.cost', count=petal))
             rickroll(msg)
         if msg.target.target_from != 'TEST|Console' and not is_superuser:
             qc.reset()

modules/user/tpg.py

@@ -13,9 +13,9 @@ def tpg(msg, favicon, wikiname, username, gender, registertime, contributionwiki
     font = ImageFont.truetype(abspath('./assets/SourceHanSansCN-Normal.ttf'), 40)
     font1 = ImageFont.truetype(abspath('./assets/SourceHanSansCN-Normal.ttf'), 70)
     if bantype is None:
-        img = Image.open(abspath('./assets/base.png'))
+        img = Image.open(abspath('./assets/user/base.png'))
     elif bantype == 'Y' or bantype == 'YN':
-        img = Image.open(abspath('./assets/ban.png'))
+        img = Image.open(abspath('./assets/user/ban.png'))
     if favicon:
         img2 = Image.open(favicon)
     else:
@@ -89,7 +89,7 @@ def tpg(msg, favicon, wikiname, username, gender, registertime, contributionwiki
     img3.alpha_composite(img7, (655, 960))
 
     if bantype == 'Y' or bantype == 'YN':
-        img8 = Image.open(abspath('./assets/Blocked.png'))
+        img8 = Image.open(abspath('./assets/user/Blocked.png'))
         w, h = img8.size
         w = int(w)
         h = int(h)