Upgrade: 适配 Nonebot2 v2.0.0a16

README.md

@@ -5,25 +5,27 @@
 基于 [Nonebot2](https://github.com/nonebot/nonebot2) 的 qq 机器人
 
 ![GitHub](https://img.shields.io/github/license/Ailitonia/omega-miya)
-![Python](https://img.shields.io/badge/Python-3.8+-blue)
+![Python](https://img.shields.io/badge/Python-3.9+-blue)
 ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/Ailitonia/omega-miya?include_prereleases)
 ![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/Ailitonia/omega-miya)
 
 </div>
 
 ## 当前适配nonebot2版本
 
-[Nonebot2 Pre Release v2.0.0a13.post1](https://github.com/nonebot/nonebot2/releases/tag/v2.0.0a13.post1)
+[Nonebot2 Pre Release v2.0.0a16](https://github.com/nonebot/nonebot2/releases/tag/v2.0.0a16)
 
 ## 功能 & 特点
 
 - 基于异步 SQLAlchemy / MySQL 的数据存储
+- 插件管理系统
 - 权限控制及管理系统
     - 针对不同群组可选启用通知权限、命令权限、权限等级控制
     - 针对不同好友可选启用 Bot 功能
     - 针对不同群组、好友独立配置插件权限节点
 - 支持多协议端连接, 各协议端权限及订阅配置相互独立
 - 命令冷却系统
+- 速率控制系统
 - HTTP 代理功能
 - 自动处理加好友和被邀请进群
 - 插件帮助功能 (支持群聊 / 私聊)
@@ -36,6 +38,7 @@
 - 签到 (仅支持群聊)
 - 求签 (仅支持群聊)
 - 抽卡 (仅支持群聊)
+- 塔罗牌 (仅支持群聊)
 - 能不能好好说话 (lab.magiconch.com API) (支持群聊 / 私聊)
 - Pixiv助手 (需要 HTTP 代理, 除非部署在外网) (需要 go-cqhttp v0.9.40 及以上版本) (仅支持群聊)
 - Pixiv订阅 (需要 HTTP 代理, 除非部署在外网) (仅支持群聊)
@@ -59,7 +62,7 @@
 ## 关于图片数据
 
 如果你不想自己收集图片数据, 可以将
-[这个图片数据库](https://github.com/Ailitonia/omega-miya/raw/main/archive_data/db_pixiv.7z)
+[这个图片数据库](https://github.com/Ailitonia/omega-miya/raw/master/archive_data/db_pixiv.7z)
 导入, 基本都是按我自己口味收集的图片
 
 Update 2021.8.10: 最新发布图片数据库共 9w7 条图片数据 (包含已失效或画师已删除作品)

bot.py

@@ -11,7 +11,7 @@
     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
 # File path
-bot_root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'omega_miya'))
+bot_root_path = os.path.abspath(os.path.dirname(__file__))
 bot_tmp_path = os.path.abspath(os.path.join(bot_root_path, 'tmp'))
 if not os.path.exists(bot_tmp_path):
     os.makedirs(bot_tmp_path)
@@ -20,6 +20,11 @@
 if not os.path.exists(bot_log_path):
     os.makedirs(bot_log_path)
 
+# Static resources path
+bot_resources_path = os.path.abspath(os.path.join(bot_root_path, 'omega_miya', 'resources'))
+if not os.path.exists(bot_resources_path):
+    os.makedirs(bot_resources_path)
+
 # Custom logger
 log_info_name = f"{datetime.today().strftime('%Y%m%d-%H%M%S')}-INFO.log"
 log_error_name = f"{datetime.today().strftime('%Y%m%d-%H%M%S')}-ERROR.log"
@@ -41,6 +46,7 @@
 config = nonebot.get_driver().config
 config.root_path_ = bot_root_path
 config.tmp_path_ = bot_tmp_path
+config.resources_path_ = bot_resources_path
 
 # 注册 cqhttp adapter
 driver = nonebot.get_driver()

omega_miya/utils/Omega_Base/__init__.py → omega_miya/database/__init__.py

@@ -6,7 +6,8 @@
 from .class_result import Result
 from .model import (
     DBUser, DBFriend, DBBot, DBBotGroup, DBGroup, DBSkill, DBSubscription, DBDynamic,
-    DBPixivUserArtwork, DBPixivillust, DBPixivision, DBEmail, DBEmailBox, DBHistory, DBAuth, DBCoolDownEvent, DBStatus)
+    DBPixivUserArtwork, DBPixivillust, DBPixivision, DBEmail, DBEmailBox, DBHistory,
+    DBAuth, DBCoolDownEvent, DBStatus, DBStatistic, DBPlugin)
 
 
 __all__ = [
@@ -27,5 +28,7 @@
     'DBAuth',
     'DBCoolDownEvent',
     'DBStatus',
+    'DBStatistic',
+    'DBPlugin',
     'Result'
 ]

omega_miya/utils/Omega_Base/database.py → omega_miya/database/database.py

@@ -1,4 +1,5 @@
 import nonebot
+from urllib.parse import quote
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.future import select
@@ -18,7 +19,7 @@
 __DB_NAME = global_config.db_name
 
 # 格式化数据库引擎链接
-__DB_ENGINE = f'{__DATABASE}+{__DB_DRIVER}://{__DB_USER}:{__DB_PASSWORD}@{__DB_HOST}:{__DB_PORT}/{__DB_NAME}'
+__DB_ENGINE = f'{__DATABASE}+{__DB_DRIVER}://{__DB_USER}:{quote(__DB_PASSWORD)}@{__DB_HOST}:{__DB_PORT}/{__DB_NAME}'
 
 
 # 创建数据库连接
@@ -28,10 +29,10 @@
         connect_args={"use_unicode": True, "charset": "utf8mb4"},
         pool_recycle=3600, pool_pre_ping=True, echo=False
     )
-except Exception as exp:
+except Exception as e:
     import sys
-    nonebot.logger.opt(colors=True).critical(f'<r>创建数据库连接失败</r>, error: {repr(exp)}')
-    sys.exit('创建数据库连接失败')
+    nonebot.logger.opt(colors=True).critical(f'<r>创建数据库连接失败</r>, error: {repr(e)}')
+    sys.exit(f'创建数据库连接失败, {e}')
 
 
 # 初始化化数据库
@@ -48,14 +49,14 @@ async def database_init():
             # where synchronous IO calls will be transparently translated for
             # await.
             await conn.run_sync(Base.metadata.create_all)
-        nonebot.logger.opt(colors=True).info(f'<lg>数据库初始化已完成.</lg>')
-    except Exception as e:
+        nonebot.logger.opt(colors=True).success(f'<lg>数据库初始化已完成.</lg>')
+    except Exception as e_:
         import sys
-        nonebot.logger.opt(colors=True).critical(f'<r>数据库初始化失败</r>, error: {repr(e)}')
-        sys.exit('数据库初始化失败')
+        nonebot.logger.opt(colors=True).critical(f'<r>数据库初始化失败</r>, error: {repr(e_)}')
+        sys.exit(f'数据库初始化失败, {e_}')
 
 
-class NBdb(object):
+class BaseDB(object):
     def __init__(self):
         # expire_on_commit=False will prevent attributes from being expired
         # after commit.
@@ -90,7 +91,7 @@ async def list_col(self, col_name) -> Result.ListResult:
         if not self.__table:
             result = Result.ListResult(error=True, info='Table not exist', result=res)
         else:
-            async_session = NBdb().get_async_session()
+            async_session = BaseDB().get_async_session()
             async with async_session() as session:
                 async with session.begin():
                     try:
@@ -99,16 +100,16 @@ async def list_col(self, col_name) -> Result.ListResult:
                         for item in session_result.scalars().all():
                             res.append(item)
                         result = Result.ListResult(error=False, info='Success', result=res)
-                    except Exception as e:
-                        result = Result.ListResult(error=True, info=repr(e), result=res)
+                    except Exception as e_:
+                        result = Result.ListResult(error=True, info=repr(e_), result=res)
         return result
 
     async def list_col_with_condition(self, col_name, condition_col_name, condition) -> Result.ListResult:
         res = []
         if not self.__table:
             result = Result.ListResult(error=True, info='Table not exist', result=res)
         else:
-            async_session = NBdb().get_async_session()
+            async_session = BaseDB().get_async_session()
             async with async_session() as session:
                 async with session.begin():
                     try:
@@ -118,11 +119,11 @@ async def list_col_with_condition(self, col_name, condition_col_name, condition)
                         for item in session_result.scalars().all():
                             res.append(item)
                         result = Result.ListResult(error=False, info='Success', result=res)
-                    except Exception as e:
-                        result = Result.ListResult(error=True, info=repr(e), result=res)
+                    except Exception as e_:
+                        result = Result.ListResult(error=True, info=repr(e_), result=res)
         return result
 
 
 __all__ = [
-    'NBdb'
+    'BaseDB'
 ]

omega_miya/utils/Omega_Base/model/__init__.py → omega_miya/database/model/__init__.py

@@ -10,10 +10,13 @@
 from .pixiv_user_artwork import DBPixivUserArtwork
 from .pixivillust import DBPixivillust
 from .pixivision import DBPixivision
+from .plugins import DBPlugin
 from .skill import DBSkill
+from .statistic import DBStatistic
+from .status import DBStatus
 from .subscription import DBSubscription
 from .user import DBUser
-from .status import DBStatus
+
 
 __all__ = [
     'DBAuth',
@@ -29,8 +32,10 @@
     'DBPixivUserArtwork',
     'DBPixivillust',
     'DBPixivision',
+    'DBPlugin',
     'DBSkill',
+    'DBStatistic',
+    'DBStatus',
     'DBSubscription',
-    'DBUser',
-    'DBStatus'
+    'DBUser'
 ]

omega_miya/utils/Omega_Base/model/auth.py → omega_miya/database/model/auth.py

@@ -1,6 +1,6 @@
-from omega_miya.utils.Omega_Base.database import NBdb
-from omega_miya.utils.Omega_Base.class_result import Result
-from omega_miya.utils.Omega_Base.tables import AuthUser, AuthGroup, User, Friends, Group, BotGroup
+from omega_miya.database.database import BaseDB
+from omega_miya.database.class_result import Result
+from omega_miya.database.tables import AuthUser, AuthGroup, User, Friends, Group, BotGroup
 from .friend import DBFriend
 from .bot_group import DBBotGroup
 from .bot_self import DBBot
@@ -29,7 +29,7 @@ async def id(self) -> Result.IntResult:
         if self_bot_id_result.error:
             return Result.IntResult(error=True, info='Bot not exist', result=-1)
 
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             async with session.begin():
                 try:
@@ -76,7 +76,7 @@ async def set(self, allow_tag: int, deny_tag: int, auth_info: str = None) -> Res
         if self_bot_id_result.error:
             return Result.IntResult(error=True, info='Bot not exist', result=-1)
 
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             try:
                 async with session.begin():
@@ -154,7 +154,7 @@ async def allow_tag(self) -> Result.IntResult:
         if self_bot_id_result.error:
             return Result.IntResult(error=True, info='Bot not exist', result=-1)
 
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             async with session.begin():
                 try:
@@ -197,7 +197,7 @@ async def deny_tag(self) -> Result.IntResult:
         if self_bot_id_result.error:
             return Result.IntResult(error=True, info='Bot not exist', result=-1)
 
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             async with session.begin():
                 try:
@@ -240,7 +240,7 @@ async def tags_info(self) -> Result.IntTupleResult:
         if self_bot_id_result.error:
             return Result.IntTupleResult(error=True, info='Bot not exist', result=(-1, -1))
 
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             async with session.begin():
                 try:
@@ -283,7 +283,7 @@ async def delete(self) -> Result.IntResult:
         if self_bot_id_result.error:
             return Result.IntResult(error=True, info='Bot not exist', result=-1)
 
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             try:
                 async with session.begin():
@@ -333,7 +333,7 @@ async def list(cls, auth_type: str, auth_id: int, self_bot: DBBot) -> Result.Lis
         if self_bot_id_result.error:
             return Result.ListResult(error=True, info='Bot not exist', result=[])
 
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             async with session.begin():
                 try:

omega_miya/utils/Omega_Base/model/bilidynamic.py → omega_miya/database/model/bilidynamic.py

@@ -1,6 +1,6 @@
-from omega_miya.utils.Omega_Base.database import NBdb
-from omega_miya.utils.Omega_Base.class_result import Result
-from omega_miya.utils.Omega_Base.tables import Bilidynamic
+from omega_miya.database.database import BaseDB
+from omega_miya.database.class_result import Result
+from omega_miya.database.tables import Bilidynamic
 from datetime import datetime
 from sqlalchemy.future import select
 from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
@@ -12,7 +12,7 @@ def __init__(self, uid: int, dynamic_id: int):
         self.dynamic_id = dynamic_id
 
     async def id(self) -> Result.IntResult:
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             async with session.begin():
                 try:
@@ -36,7 +36,7 @@ async def exist(self) -> bool:
         return result.success()
 
     async def add(self, dynamic_type: int, content: str) -> Result.IntResult:
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             try:
                 async with session.begin():
@@ -67,7 +67,7 @@ async def add(self, dynamic_type: int, content: str) -> Result.IntResult:
 
     @classmethod
     async def list_all_dynamic(cls) -> Result.IntListResult:
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             async with session.begin():
                 try:
@@ -82,7 +82,7 @@ async def list_all_dynamic(cls) -> Result.IntListResult:
 
     @classmethod
     async def list_dynamic_by_uid(cls, uid: int) -> Result.IntListResult:
-        async_session = NBdb().get_async_session()
+        async_session = BaseDB().get_async_session()
         async with async_session() as session:
             async with session.begin():
                 try: