diff --git a/config_default.py b/config_default.py index 0bd80aa376df2f9c21631359e3d4daf8de5200a5..b1cb99e942d731df211f9196a3b6c8936df38b9b 100644 --- a/config_default.py +++ b/config_default.py @@ -10,33 +10,6 @@ SECRET = "" POST_ADDRESS = "0.0.0.0" # 上报端口 POST_PORT = 5002 -# 小时和分钟,24时制 -BROADCAST_HOUR = 8 -BROADCAST_MINUTE = 0 -# 一言广播(小时) -HITOKOTO_HOUR = 8 -# 分钟 -HITOKOTO_MINUTE = 0 -# 启用HITOKOTO的群 -# list 或者URL的文本 -HITOKOTO_BROADCAST_LIST = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/hitokoto.json" -# 检查间隔 -CHECK_INTERVAL = 5 -# 执行延时 -EXECUTE_DELAY = 60 -# 列表地址 -LIST_URL = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/countdown.json" -# OI Wiki 列表地址 -OIWIKI_LIST_URL = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/wikipages.json" -# 一句话被重复几次后会进行复读 -REPEAT_TIME_LIMIT = 3 # 指令前缀 COMMAND_PREFIX = ["--", "!!"] -# 执行Python代码的输出长度限制 -OUTPUT_LENGTH_LIMIT = 200 -# 执行Python代码的时间限制(ms) -EXECUTE_TIME_LIMIT = 2000 -# 负责执行的Docker镜像名 -DOCKER_IMAGE = "" -# 签到数据文件路径 -ATTENDANCE_DATA = "./bot-data/" \ No newline at end of file + diff --git a/plugins/broadcast.py b/plugins/broadcast.py index 758d495c1a5248e5d6bde2046fd58fc035f973ea..3fffffe7c46d7a85f4377b31935864fec07bf8bb 100644 --- a/plugins/broadcast.py +++ b/plugins/broadcast.py @@ -1,8 +1,12 @@ import global_vars -from global_vars import config from util import print_log from register import command, schedule_loop +try: + import plugins.config.broadcast_config as config +except ImportError as ex: + import plugins.config.broadcast_config_default as config + def plugin(): return { diff --git a/plugins/config/broadcast_config_default.py b/plugins/config/broadcast_config_default.py new file mode 100644 index 0000000000000000000000000000000000000000..cf30d0a10207921496199d509aa5ae52cd3ca985 --- /dev/null +++ b/plugins/config/broadcast_config_default.py @@ -0,0 +1,9 @@ +# 小时和分钟,24时制 +BROADCAST_HOUR = 8 +BROADCAST_MINUTE = 0 +# 检查间隔 +CHECK_INTERVAL = 5 +# 执行延时 +EXECUTE_DELAY = 60 +# 列表地址 +LIST_URL = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/countdown.json" diff --git a/plugins/config/hikotoko_config_default.py b/plugins/config/hikotoko_config_default.py new file mode 100644 index 0000000000000000000000000000000000000000..b4bd5cd7b504424497c9914db26763e3db575cfa --- /dev/null +++ b/plugins/config/hikotoko_config_default.py @@ -0,0 +1,11 @@ +# 小时 +HITOKOTO_HOUR = 8 +# 分钟 +HITOKOTO_MINUTE = 0 +# 启用HITOKOTO的群 +# list 或者URL的文本 +HITOKOTO_BROADCAST_LIST = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/hitokoto.json" +# 检查间隔 +CHECK_INTERVAL = 5 +# 执行延时 +EXECUTE_DELAY = 60 diff --git a/plugins/config/oiwiki_config_default.py b/plugins/config/oiwiki_config_default.py new file mode 100644 index 0000000000000000000000000000000000000000..765c67b04b5831f8fba9c87936ccc89bc9cb6c0d --- /dev/null +++ b/plugins/config/oiwiki_config_default.py @@ -0,0 +1,2 @@ +# OI Wiki 列表地址 +OIWIKI_LIST_URL = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/wikipages.json" diff --git a/plugins/config/python_runner_config_default.py b/plugins/config/python_runner_config_default.py new file mode 100644 index 0000000000000000000000000000000000000000..c48417f580878025420af115a7ed4ce1285b4384 --- /dev/null +++ b/plugins/config/python_runner_config_default.py @@ -0,0 +1,6 @@ +# 执行Python代码的输出长度限制 +OUTPUT_LENGTH_LIMIT = 200 +# 执行Python代码的时间限制(ms) +EXECUTE_TIME_LIMIT = 2000 +# 负责执行的Docker镜像名 +DOCKER_IMAGE = "" diff --git a/plugins/config/repeat_config_default.py b/plugins/config/repeat_config_default.py new file mode 100644 index 0000000000000000000000000000000000000000..0ac0d65be9cc2a721a4ad19dc0cd02a331482e77 --- /dev/null +++ b/plugins/config/repeat_config_default.py @@ -0,0 +1,2 @@ +# 一句话被重复几次后会进行复读 +REPEAT_TIME_LIMIT = 3 diff --git a/plugins/config/sign_in_config_default.py b/plugins/config/sign_in_config_default.py new file mode 100644 index 0000000000000000000000000000000000000000..42419ff8ea12b90efbde8b6651e274728b6bb6f2 --- /dev/null +++ b/plugins/config/sign_in_config_default.py @@ -0,0 +1,2 @@ +# 签到数据文件路径 +ATTENDANCE_DATA = "plugins/data/group-data/" diff --git a/plugins/hitokoto.py b/plugins/hitokoto.py index 02195ac570055d1a98d38ea8ddb6f423d9649cb8..3732ef25256d6bccc525fc472ea59aad42b39d7a 100644 --- a/plugins/hitokoto.py +++ b/plugins/hitokoto.py @@ -2,11 +2,15 @@ from cqhttp import CQHttp from util import print_log from register import command, schedule_loop from global_vars import registered_commands as commands -from global_vars import config import global_vars import re import util +try: + import plugins.config.hitokoto_config as config +except ImportError as ex: + import plugins.config.hitokoto_config_default as config + def plugin(): return { diff --git a/plugins/oierwiki_query.py b/plugins/oierwiki_query.py index 47680d535421f801f4097823b56bcb22e72e6fbe..6b35489f2b1bf5bded0704c8b70ede5a783133a3 100644 --- a/plugins/oierwiki_query.py +++ b/plugins/oierwiki_query.py @@ -2,10 +2,15 @@ from cqhttp import CQHttp from util import print_log from register import command from global_vars import registered_commands as commands -from global_vars import config import re import util +try: + import plugins.config.oiwiki_config as config +except ImportError as ex: + import plugins.config.oiwiki_config_default as config + + def plugin(): return { diff --git a/plugins/python_runner.py b/plugins/python_runner.py index faec3bd6b2f857fad6102c33c1ffd83610258be3..2b839cdea666a3a7aef0822453cdaf5bd4e66d5a 100644 --- a/plugins/python_runner.py +++ b/plugins/python_runner.py @@ -10,12 +10,17 @@ from cqhttp import CQHttp import docker import util -from global_vars import config from global_vars import registered_commands as commands -from main import config from register import command from util import print_log +try: + import plugins.config.hitokoto_config as config +except ImportError as ex: + import plugins.config.hitokoto_config_default as config + + + def plugin(): return { "author": "officeyutong", diff --git a/plugins/repeater.py b/plugins/repeater.py index 0f996f81676d63452dadb008440fa1f87b3e907b..639edea48cddaa1e3c8e6858cd9b7ba0fad9f880 100644 --- a/plugins/repeater.py +++ b/plugins/repeater.py @@ -1,8 +1,13 @@ -from global_vars import config, repeat_time, last_message +from global_vars import repeat_time, last_message from cqhttp import CQHttp from util import print_log from register import message_listener +try: + import plugins.config.repeat_config as config +except ImportError as ex: + import plugins.config.repeat_config_default as config + def plugin(): return { diff --git a/plugins/sign_in.py b/plugins/sign_in.py index 6672ae33ea3083f671b9b1decc077e65fe1b50f5..ce0eeee965e2312055f895ae453b0ccb2bc6649a 100644 --- a/plugins/sign_in.py +++ b/plugins/sign_in.py @@ -17,7 +17,10 @@ def sign_in(bot, context, args): def load_data(group_id): - from global_vars import config + try: + import plugins.config.sign_in_config as config + except ImportError as ex: + import plugins.config.sign_in_config_default as config import os import json file_path = os.path.join(config.ATTENDANCE_DATA,