From 785179e4a7d28c271b5ad8a06f878480ffffade6 Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Sat, 11 Jun 2022 17:57:19 +0800 Subject: [PATCH] update pix --- README.md | 4 ++++ plugins/pix_gallery/pix.py | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 02d58eb8..12ba752f 100644 --- a/README.md +++ b/README.md @@ -243,6 +243,10 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__ ## 更新 +### 2022/6/11 + +* pix当只有一个tag时且为数字时可以通过添加'#'防止判定为数量 + ### 2022/6/9 * 修复b站订阅同群二人以上相同订阅时发送多次信息 diff --git a/plugins/pix_gallery/pix.py b/plugins/pix_gallery/pix.py index aa1c2698..276bf612 100755 --- a/plugins/pix_gallery/pix.py +++ b/plugins/pix_gallery/pix.py @@ -20,6 +20,11 @@ usage: pix ?*[tags]: 通过 tag 获取相似图片,不含tag时随机抽取 pid [uid]: 通过uid获取图片 pix pid[pid]: 查看图库中指定pid图片 + 示例:pix 萝莉 白丝 + 示例:pix 萝莉 白丝 10 (10为数量) + 示例:pix #02 (当tag只有1个tag且为数字时,使用#标记,否则将被判定为数量) + 示例:pix 34582394 (查询指定uid图片) + 示例:pix pid:12323423 (查询指定pid图片) """.strip() __plugin_superuser_usage__ = """ usage: @@ -88,9 +93,12 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()): nsfw_tag == 2 and not Config.get_config("pix", "ALLOW_GROUP_R18") ): await pix.finish("你不能看这些噢,这些都是是留给管理员看的...") - if n := len(x) == 1 and is_number(x[0]) and int(x[0]) < 100: - num = int(x[0]) - keyword = "" + if n := len(x) == 1: + if is_number(x[0]) and int(x[0]) < 100: + num = int(x[0]) + keyword = "" + elif x[0].startswith("#"): + keyword = x[0][1:] elif n > 1: if is_number(x[-1]): num = int(x[-1])