<refactor>[feat]change tools files path

src/constant/jx3/skilldatalib.py

@@ -3,8 +3,8 @@
 
 from nonebot.adapters.onebot.v11 import MessageSegment as ms
 
-from src.tools.utils import get_url, get_status, get_content
-from src.tools.file import read, write
+from src.tools.utils.request import get_url, get_status, get_content
+from src.tools.utils.file import read, write
 from src.tools.utils.path import CONSTANT, ASSETS
 
 import json

src/plugins/ban/__init__.py

@@ -7,10 +7,10 @@
 from nonebot.params import CommandArg, Arg
 
 from src.tools.config import Config
-from src.tools.utils import checknumber
+from src.tools.utils.num import checknumber
 from src.tools.permission import checker, error
-from src.tools.data import group_db, BannedList, GroupSettings
-from src.tools.basic.message_process import preprocess
+from src.tools.database import group_db, BannedList, GroupSettings
+from src.tools.basic.process import preprocess
 
 leave_msg = f"{Config.bot_basic.bot_name}要离开这里啦，{Config.bot_basic.bot_name}还没有学会人类的告别语，但是数据库中有一句话似乎很适合现在使用——如果还想来找我的话，我一直在这里（650495414）。"
 

src/plugins/banword/__init__.py

@@ -6,7 +6,7 @@
 from nonebot.params import CommandArg
 
 from src.tools.permission import checker, error
-from src.tools.data import group_db, BannedWordList
+from src.tools.database import group_db, BannedWordList
 
 
 banword = on_command("banword", force_whitespace=True, priority=5)

src/plugins/blacklist/__init__.py

@@ -7,8 +7,8 @@
 from nonebot.params import CommandArg
 
 from src.tools.permission import checker
-from src.tools.data import group_db, GroupSettings
-from src.tools.utils import read, write
+from src.tools.database import group_db, GroupSettings
+from src.tools.utils.file import read, write
 from src.tools.utils.path import ASSETS, CACHE, VIEWS
 from src.tools.generate import get_uuid, generate
 

src/plugins/developer_tools/application.py

@@ -6,8 +6,9 @@
 from nonebot.adapters import Message
 
 from src.tools.permission import checker, error
-from src.tools.data import group_db, ApplicationsList
-from src.tools.utils.common import convert_time, checknumber
+from src.tools.database import group_db, ApplicationsList
+from src.tools.utils.time import convert_time
+from src.tools.utils.num import checknumber
 
 current_application = on_command("邀请列表", force_whitespace=True, priority=5)
 

src/plugins/developer_tools/classic.py

@@ -3,10 +3,11 @@
 from nonebot.params import CommandArg
 from nonebot.adapters import Message
 
-from src.tools.utils.common import convert_time, getCurrentTime, checknumber
+from src.tools.utils.time import convert_time, get_current_time
+from src.tools.utils.num import checknumber
 from src.tools.permission import checker, error
 from src.tools.utils.path import CACHE
-from src.tools.basic.group_opeator import getAllGroups
+from src.tools.basic.group import getAllGroups
 from src.tools.config import Config
 
 import os
@@ -47,7 +48,7 @@ async def _(bot: Bot, event: MessageEvent, args: Message = CommandArg()):
         return
     permission = checker(str(event.user_id), 1)
     if not permission:
-        await ping.finish(f"咕咕咕，音卡来啦！\n当前时间为：{convert_time(getCurrentTime())}\n欢迎使用Inkar-Suki！")
+        await ping.finish(f"咕咕咕，音卡来啦！\n当前时间为：{convert_time(get_current_time())}\n欢迎使用Inkar-Suki！")
     else:
         groups = await bot.call_api("get_group_list")
         group_count = len(groups)
@@ -57,7 +58,7 @@ async def _(bot: Bot, event: MessageEvent, args: Message = CommandArg()):
         if not isinstance(registers, list):
             return
         register_count = len(registers)
-        msg = f"咕咕咕，音卡来啦！\n现在是：{convert_time(getCurrentTime())}\n{group_count} | {register_count} | {friend_count}\n您拥有机器人的管理员权限！"
+        msg = f"咕咕咕，音卡来啦！\n现在是：{convert_time(get_current_time())}\n{group_count} | {register_count} | {friend_count}\n您拥有机器人的管理员权限！"
     await ping.finish(msg)
 
 post = on_command("post", force_whitespace=True, priority=5)  # 发送全域公告至每一个机器人加入的QQ群。

