Merge pull request #1373 from yajiwa/main

🗃️  数据库字段"user_qq"改为"user_id"并更改字段类型为str

plugins/black_word/utils.py

@@ -235,7 +235,7 @@ async def _get_punish(
     ban_4_duration = Config.get_config("black_word", "BAN_4_DURATION")
     # 口头警告内容
     warning_result = Config.get_config("black_word", "WARNING_RESULT")
-    if user := await GroupInfoUser.get_or_none(user_qq=user_id, group_id=group_id):
+    if user := await GroupInfoUser.get_or_none(user_id=str(user_id), group_id=str(group_id)):
         uname = user.user_name
     else:
         uname = user_id

plugins/my_info/__init__.py

@@ -32,7 +32,7 @@ async def _(event: GroupMessageEvent):
 
 
 async def get_member_info(user_qq: int, group_id: int) -> str:
-    if user := await GroupInfoUser.get_or_none(user_qq=user_qq, group_id=group_id):
+    if user := await GroupInfoUser.get_or_none(user_id=str(user_qq), group_id=str(group_id)):
         result = ""
         result += "昵称:" + user.user_name + "\n"
         result += "加群时间:" + str(user.user_join_time.date())

plugins/open_cases/open_cases_c.py

@@ -73,7 +73,7 @@ async def get_user_max_count(user_qq: int, group_id: int) -> int:
     Returns:
         int: 最大开箱次数
     """
-    user, _ = await SignGroupUser.get_or_create(user_qq=user_qq, group_id=group_id)
+    user, _ = await SignGroupUser.get_or_create(user_id=str(user_qq), group_id=str(group_id))
     impression = int(user.impression)
     initial_open_case_count = Config.get_config("open_cases", "INITIAL_OPEN_CASE_COUNT")
     each_impression_add_count = Config.get_config(

plugins/russian/__init__.py

@@ -160,7 +160,7 @@ async def _(event: GroupMessageEvent):
     if rs_player[event.group_id]["at"] == event.user_id:
         at_player_name = (
             await GroupInfoUser.get_or_none(
-                user_qq=event.user_id, group_id=event.group_id
+                user_id=str(event.user_id), group_id=str(event.group_id)
             )
         ).user_name
         await accept.send(

plugins/send_setu_/send_setu/__init__.py

@@ -172,7 +172,7 @@ async def _(
     msg = arg.extract_plain_text().strip()
     if isinstance(event, GroupMessageEvent):
         user, _ = await SignGroupUser.get_or_create(
-            user_qq=event.user_id, group_id=event.group_id
+            user_id=str(event.user_id), group_id=str(event.group_id)
         )
         impression = user.impression
         if luox := get_luoxiang(impression):
@@ -232,7 +232,7 @@ num_key = {
 async def _(bot: Bot, event: MessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()):
     if isinstance(event, GroupMessageEvent):
         user, _ = await SignGroupUser.get_or_create(
-            user_qq=event.user_id, group_id=event.group_id
+            user_id=str(event.user_id), group_id=str(event.group_id)
         )
         impression = user.impression
         if luox := get_luoxiang(impression):

plugins/sign_in/goods_register.py

@@ -31,7 +31,7 @@ async def _():
         **{"好感度双倍加持卡Ⅰ_prob": 0.1, "好感度双倍加持卡Ⅱ_prob": 0.2, "好感度双倍加持卡Ⅲ_prob": 0.3},
     )
     async def sign_card(user_id: int, group_id: int, prob: float):
-        user, _ = await SignGroupUser.get_or_create(user_qq=user_id, group_id=group_id)
+        user, _ = await SignGroupUser.get_or_create(user_id=str(user_id), group_id=str(group_id))
         user.add_probability = prob
         await user.save(update_fields=["add_probability"])
 

plugins/sign_in/group_user_checkin.py

@@ -28,7 +28,7 @@ async def group_user_check_in(
     "Returns string describing the result of checking in"
     present = datetime.now()
     # 取得相应用户
-    user, is_create = await SignGroupUser.get_or_create(user_qq=user_qq, group_id=group)
+    user, is_create = await SignGroupUser.get_or_create(user_id=str(user_qq), group_id=str(group))
     # 如果同一天签到过，特殊处理
     if not is_create and (
         user.checkin_time_last.date() >= present.date()
@@ -49,7 +49,7 @@ async def check_in_all(nickname: str, user_qq: int):
         :param user_qq: 用户qq
     """
     present = datetime.now()
-    for u in await SignGroupUser.filter(user_qq=user_qq).all():
+    for u in await SignGroupUser.filter(user_id=str(user_qq)).all():
         group = u.group_id
         if not (
             u.checkin_time_last.date() >= present.date()
@@ -62,7 +62,7 @@ async def check_in_all(nickname: str, user_qq: int):
 async def _handle_check_in(
     nickname: str, user_qq: int, group: int, present: datetime
 ) -> MessageSegment:
-    user, _ = await SignGroupUser.get_or_create(user_qq=user_qq, group_id=group)
+    user, _ = await SignGroupUser.get_or_create(user_id=str(user_qq), group_id=str(group))
     impression_added = (secrets.randbelow(99) + 1) / 100
     critx2 = random.random()
     add_probability = float(user.add_probability)
@@ -83,7 +83,7 @@ async def _handle_check_in(
         gift += " + 1"
 
     logger.info(
-        f"(USER {user.user_qq}, GROUP {user.group_id})"
+        f"(USER {user.user_id}, GROUP {user.group_id})"
         f" CHECKED IN successfully. score: {user.impression:.2f} "
         f"(+{impression_added:.2f}).获取金币：{gold + gift if gift == 'gold' else gold}"
     )
@@ -95,7 +95,7 @@ async def _handle_check_in(
 
 async def group_user_check(nickname: str, user_qq: int, group: int) -> MessageSegment:
     # heuristic: if users find they have never checked in they are probable to check in
-    user, _ = await SignGroupUser.get_or_create(user_qq=user_qq, group_id=group)
+    user, _ = await SignGroupUser.get_or_create(user_id=str(user_qq), group_id=str(group))
     gold = await BagUser.get_gold(user_qq, group)
     return await get_card(user, nickname, None, gold, "", is_card_view=True)
 
@@ -171,7 +171,7 @@ async def _pst(users: list, impressions: list, groups: list):
             impressions.pop(index)
             users.pop(index)
             groups.pop(index)
-            if user_ := await GroupInfoUser.get_or_none(user_qq=user, group_id=group):
+            if user_ := await GroupInfoUser.get_or_none(user_id=str(user), group_id=str(group)):
                 user_name = user_.user_name
             else:
                 user_name = f"我名字呢？"

plugins/sign_in/utils.py

@@ -35,10 +35,10 @@ driver: Driver = nonebot.get_driver()
 async def init_image():
     SIGN_RESOURCE_PATH.mkdir(parents=True, exist_ok=True)
     SIGN_TODAY_CARD_PATH.mkdir(exist_ok=True, parents=True)
-    if not await GroupInfoUser.get_or_none(user_qq=114514):
+    if not await GroupInfoUser.get_or_none(user_id="A_nmi_114514"):
         await GroupInfoUser.create(
-            user_qq=114514,
-            group_id=114514,
+            user_id="A_nmi_114514",
+            group_id="A_nmi_114514",
             user_name="",
             uid=0,
         )
@@ -55,7 +55,7 @@ async def get_card(
     is_double: bool = False,
     is_card_view: bool = False,
 ) -> MessageSegment:
-    user_id = user.user_qq
+    user_id = user.user_id
     date = datetime.now().date()
     _type = "view" if is_card_view else "sign"
     card_file = (
@@ -83,7 +83,7 @@ async def get_card(
                 )
             is_card_view = True
         ava = BytesIO(await get_user_avatar(user_id))
-        uid = await GroupInfoUser.get_group_member_uid(user.user_qq, user.group_id)
+        uid = await GroupInfoUser.get_group_member_uid(user.user_id, user.group_id)
         impression_list = None
         if is_card_view:
             _, impression_list, _ = await SignGroupUser.get_all_impression(
@@ -109,7 +109,7 @@ async def get_card(
 def _generate_card(
     user: "SignGroupUser",
     nickname: str,
-    user_id: int,
+    user_id: str,
     impression: Optional[float],
     gold: Optional[int],
     gift: str,

plugins/statistics/statistics_handle.py

@@ -162,8 +162,8 @@ async def _(bot: Bot, event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg
     day_index = data["day_index"]
     data = data[arg][key]
     if _type == "group":
-        group = await GroupInfo.filter(group_id=event.group_id).first()
-        name = name.group_name if group else str(event.group_id)
+        group = await GroupInfo.filter(group_id=str(event.group_id)).first()
+        name = group if group else str(event.group_id)
     else:
         name = event.sender.card or event.sender.nickname
     img = await generate_statistics_img(data, arg, name, plugin, day_index)

plugins/web_ui/api/request.py

@@ -56,12 +56,12 @@ async def _(parma: HandleRequest) -> Result:
                 if parma.type == "group":
                     if rid := requests_manager.get_group_id(parma.id):
                         # await GroupInfo.update_or_create(defaults={"group_flag": 1}, )
-                        if group := await GroupInfo.get_or_none(group_id=rid):
+                        if group := await GroupInfo.get_or_none(group_id=str(rid)):
                             await group.update_or_create(group_flag=1)
                         else:
                             group_info = await bot.get_group_info(group_id=rid)
                             await GroupInfo.update_or_create(
-                                group_id=group_info["group_id"],
+                                group_id=str(group_info["group_id"]),
                                 defaults={
                                     "group_name": group_info["group_name"],
                                     "max_member_count": group_info["max_member_count"],