补充一些权限系统有关的注释

konabot/common/permsys/__init__.py

@@ -29,10 +29,21 @@ async def _to_entity_chain(el: _EntityLike):
 
 
 class PermManager:
+    """
+    权限管理模块
+    """
+
     def __init__(self, db: DatabaseManager) -> None:
         self.db = db
 
-    async def get_permission_info(self, entities: _EntityLike, key: str):
+    async def get_permission_info(
+        self, entities: _EntityLike, key: str
+    ) -> tuple[PermEntity, str, bool] | None:
+        """
+        获得一个权限实体或权限实体串对一个 key 的权限信息。若未入库（默认值）则
+        代表没有该权限相关的记录
+        """
+
         entities = await _to_entity_chain(entities)
         key = key.removesuffix("*").removesuffix(".")
         key_split = key.split(".")
@@ -52,17 +63,29 @@ class PermManager:
         return None
 
     async def check_has_permission(self, entities: _EntityLike, key: str) -> bool:
+        """
+        检查一个权限实体或者权限实体串是否有权限
+        """
+
         res = await self.get_permission_info(entities, key)
         if res is None:
             return False
         return res[2]
 
     async def update_permission(self, entity: PermEntity, key: str, perm: bool | None):
+        """
+        更新一个具体的权限实体的一则权限
+        """
+
         async with self.db.get_conn() as conn:
             repo = PermRepo(conn)
             await repo.update_perm_info(entity, key, perm)
 
     async def list_permission(self, entities: _EntityLike, query: PagerQuery):
+        """
+        列出一个权限实体或权限实体串拥有的所有权限记录
+        """
+
         entities = await _to_entity_chain(entities)
         async with self.db.get_conn() as conn:
             repo = PermRepo(conn)

konabot/common/permsys/entity.py

@@ -22,6 +22,11 @@ class PermEntity:
 
 
 def get_entity_chain_of_entity(entity: PermEntity) -> list[PermEntity]:
+    """
+    获得一个权限实体的权限串。实际上返回三个权限，从小到大分别是用户、平台全体和
+    系统全局的权限实体。
+    """
+
     return [
         PermEntity("sys", "global", "global"),
         PermEntity(entity.platform, "global", "global"),
@@ -30,6 +35,10 @@ def get_entity_chain_of_entity(entity: PermEntity) -> list[PermEntity]:
 
 
 async def get_entity_chain(event: Event) -> list[PermEntity]:  # pragma: no cover
+    """
+    获得一个 Nonebot Event 的权限实体串。
+    """
+
     entities = [PermEntity("sys", "global", "global")]
 
     if isinstance(event, OB11Event):

konabot/docs/concepts/罗文.txt

@@ -1,3 +0,0 @@
-# 关于罗文和洛温
-
-AdoreLowen 希望和洛温阿特金森区分，所以最好就不要叫他洛温了！此方 BOT 会在一些群提醒叫错了的人。

konabot/docs/user/此方晚安.txt

@@ -0,0 +1,8 @@
+# 指令介绍
+
+**此方晚安** - 让此方 BOT 禁言你一段时间
+
+## 指令格式
+
+- `@此方BOT 此方晚安`: 禁言几个小时
+- `@此方BOT 此方午安`: 禁言几十分钟

konabot/plugins/memepack/__init__.py

@@ -1,6 +1,8 @@
 from io import BytesIO
 from typing import Iterable, cast
 
+import PIL.Image
+
 from loguru import logger
 from nonebot import on_message
 from nonebot_plugin_alconna import (
@@ -18,7 +20,7 @@ from nonebot_plugin_alconna import (
 from playwright.async_api import ConsoleMessage, Page
 
 from konabot.common.nb.match_keyword import match_keyword
-from konabot.common.nb.extract_image import DepPILImage
+from konabot.common.nb.extract_image import DepImageBytesOrNone, DepPILImage
 from konabot.common.web_render import konaweb
 from konabot.common.web_render.core import WebRenderer
 from konabot.common.web_render.host_images import host_tempdir
@@ -35,6 +37,7 @@ from konabot.plugins.memepack.drawing.saying import (
     draw_pt,
     draw_suan,
     draw_vr,
+    draw_xm
 )
 from konabot.plugins.memepack.drawing.watermark import draw_doubao_watermark
 
@@ -361,3 +364,33 @@ async def _(saying: list[str]):
 
     await vrsay.send(await UniMessage().image(raw=img_bytes).export())
 
+
+xmsay = on_alconna(
+    Alconna(
+        "小睦说",
+        Args[
+            "saying",
+            MultiVar(str, "*"),
+            Field(missing_tips=lambda: "你没有写小睦说了什么"),
+        ],
+        Args["image?", Image | None],
+    ),
+    use_cmd_start=True,
+    use_cmd_sep=False,
+    skip_for_unmatch=False,
+    aliases={"小睦想"},
+)
+
+
+@xmsay.handle()
+async def _(saying: list[str], image: DepImageBytesOrNone):
+    if image is not None:
+        img = PIL.Image.open(BytesIO(image))
+    else:
+        img = None
+    img = await draw_xm("\n".join(saying), img)
+    img_bytes = BytesIO()
+    img.save(img_bytes, format="PNG")
+
+    await xmsay.send(await UniMessage().image(raw=img_bytes).export())
+

konabot/plugins/memepack/drawing/saying.py

@@ -7,23 +7,41 @@ import PIL.Image
 from konabot.common.path import ASSETS_PATH
 from konabot.common.utils.to_async import make_async
 
-from .base.fonts import HARMONYOS_SANS_SC_BLACK, HARMONYOS_SANS_SC_REGULAR, LXGWWENKAI_REGULAR
+from .base.fonts import (
+    HARMONYOS_SANS_SC_BLACK,
+    HARMONYOS_SANS_SC_REGULAR,
+    LXGWWENKAI_REGULAR,
+)
 
-geimao_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "geimao.jpg").convert("RGBA")
+geimao_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "geimao.jpg").convert(
+    "RGBA"
+)
 pt_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "ptsay.png").convert("RGBA")
 mnk_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "mnksay.jpg").convert("RGBA")
 dasuan_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "dss.png").convert("RGBA")