src/plugins/developer_tools/feedback.py

@@ -6,18 +6,18 @@
 from nonebot.adapters import Message
 
 from src.tools.config import Config
-from src.tools.utils.common import convert_time, getCurrentTime
+from src.tools.utils.time import convert_time, get_current_time
 from src.tools.utils.request import post_url
 from src.tools.permission import checker, error
-from src.tools.data import group_db, Population
+from src.tools.database import group_db, Population
 
 from .stastic import generate_bar_chart
 
 github_token = Config.github.github_personal_token
 
 async def createIssue(uin: str, comment: str):
     title = "【反馈】Inkar Suki · 使用反馈"
-    date = convert_time(getCurrentTime())
+    date = convert_time(get_current_time())
     msg = f"日期：{date}\n用户：{uin}\n留言：{comment}"
     url = f"https://api.github.com/repos/{Config.bot_basic.bot_repo}/issues"
     headers = {

src/plugins/event_notice/__init__.py

@@ -16,8 +16,8 @@
 
 from src.tools.config import Config
 from src.tools.permission import checker, error
-from src.tools.data import group_db, BannedList, ApplicationsList, GroupSettings
-from src.tools.basic.group_opeator import getGroupSettings, setGroupSettings
+from src.tools.database import group_db, BannedList, ApplicationsList, GroupSettings
+from src.tools.basic.group import getGroupSettings, setGroupSettings
 
 from src.plugins.ban import banned
 

src/plugins/github/__init__.py

@@ -10,8 +10,8 @@
 from src.tools.config import Config
 from src.tools.utils.request import get_status, get_content
 from src.tools.permission import checker, error
-from src.tools.data import group_db, GroupSettings
-from src.tools.basic.group_opeator import getGroupSettings, setGroupSettings, getAllGroups
+from src.tools.database import group_db, GroupSettings
+from src.tools.basic.group import getGroupSettings, setGroupSettings, getAllGroups
 
 import nonebot
 

src/plugins/grab/bmi.py

@@ -3,7 +3,7 @@
 from nonebot.adapters import Message
 from nonebot.params import CommandArg
 
-from src.tools.utils.common import checknumber
+from src.tools.utils.num import checknumber
 
 bmi = on_command("bmi", aliases={"BMI", "身体质量指数"}, force_whitespace=True, priority=5)
 

src/plugins/grab/check_pass.py

@@ -1,7 +1,7 @@
 from typing import Tuple
 from nonebot import get_driver
 
-from src.tools.utils.common import getCurrentTime
+from src.tools.utils.time import get_current_time
 
 from .config import Config as eat_Config
 
@@ -12,7 +12,7 @@
 
 def check_cd(last_time: int) -> Tuple[bool, int, int]:
     # 检查cd
-    current_time = getCurrentTime()
+    current_time = get_current_time()
     delta_time = current_time - last_time
     if not isinstance(cd, int):
         return True, 0, current_time

src/plugins/grab/rdimg.py

@@ -6,7 +6,7 @@
 from nonebot.adapters.onebot.v11 import MessageEvent, MessageSegment as ms
 
 from src.tools.utils.request import get_content, get_api
-from src.tools.file import get_content_local
+from src.tools.utils.file import get_content_local
 from src.tools.utils.path import PLUGINS
 
 import random

src/plugins/jx3/achievement/__init__.py

@@ -4,10 +4,10 @@
 from nonebot.params import CommandArg, Arg
 from nonebot.typing import T_State
 
-from src.tools.basic.msg import PROMPT
-from src.tools.utils.common import checknumber
-from src.tools.file import get_content_local
-from src.tools.basic.data_server import getGroupServer
+from src.tools.basic.prompts import PROMPT
+from src.tools.utils.num import checknumber
+from src.tools.utils.file import get_content_local
+from src.tools.basic.server import getGroupServer
 from src.plugins.jx3.dungeon.api import mode_mapping
 
 from .box import *

src/plugins/jx3/achievement/v1_v2.py

@@ -1,12 +1,12 @@
 from pathlib import Path
 from typing import Optional, Union, Literal
 
-from src.tools.basic.data_server import server_mapping
+from src.tools.basic.server import server_mapping
 from src.tools.config import Config
-from src.tools.basic.msg import PROMPT
+from src.tools.basic.prompts import PROMPT
 from src.tools.utils.request import get_api, post_url
 from src.tools.utils.path import ASSETS, CACHE, VIEWS
-from src.tools.file import read, write
+from src.tools.utils.file import read, write
 from src.tools.generate import generate, get_uuid
 from src.tools.basic.jx3 import gen_ts, format_body, gen_xsk
 

src/plugins/jx3/affection/__init__.py

@@ -5,8 +5,8 @@
 from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageSegment as ms
 from nonebot.params import CommandArg
 
-from src.tools.utils.common import checknumber
-from src.tools.file import get_content_local
+from src.tools.utils.num import checknumber
+from src.tools.utils.file import get_content_local
 
 from .app import *
 
@@ -23,7 +23,7 @@ async def _(event: GroupMessageEvent, args: Message = CommandArg()):
     self_qq = event.user_id
     other_name = arg[1]
     other_qq = int(arg[2])
-    custom_time = arg[3] if len(arg) == 4 else convert_time(getCurrentTime(), "%Y-%m-%d")
+    custom_time = arg[3] if len(arg) == 4 else convert_time(get_current_time(), "%Y-%m-%d")
     if not isinstance(custom_time, str):
         return
     timestamp = 0

src/plugins/jx3/affection/app.py

@@ -3,14 +3,14 @@
 
 from src.constant.jx3 import kungfu_to_school, colorList as colors
 
-from src.tools.data import group_db, AffectionsList
+from src.tools.database import group_db, AffectionsList
 from src.tools.utils.request import get_api
-from src.tools.file import read, write
+from src.tools.utils.file import read, write
 from src.tools.generate import get_uuid, generate
-from src.tools.utils.common import convert_time, getRelateTime, getCurrentTime
+from src.tools.utils.time import convert_time, get_relate_time, get_current_time
 from src.tools.config import Config
-from src.tools.basic.msg import PROMPT
-from src.tools.basic.data_server import getGroupServer
+from src.tools.basic.prompts import PROMPT
+from src.tools.basic.server import getGroupServer
 from src.tools.utils.path import ASSETS, CACHE, VIEWS
 
 from src.plugins.jx3.bind import get_player_local_data
@@ -105,7 +105,7 @@ async def generateAffectionImage(uin: int):
             recognization = convert_time(i["time"], "%Y年%m月%d日")
             if not isinstance(recognization, str):
                 return
-            relate = getRelateTime(getCurrentTime(), i["time"])[:-1]
+            relate = get_relate_time(get_current_time(), i["time"])[:-1]
             html = read(VIEWS + "/jx3/affections/affections.html")
             html = html.replace("$btxbfont", btxbfont).replace("$yozaifont", yozaifont).replace("$bg", bg).replace("$uin1", str(uin_1)).replace("$uin2", str(uin_2)).replace("$color1", color_1).replace("$color2", color_2).replace("$img1", img_1).replace("$img2", img_2).replace("$name1", name_1).replace("$name2", name_2).replace("$server", server).replace("$time", recognization).replace("$relate", relate)
             final_html = CACHE + "/" + get_uuid() + ".html"

src/plugins/jx3/announce/__init__.py

@@ -5,7 +5,7 @@
 
 from pathlib import Path
 
-from src.tools.file import get_content_local
+from src.tools.utils.file import get_content_local
 from src.tools.utils.path import ASSETS
 from src.tools.utils.request import get_api
 from src.tools.config import Config

src/plugins/jx3/assistance/__init__.py

@@ -3,9 +3,9 @@
 from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageSegment as ms
 from nonebot.params import CommandArg
 
-from src.tools.utils.common import checknumber
-from src.tools.file import get_content_local
-from src.tools.basic.group_opeator import getGroupSettings
+from src.tools.utils.num import checknumber
+from src.tools.utils.file import get_content_local
+from src.tools.basic.group import getGroupSettings
 
 from .app import *
 

src/plugins/jx3/assistance/app.py

@@ -3,12 +3,12 @@
 
 from src.constant.jx3 import school_name_aliases, skill_icons, colorList
 
-from src.tools.basic.group_opeator import getGroupSettings, setGroupSettings
-from src.tools.utils.common import getCurrentTime
+from src.tools.basic.group import getGroupSettings, setGroupSettings
+from src.tools.utils.time import get_current_time
 from src.tools.utils.request import get_api
 from src.tools.generate import generate, get_uuid
 from src.tools.utils.path import ASSETS, CACHE, VIEWS
-from src.tools.file import read, write
+from src.tools.utils.file import read, write
 from src.tools.config import Config
 
 import random
@@ -34,7 +34,7 @@ async def create_group(self, group: str, description: str, creator: str):
             "creator": creator,
             "applying": [],
             "member": [[], [], [], [], []],
-            "create_time": getCurrentTime(),
+            "create_time": get_current_time(),
             "description": description
         }
         opening = getGroupSettings(group, "opening")
