fix: main.py中错误的预引用顺序

This commit is contained in:
Rock Chin
2023-01-06 13:50:45 +08:00
parent 2a74c8e053
commit 97ddb10ff5
2 changed files with 7 additions and 7 deletions

12
main.py
View File

@@ -6,12 +6,6 @@ import time
import logging import logging
import sys import sys
import mirai.exceptions
import requests
import websockets.exceptions
from urllib3.exceptions import InsecureRequestWarning
try: try:
import colorlog import colorlog
except ImportError: except ImportError:
@@ -19,6 +13,11 @@ except ImportError:
sys.exit(1) sys.exit(1)
import colorlog import colorlog
import requests
import websockets.exceptions
from urllib3.exceptions import InsecureRequestWarning
sys.path.append(".") sys.path.append(".")
log_colors_config = { log_colors_config = {
@@ -120,6 +119,7 @@ def main(first_time_init=False):
if first_time_init: # 不是热重载之后的启动,则不启动新的bot线程 if first_time_init: # 不是热重载之后的启动,则不启动新的bot线程
import mirai.exceptions
def run_bot_wrapper(): def run_bot_wrapper():
global known_exception_caught global known_exception_caught
try: try:

View File

@@ -243,7 +243,7 @@ def process_message(launcher_type: str, launcher_id: int, text_message: str, mes
and not config.include_image_description): and not config.include_image_description):
reply.append(" ".join(params)) reply.append(" ".join(params))
elif cmd == 'version': elif cmd == 'version':
reply_str = "[bot]当前版本:{}\n".format(pkg.utils.updater.get_current_version_info()) reply_str = "[bot]当前版本:\n{}\n".format(pkg.utils.updater.get_current_version_info())
try: try:
if pkg.utils.updater.is_new_version_available(): if pkg.utils.updater.is_new_version_available():
reply_str += "\n有新版本可用,请使用命令 !update 进行更新" reply_str += "\n有新版本可用,请使用命令 !update 进行更新"