♻️ 跟进 service 的变化

1 files changed, 15 insertions, 17 deletions

diff --git a/ATRI/plugins/rss/__init__.py b/ATRI/plugins/rss/__init__.py
index a29f385..3f0b906 100644
--- a/ATRI/plugins/rss/__init__.py
+++ b/ATRI/plugins/rss/__init__.py
@@ -1,28 +1,25 @@
 from pathlib import Path
 
 from nonebot.adapters.onebot.v11 import MessageEvent
-from nonebot.permission import SUPERUSER
-from nonebot.adapters.onebot.v11 import GROUP_OWNER, GROUP_ADMIN
 
+from ATRI.permission import ADMIN
 from ATRI.service import Service
+from ATRI.message import MessageBuilder
 
 
 RSS_PLUGIN_DIR = Path(".") / "ATRI" / "plugins" / "rss"
 
 
-class RssHelper(Service):
-    def __init__(self):
-        Service.__init__(
-            self,
-            "rss",
-            "Rss系插件助手",
-            True,
-            permission=SUPERUSER | GROUP_OWNER | GROUP_ADMIN,
-            main_cmd="/rss",
-        )
+rss_helper = (
+    Service("rss")
+    .document("Rss系插件助手")
+    .only_admin(True)
+    .permission(ADMIN)
+    .main_cmd("/rss")
+)
 
 
-rss_menu = RssHelper().on_command("/rss", "Rss帮助菜单")
+rss_menu = rss_helper.on_command("/rss", "Rss帮助菜单")
 
 
 @rss_menu.handle()
@@ -32,8 +29,9 @@ async def _rss_menu(event: MessageEvent):
     if not rss_list:
         rss_list = [str(i).split("\\")[-1] for i in raw_rss_list]
 
-    result = f"""Rss Helper:
-    可用订阅源: {"、".join(map(str, rss_list)).replace("rss_", str())}
-    命令: /rss.(订阅源名称)
-    """.strip()
+    result = (
+        MessageBuilder("Rss Helper:")
+        .text(f"可用订阅源: {', '.join(map(str, rss_list)).replace('rss_', str())}")
+        .text("命令: /rss.(订阅源名称)")
+    )
     await rss_menu.finish(result)