From 635541092c4d0f8b6fc4a8f1a73bf0a5d63b15f0 Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Wed, 15 Jun 2022 12:58:32 +0800 Subject: =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=AE=A2=E9=98=85=E6=97=B6=E7=BC=BA=E5=B0=91=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E6=80=A7=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/bilibili_dynamic/__init__.py | 4 ++-- ATRI/plugins/bilibili_dynamic/data_source.py | 4 ++-- ATRI/plugins/bilibili_dynamic/db.py | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'ATRI/plugins/bilibili_dynamic') diff --git a/ATRI/plugins/bilibili_dynamic/__init__.py b/ATRI/plugins/bilibili_dynamic/__init__.py index af66788..61333a4 100644 --- a/ATRI/plugins/bilibili_dynamic/__init__.py +++ b/ATRI/plugins/bilibili_dynamic/__init__.py @@ -54,7 +54,7 @@ async def _bd_deal_add_sub( await sub.add_sub(__id, group_id) await sub.update_sub( - __id, {"up_nickname": up_nickname, "last_update": datetime.utcnow()} + __id, group_id, {"up_nickname": up_nickname, "last_update": datetime.utcnow()} ) await add_sub.finish(f"成功订阅名为[{up_nickname}]up主的动态～！") @@ -168,8 +168,8 @@ async def _check_bd(): await bot.send_group_msg(group_id=m.group_id, message=content) await sub.update_sub( m.uid, + m.group_id, { - "group_id": m.group_id, "last_update": timestamp2datetime(i["timestamp"]), }, ) diff --git a/ATRI/plugins/bilibili_dynamic/data_source.py b/ATRI/plugins/bilibili_dynamic/data_source.py index c7e6ecc..3327179 100644 --- a/ATRI/plugins/bilibili_dynamic/data_source.py +++ b/ATRI/plugins/bilibili_dynamic/data_source.py @@ -41,10 +41,10 @@ class BilibiliDynamicSubscriptor(Service): except BilibiliDynamicError: raise BilibiliDynamicError("添加订阅失败") - async def update_sub(self, uid: int, update_map: dict): + async def update_sub(self, uid: int, group_id: int, update_map: dict): try: async with DB() as db: - await db.update_sub(uid, update_map) + await db.update_sub(uid, group_id, update_map) except BilibiliDynamicError: raise BilibiliDynamicError("更新订阅失败") diff --git a/ATRI/plugins/bilibili_dynamic/db.py b/ATRI/plugins/bilibili_dynamic/db.py index a969177..e6bb8bc 100644 --- a/ATRI/plugins/bilibili_dynamic/db.py +++ b/ATRI/plugins/bilibili_dynamic/db.py @@ -11,8 +11,10 @@ class DB: async def add_sub(self, uid: int, group_id: int): await BilibiliSubscription.create(uid=uid, group_id=group_id) - async def update_sub(self, uid: int, update_map: dict): - await BilibiliSubscription.filter(uid=uid).update(**update_map) + async def update_sub(self, uid: int, group_id: int, update_map: dict): + await BilibiliSubscription.filter(uid=uid, group_id=group_id).update( + **update_map + ) async def del_sub(self, query_map: dict): await BilibiliSubscription.filter(**query_map).delete() -- cgit v1.2.3