nonebot-plugin-fishing2 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

nonebot_plugin_fishing2/__init__.py

@@ -2,6 +2,7 @@ from nonebot import require
 
 require("nonebot_plugin_orm")  # noqa
 
+import copy
 import shlex
 from typing import Union
 
@@ -40,6 +41,7 @@ from .data_source import (
     buy_fish,
     predict,
     get_pool,
+    remove_special_fish,
 )
 from .fish_helper import fish_list, get_fish_by_name
 
@@ -53,27 +55,28 @@ cool_down = (
 __plugin_meta__ = PluginMetadata(
     name="更好的电子钓鱼",
     description="赛博钓鱼……但是加强版本",
-    usage=f"""▶ 查询 [物品]：查询某个物品的信息
+    usage=f"""▶ 钓鱼帮助：打印本信息
+▶ 查询 [物品]：查询某个物品的信息
 ▶ 钓鱼 [鱼竿] [鱼饵]：
   ▷ 钓鱼后有 {cool_down} 的冷却，频繁钓鱼会触怒河神
   ▷ {config.no_fish_probability} 概率空军，{config.special_fish_probability} 概率钓到特殊鱼
   ▷ 加参数可以使用鱼饵或鱼竿，同类物品同时只能使用一种 
-▶ 出售 <物品> <数量>：出售物品获得{fishing_coin_name}
-  ▷ 如果卖不出去，尝试用英文双引号框住鱼名
-▶ 购买 <物品> <份数>：购买渔具店的物品
+▶ 出售 [-i] [-s] <物品或序号> [数量]：出售物品获得{fishing_coin_name}
+  ▷ -i 按照序号卖鱼 -s 卖特殊鱼
+▶ 购买 <物品> [份数]：购买物品
 ▶ 放生 <鱼名>：给一条鱼取名并放生
   ▷ 不要放生奇怪名字的鱼
 ▶ 商店：看看渔具店都有些啥
-▶ 祈愿：向神祈愿，随机获取/损失{fishing_coin_name}
+▶ 祈愿：向神祈愿{fishing_coin_name}
 ▶ 背包：查看背包中的{fishing_coin_name}与物品
 ▶ 成就：查看拥有的成就
 ▶ 钓鱼排行榜：查看{fishing_coin_name}排行榜
 """,
     type="application",
-    homepage="https://github.com/FDCraft/nonebot-plugin-fishing2",
+    homepage="https://github.com/GLDYM/nonebot-plugin-fishing2",
     config=Config,
     supported_adapters={"~onebot.v11"},
-    extra={"author": "Polaris_Light", "version": "0.1.0", "priority": 5},
+    extra={"author": "Polaris_Light", "version": "0.1.1", "priority": 5},
 )
 
 
@@ -91,18 +94,36 @@ sell = on_command("sell", aliases={"卖鱼", "出售", "售卖"}, force_whitespa
 free_fish_cmd = on_command("free_fish", aliases={"放生", "钓鱼放生"}, force_whitespace=True, priority=5)
 lottery_cmd = on_command("lottery", aliases={"祈愿"}, force_whitespace=True, priority=5)
 achievement_cmd = on_command("achievement", aliases={"成就", "钓鱼成就"}, force_whitespace=True, priority=5)
-give_cmd = on_command("give", aliases={"赐予"}, force_whitespace=True, priority=5)
 board_cmd = on_command("board", aliases={"排行榜", "钓鱼排行榜"}, force_whitespace=True, priority=5)
 
 # hidden cmd
+give_cmd = on_command("give", aliases={"赐予"}, force_whitespace=True, priority=5)
 predict_cmd = on_command("predict", aliases={"钓鱼预测"}, force_whitespace=True, priority=5)
 pool_cmd = on_command("pool", aliases={"鱼池"}, force_whitespace=True, priority=5)
+remove_cmd = on_command("remove", aliases={"捞鱼"}, force_whitespace=True, priority=5)
 # fmt:on
 
 
 @fishing_help.handle()
-async def _():
-    await fishing_help.finish(__plugin_meta__.usage)
+async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
+    user_id = event.get_user_id()
+    is_superuser = str(user_id) in bot.config.superusers
+    is_self = event.self_id == user_id
+
+    if not is_superuser and not is_self:
+        await fishing_help.finish(__plugin_meta__.usage)
+    else:
+        messages: list[MessageSegment] = []
+        messages.append(MessageSegment.text(__plugin_meta__.usage))
+        message2 = """以下为管理员命令：
+▶ 背包 [QQ或at]：让我看看
+▶ 赐予 [-i] [-s] <QQ或at> <物品或序号> [数量]：神秘力量
+▶ 钓鱼预测 [鱼竿] [鱼饵]：预测钓鱼
+▶ 鱼池 [鱼名长度最大值] [单页长度最大值]：查看所有特殊鱼
+▶ 捞鱼 [-i] <物品或序号>：捞出鱼池内特殊鱼
+"""
+        messages.append(MessageSegment.text(message2))
+        await forward_send(bot, event, messages)
 
 
 @shop.handle()
@@ -138,14 +159,19 @@ async def _(
 
 
 @fishing.handle()
-async def _(bot: Bot, event: Event, matcher: Matcher, arg: Message = CommandArg()):
+async def _(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    matcher: Matcher,
+    arg: Message = CommandArg(),
+):
     user_id = event.get_user_id()
     if user_id in block_user_list:
         await fishing.finish()
 
     tools = shlex.split((arg.extract_plain_text()))[:2]
 
-    logger.debug(f"Fishing: {user_id} try to use {tools}")
+    logger.info(f"Fishing: {user_id} try to use {tools}")
 
     check_result = await check_tools(user_id, tools)
     if check_result:
@@ -199,26 +225,85 @@ async def _(
 
 
 @pool_cmd.handle()
-async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
+async def _(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    arg: Message = CommandArg(),
+):
     user_id = event.get_user_id()
     is_superuser = str(user_id) in bot.config.superusers
     is_self = event.self_id == user_id
     if not is_superuser and not is_self:
         return None
 
-    messages: list[MessageSegment] = await get_pool()
+    args = shlex.split(arg.extract_plain_text())
+
+    match len(args):
+        case 0:
+            messages = await get_pool()
+        case 1:
+            if not args[0].isdigit():
+                await pool_cmd.finish(MessageSegment.text("你完全不看帮助是吗 ￣へ￣"))
+            messages = await get_pool(int(args[0]))
+        case 2:
+            if not args[0].isdigit() or not args[1].isdigit():
+                await pool_cmd.finish(MessageSegment.text("你完全不看帮助是吗 ￣へ￣"))
+            messages = await get_pool(int(args[0]), int(args[1]))
 
     await forward_send(bot, event, messages)
     return None
 
 
+@remove_cmd.handle()
+async def _(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    arg: Message = CommandArg(),
+):
+    user_id = event.get_user_id()
+    is_superuser = str(user_id) in bot.config.superusers
+    is_self = event.self_id == user_id
+    if not is_superuser and not is_self:
+        return None
+
+    args = shlex.split(arg.extract_plain_text())
+    as_index = False
+    for arg in copy.deepcopy(args):
+        if arg in ["-i", "--index"]:
+            as_index = True
+            args.remove(arg)
+
+    name_or_index = args[0]
+    result = await remove_special_fish(name_or_index, as_index)
+    await remove_cmd.finish(result)
+
+
 @backpack.handle()
-async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
+async def _(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    arg: Message = CommandArg(),
+):
     user_id = event.get_user_id()
+    is_superuser = str(user_id) in bot.config.superusers
+    is_self = event.self_id == user_id
+    if not is_superuser and not is_self:
+        user_id = user_id
+    else:
+        args = shlex.split(arg.extract_plain_text())
+        target = await get_at(event)
+        if target:
+            args.insert(0, target)
+        if len(args) >= 1:
+            user_id = args[0]
+        else:
+            user_id = user_id
+
     if not config.backpack_forward:
         await backpack.finish(
-            MessageSegment.at(user_id)
-            + " \n"
+            (MessageSegment.at(user_id) + " \n")
+            if isinstance(event, GroupMessageEvent)
+            else ""
             + await get_stats(user_id)
             + "\n"
             + await get_balance(user_id)
@@ -227,7 +312,8 @@ async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
         )
     else:
         messages: list[MessageSegment] = []
-        messages.append(MessageSegment.at(user_id))
+        if isinstance(event, GroupMessageEvent):
+            messages.append(MessageSegment.at(user_id))
         messages.append(await get_stats(user_id))
         messages.append(await get_balance(user_id))
         backpacks = await get_backpack(user_id)
@@ -236,7 +322,9 @@ async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
 
 
 @buy.handle()
-async def _(event: Event, arg: Message = CommandArg()):
+async def _(
+    event: Union[GroupMessageEvent, PrivateMessageEvent], arg: Message = CommandArg()
+):
     args = arg.extract_plain_text().split(" ")
     args = [x for x in args if x != ""]
 
@@ -261,29 +349,49 @@ async def _(event: Event, arg: Message = CommandArg()):
 
 
 @sell.handle()
-async def _(event: Event, arg: Message = CommandArg()):
+async def _(
+    event: Union[GroupMessageEvent, PrivateMessageEvent], arg: Message = CommandArg()
+):
     args = shlex.split(arg.extract_plain_text())
-
     user_id = event.get_user_id()
+    as_index = False
+    as_special = False
+
+    logger.info(f"Sell: {user_id} sells :{args}")
+
     if args == []:
         await sell.finish(
             MessageSegment.at(user_id)
             + " "
             + "请输入要卖出的鱼的名字和数量 (数量为1时可省略), 如 /卖鱼 小鱼 1"
         )
+
+    for arg in copy.deepcopy(args):
+        if arg in ["-i", "--index"]:
+            as_index = True
+            args.remove(arg)
+        if arg in ["-s", "--spec", "--special"]:
+            as_special = True
+            args.remove(arg)
+
     if len(args) == 1:
-        fish_name = args[0]
-        await sell.finish(
-            MessageSegment.at(user_id) + " " + await sell_fish(user_id, fish_name)
-        )
+        name_or_index = args[0]
+        fish_quantity = 1
     else:
-        fish_name, fish_quantity = args[0], args[1]
-        result = await sell_fish(user_id, fish_name, int(fish_quantity))
-        await sell.finish(MessageSegment.at(user_id) + " " + result)
+        name_or_index, fish_quantity = args[0], args[1]
+
+    result = await sell_fish(
+        user_id, name_or_index, int(fish_quantity), as_index, as_special
+    )
+    await sell.finish(MessageSegment.at(user_id) + " " + result)
 
 
 @free_fish_cmd.handle()
-async def _(bot: Bot, event: Event, arg: Message = CommandArg()):
+async def _(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    arg: Message = CommandArg(),
+):
     if not config.special_fish_enabled:
         await free_fish_cmd.finish("未开启此功能, 请联系机器人管理员")
 
@@ -296,7 +404,7 @@ async def _(bot: Bot, event: Event, arg: Message = CommandArg()):
         or "\u200d" in fish_name
         or "\u2060" in fish_name
         or "\ufeff" in fish_name
-    ):
+    ):  # TODO: 检测特殊字符
         if isinstance(event, GroupMessageEvent):
             group_id = event.group_id
             await bot.set_group_ban(group_id=group_id, user_id=user_id, duration=1800)
@@ -314,7 +422,9 @@ async def _(bot: Bot, event: Event, arg: Message = CommandArg()):
 
 
 @lottery_cmd.handle()
-async def _(bot: Bot, event: Event, matcher: Matcher):
+async def _(
+    bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent], matcher: Matcher
+):
     user_id = event.get_user_id()
     try:
         await punish(bot, event, matcher, user_id)
@@ -345,17 +455,27 @@ async def _(
     if not is_superuser and not is_self:
         return None
 
-    target = await get_at(event)
     args = shlex.split(arg.extract_plain_text())
+
+    for arg in copy.deepcopy(args):
+        if arg in ["-i", "--index"]:
+            as_index = True
+            args.remove(arg)
+        if arg in ["-s", "--spec", "--special"]:
+            as_special = True
+            args.remove(arg)
+
+    target = await get_at(event)
     if target:
         args.insert(0, target)
+
     if len(args) < 2 or len(args) > 3:
         await give_cmd.finish(
             "请输入用户的 id 和鱼的名字和数量 (数量为1时可省略), 如 /give 114514 开发鱼 1"
         )
     else:
         quantity = int(args[2]) if len(args) == 3 else 1
-        result = await give(args[0], args[1], quantity)
+        result = await give(args[0], args[1], quantity, as_index, as_special)
         achievements = await check_achievement(args[0])
         if achievements is not None:
             for achievement in achievements:
@@ -390,7 +510,12 @@ async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
     await board_cmd.finish(msg)
 
 
-async def punish(bot: Bot, event: Event, matcher: Matcher, user_id: int):
+async def punish(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    matcher: Matcher,
+    user_id: int,
+):
     global punish_user_dict
 
     if not await can_fishing(user_id):

nonebot_plugin_fishing2/data_source.py

@@ -4,7 +4,7 @@ import random
 import time
 import json
 
-from typing import Union
+from collections.abc import Hashable
 from sqlalchemy import select, update, delete
 from sqlalchemy.sql.expression import func
 from nonebot.adapters.onebot.v11 import MessageSegment
@@ -15,6 +15,23 @@ from .model import FishingRecord, SpecialFishes
 from .fish_helper import *
 
 
+def get_key_by_index(
+    dict: dict, index: int, default: Hashable | None = None
+) -> Hashable | None:
+    """Utils: get the key of OrderedDict by index.
+
+    Args:
+        dict (dict)
+        index (int)
+        default (Hashable | None, optional): default value. Defaults to None.
+
+    Returns:
+        Hashable | None: a key of dict.
+    """
+    key_list = list(dict.keys())
+    return key_list[index] if index < len(key_list) else default
+
+
 async def can_fishing(user_id: str) -> bool:
     time_now = int(time.time())
     session = get_session()
@@ -395,17 +412,44 @@ async def save_special_fish(user_id: str, fish_name: str) -> None:
         await session.commit()
 
 
-async def sell_fish(user_id: str, fish_name: str, quantity: int = 1) -> str:
+async def sell_fish(
+    user_id: str,
+    name_or_index: str,
+    quantity: int = 1,
+    as_index: bool = False,
+    as_special: bool = False,
+) -> str:
     if quantity <= 0:
         return "你在卖什么 w(ﾟДﾟ)w"
+
     session = get_session()
     async with session.begin():
         select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
         fishes_record = await session.scalar(select_user)
         if fishes_record := fishes_record:
             loads_fishes = json.loads(fishes_record.fishes)
+            loads_fishes = {
+                key: loads_fishes[key] for key in fish_list if key in loads_fishes
+            }
+
             spec_fishes = json.loads(fishes_record.special_fishes)
-            if fish_name in loads_fishes and loads_fishes[fish_name] > 0:
+            spec_fishes = dict(sorted(spec_fishes.items()))
+
+            if as_index:
+                if not name_or_index.isdigit():
+                    return "你完全不看帮助是吗 ￣へ￣"
+                load_dict = loads_fishes if not as_special else spec_fishes
+                fish_name = get_key_by_index(load_dict, int(name_or_index))
+                if not fish_name:
+                    return "查无此鱼"
+            else:
+                fish_name = name_or_index
+
+            if (
+                not as_special
+                and fish_name in loads_fishes
+                and loads_fishes[fish_name] > 0
+            ):
                 if fish_name not in can_sell_fishes:
                     return f"这个 {fish_name} 不可以卖哦~"
                 if loads_fishes[fish_name] < quantity:
@@ -425,6 +469,7 @@ async def sell_fish(user_id: str, fish_name: str, quantity: int = 1) -> str:
                 )
                 await session.execute(user_update)
                 await session.commit()
+
                 return (
                     f"你以 {fish_price} {fishing_coin_name} / 条的价格卖出了 {quantity} 条 {fish_name}, "
                     f"你获得了 {fish_price * quantity} {fishing_coin_name}"
@@ -584,13 +629,20 @@ async def lottery(user_id: str) -> str:
             return "河神没有回应你……"
 
 
-async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
+async def give(
+    user_id: str,
+    name_or_index: str,
+    quantity: int = 1,
+    as_index: bool = False,
+    as_special: bool = False,
+) -> str:
     session = get_session()
     async with session.begin():
         select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
         record = await session.scalar(select_user)
         if record:
-            if fish_name == "coin" or fish_name == fishing_coin_name:
+
+            if name_or_index == "coin" or name_or_index == fishing_coin_name:
                 user_update = (
                     update(FishingRecord)
                     .where(FishingRecord.user_id == user_id)
@@ -601,13 +653,27 @@ async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
                 await session.execute(user_update)
                 await session.commit()
                 return f"使用滥权之力成功为 {user_id} {"增加" if quantity >= 0 else "减少"} {abs(quantity)} {fishing_coin_name} ヾ(≧▽≦*)o"
+
             loads_fishes = json.loads(record.fishes)
             spec_fishes = json.loads(record.special_fishes)
-            if fish_name in fish_list:
+
+            if as_index:
+                if not name_or_index.isdigit():
+                    return "你完全不看帮助是吗 ￣へ￣"
+                load_dict = loads_fishes if not as_special else spec_fishes
+                fish_name = get_key_by_index(load_dict, int(name_or_index))
+                if not fish_name:
+                    return "查无此鱼，你再看看这人背包呢？"
+            else:
+                fish_name = name_or_index
+
+            if not as_special and fish_name in fish_list:
                 try:
                     loads_fishes[fish_name] += quantity
                 except KeyError:
                     loads_fishes[fish_name] = quantity
+                if loads_fishes[fish_name] <= 0:
+                    del loads_fishes[fish_name]
                 dump_fishes = json.dumps(loads_fishes)
                 user_update = (
                     update(FishingRecord)
@@ -621,6 +687,8 @@ async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
                     spec_fishes[fish_name] += quantity
                 except KeyError:
                     spec_fishes[fish_name] = quantity
+                if spec_fishes[fish_name] <= 0:
+                    del spec_fishes[fish_name]
                 dump_fishes = json.dumps(spec_fishes)
                 user_update = (
                     update(FishingRecord)
@@ -629,26 +697,24 @@ async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
                 )
                 await session.execute(user_update)
                 await session.commit()
+            
+            fish_name = (
+                fish_name[:20] + "..." + str(len(fish_name) - 20)
+                if len(fish_name) > 20
+                else fish_name
+            )
             return (
-                f"使用滥权之力成功将 {fish_name} 添加到 {user_id} 的背包之中 ヾ(≧▽≦*)o"
+                f"使用滥权之力成功为 {user_id} {"增加" if quantity >= 0 else "减少"} {abs(quantity)} 条 {fish_name} ヾ(≧▽≦*)o"
             )
         return "未查找到用户信息, 无法执行滥权操作 w(ﾟДﾟ)w"
 
 
-async def get_all_special_fish() -> list[str]:
+async def get_all_special_fish() -> dict[str, int]:
     session = get_session()
     async with session.begin():
         random_select = select(SpecialFishes.fish).order_by(SpecialFishes.fish.asc())
         data = await session.scalars(random_select)
-        result = data.all()
-        return result
-
-
-async def get_pool() -> list[MessageSegment]:
-
-    messages: list[MessageSegment] = []
-    pool = await get_all_special_fish()
-    messages.append(MessageSegment.text(f"现在鱼池里面有 {len(pool)} 条鱼。"))
+        pool = data.all()
 
     result = dict()
     for fish in pool:
@@ -657,14 +723,65 @@ async def get_pool() -> list[MessageSegment]:
         except KeyError:
             result[fish] = 1
 
+    return result
+
+
+async def remove_special_fish(name_or_index: str, as_index: bool = False) -> str | None:
+    pool = await get_all_special_fish()
+
+    if as_index:
+        if not name_or_index.isdigit():
+            return "你完全不看帮助是吗 ￣へ￣"
+        fish_name = get_key_by_index(pool, int(name_or_index))
+        if not fish_name:
+            return "查无此鱼"
+    else:
+        fish_name = name_or_index
+        if fish_name not in pool:
+            return "查无此鱼"
+
+    session = get_session()
+    async with session.begin():
+        delete_fishes = delete(SpecialFishes).where(SpecialFishes.fish == fish_name)
+        await session.execute(delete_fishes)
+        await session.commit()
+        
+    fish_name = (
+        fish_name[:20] + "..." + str(len(fish_name) - 20)
+        if len(fish_name) > 20
+        else fish_name
+    )
+
+    return f"已成功捞出 {fish_name}"
+
+
+async def get_pool(name_limit: int = 30, page_limit: int = 200) -> list[MessageSegment]:
+    messages: list[MessageSegment] = []
+    pool = await get_all_special_fish()
+    messages.append(
+        MessageSegment.text(f"现在鱼池里面有 {sum(list(pool.values()))} 条鱼。")
+    )
+
     msg = "鱼池列表：\n"
-    for fish, num in result.items():
-        if len(msg) > 300:
-            msg += f"{fish} x {num}"
+    i = 0
+    j = 1
+    for fish, num in pool.items():
+        if len(msg) > page_limit:
+            fish = (
+                fish[:name_limit] + "..." + str(len(fish) - name_limit)
+                if len(fish) > name_limit
+                else fish
+            )
+            msg += f"{i}. {fish} x {num}\n"
+            msg += f"【第 {j} 页结束】"
             messages.append(MessageSegment.text(msg))
             msg = ""
+            i += 1
+            j += 1
         else:
-            msg += f"{fish} x {num}\n"
+            fish = fish[:name_limit] + "..." if len(fish) > name_limit else fish
+            msg += f"{i}. {fish} x {num}\n"
+            i += 1
     else:
         messages.append(MessageSegment.text(msg))
 
@@ -697,33 +814,35 @@ async def get_backpack(user_id: str) -> list[str]:
         select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
         fishes_record = await session.scalar(select_user)
         if fishes_record:
-            load_fishes = json.loads(fishes_record.fishes)
-            sorted_fishes = {
-                key: load_fishes[key] for key in fish_list if key in load_fishes
+            loads_fishes = json.loads(fishes_record.fishes)
+            loads_fishes = {
+                key: loads_fishes[key] for key in fish_list if key in loads_fishes
             }
-            load_special_fishes = json.loads(fishes_record.special_fishes)
-            if load_special_fishes:
-                sorted_special_fishes = {
-                    key: load_special_fishes[key] for key in sorted(load_special_fishes)
-                }
-                return print_backpack(sorted_fishes, sorted_special_fishes)
+            spec_fishes: dict = json.loads(fishes_record.special_fishes)
+            if spec_fishes:
+                spec_fishes = dict(sorted(spec_fishes.items()))
+                return print_backpack(loads_fishes, spec_fishes)
             return (
                 ["🎒你的背包里空无一物"]
-                if sorted_fishes == {}
-                else print_backpack(sorted_fishes)
+                if loads_fishes == {}
+                else print_backpack(loads_fishes)
             )
         return ["🎒你的背包里空无一物"]
 
 
-def print_backpack(backpack: dict, special_backpack=None) -> list[str]:
-    result = [
-        f"{fish_name}×{str(quantity)}" for fish_name, quantity in backpack.items()
-    ]
+def print_backpack(backpack: dict, special_backpack: dict = None) -> list[str]:
+    i = 0
+    result = []
+    for fish_name, quantity in backpack.items():
+        result.append(f"{i}. {fish_name}×{str(quantity)}")
+        i += 1
+
     if special_backpack:
-        special_result = [
-            f"{fish_name}×{str(quantity)}"
-            for fish_name, quantity in special_backpack.items()
-        ]
+        i = 0
+        special_result: list[str] = []
+        for fish_name, quantity in special_backpack.items():
+            special_result.append(f"{i}. {fish_name}×{str(quantity)}")
+            i += 1
         return [
             "🎒普通鱼:\n" + "\n".join(result),
             "🎒特殊鱼:\n" + "\n".join(special_result),

{nonebot_plugin_fishing2-0.1.0.dist-info → nonebot_plugin_fishing2-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-fishing2
-Version: 0.1.0
+Version: 0.1.1
 Summary: 更好的电子钓鱼
 License: MIT
 Keywords: fishing
@@ -21,16 +21,12 @@ Requires-Dist: nonebot-plugin-orm (>=0.7.1)
 Requires-Dist: nonebot2 (>=2.2.1)
 Requires-Dist: pydantic (>=1.10)
 Requires-Dist: sqlalchemy (>=2.0.27)
-Project-URL: Homepage, https://github.com/FDCraft/nonebot-plugin-fishing2
+Project-URL: Homepage, https://github.com/GLDYM/nonebot-plugin-fishing2
 Description-Content-Type: text/markdown
 
 <div align="center">
-  <a href="https://v2.nonebot.dev/store"><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/nbp_logo.png" width="180" height="180" alt="NoneBotPluginLogo"></a>
-  <br>
-  <p><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/NoneBotPlugin.svg" width="240" alt="NoneBotPluginText"></p>
-</div>
-
-<div align="center">
+    <a href="https://v2.nonebot.dev/store">
+    <img src="https://raw.githubusercontent.com/fllesser/nonebot-plugin-template/refs/heads/resource/.docs/NoneBotPlugin.svg" width="310" alt="logo"></a>
 
 # nonebot-plugin-fishing2
 
@@ -147,14 +143,7 @@ FISHES='
 
 ### 指令表
 
-在群聊或私聊发送“钓鱼帮助”查看本插件的帮助，或者使用[NoneBot-Plugin-PicMenu-Next](https://github.com/lgc-NB2Dev/nonebot-plugin-picmenu-next)等帮助插件查看。
-
-### 管理员指令表
-
-| 指令     | 范围 | 说明                                           |
-|:--------:|:----:|:----------------------------------------------:|
-| 钓鱼预测 | 所有 | 对钓鱼进行模拟，查看各鱼的概率与期望，便于填表 |
-| 鱼池     | 所有 | 查看数据库里面的所有特殊鱼                     |
+在群聊或私聊发送“钓鱼帮助”查看本插件的帮助，或者使用[NoneBot-Plugin-PicMenu-Next](https://github.com/lgc-NB2Dev/nonebot-plugin-picmenu-next)等帮助插件查看。管理员指令默认隐藏，只能由 SUPERUSER 发送“钓鱼帮助”查看。
 
 ### 赛博放生
 
@@ -170,7 +159,7 @@ FISHES='
 - [x] 为钓鱼背包添加排序
 - [x] 添加成就系统
 - [x] 买装备！
-- [ ] 支持卖与普通鱼同名的特殊鱼
-- [ ] 管理员命令：捞鱼
+- [x] 支持卖与普通鱼同名的特殊鱼
+- [x] 管理员命令：捞鱼
 - [ ] 屏蔽词库
 

{nonebot_plugin_fishing2-0.1.0.dist-info → nonebot_plugin_fishing2-0.1.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-nonebot_plugin_fishing2/__init__.py,sha256=F-CFOiu-FwvAxofCbeGLqPjI81_gfQNQhsoWu59sH5s,16436
+nonebot_plugin_fishing2/__init__.py,sha256=P-rLNXG2ZmdfzU7UXSwWrnh4jT8OI2fsm3LPy6COrh8,20200
 nonebot_plugin_fishing2/config.py,sha256=xYDdq9Rwce8vfg-M91lUd2TfZDQnToHlI77GdpLFp-U,9751
-nonebot_plugin_fishing2/data_source.py,sha256=-8fttiui-tCr3r9-c3U7_PLdxbryW-f_uJFXhhHl1Sc,30778
+nonebot_plugin_fishing2/data_source.py,sha256=fbIWF4nJ1GVQ17UCue_RcEPxi_2oRmByhkveAXI_6oU,34488
 nonebot_plugin_fishing2/fish_helper.py,sha256=Rf3SX4UcM0-E6apLUbHB40I4onK-8qPZmZrsVBMnZ3I,6054
 nonebot_plugin_fishing2/migrations/68463f3e5f33_.py,sha256=WnaV5T1uCHvYWcnepHqV9kOurDYddFUvXXfA2Rtd5Ok,776
 nonebot_plugin_fishing2/migrations/7609e6d106dd_init_db.py,sha256=tpuIfsS6yPsnGIeMPo16exsEfYZ_urgYAqlCyQ8aw-Y,1386
@@ -8,7 +8,7 @@ nonebot_plugin_fishing2/migrations/c5ab992c9af3_add_achievements.py,sha256=KVj9A
 nonebot_plugin_fishing2/migrations/e9015df43907_add_special_fishes_field.py,sha256=R4p9vPD5lgg4vmY2KUgF2qIlraxhPYkL93lM5l7wMZw,1094
 nonebot_plugin_fishing2/migrations/f70bdeaec7a4_add_specialfishes_table.py,sha256=DUqv9MTaOSZCBj_9oT2eY3pmWeMnyH0cPj9GyYa5Sag,1194
 nonebot_plugin_fishing2/model.py,sha256=_DtmxiQhJDiIvY1XOMQZ0HA-ruWY0bexWX9frdhnk0Q,752
-nonebot_plugin_fishing2-0.1.0.dist-info/LICENSE,sha256=n-2xoOXX434-tBisMKX2-_FycV2VrmIiTP1rZvuW_fY,1091
-nonebot_plugin_fishing2-0.1.0.dist-info/METADATA,sha256=g5XWZCLnZ9nGAwW5GUXaEF8g_2yHLe7XEGH0mFxY6Ag,7793
-nonebot_plugin_fishing2-0.1.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-nonebot_plugin_fishing2-0.1.0.dist-info/RECORD,,
+nonebot_plugin_fishing2-0.1.1.dist-info/LICENSE,sha256=n-2xoOXX434-tBisMKX2-_FycV2VrmIiTP1rZvuW_fY,1091
+nonebot_plugin_fishing2-0.1.1.dist-info/METADATA,sha256=-sV5ctEfIgmreAt6aDgmEPA6GRUeskeBk4XEpeV2JQ4,7355
+nonebot_plugin_fishing2-0.1.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+nonebot_plugin_fishing2-0.1.1.dist-info/RECORD,,