diff --git a/core/loader/decorator.py b/core/decorator.py similarity index 100% rename from core/loader/decorator.py rename to core/decorator.py diff --git a/modules/b30/__init__.py b/modules/b30/__init__.py index fe2dc9a5..1ebe57fe 100644 --- a/modules/b30/__init__.py +++ b/modules/b30/__init__.py @@ -1,7 +1,7 @@ import os from core.elements import MessageSession, Plain, Image -from core.loader.decorator import command +from core.decorator import command from .getb30 import getb30 from .initialize import arcb30init diff --git a/modules/bugtracker/__init__.py b/modules/bugtracker/__init__.py index fbe7eda4..f5cf5036 100644 --- a/modules/bugtracker/__init__.py +++ b/modules/bugtracker/__init__.py @@ -1,7 +1,7 @@ import re from core.elements import MessageSession -from core.loader.decorator import command, regex +from core.decorator import command, regex from .bugtracker import bugtracker_get diff --git a/modules/core/__init__.py b/modules/core/__init__.py index bad70582..a31d4204 100644 --- a/modules/core/__init__.py +++ b/modules/core/__init__.py @@ -2,14 +2,13 @@ import asyncio import os import sys import time -from typing import List import psutil import ujson as json from core.elements import MessageSession, Command from core.loader import ModulesManager -from core.loader.decorator import command +from core.decorator import command from core.parser.command import CommandParser, InvalidHelpDocTypeError from core.utils import PrivateAssets from database import BotDBUtil diff --git a/modules/cytoid/__init__.py b/modules/cytoid/__init__.py index 0ef94b49..9f962a19 100644 --- a/modules/cytoid/__init__.py +++ b/modules/cytoid/__init__.py @@ -1,5 +1,5 @@ from core.elements import MessageSession, Image -from core.loader.decorator import command +from core.decorator import command from database import BotDBUtil from .profile import cytoid_profile from .rating import get_rating diff --git a/modules/github/__init__.py b/modules/github/__init__.py index 71afb460..bb0be6b6 100644 --- a/modules/github/__init__.py +++ b/modules/github/__init__.py @@ -1,5 +1,5 @@ from core.elements import MessageSession -from core.loader.decorator import command +from core.decorator import command from modules.github import repo, user, search diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index a3d856d8..55ff7a7b 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -9,7 +9,7 @@ from modules.maimai.libraries.maimai_best_40 import generate from core.elements import Plain, Image as BImage, MessageSession -from core.loader.decorator import command, regex as command_regex +from core.decorator import command, regex as command_regex def song_txt(music: Music): diff --git a/modules/mcv/__init__.py b/modules/mcv/__init__.py index 36da48d5..2efc430c 100644 --- a/modules/mcv/__init__.py +++ b/modules/mcv/__init__.py @@ -1,5 +1,5 @@ from core.elements import MessageSession -from core.loader.decorator import command +from core.decorator import command from .mcv import mcv, mcbv, mcdv diff --git a/modules/mcv_rss/__init__.py b/modules/mcv_rss/__init__.py index d0ae7028..eb684134 100644 --- a/modules/mcv_rss/__init__.py +++ b/modules/mcv_rss/__init__.py @@ -4,7 +4,7 @@ import traceback import ujson as json from core.elements import FetchTarget, IntervalTrigger -from core.loader.decorator import schedule +from core.decorator import schedule from core.logger import Logger from core.utils import get_url, PrivateAssets diff --git a/modules/minecraft_news/__init__.py b/modules/minecraft_news/__init__.py index 527c2caa..cc5cb79f 100644 --- a/modules/minecraft_news/__init__.py +++ b/modules/minecraft_news/__init__.py @@ -5,10 +5,10 @@ import os from config import Config from core.elements import FetchTarget, IntervalTrigger -from core.loader.decorator import command, schedule +from core.decorator import command, schedule from core.logger import Logger from core.scheduler import Scheduler -from core.utils import get_url, download_to_cache, PrivateAssets +from core.utils import get_url, PrivateAssets from database import BotDBUtil diff --git a/modules/nintendo_err/__init__.py b/modules/nintendo_err/__init__.py index fa69891f..66414c8c 100644 --- a/modules/nintendo_err/__init__.py +++ b/modules/nintendo_err/__init__.py @@ -2,7 +2,7 @@ import discord from core.elements import MessageSession -from core.loader.decorator import command +from core.decorator import command from . import switch, wiiu_support, wiiu_results, ctr_support, ctr_results diff --git a/modules/ptt/__init__.py b/modules/ptt/__init__.py index 327a6620..6cad8652 100644 --- a/modules/ptt/__init__.py +++ b/modules/ptt/__init__.py @@ -3,7 +3,7 @@ import os from PIL import Image, ImageDraw, ImageFont from core.elements import Image as Img, MessageSession -from core.loader.decorator import command +from core.decorator import command from core.utils import cache_name diff --git a/modules/secret/__init__.py b/modules/secret/__init__.py index 6d4ec7fc..64a08805 100644 --- a/modules/secret/__init__.py +++ b/modules/secret/__init__.py @@ -2,7 +2,7 @@ import ujson as json from core.dirty_check import check from core.elements import FetchTarget -from core.loader.decorator import command +from core.decorator import command from core.logger import Logger from core.scheduler import Scheduler from core.utils import get_url diff --git a/modules/server/__init__.py b/modules/server/__init__.py index 99a18b67..44f14762 100644 --- a/modules/server/__init__.py +++ b/modules/server/__init__.py @@ -2,7 +2,7 @@ import asyncio from core.dirty_check import check from core.elements import MessageSession -from core.loader.decorator import command +from core.decorator import command from .server import server diff --git a/modules/user/__init__.py b/modules/user/__init__.py index 3249cae8..ecdcc7fe 100644 --- a/modules/user/__init__.py +++ b/modules/user/__init__.py @@ -1,9 +1,7 @@ import re from core.elements import Plain, Image, MessageSession -from core.loader import ModulesManager -from core.loader.decorator import command -from core.parser.command import CommandParser +from core.decorator import command from modules.wiki.dbutils import WikiTargetInfo from .userlib import GetUser diff --git a/modules/utils/__init__.py b/modules/utils/__init__.py index 95c93b67..f72d408a 100644 --- a/modules/utils/__init__.py +++ b/modules/utils/__init__.py @@ -1,5 +1,5 @@ from core.elements import MessageSession -from core.loader.decorator import command +from core.decorator import command from modules.utils.ab import ab from modules.utils.newbie import newbie from modules.utils.rc import rc diff --git a/modules/weekly/__init__.py b/modules/weekly/__init__.py index d5d8d932..327d1f4c 100644 --- a/modules/weekly/__init__.py +++ b/modules/weekly/__init__.py @@ -3,7 +3,7 @@ import re import ujson as json from core.elements import Plain, Image, MessageSession -from core.loader.decorator import command +from core.decorator import command from core.utils import get_url diff --git a/modules/weekly_rss/__init__.py b/modules/weekly_rss/__init__.py index bab3e057..c9267f4a 100644 --- a/modules/weekly_rss/__init__.py +++ b/modules/weekly_rss/__init__.py @@ -1,5 +1,5 @@ from core.elements import CronTrigger, FetchTarget -from core.loader.decorator import schedule +from core.decorator import schedule from core.logger import Logger from modules.weekly import get_weekly diff --git a/modules/wiki/__init__.py b/modules/wiki/__init__.py index fdfa300d..9a073b6d 100644 --- a/modules/wiki/__init__.py +++ b/modules/wiki/__init__.py @@ -1,11 +1,10 @@ import re -from typing import Union import ujson as json from core.elements import MessageSession, Plain, Image, Voice, Option from core.loader import ModulesManager -from core.loader.decorator import command, regex +from core.decorator import command, regex from core.utils import download_to_cache from database import BotDBUtil from modules.wiki.dbutils import WikiTargetInfo