-suan_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "suanleba.png").convert("RGBA")
-cute_ten_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "tententen.png").convert("RGBA")
+suan_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "suanleba.png").convert(
+    "RGBA"
+)
+cute_ten_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "tententen.png").convert(
+    "RGBA"
+)
 kio_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "kiosay.jpg").convert("RGBA")
-vr_image = PIL.Image.open(ASSETS_PATH / 'img' / 'meme' / 'vr.jpg').convert("RGBA")
+vr_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "vr.jpg").convert("RGBA")
+xm_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "xiaomu.png").convert("RGBA")
 
 
 def _draw_geimao(saying: str):
     img = geimao_image.copy()
     with imagetext_py.Writer(img) as iw:
         iw.draw_text_wrapped(
-            saying, 960, 50, 0.5, 0, 1920, 240, HARMONYOS_SANS_SC_BLACK,
+            saying,
+            960,
+            50,
+            0.5,
+            0,
+            1920,
+            240,
+            HARMONYOS_SANS_SC_BLACK,
             imagetext_py.Paint.Color(imagetext_py.Color.from_hex("000000FF")),
             0.8,
             imagetext_py.TextAlign.Center,
@@ -42,7 +60,14 @@ def _draw_pt(saying: str):
     img = pt_image.copy()
     with imagetext_py.Writer(img) as iw:
         iw.draw_text_wrapped(
-            saying, 259, 278, 0.5, 0.5, 360, 48, HARMONYOS_SANS_SC_REGULAR,
+            saying,
+            259,
+            278,
+            0.5,
+            0.5,
+            360,
+            48,
+            HARMONYOS_SANS_SC_REGULAR,
             imagetext_py.Paint.Color(imagetext_py.Color.from_hex("000000FF")),
             1.0,
             imagetext_py.TextAlign.Center,
@@ -59,7 +84,14 @@ def _draw_mnk(saying: str):
     img = mnk_image.copy()
     with imagetext_py.Writer(img) as iw:
         iw.draw_text_wrapped(
-            saying, 540, 25, 0.5, 0, 1080, 120, HARMONYOS_SANS_SC_BLACK,
+            saying,
+            540,
+            25,
+            0.5,
+            0,
+            1080,
+            120,
+            HARMONYOS_SANS_SC_BLACK,
             imagetext_py.Paint.Color(imagetext_py.Color.from_hex("000000FF")),
             0.8,
             imagetext_py.TextAlign.Center,
@@ -81,7 +113,14 @@ def _draw_suan(saying: str, dasuan: bool = False):
         img = suan_image.copy()
     with imagetext_py.Writer(img) as iw:
         iw.draw_text_wrapped(
-            saying, 1020, 290, 0.5, 0.5, 400, 48, LXGWWENKAI_REGULAR,
+            saying,
+            1020,
+            290,
+            0.5,
+            0.5,
+            400,
+            48,
+            LXGWWENKAI_REGULAR,
             imagetext_py.Paint.Color(imagetext_py.Color.from_hex("000000FF")),
             1.0,
             imagetext_py.TextAlign.Center,
@@ -98,7 +137,14 @@ def _draw_cute_ten(saying: str):
     img = cute_ten_image.copy()
     with imagetext_py.Writer(img) as iw:
         iw.draw_text_wrapped(
-            saying, 390, 479, 0.5, 0.5, 760, 96, LXGWWENKAI_REGULAR,
+            saying,
+            390,
+            479,
+            0.5,
+            0.5,
+            760,
+            96,
+            LXGWWENKAI_REGULAR,
             imagetext_py.Paint.Color(imagetext_py.Color.from_hex("000000FF")),
             1.0,
             imagetext_py.TextAlign.Center,
@@ -116,7 +162,14 @@ def draw_kiosay(saying: str):
     img = kio_image.copy()
     with imagetext_py.Writer(img) as iw:
         iw.draw_text_wrapped(
-            saying, 450, 540, 0.5, 0.5, 900, 96, LXGWWENKAI_REGULAR,
+            saying,
+            450,
+            540,
+            0.5,
+            0.5,
+            900,
+            96,
+            LXGWWENKAI_REGULAR,
             imagetext_py.Paint.Color(imagetext_py.Color.from_hex("000000FF")),
             1.0,
             imagetext_py.TextAlign.Center,
@@ -131,12 +184,19 @@ def draw_vr(saying: str):
     w, h = img.size
     hw = 300
 
-    img2 = PIL.Image.new("RGBA", (w, h + hw), 'white')
+    img2 = PIL.Image.new("RGBA", (w, h + hw), "white")
     img2.paste(img, (0, hw))
 
     with imagetext_py.Writer(img2) as iw:
         iw.draw_text_wrapped(
-            saying, w // 2, hw // 2 + 15, 0.5, 0.5, w, 64, LXGWWENKAI_REGULAR,
+            saying,
+            w // 2,
+            hw // 2 + 15,
+            0.5,
+            0.5,
+            w,
+            64,
+            LXGWWENKAI_REGULAR,
             imagetext_py.Paint.Color(imagetext_py.Color.from_hex("000000FF")),
             1.0,
             imagetext_py.TextAlign.Center,
@@ -145,3 +205,36 @@ def draw_vr(saying: str):
 
     return img2
 
+
+@make_async
+def draw_xm(saying: str, image: PIL.Image.Image | None = None):
+    img_base = PIL.Image.new("RGBA", xm_image.size, (255, 255, 255, 255))
+    with imagetext_py.Writer(img_base) as iw:
+        iw.draw_text_wrapped(
+            saying,
+            442,
+            200,
+            0.5,
+            0.5,
+            884,
+            64,
+            LXGWWENKAI_REGULAR,
+            imagetext_py.Paint.Color(imagetext_py.Color.from_hex("000000FF")),
+            1.0,
+            imagetext_py.TextAlign.Center,
+            draw_emojis=True,
+        )
+    if image is not None:
+        image_r = image.copy().convert("RGBA")
+
+        width, height = image_r.size
+        base_width = img_base.size[0]
+        height = int(height / width * base_width)
+        image_r = image_r.resize((base_width, height))
+
+        # try to align center
+        y = 215 - image_r.height // 2
+        img_base.paste(image_r, (0, y), mask=image_r)
+    img_base.paste(xm_image, (0, 0), mask=xm_image)
+    return img_base
+

konabot/plugins/no_luowen.py

@@ -1,44 +0,0 @@
-import nonebot
-
-from nonebot.adapters.onebot.v11.bot import Bot
-from nonebot.adapters.onebot.v11.event import GroupMessageEvent
-from nonebot_plugin_alconna import UniMsg, UniMessage
-from pydantic import BaseModel
-
-
-class NoLuowenConfig(BaseModel):
-    plugin_noluowen_qqid: int               = -1
-    plugin_noluowen_enable_group: list[int] = []
-
-config = nonebot.get_plugin_config(NoLuowenConfig)
-
-
-async def is_luowen_mentioned(evt: GroupMessageEvent, msg: UniMsg) -> bool:
-    if config.plugin_noluowen_qqid <= 0:
-        return False
-    if evt.user_id == config.plugin_noluowen_qqid:
-        return False
-    if evt.group_id not in config.plugin_noluowen_enable_group:
-        return False
-    txt = msg.extract_plain_text()
-    if "洛温" not in txt:
-        return False
-    if "罗文" in txt:
-        return False
-    if "阿特金森" in txt:
-        return False
-    return True
-
-evt_luowen_mentioned = nonebot.on_message(rule=is_luowen_mentioned)
-
-
-@evt_luowen_mentioned.handle()
-async def _(evt: GroupMessageEvent, bot: Bot):
-    msg = (
-        UniMessage()
-        .reply(str(evt.message_id))
-        .at(str(config.plugin_noluowen_qqid))
-        .text(" 好像有人念错了你的 ID")
-    )
-    await evt_luowen_mentioned.send(await msg.export(bot=bot))
-

konabot/plugins/oyasumi/__init__.py

@@ -21,7 +21,9 @@ async def make_sleep(event: GroupMessageEvent, bot: Bot, duration: int):
     minutes = (duration // 60) % 60
     hours = duration // 3600
 
-    message = f" 晚安！已获得 {hours} 小时 {minutes} 分钟 {seconds} 秒的睡眠💤"
+    t1 = f"{hours} 小时 {minutes} 分钟 {seconds} 秒"
+
+    message = f" 好好睡吧！奖励你 {t1}的睡眠💤"
     message = UniMessage.at(str(event.user_id)).text(message)
 
     await message.send(target=event, bot=bot)