diff --git a/nonebot_plugin_bililive/database/db.py b/nonebot_plugin_bililive/database/db.py index d3cba6a..56b6db4 100644 --- a/nonebot_plugin_bililive/database/db.py +++ b/nonebot_plugin_bililive/database/db.py @@ -5,7 +5,6 @@ from nonebot import get_driver, logger from packaging.version import Version as version_parser from tortoise import Tortoise -from tortoise.connection import connections from ..utils import get_path from ..version import VERSION as APP_VERSION @@ -57,7 +56,7 @@ async def init(cls): async def close(cls): cls._ready = False await cls.save_dynamic_offsets() - await connections.close_all() + await Tortoise.close_connections() @classmethod async def wait_until_ready(cls, timeout: float = 30) -> bool: diff --git a/nonebot_plugin_bililive/utils/__init__.py b/nonebot_plugin_bililive/utils/__init__.py index 4b22b5c..f201d95 100644 --- a/nonebot_plugin_bililive/utils/__init__.py +++ b/nonebot_plugin_bililive/utils/__init__.py @@ -164,6 +164,9 @@ async def permission_check( raise FinishedException return if isinstance(event, GroupMessageEvent): + if not await db.wait_until_ready(): + await bot.send(event, "数据库尚未初始化完成,请稍后再试") + raise FinishedException if not await db.get_group_admin(event.group_id): return if await (GROUP_ADMIN | GROUP_OWNER | SUPERUSER)(bot, event): diff --git a/nonebot_plugin_bililive/version.py b/nonebot_plugin_bililive/version.py index 0e5b31f..78eccf8 100644 --- a/nonebot_plugin_bililive/version.py +++ b/nonebot_plugin_bililive/version.py @@ -1,4 +1,4 @@ from packaging.version import Version -__version__ = "2.1.3" +__version__ = "2.1.4" VERSION = Version(__version__)