Merge remote-tracking branch 'origin/main'

This commit is contained in:
远野千束 2024-05-09 21:38:45 +08:00
commit 38b496d800

10
main.py
View File

@ -6,13 +6,12 @@ from liteyuki.utils.base.data_manager import StoredConfig, common_db
from liteyuki.utils.base.ly_api import liteyuki_api from liteyuki.utils.base.ly_api import liteyuki_api
init() init()
store_config: dict = common_db.first(StoredConfig(), default=StoredConfig()).config
static_config = load_from_yaml("config.yml")
store_config.update(static_config)
nonebot.init(**store_config)
if __name__ == "__mp_main__": if __name__ == "__mp_main__":
store_config: dict = common_db.first(StoredConfig(), default=StoredConfig()).config
static_config = load_from_yaml("config.yml")
store_config.update(static_config)
nonebot.init(**store_config)
adapters = [v11.Adapter, v12.Adapter] adapters = [v11.Adapter, v12.Adapter]
driver = nonebot.get_driver() driver = nonebot.get_driver()
@ -28,5 +27,4 @@ if __name__ == "__mp_main__":
if __name__ == "__main__": if __name__ == "__main__":
from liteyuki.utils.base.reloader import Reloader from liteyuki.utils.base.reloader import Reloader
nonebot.run() nonebot.run()