数据库中所有user_qq改名以及user_id和group_id改为字符串

plugins/bilibili_sub/__init__.py

@@ -9,6 +9,7 @@ from nonebot.typing import T_State
 from configs.config import Config
 from models.level_user import LevelUser
 from services.log import logger
+from utils.depends import GetConfig
 from utils.image_utils import text2image
 from utils.manager import group_manager
 from utils.message_builder import image
@@ -89,7 +90,12 @@ async def _():
 
 @add_sub.handle()
 @del_sub.handle()
-async def _(event: MessageEvent, state: T_State, arg: Message = CommandArg()):
+async def _(
+    event: MessageEvent,
+    state: T_State,
+    arg: Message = CommandArg(),
+    sub_level: Optional[int] = GetConfig(config="GROUP_BILIBILI_SUB_LEVEL"),
+):
     msg = arg.extract_plain_text().strip().split()
     if len(msg) < 2:
         await add_sub.finish("参数不完全，请查看订阅帮助...")
@@ -99,10 +105,10 @@ async def _(event: MessageEvent, state: T_State, arg: Message = CommandArg()):
         if not await LevelUser.check_level(
             event.user_id,
             event.group_id,
-            Config.get_config("bilibili_sub", "GROUP_BILIBILI_SUB_LEVEL"),  # type: ignore
+            sub_level,  # type: ignore
         ):
             await add_sub.finish(
-                f"您的权限不足，群内订阅的需要 {Config.get_config('bilibili_sub', 'GROUP_BILIBILI_SUB_LEVEL')} 级权限..",
+                f"您的权限不足，群内订阅的需要 {sub_level} 级权限..",
                 at_sender=True,
             )
         sub_user = f"{event.user_id}:{event.group_id}"
