Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 06:12:53 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yajiwa 2023-04-14 12:48:00 +08:00
parent 04c516f783
commit 0eeb55a0ca
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basic_plugins/admin_bot_manage/_data_source.py
View File

@ -306,7 +306,7 @@ async def update_member_info(
if user_info["role"] in [
"owner",
"admin",
] and not await LevelUser.is_group_flag(user_info["user_id"], group_id):
] and not await LevelUser.is_group_flag(user_info["user_id"], str(group_id)):
await LevelUser.set_level(
user_info["user_id"],
user_info["group_id"],

2
basic_plugins/admin_bot_manage/admin_config.py
View File

@ -17,7 +17,7 @@ admin_notice = on_notice(priority=5)
@admin_notice.handle()
async def _(event: GroupAdminNoticeEvent):
if user := await GroupInfoUser.filter(
user_qq=event.user_id, group_id=event.group_id
user_qq=str(event.user_id), group_id=str(event.group_id)
).first():
nickname = user.nickname
else:

4
basic_plugins/apscheduler/__init__.py
View File

@ -91,7 +91,7 @@ async def _():
_used_group.append(g)
group_info = await bot.get_group_info(group_id=g)
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"],
@ -118,7 +118,7 @@ async def _():
bot = bots[key]
fl = await bot.get_friend_list()
for f in fl:
await FriendUser.create(user_id=f["user_id"], user_name=f["nickname"])
await FriendUser.create(user_id=str(f["user_id"]), user_name=f["nickname"])
logger.debug(f"更新好友信息成功", "自动更新好友", f["user_id"])
except Exception as e:
logger.error(f"自动更新群组信息错误", e=e)

2
basic_plugins/chat_history/chat_message_handle.py
View File

@ -69,7 +69,7 @@ async def _(event: GroupMessageEvent, reg_group: Tuple[Any, ...] = RegexGroup())
num_str = "发言次数：\n\n"
idx = 1
for uid, num in rank_data:
if user := await GroupInfoUser.filter(user_qq=uid, group_id=gid).first():
if user := await GroupInfoUser.filter(user_qq=str(uid), group_id=str(gid)).first():
user_name = user.user_name
else:
user_name = uid

14
basic_plugins/group_handle/__init__.py
View File

@ -68,7 +68,7 @@ add_group = on_request(priority=1, block=False)
@group_increase_handle.handle()
async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
if event.user_id == int(bot.self_id):
group = await GroupInfo.get_or_none(group_id=event.group_id)
group = await GroupInfo.get_or_none(group_id=str(event.group_id))
# 群聊不存在或被强制拉群，退出该群
if (not group or group.group_flag == 0) and Config.get_config(
"invite_manager", "flag"
@ -139,8 +139,8 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
group_id=event.group_id, user_id=event.user_id
)
await GroupInfoUser.update_or_create(
user_qq=user_info["user_id"],
group_id=user_info["group_id"],
user_qq=str(user_info["user_id"]),
group_id=str(user_info["group_id"]),
defaults={"user_name": user_info["nickname"], "user_join_time": join_time},
)
logger.info(f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新成功")
@ -187,12 +187,12 @@ async def _(bot: Bot, event: GroupDecreaseNoticeEvent):
group_id = event.group_id
operator_id = event.operator_id
if user := await GroupInfoUser.get_or_none(
user_qq=event.operator_id, group_id=event.group_id
user_qq=str(event.operator_id), group_id=str(event.group_id)
):
operator_name = user.user_name
else:
operator_name = "None"
group = await GroupInfo.filter(group_id=group_id).first()
group = await GroupInfo.filter(group_id=str(group_id)).first()
group_name = group.group_name if group else ""
coffee = int(list(bot.config.superusers)[0])
await bot.send_private_msg(
@ -207,12 +207,12 @@ async def _(bot: Bot, event: GroupDecreaseNoticeEvent):
group_manager.delete_group(event.group_id)
return
if user := await GroupInfoUser.get_or_none(
user_qq=event.user_id, group_id=event.group_id
user_qq=str(event.user_id), group_id=str(event.group_id)
):
user_name = user.user_name
else:
user_name = f"{event.user_id}"
await GroupInfoUser.filter(user_qq=event.user_id, group_id=event.group_id).delete()
await GroupInfoUser.filter(user_qq=str(event.user_id), group_id=str(event.group_id)).delete()
logger.info(
f"名称: {user_name} 退出群聊",
"group_decrease_handle",

4
basic_plugins/hooks/_utils.py
View File

@ -569,8 +569,8 @@ class AuthChecker:
event.user_id, event.group_id, psm.cost_gold
)
await UserShopGoldLog.create(
user_qq=event.user_id,
group_id=event.group_id,
user_qq=str(event.user_id),
group_id=str(event.group_id),
type=2,
name=plugin_name,
num=1,

4
basic_plugins/invite_manager/__init__.py
View File

@ -58,7 +58,7 @@ async def _(bot: Bot, event: FriendRequestEvent):
if Config.get_config("invite_manager", "AUTO_ADD_FRIEND"):
logger.debug(f"已开启好友请求自动同意，成功通过该请求", "好友请求", target=event.user_id)
await bot.set_friend_add_request(flag=event.flag, approve=True)
await FriendUser.create(user_id=user["user_id"], user_name=user["nickname"])
await FriendUser.create(user_id=str(user["user_id"]), user_name=user["nickname"])
else:
requests_manager.add_request(
event.user_id,
@ -87,7 +87,7 @@ async def _(bot: Bot, event: GroupRequestEvent):
)
group_info = await bot.get_group_info(group_id=event.group_id)
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"],

2
basic_plugins/nickname.py
View File

@ -104,7 +104,7 @@ async def _(
):
(msg,) = reg_group
await FriendUser.set_user_nickname(event.user_id, msg)
await GroupInfoUser.filter(user_qq=event.user_id).update(nickname=msg)
await GroupInfoUser.filter(user_qq=str(event.user_id)).update(nickname=msg)
logger.info(f"设置全局昵称成功: {msg}", "设置全局昵称", event.user_id)
await global_nickname.send(f"设置全局昵称成功！亲爱的{msg}")

2
basic_plugins/shop/my_props/__init__.py
View File

@ -33,7 +33,7 @@ my_props = on_command("我的道具", priority=5, block=True, permission=GROUP)
@my_props.handle()
async def _(event: GroupMessageEvent):
props = await BagUser.get_property(event.user_id, event.group_id)
props = await BagUser.get_property(str(event.user_id), str(event.group_id))
if props:
await my_props.send(image(b64=await create_bag_image(props)))
logger.info(f"查看我的道具", "我的道具", event.user_id, event.group_id)

4
basic_plugins/super_cmd/bot_friend_group.py
View File

@ -109,13 +109,13 @@ async def _(
if cmd[:2] == "同意":
rid = requests_manager.get_group_id(id_)
if rid:
if group := await GroupInfo.get_or_none(group_id=rid):
if group := await GroupInfo.get_or_none(group_id=str(rid)):
group.group_flag = 1
await group.save(update_fields=["group_flag"])
else:
group_info = await bot.get_group_info(group_id=rid)
await GroupInfo.create(
group_id=rid,
group_id=str(rid),
group_name=group_info["group_name"],
max_member_count=group_info["max_member_count"],
member_count=group_info["member_count"],

4
basic_plugins/super_cmd/update_friend_group_info.py
View File

@ -40,7 +40,7 @@ async def _(bot: Bot, event: MessageEvent):
try:
group_info = await bot.get_group_info(group_id=g)
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"],
@ -65,7 +65,7 @@ async def _(bot: Bot, event: MessageEvent):
for f in fl:
try:
await FriendUser.update_or_create(
user_id=f["user_id"], defaults={"nickname": f["nickname"]}
user_id=str(f["user_id"]), defaults={"nickname": f["nickname"]}
)
logger.debug(f"更新好友信息成功", "更新好友信息", event.user_id, target=f["user_id"])
num += 1