diff --git a/zhenxun/builtin_plugins/about.py b/zhenxun/builtin_plugins/about.py index f2bcbdb6..520478d7 100644 --- a/zhenxun/builtin_plugins/about.py +++ b/zhenxun/builtin_plugins/about.py @@ -1,13 +1,14 @@ from pathlib import Path -from nonebot.plugin import PluginMetadata +import aiofiles from nonebot.rule import to_me -from nonebot_plugin_alconna import Alconna, Arparma, on_alconna +from nonebot.plugin import PluginMetadata from nonebot_plugin_session import EventSession +from nonebot_plugin_alconna import Alconna, Arparma, on_alconna -from zhenxun.configs.utils import PluginExtraData from zhenxun.services.log import logger from zhenxun.utils.message import MessageUtils +from zhenxun.configs.utils import PluginExtraData __plugin_meta__ = PluginMetadata( name="关于", @@ -28,8 +29,9 @@ async def _(session: EventSession, arparma: Arparma): ver_file = Path() / "__version__" version = None if ver_file.exists(): - with open(ver_file, "r", encoding="utf8") as f: - version = f.read().split(":")[-1].strip() + async with aiofiles.open(ver_file, encoding="utf8") as f: + if text := await f.read(): + version = text.split(":")[-1].strip() info = f""" 『绪山真寻Bot』 版本：{version} diff --git a/zhenxun/builtin_plugins/scheduler/morning.py b/zhenxun/builtin_plugins/scheduler/morning.py index d858d627..7aef0e1e 100644 --- a/zhenxun/builtin_plugins/scheduler/morning.py +++ b/zhenxun/builtin_plugins/scheduler/morning.py @@ -5,7 +5,6 @@ from nonebot_plugin_apscheduler import scheduler from zhenxun.services.log import logger from zhenxun.utils.enum import PluginType from zhenxun.configs.config import BotConfig -from zhenxun.models.task_info import TaskInfo from zhenxun.utils.message import MessageUtils from zhenxun.configs.path_config import IMAGE_PATH from zhenxun.utils.common_utils import CommonUtils @@ -27,16 +26,6 @@ __plugin_meta__ = PluginMetadata( driver = nonebot.get_driver() -@driver.on_startup -async def _(): - if not await TaskInfo.exists(module="morning_goodnight"): - await TaskInfo.create( - module="morning_goodnight", - name="早晚安", - status=True, - ) - - async def check(group_id: str) -> bool: return not await CommonUtils.task_is_block("morning_goodnight", group_id) diff --git a/zhenxun/builtin_plugins/shop/__init__.py b/zhenxun/builtin_plugins/shop/__init__.py index 2a8c4bf6..e247d1a1 100644 --- a/zhenxun/builtin_plugins/shop/__init__.py +++ b/zhenxun/builtin_plugins/shop/__init__.py @@ -4,12 +4,16 @@ from nonebot_plugin_session import EventSession from nonebot_plugin_userinfo import UserInfo, EventUserInfo from nonebot_plugin_alconna import ( Args, + Query, + Option, UniMsg, Alconna, Arparma, Subcommand, UniMessage, + AlconnaQuery, on_alconna, + store_true, ) from zhenxun.services.log import logger @@ -18,7 +22,7 @@ from zhenxun.utils.exception import GoodsNotFound from zhenxun.utils.enum import BlockType, PluginType from zhenxun.configs.utils import BaseBlock, PluginExtraData -from ._data_source import ShopManage +from ._data_source import ShopManage, gold_rank __plugin_meta__ = PluginMetadata( name="商店", @@ -30,6 +34,8 @@ __plugin_meta__ = PluginMetadata( 我的道具 使用道具 [名称/Id] 购买道具 [名称/Id] + 金币排行 ?[num=10] + 金币总排行 ?[num=10] """.strip(), extra=PluginExtraData( author="HibiKier", @@ -44,10 +50,12 @@ __plugin_meta__ = PluginMetadata( _matcher = on_alconna( Alconna( "商店", + Option("--all", action=store_true), Subcommand("my-cost", help_text="我的金币"), Subcommand("my-props", help_text="我的道具"), Subcommand("buy", Args["name", str]["num", int, 1], help_text="购买道具"), Subcommand("use", Args["name", str]["num?", int, 1], help_text="使用道具"), + Subcommand("gold-list", Args["num?", int], help_text="使用道具"), ), priority=5, block=True, @@ -81,6 +89,20 @@ _matcher.shortcut( prefix=True, ) +_matcher.shortcut( + "金币排行", + command="商店", + arguments=["gold-list"], + prefix=True, +) + +_matcher.shortcut( + r"金币总排行", + command="商店", + arguments=["--all", "gold-list"], + prefix=True, +) + @_matcher.assign("$main") async def _(session: EventSession, arparma: Arparma): @@ -153,3 +175,22 @@ async def _( await MessageUtils.build_message(f"没有找到道具 {name} 或道具数量不足...").send( reply_to=True ) + + +@_matcher.assign("gold-list") +async def _( + session: EventSession, arparma: Arparma, num: Query[int] = AlconnaQuery("num", 10) +): + if session.id1: + gid = session.id3 or session.id2 + if arparma.find("all"): + gid = None + result = await gold_rank(session.id1, gid, num.result, session.platform) + logger.info( + "查看金币排行", + arparma.header_result, + session=session, + ) + await MessageUtils.build_message(result).send(reply_to=True) + else: + await MessageUtils.build_message("用户id为空...").send(reply_to=True) diff --git a/zhenxun/builtin_plugins/shop/_data_source.py b/zhenxun/builtin_plugins/shop/_data_source.py index 926f378b..fe93e093 100644 --- a/zhenxun/builtin_plugins/shop/_data_source.py +++ b/zhenxun/builtin_plugins/shop/_data_source.py @@ -12,18 +12,29 @@ from nonebot_plugin_alconna import UniMsg, UniMessage from zhenxun.services.log import logger from zhenxun.models.goods_info import GoodsInfo +from zhenxun.utils.platform import PlatformUtils +from zhenxun.models.friend_user import FriendUser from zhenxun.configs.path_config import IMAGE_PATH from zhenxun.models.user_console import UserConsole from zhenxun.models.user_gold_log import UserGoldLog from zhenxun.utils.enum import GoldHandle, PropHandle from zhenxun.models.user_props_log import UserPropsLog +from zhenxun.models.group_member_info import GroupInfoUser from zhenxun.utils.image_utils import BuildImage, ImageTemplate, text2image ICON_PATH = IMAGE_PATH / "shop_icon" +RANK_ICON_PATH = IMAGE_PATH / "_icon" + +PLATFORM_PATH = { + "dodo": RANK_ICON_PATH / "dodo.png", + "discord": RANK_ICON_PATH / "discord.png", + "kaiheila": RANK_ICON_PATH / "kook.png", + "qq": RANK_ICON_PATH / "qq.png", +} + class Goods(BaseModel): - name: str """商品名称""" before_handle: list[Callable] = [] @@ -45,7 +56,6 @@ class Goods(BaseModel): class ShopParam(BaseModel): - goods_name: str """商品名称""" user_id: int @@ -70,8 +80,50 @@ class ShopParam(BaseModel): """UniMessage""" -class ShopManage: +async def gold_rank(user_id: str, group_id: str | None, num: int, platform: str): + query = UserConsole + if group_id: + uid_list = await GroupInfoUser.filter(group_id=group_id).values_list( + "user_id", flat=True + ) + query = query.filter(user_id__in=uid_list) + user_list = await query.annotate().order_by("-gold").values_list("user_id", "gold") + user_id_list = [user[0] for user in user_list] + index = user_id_list.index(user_id) + 1 + user_list = user_list[:num] if num < len(user_list) else user_list + friend_user = await FriendUser.filter(user_id__in=user_id_list).values_list( + "user_id", "user_name" + ) + uid2name = {user[0]: user[1] for user in friend_user} + if diff_id := set(user_id_list).difference(set(uid2name.keys())): + group_user = await GroupInfoUser.filter(user_id__in=diff_id).values_list( + "user_id", "user_name" + ) + for g in group_user: + uid2name[g[0]] = g[1] + column_name = ["排名", "-", "名称", "金币", "平台"] + data_list = [] + for i, user in enumerate(user_list): + ava_bytes = await PlatformUtils.get_user_avatar(user[0], platform) + data_list.append( + [ + f"{i+1}", + (ava_bytes, 30, 30) if platform == "qq" else "", + uid2name.get(user[0]), + user[1], + (PLATFORM_PATH.get(platform), 30, 30), + ] + ) + if group_id: + title = "金币群组内排行" + tip = f"你的排名在本群第 {index} 位哦!" + else: + title = "金币全局排行" + tip = f"你的排名在全局第 {index} 位哦!" + return await ImageTemplate.table_page(title, tip, column_name, data_list) + +class ShopManage: uuid2goods: dict[str, Goods] = {} # noqa: RUF012 @classmethod diff --git a/zhenxun/builtin_plugins/sign_in/__init__.py b/zhenxun/builtin_plugins/sign_in/__init__.py index a5706cdf..d1a1278f 100644 --- a/zhenxun/builtin_plugins/sign_in/__init__.py +++ b/zhenxun/builtin_plugins/sign_in/__init__.py @@ -28,8 +28,8 @@ __plugin_meta__ = PluginMetadata( 指令: 签到 我的签到 - 好感度排行 - 好感度总排行 + 好感度排行 ?[num=10] + 好感度总排行 ?[num=10] * 签到时有 3% 概率 * 2 * """.strip(), extra=PluginExtraData( @@ -116,7 +116,7 @@ _sign_matcher.shortcut( _sign_matcher.shortcut( "好感度总排行", command="签到", - arguments=["--list", "--global"], + arguments=["--global", "--list"], prefix=True, ) diff --git a/zhenxun/builtin_plugins/sign_in/_data_source.py b/zhenxun/builtin_plugins/sign_in/_data_source.py index d68ea788..e27b074d 100644 --- a/zhenxun/builtin_plugins/sign_in/_data_source.py +++ b/zhenxun/builtin_plugins/sign_in/_data_source.py @@ -30,7 +30,6 @@ PLATFORM_PATH = { class SignManage: - @classmethod async def rank( cls, user_id: str, num: int, group_id: str | None = None @@ -51,35 +50,36 @@ class SignManage: "user_id", flat=True ) query = query.filter(user_id__in=user_list) - all_list = ( + user_list = ( await query.annotate() .order_by("-impression") - .values_list("user_id", flat=True) + .values_list("user_id", "impression", "sign_count", "platform") ) - index = all_list.index(user_id) + 1 # type: ignore - user_list = await query.annotate().order_by("-impression").limit(num).all() - user_id_list = [u.user_id for u in user_list] + user_id_list = [user[0] for user in user_list] + index = user_id_list.index(user_id) + 1 + user_list = user_list[:num] if num < len(user_list) else user_list column_name = ["排名", "-", "名称", "好感度", "签到次数", "平台"] friend_list = await FriendUser.filter(user_id__in=user_id_list).values_list( "user_id", "user_name" ) uid2name = {f[0]: f[1] for f in friend_list} - group_member_list = await GroupInfoUser.filter( - user_id__in=user_id_list - ).values_list("user_id", "user_name") - for gm in group_member_list: - uid2name[gm[0]] = gm[1] + if diff_id := set(user_id_list).difference(set(uid2name.keys())): + group_user = await GroupInfoUser.filter(user_id__in=diff_id).values_list( + "user_id", "user_name" + ) + for g in group_user: + uid2name[g[0]] = g[1] data_list = [] for i, user in enumerate(user_list): - bytes = await get_user_avatar(user.user_id) + bytes = await get_user_avatar(user[0]) data_list.append( [ f"{i+1}", - (bytes, 30, 30) if user.platform == "qq" else "", - uid2name.get(user.user_id), - user.impression, - user.sign_count, - (PLATFORM_PATH.get(user.platform), 30, 30), + (bytes, 30, 30) if user[3] == "qq" else "", + uid2name.get(user[0]), + user[1], + user[2], + (PLATFORM_PATH.get(user[3]), 30, 30), ] ) if group_id: