From a7233d1585a820d6ddcaf883d8d9994c8aaa1c5a Mon Sep 17 00:00:00 2001 From: Lint Action Date: Wed, 5 Oct 2022 13:42:21 +0000 Subject: =?UTF-8?q?:rotating=5Flight:=20=E8=87=AA=E5=8A=A8=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/rss/rss_mikanan/__init__.py | 12 +++++++----- ATRI/plugins/rss/rss_mikanan/data_source.py | 6 +++--- ATRI/plugins/rss/rss_mikanan/db.py | 10 ++++++---- 3 files changed, 16 insertions(+), 12 deletions(-) (limited to 'ATRI/plugins') diff --git a/ATRI/plugins/rss/rss_mikanan/__init__.py b/ATRI/plugins/rss/rss_mikanan/__init__.py index 4de04b5..4d49857 100644 --- a/ATRI/plugins/rss/rss_mikanan/__init__.py +++ b/ATRI/plugins/rss/rss_mikanan/__init__.py @@ -75,7 +75,9 @@ async def _(event: GroupMessageEvent, _id: str = ArgPlainText("rm_del_sub_id")): await del_sub.finish(result) -get_sub_list = RssMikananSubscriptor().cmd_as_group("list", "获取本群 Mikan 订阅列表", permission=Permission()) +get_sub_list = RssMikananSubscriptor().cmd_as_group( + "list", "获取本群 Mikan 订阅列表", permission=Permission() +) @get_sub_list.handle() @@ -86,11 +88,11 @@ async def _(event: GroupMessageEvent): query_result = await sub.get_sub_list({"group_id": group_id}) if not query_result: await get_sub_list.finish("本群还没有任何订阅呢...") - + subs = list() for i in query_result: subs.append([i.update_time, i.title]) - + output = "本群的 Mikan 订阅列表如下~\n" + tabulate( subs, headers=["最后更新时间", "标题"], tablefmt="plain" ) @@ -120,7 +122,7 @@ async def _(): except Exception: log.debug("Mikan 订阅列表为空 跳过") return - + if tq.empty(): for i in all_dy: await tq.put(i) @@ -137,7 +139,7 @@ async def _(): if not info: log.warning(f"无法获取 Mikan: {data.rss_link} 的动态") return - + time_patt = "%Y-%m-%dT%H:%M:%S.%f" if len(info) == 1: diff --git a/ATRI/plugins/rss/rss_mikanan/data_source.py b/ATRI/plugins/rss/rss_mikanan/data_source.py index eadf97b..6397c70 100644 --- a/ATRI/plugins/rss/rss_mikanan/data_source.py +++ b/ATRI/plugins/rss/rss_mikanan/data_source.py @@ -63,7 +63,7 @@ class RssMikananSubscriptor(Service): data = await self.get_mikan_info(url) if not data: return "该链接不含mikan内容" - + rss_link = data["link"] query_result = await self.get_sub_list( @@ -87,10 +87,10 @@ class RssMikananSubscriptor(Service): query_result = await self.get_sub_list({"_id": _id, "group_id": group_id}) if not query_result: return "没有找到订阅..." - + await self.__del_sub(_id, group_id) return f"成功取消ID为 {_id} 的订阅" - + async def get_mikan_info(self, url: str) -> dict: if "mikanani.me" not in url: return dict() diff --git a/ATRI/plugins/rss/rss_mikanan/db.py b/ATRI/plugins/rss/rss_mikanan/db.py index 326f4fd..ac3385d 100644 --- a/ATRI/plugins/rss/rss_mikanan/db.py +++ b/ATRI/plugins/rss/rss_mikanan/db.py @@ -12,13 +12,15 @@ class DB: await RssMikananiSubcription.create(_id=_id, group_id=group_id) async def update_sub(self, _id: str, group_id: int, update_map: dict): - await RssMikananiSubcription.filter(_id=_id, group_id=group_id).update(**update_map) - + await RssMikananiSubcription.filter(_id=_id, group_id=group_id).update( + **update_map + ) + async def del_sub(self, query_map: dict): await RssMikananiSubcription.filter(**query_map).delete() - + async def get_sub_list(self, query_map: dict) -> list: return await RssMikananiSubcription.filter(**query_map) - + async def get_all_subs(self) -> list: return await RssMikananiSubcription.all() -- cgit v1.2.3