🚧 Update the data types of the user_qq and group_id fields to str

This commit is contained in:
yajiwa
2023-04-14 15:47:53 +08:00
parent 0eeb55a0ca
commit c577aa1318
21 changed files with 39 additions and 39 deletions
+1 -1
View File
@@ -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"])
+6 -6
View File
@@ -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"我名字呢?"
+6 -6
View File
@@ -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,