From 33710f16fef4866a4ebdcbc3b877233e88df0e6c Mon Sep 17 00:00:00 2001 From: MobiusT <62053271+MobiusT@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:41:42 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20user=5Fqq=20=E2=86=92=20user=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basic_plugins/hooks/_utils.py | 2 +- basic_plugins/shop/gold.py | 2 +- plugins/russian/__init__.py | 7 +++---- utils/depends/__init__.py | 4 +--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/basic_plugins/hooks/_utils.py b/basic_plugins/hooks/_utils.py index de44e245..109c3da2 100644 --- a/basic_plugins/hooks/_utils.py +++ b/basic_plugins/hooks/_utils.py @@ -569,7 +569,7 @@ class AuthChecker: event.user_id, event.group_id, psm.cost_gold ) await UserShopGoldLog.create( - user_qq=str(event.user_id), + user_id=str(event.user_id), group_id=str(event.group_id), type=2, name=plugin_name, diff --git a/basic_plugins/shop/gold.py b/basic_plugins/shop/gold.py index e761361c..dcc3def9 100644 --- a/basic_plugins/shop/gold.py +++ b/basic_plugins/shop/gold.py @@ -53,7 +53,7 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()): else: num = 10 all_users = await BagUser.filter(group_id=event.group_id) - all_user_id = [user.user_qq for user in all_users] + all_user_id = [user.user_id for user in all_users] all_user_data = [user.gold for user in all_users] rank_image = await init_rank( "金币排行", all_user_id, all_user_data, event.group_id, num diff --git a/plugins/russian/__init__.py b/plugins/russian/__init__.py index bb6244c7..d5c1a3d1 100755 --- a/plugins/russian/__init__.py +++ b/plugins/russian/__init__.py @@ -14,7 +14,6 @@ from models.group_member_info import GroupInfoUser from services.log import logger from utils.message_builder import at, image from utils.utils import get_message_at, is_number - from .data_source import rank from .model import RussianUser @@ -296,7 +295,7 @@ async def _( at_ = at_[0] try: at_player_name = ( - await GroupInfoUser.get_or_none(user_qq=at_, group_id=event.group_id) + await GroupInfoUser.get_or_none(user_id=at_, group_id=event.group_id) ).user_name except AttributeError: at_player_name = at(at_) @@ -364,14 +363,14 @@ async def _(bot: Bot, event: GroupMessageEvent): [ f"不要打扰 {player1_name} 和 {player2_name} 的决斗啊！", f"给我好好做好一个观众！不然{NICKNAME}就要生气了", - f"不要捣乱啊baka{(await GroupInfoUser.get_or_none(user_qq=event.user_id, group_id=event.group_id)).user_name}！", + f"不要捣乱啊baka{(await GroupInfoUser.get_or_none(user_id=event.user_id, group_id=event.group_id)).user_name}！", ] ), at_sender=True, ) await shot.finish( f"你的左轮不是连发的！该 " - f'{(await GroupInfoUser.get_or_none(user_qq=int(rs_player[event.group_id]["next"]), group_id=event.group_id)).user_name} 开枪了' + f'{(await GroupInfoUser.get_or_none(user_id=int(rs_player[event.group_id]["next"]), group_id=event.group_id)).user_name} 开枪了' ) if rs_player[event.group_id]["bullet"][rs_player[event.group_id]["index"]] != 1: await shot.send( diff --git a/utils/depends/__init__.py b/utils/depends/__init__.py index 67e66f78..2abf9936 100644 --- a/utils/depends/__init__.py +++ b/utils/depends/__init__.py @@ -7,11 +7,9 @@ from nonebot.params import Command from configs.config import Config from models.bag_user import BagUser - # from models.bag_user import BagUser from models.level_user import LevelUser from models.user_shop_gold_log import UserShopGoldLog - # from models.user_shop_gold_log import UserShopGoldLog from utils.manager import admin_manager from utils.message_builder import at @@ -75,7 +73,7 @@ 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=str(event.user_id), + user_id=str(event.user_id), group_id=str(event.group_id), type=2, name=matcher.plugin_name,