fix: 修复配置字段和插件元信息 (#463)

* fix(config): 修复配置字段读取错误

* chore: 优化依赖导入并补充插件元信息

Author: mobyw

bot.py

@@ -5,8 +5,6 @@
 app = nonebot.get_asgi()
 driver = nonebot.get_driver()
 driver.register_adapter(OneBotV11Adapter)
-nonebot.load_plugin("nonebot_plugin_apscheduler")
-nonebot.load_plugin("nonebot_plugin_guild_patch")
 nonebot.load_plugins("src/plugins")
 
 if __name__ == "__main__":

src/plugins/ELF_RSS2/__init__.py

@@ -1,13 +1,17 @@
 import asyncio
 
-from nonebot import on_metaevent
+from nonebot import on_metaevent, require
 from nonebot.adapters.onebot.v11 import Bot, LifecycleMetaEvent
 from nonebot.log import logger
 from nonebot.plugin import PluginMetadata
 
+require("nonebot_plugin_apscheduler")
+require("nonebot_plugin_guild_patch")
+
 from . import command
 from . import my_trigger as tr
-from .config import DATA_PATH, config
+from .config import DATA_PATH, ELFConfig
+from .config import config as plugin_config
 from .rss_class import Rss
 from .utils import send_message_to_admin
 
@@ -16,7 +20,11 @@
 __plugin_meta__ = PluginMetadata(
     name="ELF_RSS",
     description="QQ机器人 RSS订阅 插件，订阅源建议选择 RSSHub",
-    usage="https://github.com/Quan666/ELF_RSS",
+    usage="https://github.com/Quan666/ELF_RSS/blob/2.0/docs/2.0%20%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B.md",
+    type="application",
+    homepage="https://github.com/Quan666/ELF_RSS",
+    config=ELFConfig,
+    supported_adapters={"~onebot.v11"},
     extra={"author": "Quan666 <[email protected]>", "version": VERSION},
 )
 
@@ -41,10 +49,10 @@ async def start(bot: Bot) -> None:
 
     rss_list = Rss.read_rss()  # 读取list
     if not rss_list:
-        if config.enable_boot_message:
+        if plugin_config.enable_boot_message:
             await send_message_to_admin(f"第一次启动，你还没有订阅，记得添加哟！\n{boot_message}", bot)
         logger.info("第一次启动，你还没有订阅，记得添加哟！")
-    if config.enable_boot_message:
+    if plugin_config.enable_boot_message:
         await send_message_to_admin(f"ELF_RSS 订阅器启动成功！\n{boot_message}", bot)
     logger.info("ELF_RSS 订阅器启动成功！")
     # 创建检查更新任务

src/plugins/ELF_RSS2/command/add_dy.py

@@ -12,11 +12,11 @@
 from nonebot.params import ArgPlainText, CommandArg
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
+from nonebot_plugin_guild_patch import GUILD_ADMIN, GUILD_OWNER, GuildMessageEvent
 
 from .. import my_trigger as tr
 from ..permission import GUILD_SUPERUSER
 from ..rss_class import Rss
-from ..utils import GUILD_ADMIN, GUILD_OWNER, GuildMessageEvent
 
 RSS_ADD = on_command(
     "add",

src/plugins/ELF_RSS2/command/change_dy.py

@@ -11,12 +11,13 @@
 from nonebot.params import ArgPlainText, CommandArg
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
+from nonebot_plugin_guild_patch import GUILD_ADMIN, GUILD_OWNER, GuildMessageEvent
 
 from .. import my_trigger as tr
 from ..config import DATA_PATH
 from ..permission import GUILD_SUPERUSER
 from ..rss_class import Rss
-from ..utils import GUILD_ADMIN, GUILD_OWNER, GuildMessageEvent, regex_validate
+from ..utils import regex_validate
 
 RSS_CHANGE = on_command(
     "change",

src/plugins/ELF_RSS2/command/del_dy.py

@@ -7,11 +7,11 @@
 from nonebot.params import ArgPlainText, CommandArg
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
+from nonebot_plugin_guild_patch import GUILD_ADMIN, GUILD_OWNER, GuildMessageEvent
 
 from .. import my_trigger as tr
 from ..permission import GUILD_SUPERUSER
 from ..rss_class import Rss
-from ..utils import GUILD_ADMIN, GUILD_OWNER, GuildMessageEvent
 
 RSS_DELETE = on_command(
     "deldy",

src/plugins/ELF_RSS2/command/rsshub_add.py

@@ -9,12 +9,12 @@
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
 from nonebot.typing import T_State
+from nonebot_plugin_guild_patch import GUILD_ADMIN, GUILD_OWNER
 from yarl import URL
 
 from ..config import config
 from ..permission import GUILD_SUPERUSER
 from ..rss_class import Rss
-from ..utils import GUILD_ADMIN, GUILD_OWNER
 from .add_dy import add_feed
 
 rsshub_routes: Dict[str, Any] = {}

src/plugins/ELF_RSS2/command/show_all.py

@@ -13,10 +13,10 @@
 from nonebot.params import CommandArg
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
+from nonebot_plugin_guild_patch import GUILD_ADMIN, GUILD_OWNER, GuildMessageEvent
 
 from ..permission import GUILD_SUPERUSER
 from ..rss_class import Rss
-from ..utils import GUILD_ADMIN, GUILD_OWNER, GuildMessageEvent
 from .show_dy import handle_rss_list
 
 RSS_SHOW_ALL = on_command(

src/plugins/ELF_RSS2/command/show_dy.py

@@ -6,10 +6,10 @@
 from nonebot.params import CommandArg
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
+from nonebot_plugin_guild_patch import GUILD_ADMIN, GUILD_OWNER, GuildMessageEvent
 
 from ..permission import GUILD_SUPERUSER
 from ..rss_class import Rss
-from ..utils import GUILD_ADMIN, GUILD_OWNER, GuildMessageEvent
 
 RSS_SHOW = on_command(
     "show",

src/plugins/ELF_RSS2/my_trigger.py

@@ -6,10 +6,10 @@
 from apscheduler.triggers.interval import IntervalTrigger
 from async_timeout import timeout
 from nonebot.log import logger
+from nonebot_plugin_apscheduler import scheduler
 
 from . import rss_parsing
 from .rss_class import Rss
-from .utils import scheduler
 
 
 # 检测某个rss更新

src/plugins/ELF_RSS2/qbittorrent_download.py

@@ -9,6 +9,7 @@
 from apscheduler.triggers.interval import IntervalTrigger
 from nonebot.adapters.onebot.v11 import ActionFailed, Bot, NetworkError
 from nonebot.log import logger
+from nonebot_plugin_apscheduler import scheduler
 from qbittorrent import Client
 
 from .config import config
@@ -17,7 +18,6 @@
     get_bot,
     get_bot_group_list,
     get_torrent_b16_hash,
-    scheduler,
     send_message_to_admin,
 )
 

src/plugins/ELF_RSS2/utils.py

@@ -8,18 +8,10 @@
 from aiohttp import ClientSession
 from cachetools import TTLCache
 from cachetools.keys import hashkey
-from nonebot import get_bot as _get_bot
-from nonebot import require
+from nonebot import get_bot as nonebot_get_bot
 from nonebot.adapters.onebot.v11 import Bot
 from nonebot.log import logger
 
-require("nonebot_plugin_apscheduler")  # noqa
-from nonebot_plugin_apscheduler import scheduler  # noqa
-
-require("nonebot_plugin_guild_patch")  # noqa
-from nonebot_plugin_guild_patch import GuildMessageEvent  # noqa
-from nonebot_plugin_guild_patch.permission import GUILD_ADMIN, GUILD_OWNER  # noqa
-
 from .config import config
 from .parsing.utils import get_proxy
 
@@ -120,10 +112,16 @@ def get_torrent_b16_hash(content: bytes) -> str:
 
 async def send_message_to_admin(message: str, bot: Optional[Bot] = None) -> None:
     if bot is None:
-        bot: Bot = await get_bot()  # type: ignore
+        bot = await get_bot()
     if bot is None:
         return
-    await bot.send_private_msg(user_id=int(list(config.superusers)[0]), message=message)
+    try:
+        await bot.send_private_msg(
+            user_id=int(list(config.superusers)[0]), message=message
+        )
+    except Exception as e:
+        logger.error(f"管理员消息推送失败：{e}")
+        logger.error(f"消息内容：{message}")
 
 
 async def send_msg(
@@ -240,10 +238,10 @@ async def get_bot() -> Optional[Bot]:
     global bot_offline
     bot: Optional[Bot] = None
     try:
-        bot = _get_bot()  # type: ignore
+        bot = nonebot_get_bot()  # type: ignore
         bot_offline = False
     except ValueError:
-        if not bot_offline and config.telegram_admin_id and config.telegram_bot_token:
+        if not bot_offline and config.telegram_admin_ids and config.telegram_bot_token:
             await send_message_to_telegram_admin("QQ Bot 已离线！")
             logger.warning("Bot 已离线！")
             bot_offline = True