🚑️ 修复更新订阅时缺少必要性条件

3 files changed, 8 insertions, 6 deletions

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()