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 15:47:53 +08:00
parent 0eeb55a0ca
commit c577aa1318
21 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basic_plugins/admin_bot_manage/_data_source.py
View File

@ -317,7 +317,7 @@ async def update_member_info(
user_info["user_id"], user_info["group_id"], 9
)
user = await GroupInfoUser.get_or_none(
user_qq=user_info["user_id"], group_id=user_info["group_id"]
user_id=str(user_info["user_id"]), group_id=str(user_info["group_id"])
)
if user:
if user.user_name != nickname:
@ -338,8 +338,8 @@ async def update_member_info(
"%Y-%m-%d %H:%M:%S",
)
await GroupInfoUser.update_or_create(
user_qq=user_info["user_id"],
group_id=user_info["group_id"],
user_id=str(user_info["user_id"]),
group_id=str(user_info["group_id"]),
defaults={
"user_name": nickname,
"user_join_time": join_time.replace(
@ -356,7 +356,7 @@ async def update_member_info(
)
if _del_member_list:
for del_user in _del_member_list:
await GroupInfoUser.filter(user_qq=del_user, group_id=group_id).delete()
await GroupInfoUser.filter(user_id=str(del_user), group_id=str(group_id)).delete()
logger.info(f"删除已退群用户", "更新群组成员信息", del_user, group_id)
if _error_member_list and remind_superuser:
result = ""

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=str(event.user_id), group_id=str(event.group_id)
user_id=str(event.user_id), group_id=str(event.group_id)
).first():
nickname = user.nickname
else:

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=str(uid), group_id=str(gid)).first():
if user := await GroupInfoUser.filter(user_id=str(uid), group_id=str(gid)).first():
user_name = user.user_name
else:
user_name = uid

2
basic_plugins/group_handle/__init__.py
View File

@ -212,7 +212,7 @@ async def _(bot: Bot, event: GroupDecreaseNoticeEvent):
user_name = user.user_name
else:
user_name = f"{event.user_id}"
await GroupInfoUser.filter(user_qq=str(event.user_id), group_id=str(event.group_id)).delete()
await GroupInfoUser.filter(user_id=str(event.user_id), group_id=str(event.group_id)).delete()
logger.info(
f"名称: {user_name} 退出群聊",
"group_decrease_handle",

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=str(event.user_id)).update(nickname=msg)
await GroupInfoUser.filter(user_id=str(event.user_id)).update(nickname=msg)
logger.info(f"设置全局昵称成功: {msg}", "设置全局昵称", event.user_id)
await global_nickname.send(f"设置全局昵称成功！亲爱的{msg}")

4
basic_plugins/shop/buy.py
View File

@ -94,8 +94,8 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
event.group_id,
)
await UserShopGoldLog.create(
user_qq=event.user_id,
group_id=event.group_id,
user_id=str(event.user_id),
group_id=str(event.group_id),
type=0,
name=goods.goods_name,
num=num,

2
models/bag_user.py
View File

@ -166,7 +166,7 @@ class BagUser(Model):
@classmethod
async def _run_script(cls):
return ["ALTER TABLE bag_users DROP props;", # 删除 props 字段
"ALTER TABLE bag_users RENAME COLUMN user_id TO user_id;", # 将user_id改为user_id
"ALTER TABLE bag_users RENAME COLUMN user_qq TO user_id;", # 将user_qq改为user_id
"ALTER TABLE bag_users ALTER COLUMN user_id TYPE character varying(255);",
# 将user_id字段类型改为character varying(255)
"ALTER TABLE bag_users ALTER COLUMN group_id TYPE character varying(255);"

2
models/level_user.py
View File

@ -101,7 +101,7 @@ class LevelUser(Model):
@classmethod
async def _run_script(cls):
return ["ALTER TABLE level_users RENAME COLUMN user_id TO user_id;", # 将user_id改为user_id
return ["ALTER TABLE level_users RENAME COLUMN user_qq TO user_id;", # 将user_id改为user_id
"ALTER TABLE level_users ALTER COLUMN user_id TYPE character varying(255);",
# 将user_id字段类型改为character varying(255)
"ALTER TABLE level_users ALTER COLUMN group_id TYPE character varying(255);"

2
models/sign_group_user.py
View File

@ -73,7 +73,7 @@ class SignGroupUser(Model):
@classmethod
async def _run_script(cls):
return ["ALTER TABLE sign_group_users RENAME COLUMN user_id TO user_id;", # 将user_id改为user_id
return ["ALTER TABLE sign_group_users RENAME COLUMN user_qq TO user_id;", # 将user_id改为user_id
"ALTER TABLE sign_group_users ALTER COLUMN user_id TYPE character varying(255);",
# 将user_id字段类型改为character varying(255)
"ALTER TABLE sign_group_users ALTER COLUMN group_id TYPE character varying(255);"

2
plugins/black_word/utils.py
View File

@ -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

2
plugins/my_info/__init__.py
View File

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

2
plugins/open_cases/open_cases_c.py
View File

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

2
plugins/russian/__init__.py
View File

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

4
plugins/send_setu_/send_setu/__init__.py
View File

@ -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):

2
plugins/sign_in/goods_register.py
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"])

12
plugins/sign_in/group_user_checkin.py
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"我名字呢？"

12
plugins/sign_in/utils.py
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,

4
plugins/statistics/statistics_handle.py
View File

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

4
plugins/web_ui/api/request.py
View File

@ -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"],

2
utils/data_utils.py
View File

@ -32,7 +32,7 @@ async def init_rank(
all_user_id.remove(max_user_id)
all_user_data.remove(_max)
if user := await GroupInfoUser.get_or_none(
user_qq=max_user_id, group_id=group_id
user_qq=str(max_user_id), group_id=str(group_id)
):
user_name = user.user_name
else:

4
utils/depends/__init__.py
View File

@ -75,8 +75,8 @@ def CostGold(gold: int):
await matcher.finish(at(event.user_id) + f"金币不足..该功能需要{gold}金币..")
await BagUser.spend_gold(event.user_id, event.group_id, 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=matcher.plugin_name,
num=1,