move core.loader.decorator to core.decorator

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
 

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
 
 

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

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

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
 
 

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):

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
 
 

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
 

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
 
 

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
 
 

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
 
 

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

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
 
 

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
 

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

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
 
 

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
 

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