@@ -60,7 +60,7 @@ async def apply_for_place(self, group: str, description: str, id: str, job: str,
             "job": job_,
             "img": job_icon,
             "apply": applyer,
-            "time": getCurrentTime()
+            "time": get_current_time()
         }
         stg = await self.storge(group, description, new)
         if stg is False:

src/plugins/jx3/attributes/__init__.py

@@ -3,7 +3,7 @@
 from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageSegment as ms
 from nonebot.params import CommandArg
 
-from src.tools.file import get_content_local
+from src.tools.utils.file import get_content_local
 
 from .api import *
 from .v4 import *

src/plugins/jx3/attributes/api.py

@@ -4,12 +4,12 @@
 
 from src.constant.jx3.skilldatalib import kungfu_to_school
 
-from src.tools.basic.msg import PROMPT
+from src.tools.basic.prompts import PROMPT
 from src.tools.generate import get_uuid
 from src.tools.config import Config
 from src.tools.utils.request import get_api, get_content, post_url
-from src.tools.basic.data_server import server_mapping, Zone_mapping
-from src.tools.file import read
+from src.tools.basic.server import server_mapping, Zone_mapping
+from src.tools.utils.file import read
 from src.tools.utils.path import ASSETS, CACHE, PLUGINS
 from src.tools.basic.jx3 import gen_ts, format_body, gen_xsk
 

