mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2025-12-15 14:22:55 +08:00
🐛 user_qq → user_id
This commit is contained in:
parent
321af81d88
commit
33710f16fe
@ -569,7 +569,7 @@ class AuthChecker:
|
|||||||
event.user_id, event.group_id, psm.cost_gold
|
event.user_id, event.group_id, psm.cost_gold
|
||||||
)
|
)
|
||||||
await UserShopGoldLog.create(
|
await UserShopGoldLog.create(
|
||||||
user_qq=str(event.user_id),
|
user_id=str(event.user_id),
|
||||||
group_id=str(event.group_id),
|
group_id=str(event.group_id),
|
||||||
type=2,
|
type=2,
|
||||||
name=plugin_name,
|
name=plugin_name,
|
||||||
|
|||||||
@ -53,7 +53,7 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
|
|||||||
else:
|
else:
|
||||||
num = 10
|
num = 10
|
||||||
all_users = await BagUser.filter(group_id=event.group_id)
|
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]
|
all_user_data = [user.gold for user in all_users]
|
||||||
rank_image = await init_rank(
|
rank_image = await init_rank(
|
||||||
"金币排行", all_user_id, all_user_data, event.group_id, num
|
"金币排行", all_user_id, all_user_data, event.group_id, num
|
||||||
|
|||||||
@ -14,7 +14,6 @@ from models.group_member_info import GroupInfoUser
|
|||||||
from services.log import logger
|
from services.log import logger
|
||||||
from utils.message_builder import at, image
|
from utils.message_builder import at, image
|
||||||
from utils.utils import get_message_at, is_number
|
from utils.utils import get_message_at, is_number
|
||||||
|
|
||||||
from .data_source import rank
|
from .data_source import rank
|
||||||
from .model import RussianUser
|
from .model import RussianUser
|
||||||
|
|
||||||
@ -296,7 +295,7 @@ async def _(
|
|||||||
at_ = at_[0]
|
at_ = at_[0]
|
||||||
try:
|
try:
|
||||||
at_player_name = (
|
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
|
).user_name
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
at_player_name = at(at_)
|
at_player_name = at(at_)
|
||||||
@ -364,14 +363,14 @@ async def _(bot: Bot, event: GroupMessageEvent):
|
|||||||
[
|
[
|
||||||
f"不要打扰 {player1_name} 和 {player2_name} 的决斗啊!",
|
f"不要打扰 {player1_name} 和 {player2_name} 的决斗啊!",
|
||||||
f"给我好好做好一个观众!不然{NICKNAME}就要生气了",
|
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,
|
at_sender=True,
|
||||||
)
|
)
|
||||||
await shot.finish(
|
await shot.finish(
|
||||||
f"你的左轮不是连发的!该 "
|
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:
|
if rs_player[event.group_id]["bullet"][rs_player[event.group_id]["index"]] != 1:
|
||||||
await shot.send(
|
await shot.send(
|
||||||
|
|||||||
@ -7,11 +7,9 @@ from nonebot.params import Command
|
|||||||
|
|
||||||
from configs.config import Config
|
from configs.config import Config
|
||||||
from models.bag_user import BagUser
|
from models.bag_user import BagUser
|
||||||
|
|
||||||
# from models.bag_user import BagUser
|
# from models.bag_user import BagUser
|
||||||
from models.level_user import LevelUser
|
from models.level_user import LevelUser
|
||||||
from models.user_shop_gold_log import UserShopGoldLog
|
from models.user_shop_gold_log import UserShopGoldLog
|
||||||
|
|
||||||
# from models.user_shop_gold_log import UserShopGoldLog
|
# from models.user_shop_gold_log import UserShopGoldLog
|
||||||
from utils.manager import admin_manager
|
from utils.manager import admin_manager
|
||||||
from utils.message_builder import at
|
from utils.message_builder import at
|
||||||
@ -75,7 +73,7 @@ def CostGold(gold: int):
|
|||||||
await matcher.finish(at(event.user_id) + f"金币不足..该功能需要{gold}金币..")
|
await matcher.finish(at(event.user_id) + f"金币不足..该功能需要{gold}金币..")
|
||||||
await BagUser.spend_gold(event.user_id, event.group_id, gold)
|
await BagUser.spend_gold(event.user_id, event.group_id, gold)
|
||||||
await UserShopGoldLog.create(
|
await UserShopGoldLog.create(
|
||||||
user_qq=str(event.user_id),
|
user_id=str(event.user_id),
|
||||||
group_id=str(event.group_id),
|
group_id=str(event.group_id),
|
||||||
type=2,
|
type=2,
|
||||||
name=matcher.plugin_name,
|
name=matcher.plugin_name,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user