update v0.1.5.6

plugins/pix_gallery/_model/omega_pixiv_illusts.py

@@ -139,15 +139,14 @@ class OmegaPixivIllusts(db.Model):
         data = await cls.select('pid').gino.all()
         return [x[0] for x in data]
 
-    @classmethod
-    async def test(cls, nsfw_tag: int = 1):
-        if nsfw_tag is not None:
-            query = cls.query.where(cls.nsfw_tag == nsfw_tag)
-        else:
-            query = cls.query
-        query = query.where((cls.width - cls.height) < 50)
-        for x in await query.gino.all():
-            print(x.pid)
+    # async def test(cls, nsfw_tag: int = 1):
+    #     if nsfw_tag is not None:
+    #         query = cls.query.where(cls.nsfw_tag == nsfw_tag)
+    #     else:
+    #         query = cls.query
+    #     query = query.where((cls.width - cls.height) < 50)
+    #     for x in await query.gino.all():
+    #         print(x.pid)
 
 
 

plugins/pix_gallery/pix.py

@@ -18,6 +18,7 @@ usage：
     查看 pix 好康图库
     指令：
         pix ?*[tags]: 通过 tag 获取相似图片，不含tag时随机抽取
+        pid [uid]: 通过uid获取图片
         pix pid[pid]: 查看图库中指定pid图片
 """.strip()
 __plugin_superuser_usage__ = """
@@ -49,7 +50,9 @@ __plugin_configs__ = {
         "value": None,
         "help": "单次发送的图片数量达到指定值时转发为合并消息",
         "default_value": None,
-    }
+    },
+    "ALLOW_GROUP_SETU": {"value": False, "help": "允许非超级用户使用-s参数", "default_value": False},
+    "ALLOW_GROUP_R18": {"value": False, "help": "允许非超级用户使用-r参数", "default_value": False},
 }
 
 
@@ -80,10 +83,13 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
         nsfw_tag = 2
     else:
         nsfw_tag = 0
-    if nsfw_tag != 0 and str(event.user_id) not in bot.config.superusers:
-        await pix.finish("你不能看这些噢，这些都是是留给管理员看的...")
-    if n := len(x) == 1 and is_number(x[0]):
-        num = int(x[-1])
+    if str(event.user_id) not in bot.config.superusers:
+        if (nsfw_tag == 1 and not Config.get_config("pix", "ALLOW_GROUP_SETU")) or (
+            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 = ""
     elif n > 1:
         if is_number(x[-1]):