src/plugins/jx3/attributes/v4.py

@@ -5,9 +5,9 @@
 
 from src.tools.utils.request import get_api
 from src.tools.config import Config
-from src.tools.file import read, write
-from src.tools.basic.data_server import server_mapping, Zone_mapping
-from src.tools.basic.msg import PROMPT
+from src.tools.utils.file import read, write
+from src.tools.basic.server import server_mapping, Zone_mapping
+from src.tools.basic.prompts import PROMPT
 from src.tools.basic.jx3 import gen_ts, format_body, gen_xsk
 from src.tools.utils.request import post_url
 from src.tools.generate import get_uuid, generate

src/plugins/jx3/bind/__init__.py

@@ -5,9 +5,9 @@
 from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent
 from nonebot.params import CommandArg
 
-from src.tools.basic.msg import PROMPT
-from src.tools.basic.data_server import server_mapping
-from src.tools.basic.group_opeator import setGroupSettings
+from src.tools.basic.prompts import PROMPT
+from src.tools.basic.server import server_mapping
+from src.tools.basic.group import setGroupSettings
 from src.tools.permission import checker
 
 from .role import *

src/plugins/jx3/bind/role.py

@@ -3,8 +3,8 @@
 from src.tools.config import Config
 from src.tools.utils.request import post_url
 from src.tools.basic.jx3 import gen_ts, gen_xsk, format_body
-from src.tools.basic.data_server import server_mapping, Zone_mapping
-from src.tools.data import group_db, RoleData
+from src.tools.basic.server import server_mapping, Zone_mapping
+from src.tools.database import group_db, RoleData
 
 try:
     from .uid import get_uid

src/plugins/jx3/buff/__init__.py

@@ -4,7 +4,7 @@
 from nonebot.params import CommandArg, Arg
 from nonebot.typing import T_State
 
-from src.tools.utils.common import checknumber
+from src.tools.utils.time import checknumber
 
 from .api import *
 

src/plugins/jx3/calendar/__init__.py

@@ -3,7 +3,7 @@
 from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageSegment as ms
 from nonebot.params import CommandArg
 
-from src.tools.file import get_content_local
+from src.tools.utils.file import get_content_local
 
 from .api import getCalendar
 

src/plugins/jx3/calendar/api.py

@@ -3,7 +3,7 @@
 from src.tools.generate import get_uuid, generate
 from src.tools.config import Config
 from src.tools.utils.request import get_api
-from src.tools.file import read, write
+from src.tools.utils.file import read, write
 from src.tools.utils.path import ASSETS, CACHE, VIEWS
 
 def generate_weekday_list(start_day):