@@ -155,9 +161,10 @@ async def _(
     else:
         await add_sub.finish("参数错误，第一参数必须为：主播/up/番剧！")
     logger.info(
-        f"(USER {event.user_id}, GROUP "
-        f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
-        f" 添加订阅：{sub_type} -> {sub_user} -> {id_}"
+        f"添加订阅：{sub_type} -> {sub_user} -> {id_}",
+        "添加订阅",
+        event.user_id,
+        getattr(event, "group_id", None),
     )
 
 
@@ -171,20 +178,27 @@ async def _(
     sub_user: str = ArgStr("sub_user"),
 ):
     if sub_type in ["主播", "直播"]:
-        result = await BilibiliSub.delete_bilibili_sub(int(id_), sub_user, "live")
+        result = await BilibiliSub.delete_bilibili_sub(id_, sub_user, "live")
     elif sub_type.lower() in ["up", "用户"]:
-        result = await BilibiliSub.delete_bilibili_sub(int(id_), sub_user, "up")
+        result = await BilibiliSub.delete_bilibili_sub(id_, sub_user, "up")
     else:
-        result = await BilibiliSub.delete_bilibili_sub(int(id_), sub_user)
+        result = await BilibiliSub.delete_bilibili_sub(id_, sub_user)
     if result:
         await del_sub.send(f"删除订阅id：{id_} 成功...")
         logger.info(
-            f"(USER {event.user_id}, GROUP "
-            f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
-            f" 删除订阅 {id_}"
+            f"删除订阅 {id_}",
+            "删除订阅",
+            event.user_id,
+            getattr(event, "group_id", None),
         )
     else:
         await del_sub.send(f"删除订阅id：{id_} 失败...")
+        logger.info(
+            f"删除订阅 {id_} 失败",
+            "删除订阅",
+            event.user_id,
+            getattr(event, "group_id", None),
+        )
 
 
 @show_sub_info.handle()
@@ -236,18 +250,18 @@ async def _():
     bot = get_bot()
     sub = None
     if bot:
-        # try:
         await sub_manager.reload_sub_data()
         sub = await sub_manager.random_sub_data()
         if sub:
-            logger.debug(f"Bilibili订阅开始检测：{sub.sub_id}")
-            rst = await get_sub_status(sub.sub_id, sub.sub_type)
-            await send_sub_msg(rst or "", sub, bot)  # type: ignore
-            if sub.sub_type == "live":
-                rst = await get_sub_status(sub.sub_id, "up")
+            try:
+                logger.debug(f"Bilibili订阅开始检测：{sub.sub_id}")
+                rst = await get_sub_status(sub.sub_id, sub.sub_type)
                 await send_sub_msg(rst or "", sub, bot)  # type: ignore
-        # except Exception as e:
-        #     logger.error(f"B站订阅推送发生错误 sub_id：{sub.sub_id if sub else 0} {type(e)}：{e}")
+                if sub.sub_type == "live":
+                    rst = await get_sub_status(sub.sub_id, "up")
+                    await send_sub_msg(rst or "", sub, bot)  # type: ignore
+            except Exception as e:
+                logger.error(f"B站订阅推送发生错误 sub_id：{sub.sub_id}", e=e)
 
 
 async def send_sub_msg(rst: str, sub: BilibiliSub, bot: Bot):
@@ -284,4 +298,4 @@ async def send_sub_msg(rst: str, sub: BilibiliSub, bot: Bot):
                 else:
                     await bot.send_private_msg(user_id=int(x), message=Message(rst))
             except Exception as e:
-                logger.error(f"B站订阅推送发生错误 sub_id：{sub.sub_id} {type(e)}：{e}")
+                logger.error(f"B站订阅推送发生错误 sub_id：{sub.sub_id}", e=e)

plugins/bilibili_sub/data_source.py

@@ -38,12 +38,16 @@ async def add_live_sub(live_id: str, sub_user: str) -> str:
     :return:
     """
     try:
+        if await BilibiliSub.exists(
+            sub_type="live", sub_id=live_id, sub_users__contains=sub_user + ","
+        ):
+            return "该订阅Id已存在..."
         try:
             """bilibili_api.live库的LiveRoom类中get_room_info改为bilireq.live库的get_room_info_by_id方法"""
             live_info = await get_room_info_by_id(live_id)
         except ResponseCodeError:
             return f"未找到房间号Id：{live_id} 的信息，请检查Id是否正确"
-        uid = live_info["uid"]
+        uid = str(live_info["uid"])
         room_id = live_info["room_id"]
         short_id = live_info["short_id"]
         title = live_info["title"]
@@ -56,7 +60,10 @@ async def add_live_sub(live_id: str, sub_user: str) -> str:
             live_short_id=short_id,
             live_status=live_status,
         ):
-            await _get_up_status(room_id)
+            try:
+                await _get_up_status(room_id)
+            except Exception as e:
+                logger.error(f"获取主播UP信息失败: {live_id} 错误", e=e)
             if data := await BilibiliSub.get_or_none(sub_id=room_id):
                 uname = data.uname
                 return (
@@ -66,11 +73,9 @@ async def add_live_sub(live_id: str, sub_user: str) -> str:
                     f"\tlive_id：{room_id}\n"
                     f"\tuid：{uid}"
                 )
-            return "添加订阅失败..."
-        else:
-            return "添加订阅失败..."
+        return "添加订阅失败..."
     except Exception as e:
-        logger.error(f"订阅主播live_id：{live_id} 发生了错误 {type(e)}：{e}")
+        logger.error(f"订阅主播live_id: {live_id} 错误", e=e)
     return "添加订阅失败..."
 
 
@@ -80,7 +85,14 @@ async def add_up_sub(uid: str, sub_user: str) -> str:
     :param uid: UP uid
     :param sub_user: 订阅用户
     """
+    uname = uid
+    dynamic_upload_time = 0
+    latest_video_created = 0
     try:
+        if await BilibiliSub.exists(
+            sub_type="up", sub_id=uid, sub_users__contains=sub_user + ","
+        ):
+            return "该订阅Id已存在..."
         try:
             """bilibili_api.user库中User类的get_user_info改为bilireq.user库的get_user_info方法"""
             user_info = await get_user_card(uid)
@@ -89,29 +101,26 @@ async def add_up_sub(uid: str, sub_user: str) -> str:
         uname = user_info["name"]
         """bilibili_api.user库中User类的get_dynamics改为bilireq.dynamic库的get_user_dynamics方法"""
         dynamic_info = await dynamic.get_user_dynamics(int(uid))
-        dynamic_upload_time = 0
         if dynamic_info.get("cards"):
             dynamic_upload_time = dynamic_info["cards"][0]["desc"]["timestamp"]
         """bilibili_api.user库中User类的get_videos改为bilireq.user库的get_videos方法"""
         video_info = await get_videos(int(uid))
-        latest_video_created = 0
         if video_info["list"].get("vlist"):
             latest_video_created = video_info["list"]["vlist"][0]["created"]
-        if await BilibiliSub.sub_handle(
-            uid,
-            "up",
-            sub_user,
-            uid=int(uid),
-            uname=uname,
-            dynamic_upload_time=dynamic_upload_time,
-            latest_video_created=latest_video_created,
-        ):
-            return "已成功订阅UP：\n" f"\tname: {uname}\n" f"\tuid：{uid}"
-        else:
-            return "添加订阅失败..."
     except Exception as e:
-        logger.error(f"订阅Up uid：{uid} 发生了错误 {type(e)}：{e}")
-    return "添加订阅失败..."
+        logger.error(f"订阅Up uid: {uid} 错误", e=e)
+    if await BilibiliSub.sub_handle(
+        uid,
+        "up",
+        sub_user,
+        uid=uid,
+        uname=uname,
+        dynamic_upload_time=dynamic_upload_time,
+        latest_video_created=latest_video_created,
+    ):
+        return "已成功订阅UP：\n" f"\tname: {uname}\n" f"\tuid：{uid}"
+    else:
+        return "添加订阅失败..."
 
 
 async def add_season_sub(media_id: str, sub_user: str) -> str:
@@ -121,6 +130,10 @@ async def add_season_sub(media_id: str, sub_user: str) -> str:
     :param sub_user: 订阅用户
     """
     try:
+        if await BilibiliSub.exists(
+            sub_type="season", sub_id=media_id, sub_users__contains=sub_user + ","
+        ):
+            return "该订阅Id已存在..."
         try:
             """bilibili_api.bangumi库中get_meta改为bilireq.bangumi库的get_meta方法"""
             season_info = await get_meta(media_id)
@@ -145,7 +158,7 @@ async def add_season_sub(media_id: str, sub_user: str) -> str:
         else:
             return "添加订阅失败..."
     except Exception as e:
-        logger.error(f"订阅番剧 media_id：{media_id} 发生了错误 {type(e)}：{e}")
+        logger.error(f"订阅番剧 media_id: {media_id} 错误", e=e)
     return "添加订阅失败..."
 
 
@@ -155,7 +168,7 @@ async def delete_sub(sub_id: str, sub_user: str) -> str:
     :param sub_id: 订阅 id
     :param sub_user: 订阅用户 id # 7384933:private or 7384933:2342344(group)
     """
-    if await BilibiliSub.delete_bilibili_sub(int(sub_id), sub_user):
+    if await BilibiliSub.delete_bilibili_sub(sub_id, sub_user):
         return f"已成功取消订阅：{sub_id}"
     else:
         return f"取消订阅：{sub_id} 失败，请检查是否订阅过该Id...."
@@ -204,12 +217,11 @@ async def get_sub_status(id_: str, sub_type: str) -> Optional[str]:
             return await _get_up_status(id_)
         elif sub_type == "season":
             return await _get_season_status(id_)
-    except ResponseCodeError as msg:
-        logger.info(f"Id：{id_} 获取信息失败...{msg}")
-        return None
+    except ResponseCodeError as e:
+        logger.error(f"Id：{id_} 获取信息失败...", e=e)
         # return f"Id：{id_} 获取信息失败...请检查订阅Id是否存在或稍后再试..."
-    # except Exception as e:
-    #     logger.error(f"获取订阅状态发生预料之外的错误 id_：{id_} {type(e)}：{e}")
+    except Exception as e:
+        logger.error(f"获取订阅状态发生预料之外的错误 Id_：{id_}", e=e)
     #     return "发生了预料之外的错误..请稍后再试或联系管理员....."
 
 
@@ -250,7 +262,7 @@ async def _get_up_status(id_: str) -> Optional[str]:
         user_info = await get_user_card(_user.uid)
         uname = user_info["name"]
         """bilibili_api.user库中User类的get_videos改为bilireq.user库的get_videos方法"""
-        video_info = await get_videos(_user.uid)
+        video_info = await get_videos(int(_user.uid))
         latest_video_created = 0
         video = None
         dividing_line = "\n-------------\n"
@@ -308,7 +320,7 @@ async def _get_season_status(id_: str) -> Optional[str]:
 
 
 async def get_user_dynamic(
-    uid: int, local_user: BilibiliSub
+    uid: str, local_user: BilibiliSub
 ) -> Tuple[Optional[MessageSegment], int, str]:
     """
     获取用户动态
@@ -317,7 +329,7 @@ async def get_user_dynamic(
     :return: 最新动态截图与时间
     """
     """bilibili_api.user库中User类的get_dynamics改为bilireq.dynamic库的get_user_dynamics方法"""
-    dynamic_info = await dynamic.get_user_dynamics(uid)
+    dynamic_info = await dynamic.get_user_dynamics(int(uid))
     if dynamic_info.get("cards"):
         dynamic_upload_time = dynamic_info["cards"][0]["desc"]["timestamp"]
         dynamic_id = dynamic_info["cards"][0]["desc"]["dynamic_id"]

plugins/bilibili_sub/model.py

@@ -21,7 +21,7 @@ class BilibiliSub(Model):
     """直播短id"""
     live_status = fields.IntField(null=True)
     """直播状态 0: 停播  1: 直播"""
-    uid = fields.BigIntField(null=True)
+    uid = fields.CharField(255, null=True)
     """主播/UP UID"""
     uname = fields.CharField(255, null=True)
     """主播/UP 名称"""
@@ -53,7 +53,7 @@ class BilibiliSub(Model):
         live_short_id: Optional[str] = None,
         live_status: Optional[int] = None,
         dynamic_upload_time: int = 0,
-        uid: Optional[int] = None,
+        uid: Optional[str] = None,
         uname: Optional[str] = None,
         latest_video_created: Optional[int] = None,
         season_name: Optional[str] = None,
@@ -80,59 +80,63 @@ class BilibiliSub(Model):
             :param season_update_time: 番剧更新时间
         """
         sub_id = str(sub_id)
-        # try:
-        data = {
-            "sub_type": sub_type,
-            "sub_user": sub_user,
-            "live_short_id": live_short_id,
-            "live_status": live_status,
-            "dynamic_upload_time": dynamic_upload_time,
-            "uid": uid,
-            "uname": uname,
-            "latest_video_created": latest_video_created,
-            "season_name": season_name,
-            "season_id": season_id,
-            "season_current_episode": season_current_episode,
-            "season_update_time": season_update_time,
-        }
-        if sub_user:
-            sub_user = sub_user if sub_user[-1] == "," else f"{sub_user},"
-        sub = None
-        if sub_type:
-            sub = await cls.get_or_none(sub_id=sub_id, sub_type=sub_type)
-        else:
-            sub = await cls.get_or_none(sub_id=sub_id)
-        if sub:
-            sub_users = sub.sub_users + sub_user
-            data["sub_type"] = sub_type or sub.sub_type
-            data["sub_users"] = sub_users
-            data["live_short_id"] = live_short_id or sub.live_short_id
-            data["live_status"] = (
-                live_status if live_status is not None else sub.live_status
-            )
-            data["dynamic_upload_time"] = dynamic_upload_time or sub.dynamic_upload_time
-            data["uid"] = uid or sub.uid
-            data["uname"] = uname or sub.uname
-            data["latest_video_created"] = (
-                latest_video_created or sub.latest_video_created
-            )
-            data["season_name"] = season_name or sub.season_name
-            data["season_id"] = season_id or sub.season_id
-            data["season_current_episode"] = (
-                season_current_episode or sub.season_current_episode
-            )
-            data["season_update_time"] = season_update_time or sub.season_update_time
-        else:
-            await cls.create(sub_id=sub_id, sub_type=sub_type, sub_users=sub_user)
-        await cls.update_or_create(sub_id=sub_id, defaults=data)
-        return True
-        # except Exception as e:
-        #     logger.info(f"bilibili_sub 添加订阅错误 {type(e)}: {e}")
-        # return False
+        try:
+            data = {
+                "sub_type": sub_type,
+                "sub_user": sub_user,
+                "live_short_id": live_short_id,
+                "live_status": live_status,
+                "dynamic_upload_time": dynamic_upload_time,
+                "uid": uid,
+                "uname": uname,
+                "latest_video_created": latest_video_created,
+                "season_name": season_name,
+                "season_id": season_id,
+                "season_current_episode": season_current_episode,
+                "season_update_time": season_update_time,
+            }
+            if sub_user:
+                sub_user = sub_user if sub_user[-1] == "," else f"{sub_user},"
+            sub = None
+            if sub_type:
+                sub = await cls.get_or_none(sub_id=sub_id, sub_type=sub_type)
+            else:
+                sub = await cls.get_or_none(sub_id=sub_id)
+            if sub:
+                sub_users = sub.sub_users + sub_user
+                data["sub_type"] = sub_type or sub.sub_type
+                data["sub_users"] = sub_users
+                data["live_short_id"] = live_short_id or sub.live_short_id
+                data["live_status"] = (
+                    live_status if live_status is not None else sub.live_status
+                )
+                data["dynamic_upload_time"] = (
+                    dynamic_upload_time or sub.dynamic_upload_time
+                )
+                data["uid"] = uid or sub.uid
+                data["uname"] = uname or sub.uname
+                data["latest_video_created"] = (
+                    latest_video_created or sub.latest_video_created
+                )
+                data["season_name"] = season_name or sub.season_name
+                data["season_id"] = season_id or sub.season_id
+                data["season_current_episode"] = (
+                    season_current_episode or sub.season_current_episode
+                )
+                data["season_update_time"] = (
+                    season_update_time or sub.season_update_time
+                )
+            else:
+                await cls.create(sub_id=sub_id, sub_type=sub_type, sub_users=sub_user)
+            await cls.update_or_create(sub_id=sub_id, defaults=data)
+            return True
+        except Exception as e:
+            logger.error(f"添加订阅 Id: {sub_id} 错误", e=e)
+        return False
 
     @classmethod
     async def delete_bilibili_sub(
-        cls, sub_id: int, sub_user: str, sub_type: Optional[str] = None
+        cls, sub_id: str, sub_user: str, sub_type: Optional[str] = None
     ) -> bool:
         """
         说明:
@@ -142,24 +146,34 @@ class BilibiliSub(Model):
             :param sub_user: 删除此条目的用户
         """
         try:
+            group_id = None
+            contains_str = sub_user
+            if ":" in sub_user:
+                group_id = sub_user.split(":")[1]
+                contains_str = f":{group_id}"
             if sub_type:
-                sub = await cls.filter(
-                    sub_id=sub_id, sub_type=sub_type, sub_users__contains=sub_user
-                ).first()
+                sub = await cls.get_or_none(
+                    sub_id=sub_id, sub_type=sub_type, sub_users__contains=contains_str
+                )
             else:
-                sub = await cls.filter(
-                    sub_id=sub_id, sub_users__contains=sub_user
-                ).first()
+                sub = await cls.get_or_none(
+                    sub_id=sub_id, sub_users__contains=contains_str
+                )
             if not sub:
                 return False
-            sub.sub_users = sub.sub_users.replace(f"{sub_user},", "")
+            if group_id:
+                sub.sub_users = ",".join(
+                    [s for s in sub.sub_users.split(",") if f":{group_id}" not in s]
+                )
+            else:
+                sub.sub_users = sub.sub_users.replace(f"{sub_user},", "")
             if sub.sub_users.strip():
                 await sub.save(update_fields=["sub_users"])
             else:
                 await sub.delete()
             return True
         except Exception as e:
-            logger.info(f"bilibili_sub 删除订阅错误 {type(e)}: {e}")
+            logger.error(f"bilibili_sub 删除订阅错误", target=sub_id, e=e)
         return False
 
     @classmethod
@@ -189,4 +203,5 @@ class BilibiliSub(Model):
             "ALTER TABLE bilibili_sub ALTER COLUMN season_update_time TYPE timestamp with time zone USING season_update_time::timestamp with time zone;",
             "alter table bilibili_sub alter COLUMN sub_id type varchar(255);",  # 将sub_id字段改为字符串
             "alter table bilibili_sub alter COLUMN live_short_id type varchar(255);",  # 将live_short_id字段改为字符串
+            "alter table bilibili_sub alter COLUMN uid type varchar(255);",  # 将live_short_id字段改为字符串
         ]