Merge branch 'master' of ssh://gitea.service.jazzwhom.top:2221/mttu-developers/konabot

Reviewed-on: #27

konabot/common/longtask.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from contextlib import asynccontextmanager
 import datetime
 import json
@@ -89,6 +91,7 @@ class LongTaskTarget(BaseModel):
                 )
                 return False
             await bot.send_message(self.channel_id, cast(Any, await msg.export()))
+            return True
         if self.platform == "discord":
             if not isinstance(bot, DCBot):
                 logger.warning(
@@ -104,6 +107,7 @@ class LongTaskTarget(BaseModel):
                 ),
                 tts=False,
             )
+            return True
         logger.warning(f"没有一个平台是期望的平台 PLATFORM={self.platform}")
         return False
 
@@ -111,7 +115,7 @@ class LongTaskTarget(BaseModel):
 class LongTask(BaseModel):
     uuid: str
     data_json: str
-    target: "LongTaskTarget"
+    target: LongTaskTarget
     callback: str
     deadline: datetime.datetime
     canceled: bool = False
@@ -143,11 +147,25 @@ class LongTask(BaseModel):
                 datafile.unhandled.setdefault(self.callback, []).append(self)
 
             return
-        await hdl(self)
+        success = False
+        try:
+            await hdl(self)
+            success = True
+        except Exception as e:
+            logger.exception(e)
         async with longtask_data() as datafile:
             datafile.to_handle[self.callback] = [
                 t for t in datafile.to_handle[self.callback] if t.uuid != self.uuid
             ]
+            if not success:
+                datafile.unhandled.setdefault(self.callback, []).append(self)
+                logger.info(
+                    f"LongTask 执行失败 UUID={self.uuid} callback={self.callback}"
+                )
+            else:
+                logger.info(
+                    f"LongTask 工作完成 UUID={self.uuid} callback={self.callback}"
+                )
 
     def clean(self):
         self._aio_task = None
@@ -236,11 +254,10 @@ def _save_longtask_data(data: LongTaskModuleData):
 
 @asynccontextmanager
 async def longtask_data():
-    await longtask_lock.acquire()
-    data = _load_longtask_data()
-    yield data
-    _save_longtask_data(data)
-    longtask_lock.release()
+    async with longtask_lock:
+        data = _load_longtask_data()
+        yield data
+        _save_longtask_data(data)
 
 
 async def create_longtask(
@@ -257,6 +274,7 @@ async def create_longtask(
         deadline=deadline,
     )
 
+    logger.info(f"创建了新的 LongTask UUID={task.uuid} CALLBACK={task.callback}")
     await task.start()
 
     async with longtask_data() as d:
@@ -266,10 +284,17 @@ async def create_longtask(
 
 
 async def init_longtask():
+    counter = 0
+    req: set[str] = set()
+
     async with longtask_data() as data:
         for v in data.to_handle.values():
             for t in v:
                 await t.start()
+                counter += 1
+                req.add(t.callback)
+
+        logger.info(f"LongTask 启动了任务 数量={counter} 期望的门类=[{','.join(req)}]")
 
 
 DepLongTaskTarget = Annotated[LongTaskTarget, Depends(get_long_task_target)]

konabot/plugins/idiomgame/__init__.py

@@ -1,22 +1,18 @@
 import asyncio as asynkio
-import base64
-from pathlib import Path
-import secrets
-import json
 import datetime
-from typing import Literal, Optional
+import json
+import secrets
 from enum import Enum
+from pathlib import Path
+from typing import Optional
 
 from loguru import logger
 from nonebot import on_message
 from nonebot.adapters import Event as BaseEvent
-from nonebot.adapters.console.event import MessageEvent as ConsoleMessageEvent
 from nonebot.adapters.discord.event import MessageEvent as DiscordMessageEvent
 from nonebot_plugin_alconna import (
     Alconna,
     Args,
-    Field,
-    Subcommand,
     UniMessage,
     UniMsg,
     on_alconna,
@@ -72,17 +68,19 @@ class TryStopState(Enum):
 
 class TryVerifyState(Enum):
     VERIFIED = 0
-    NOT_IDIOM = 1
-    WRONG_FIRST_CHAR = 2
-    VERIFIED_BUT_NO_NEXT = 3
-    VERIFIED_GAME_END = 4
+    VERIFIED_AND_REAL = 1
+    NOT_IDIOM = 2
+    WRONG_FIRST_CHAR = 3
+    VERIFIED_BUT_NO_NEXT = 4
+    VERIFIED_GAME_END = 5
 
 
 class IdiomGame:
     ALL_WORDS = []  # 所有四字词语
     ALL_IDIOMS = []  # 所有成语
     INSTANCE_LIST: dict[str, "IdiomGame"] = {}  # 群号对应的游戏实例
-    IDIOM_FIRST_CHAR = {}  # 成语首字字典
+    IDIOM_FIRST_CHAR = {}  # 所有成语包括词语的首字字典
+    AVALIABLE_IDIOM_FIRST_CHAR = {} # 真正有效的成语首字字典
 
     __inited = False
 
@@ -161,31 +159,31 @@ class IdiomGame:
         """
         跳过当前成语，选择下一个成语
         """
-        await self.lock.acquire()
-        self._skip_idiom_async(buff_score)
-        self.lock.release()
+        async with self.lock:
+            self._skip_idiom_async()
+            self.add_buff_score(buff_score)
         return self.last_idiom
 
-    def _skip_idiom_async(self, buff_score: int = -100) -> str:
+    def _skip_idiom_async(self) -> str:
         self.last_idiom = secrets.choice(IdiomGame.ALL_IDIOMS)
         self.last_char = self.last_idiom[-1]
-        self.add_buff_score(buff_score)
+        if not self.is_nextable(self.last_char):
+            self._skip_idiom_async()
         return self.last_idiom
 
     async def try_verify_idiom(self, idiom: str, user_id: str) -> TryVerifyState:
         """
         用户发送成语
         """
-        await self.lock.acquire()
-        state = self._verify_idiom(idiom, user_id)
-        self.lock.release()
+        async with self.lock:
+            state = self._verify_idiom(idiom, user_id)
         return state
 
     def is_nextable(self, last_char: str) -> bool:
         """
         判断是否有成语可以接
         """
-        return last_char in IdiomGame.IDIOM_FIRST_CHAR
+        return last_char in IdiomGame.AVALIABLE_IDIOM_FIRST_CHAR
 
     def _verify_idiom(self, idiom: str, user_id: str) -> TryVerifyState:
         # 新成语的首字应与上一条成语的尾字相同
@@ -197,6 +195,8 @@ class IdiomGame:
         self.last_idiom = idiom
         self.last_char = idiom[-1]
         self.add_score(user_id, 1)
+        if idiom in IdiomGame.ALL_IDIOMS:
+            self.add_score(user_id, 4) # 再加 4 分
         self.remain_rounds -= 1
         if self.remain_rounds <= 0:
             self.now_playing = False
@@ -205,12 +205,16 @@ class IdiomGame:
             # 没有成语可以接了，自动跳过
             self._skip_idiom_async()
             return TryVerifyState.VERIFIED_BUT_NO_NEXT
+        if idiom in IdiomGame.ALL_IDIOMS:
+            return TryVerifyState.VERIFIED_AND_REAL # 真实成语
         return TryVerifyState.VERIFIED
 
-    def get_user_score(self, user_id: str) -> int:
+    def get_user_score(self, user_id: str) -> float:
         if user_id not in self.score_board:
             return 0
-        return self.score_board[user_id]["score"]
+        # 避免浮点数精度问题导致过长
+        handled_score = round(self.score_board[user_id]["score"], 1)
+        return handled_score
 
     def add_score(self, user_id: str, score: int):
         if user_id not in self.score_board:
@@ -225,6 +229,13 @@ class IdiomGame:
 
     def get_last_char(self) -> str:
         return self.last_char
+    
+    @classmethod
+    def random_idiom_starting_with(cls, first_char: str) -> Optional[str]:
+        cls.init_lexicon()
+        if first_char not in cls.IDIOM_FIRST_CHAR:
+            return None
+        return secrets.choice(cls.IDIOM_FIRST_CHAR[first_char])
 
     @classmethod
     def init_lexicon(cls):
@@ -290,6 +301,12 @@ class IdiomGame:
                 cls.IDIOM_FIRST_CHAR[idiom[0]] = []
             cls.IDIOM_FIRST_CHAR[idiom[0]].append(idiom)
 
+        # 根据真正的成语大表，划分出有效成语首字字典
+        for idiom in cls.ALL_IDIOMS:
+            if idiom[0] not in cls.AVALIABLE_IDIOM_FIRST_CHAR:
+                cls.AVALIABLE_IDIOM_FIRST_CHAR[idiom[0]] = []
+            cls.AVALIABLE_IDIOM_FIRST_CHAR[idiom[0]].append(idiom)
+
 
 evt = on_alconna(
     Alconna(
@@ -360,8 +377,10 @@ evt = on_alconna(
 
 
 @evt.handle()
-async def force_play_game(event: BaseEvent, rounds: Optional[int] = 100):
-    await play_game(event, force=True, rounds=rounds)
+async def force_play_game(
+    event: BaseEvent, target: DepLongTaskTarget, rounds: Optional[int] = 100
+):
+    await play_game(event, target, force=True, rounds=rounds)
 
 
 async def end_game(event: BaseEvent, group_id: str):
@@ -379,7 +398,7 @@ async def end_game(event: BaseEvent, group_id: str):
             result_text += (
                 f"{i + 1}. "
                 + UniMessage().at(user_id)
-                + f": {info['score'] + instance.get_all_buff_score()} 分\n"
+                + f": {round(info['score'] + instance.get_all_buff_score(), 1)} 分\n"
             )
     await evt.send(await result_text.export())
     instance.clear_score_board()
@@ -421,7 +440,8 @@ async def _(target: DepLongTaskTarget):
     instance = IdiomGame.INSTANCE_LIST.get(group_id)
     if not instance or not instance.get_playing_state():
         return
-    await evt.send(await UniMessage().text("你们太菜了！全部扣100分！").export())
+    avaliable_idiom = IdiomGame.random_idiom_starting_with(instance.get_last_char())
+    await evt.send(await UniMessage().text(f"你们太菜了，全部扣100分！明明还可以接「{avaliable_idiom}」的！").export())
     idiom = await instance.skip_idiom(-100)
     await evt.send(
         await UniMessage().text(f"重新开始，下一个成语是「{idiom}」").export()
@@ -458,16 +478,24 @@ async def _(event: BaseEvent, msg: UniMsg, target: DepLongTaskTarget):
         await evt.send(
             await UniMessage()
             .at(user_id)
-            .text("接不上！这个不一样！你被扣了 0.1 分！")
+            .text(" 接不上！这个不一样！你被扣了 0.1 分！")
             .export()
         )
         return
-    await evt.send(
-        await UniMessage()
-        .at(user_id)
-        .text(f"接对了！你有 {instance.get_user_score(user_id)} 分！")
-        .export()
-    )
+    if state == TryVerifyState.VERIFIED:
+        await evt.send(
+            await UniMessage()
+            .at(user_id)
+            .text(f" 接上了，喜提 1 分！你有 {instance.get_user_score(user_id)} 分！")
+            .export()
+        )
+    elif state == TryVerifyState.VERIFIED_AND_REAL:
+        await evt.send(
+            await UniMessage()
+            .at(user_id)
+            .text(f" 接上了，这是个真实成语，喜提 5 分！你有 {instance.get_user_score(user_id)} 分！")
+            .export()
+        )
     if state == TryVerifyState.VERIFIED_GAME_END:
         await evt.send(await UniMessage().text("全部回合结束！").export())
         await end_game(event, group_id)
@@ -518,4 +546,3 @@ async def _(event: BaseEvent, target: DepLongTaskTarget):
     group_id = target.channel_id
     remove_banned_id(group_id)
     await evt.send(await UniMessage().text("本群已开启成语接龙功能！").export())
-

konabot/plugins/image_process/__init__.py

@@ -1,10 +1,10 @@
 import re
 from io import BytesIO
 
+import PIL.Image
 from nonebot import on_message
 from nonebot.adapters import Bot
-from nonebot_plugin_alconna import (Alconna, Args, Image, Option, UniMessage,
-                                    on_alconna)
+from nonebot_plugin_alconna import Alconna, Args, Image, Option, UniMessage, on_alconna
 
 from konabot.common.nb.exc import BotExceptionMessage
 from konabot.common.nb.extract_image import PIL_Image
@@ -29,15 +29,17 @@ def parse_timestamp(tx: str) -> float | None:
     return res
 
 
-cmd_giftool = on_alconna(Alconna(
-    "giftool",
-    Args["img", Image | None],
-    Option("--ss", Args["start_point", str]),
-    Option("--frames:v", Args["frame_count", int]),
-    Option("-t", Args["length", str]),
-    Option("-to", Args["end_point", str]),
-    Option("--speed", Args["speed_factor", float], default=1.0, alias=["-s"]),
-))
+cmd_giftool = on_alconna(
+    Alconna(
+        "giftool",
+        Args["img", Image | None],
+        Option("--ss", Args["start_point", str]),
+        Option("--frames:v", Args["frame_count", int]),
+        Option("-t", Args["length", str]),
+        Option("-to", Args["end_point", str]),
+        Option("--speed", Args["speed_factor", float], default=1.0, alias=["-s"]),
+    )
+)
 
 
 @cmd_giftool.handle()
@@ -80,81 +82,66 @@ async def _(
     if not getattr(image, "is_animated", False):
         raise BotExceptionMessage("错误：输入的不是动图（GIF）")
 
-    frames = []
-    durations = []
-    total_duration = 0.0
-
+    ##
+    # 从这里开始，采样整个 GIF 图
+    frames: list[PIL.Image.Image] = []
+    durations: list[float] = []
     try:
         for i in range(getattr(image, "n_frames")):
             image.seek(i)
             frames.append(image.copy())
-            duration = image.info.get("duration", 100)  # 单位：毫秒
+            duration = image.info.get("duration", 100) / 1000
             durations.append(duration)
-            total_duration += duration / 1000.0  # 转为秒
     except EOFError:
         pass
-
     if not frames:
         raise BotExceptionMessage("错误：读取 GIF 帧失败")
+    # 采样结束
 
-    def time_to_frame_index(target_time: float) -> int:
-        if target_time <= 0:
-            return 0
-        cum = 0.0
-        for idx, dur in enumerate(durations):
-            cum += dur / 1000.0
-            if cum >= target_time:
-                return min(idx, len(frames) - 1)
-        return len(frames) - 1
-    start_frame = 0
-    end_frame = len(frames) - 1
-    if ss is not None:
-        start_frame = time_to_frame_index(ss)
-    if to is not None:
-        end_frame = time_to_frame_index(to)
-        if end_frame < start_frame:
-            end_frame = start_frame
-    elif t is not None:
-        end_time = (ss or 0.0) + t
-        end_frame = time_to_frame_index(end_time)
-        if end_frame < start_frame:
-            end_frame = start_frame
+    ##
+    # 根据开始、结束时间或者帧数量来裁取 GIF 图
 
-    start_frame = max(0, start_frame)
-    end_frame = min(len(frames) - 1, end_frame)
-    selected_frames = frames[start_frame : end_frame + 1]
-    selected_durations = durations[start_frame : end_frame + 1]
+    begin_time = ss or 0
+    end_time = sum(durations)
+    end_time = min(begin_time + (t or end_time), to or end_time, end_time)
 
-    if frame_count is not None and frame_count > 0:
-        if frame_count >= len(selected_frames):
-            pass
-        else:
-            step = len(selected_frames) / frame_count
-            sampled_frames = []
-            sampled_durations = []
-            for i in range(frame_count):
-                idx = int(i * step)
-                sampled_frames.append(selected_frames[idx])
-                sampled_durations.append(
-                    sum(selected_durations) // len(selected_durations)
-                )
-            selected_frames = sampled_frames
-            selected_durations = sampled_durations
+    accumulated = 0.0
+    status = 0
 
-    output_img = BytesIO()
+    sel_frames: list[PIL.Image.Image] = []
+    sel_durations: list[float] = []
 
-    adjusted_durations = [
-        dur / speed_factor for dur in selected_durations
-    ]
+    for i in range(len(frames)):
+        frame = frames[i]
+        duration = durations[i]
+
+        if status == 0:
+            if accumulated + duration > begin_time:
+                status = 1
+                sel_frames.append(frame)
+                sel_durations.append(accumulated + duration - begin_time)
+        elif status == 1:
+            if accumulated + duration > end_time:
+                sel_frames.append(frame)
+                sel_durations.append(end_time - accumulated)
+                break
+            sel_frames.append(frame)
+            sel_durations.append(duration)
+
+        accumulated += duration
+
+    ##
+    # 加速！
+    sel_durations = [dur / speed_factor * 1000 for dur in durations]
 
     rframes = []
     rdur = []
 
     acc_mod_20 = 0
 
-    for i in range(len(selected_frames)):
-        fr = selected_frames[i]
-        du: float = adjusted_durations[i]
+    for i in range(len(sel_frames)):
+        fr = sel_frames[i]
+        du = round(sel_durations[i])
 
         if du >= 20:
             rframes.append(fr)
@@ -170,10 +157,12 @@ async def _(
                 if acc_mod_20 >= 20:
                     acc_mod_20 = 0
 
-    if len(rframes) == 1 and len(selected_frames) > 1:
-        rframes.append(selected_frames[max(2, len(selected_frames) // 2)])
+    if len(rframes) == 1 and len(sel_frames) > 1:
+        rframes.append(sel_frames[max(2, len(sel_frames) // 2)])
         rdur.append(20)
 
+    ##
+    # 收尾：看看透明度这块
     transparency_flag = False
     for f in rframes:
         if f.mode == "RGBA":
@@ -186,12 +175,13 @@ async def _(
 
     tf = {}
     if transparency_flag:
-        tf['transparency'] = 0
+        tf["transparency"] = 0
 
     if is_rev:
         rframes = rframes[::-1]
         rdur = rdur[::-1]
 
+    output_img = BytesIO()
     if rframes:
         rframes[0].save(
             output_img,

konabot/plugins/longtask_core.py

@@ -4,13 +4,11 @@ import asyncio
 from loguru import logger
 import nonebot
 
-# from nonebot.adapters import Bot, Event
 # from nonebot_plugin_alconna import UniMessage
 from konabot.common.longtask import (
     # DepLongTaskTarget,
     # LongTask,
     # create_longtask,
-    # get_long_task_target,
     # handle_long_task,
     init_longtask,
 )
@@ -45,6 +43,5 @@ async def _():
 #         handler="test_callback_001",
 #         data={},
 #         target=target,
-#         deadline=datetime.datetime.now() + datetime.timedelta(seconds=2),
+#         deadline=datetime.datetime.now() + datetime.timedelta(seconds=20),
 #     )
-# await target.send_message(UniMessage().text("Hello, world!"), at=True)

konabot/plugins/memepack/__init__.py

@@ -2,25 +2,52 @@ from io import BytesIO
 from typing import Iterable, cast
 
 from nonebot import on_message
-from nonebot_plugin_alconna import (Alconna, Args, Field, Image, MultiVar, Option, Text,
-                                    UniMessage, UniMsg, on_alconna)
+from nonebot_plugin_alconna import (
+    Alconna,
+    Args,
+    Field,
+    Image,
+    MultiVar,
+    Option,
+    Text,
+    UniMessage,
+    UniMsg,
+    on_alconna,
+)
 
 from konabot.common.nb.extract_image import PIL_Image, extract_image_from_message
-from konabot.plugins.memepack.drawing.display import draw_cao_display, draw_snaur_display
-from konabot.plugins.memepack.drawing.saying import (draw_cute_ten,
-                                                     draw_geimao, draw_mnk,
-                                                     draw_pt, draw_suan)
+from konabot.plugins.memepack.drawing.display import (
+    draw_cao_display,
+    draw_snaur_display,
+    draw_anan_display,
+)
+from konabot.plugins.memepack.drawing.saying import (
+    draw_cute_ten,
+    draw_geimao,
+    draw_mnk,
+    draw_pt,
+    draw_suan,
+)
 
 from nonebot.adapters import Bot, Event
 
 from returns.result import Success, Failure
 
-geimao = on_alconna(Alconna(
-    "给猫说",
-    Args["saying", MultiVar(str, '+'), Field(
-        missing_tips=lambda: "你没有写给猫说了什么"
-    )]
-), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=False, aliases={"给猫哈"})
+geimao = on_alconna(
+    Alconna(
+        "给猫说",
+        Args[
+            "saying",
+            MultiVar(str, "+"),
+            Field(missing_tips=lambda: "你没有写给猫说了什么"),
+        ],
+    ),
+    use_cmd_start=True,
+    use_cmd_sep=False,
+    skip_for_unmatch=False,
+    aliases={"给猫哈"},
+)
+
 
 @geimao.handle()
 async def _(saying: list[str]):
@@ -31,12 +58,21 @@ async def _(saying: list[str]):
     await geimao.send(await UniMessage().image(raw=img_bytes).export())
 
 
-pt = on_alconna(Alconna(
-    "pt说",
-    Args["saying", MultiVar(str, '+'), Field(
-        missing_tips=lambda: "你没有写小帕说了什么"
-    )]
-), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=False, aliases={"小帕说"})
+pt = on_alconna(
+    Alconna(
+        "pt说",
+        Args[
+            "saying",
+            MultiVar(str, "+"),
+            Field(missing_tips=lambda: "你没有写小帕说了什么"),
+        ],
+    ),
+    use_cmd_start=True,
+    use_cmd_sep=False,
+    skip_for_unmatch=False,
+    aliases={"小帕说"},
+)
+
 
 @pt.handle()
 async def _(saying: list[str]):
@@ -47,12 +83,21 @@ async def _(saying: list[str]):
     await pt.send(await UniMessage().image(raw=img_bytes).export())
 
 
-mnk = on_alconna(Alconna(
-    "re:小?黑白子?说",
-    Args["saying", MultiVar(str, '+'), Field(
-        missing_tips=lambda: "你没有写黑白子说了什么"
-    )]
-), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=False, aliases={"mnk说"})
+mnk = on_alconna(
+    Alconna(
+        "re:小?黑白子?说",
+        Args[
+            "saying",
+            MultiVar(str, "+"),
+            Field(missing_tips=lambda: "你没有写黑白子说了什么"),
+        ],
+    ),
+    use_cmd_start=True,
+    use_cmd_sep=False,
+    skip_for_unmatch=False,
+    aliases={"mnk说"},
+)
+
 
 @mnk.handle()
 async def _(saying: list[str]):
@@ -63,12 +108,21 @@ async def _(saying: list[str]):
     await mnk.send(await UniMessage().image(raw=img_bytes).export())
 
 
-suan = on_alconna(Alconna(
-    "小蒜说",
-    Args["saying", MultiVar(str, '+'), Field(
-        missing_tips=lambda: "你没有写小蒜说了什么"
-    )]
-), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=False, aliases=set())
+suan = on_alconna(
+    Alconna(
+        "小蒜说",
+        Args[
+            "saying",
+            MultiVar(str, "+"),
+            Field(missing_tips=lambda: "你没有写小蒜说了什么"),
+        ],
+    ),
+    use_cmd_start=True,
+    use_cmd_sep=False,
+    skip_for_unmatch=False,
+    aliases=set(),
+)
+
 
 @suan.handle()
 async def _(saying: list[str]):
@@ -79,12 +133,21 @@ async def _(saying: list[str]):
     await suan.send(await UniMessage().image(raw=img_bytes).export())
 
 
-dsuan = on_alconna(Alconna(
-    "大蒜说",
-    Args["saying", MultiVar(str, '+'), Field(
-        missing_tips=lambda: "你没有写大蒜说了什么"
-    )]
-), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=False, aliases=set())
+dsuan = on_alconna(
+    Alconna(
+        "大蒜说",
+        Args[
+            "saying",
+            MultiVar(str, "+"),
+            Field(missing_tips=lambda: "你没有写大蒜说了什么"),
+        ],
+    ),
+    use_cmd_start=True,
+    use_cmd_sep=False,
+    skip_for_unmatch=False,
+    aliases=set(),
+)
+
 
 @dsuan.handle()
 async def _(saying: list[str]):
@@ -95,12 +158,21 @@ async def _(saying: list[str]):
     await dsuan.send(await UniMessage().image(raw=img_bytes).export())
 
 
-cutecat = on_alconna(Alconna(
-    "乖猫说",
-    Args["saying", MultiVar(str, '+'), Field(
-        missing_tips=lambda: "你没有写十猫说了什么"
-    )]
-), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=False, aliases={"十猫说"})
+cutecat = on_alconna(
+    Alconna(
+        "乖猫说",
+        Args[
+            "saying",
+            MultiVar(str, "+"),
+            Field(missing_tips=lambda: "你没有写十猫说了什么"),
+        ],
+    ),
+    use_cmd_start=True,
+    use_cmd_sep=False,
+    skip_for_unmatch=False,
+    aliases={"十猫说"},
+)
+
 
 @cutecat.handle()
 async def _(saying: list[str]):
@@ -113,13 +185,14 @@ async def _(saying: list[str]):
 
 cao_display_cmd = on_message()
 
+
 @cao_display_cmd.handle()
 async def _(msg: UniMsg, evt: Event, bot: Bot):
     flag = False
     for text in cast(Iterable[Text], msg.get(Text)):
         if text.text.strip() == "小槽展示":
             flag = True
-        elif text.text.strip() == '':
+        elif text.text.strip() == "":
             continue
         else:
             return
@@ -134,29 +207,71 @@ async def _(msg: UniMsg, evt: Event, bot: Bot):
         case Failure(err):
             await cao_display_cmd.send(
                 await UniMessage()
-                    .at(user_id=evt.get_user_id())
-                    .text(' ')
-                    .text(err)
-                    .export()
+                .at(user_id=evt.get_user_id())
+                .text(" ")
+                .text(err)
+                .export()
             )
 
 
-snaur_display_cmd = on_alconna(Alconna(
-    "卵总展示",
-    Option("--whiteness",   Args["whiteness", float],   alias=["-w"]),
-    Option("--black-level", Args["black_level", float], alias=["-b"]),
-    Option("--opacity",     Args["opacity", float],     alias=["-o"]),
-    Option("--saturation",  Args["saturation", float],  alias=["-s"]),
-    Args["image", Image | None],
-))
+snaur_display_cmd = on_alconna(
+    Alconna(
+        "卵总展示",
+        Option("--whiteness", Args["whiteness", float], alias=["-w"]),
+        Option("--black-level", Args["black_level", float], alias=["-b"]),
+        Option("--opacity", Args["opacity", float], alias=["-o"]),
+        Option("--saturation", Args["saturation", float], alias=["-s"]),
+        Args["image", Image | None],
+    )
+)
+
 
 @snaur_display_cmd.handle()
-async def _(img: PIL_Image, whiteness: float = 0.0, black_level: float = 0.2,
-            opacity: float = 0.8, saturation: float = 0.85):
+async def _(
+    img: PIL_Image,
+    whiteness: float = 0.0,
+    black_level: float = 0.2,
+    opacity: float = 0.8,
+    saturation: float = 0.85,
+):
     img_processed = await draw_snaur_display(
-        img, whiteness, black_level, opacity, saturation, 
+        img,
+        whiteness,
+        black_level,
+        opacity,
+        saturation,
     )
     img_data = BytesIO()
     img_processed.save(img_data, "PNG")
     await snaur_display_cmd.send(await UniMessage().image(raw=img_data).export())
 
+anan_display_cmd = on_message()
+@anan_display_cmd.handle()
+async def _(msg: UniMsg, evt: Event, bot: Bot):
+    flag = False
+    for text in cast(Iterable[Text], msg.get(Text)):
+        stripped = text.text.strip()
+        if stripped == "安安展示":
+            flag = True
+        elif stripped == "":
+            continue
+        else:
+            return
+    if not flag:
+        return
+
+    match await extract_image_from_message(evt.get_message(), evt, bot):
+        case Success(img):
+            img_handled = await draw_anan_display(img)
+            img_bytes = BytesIO()
+            img_handled.save(img_bytes, format="PNG")
+            await anan_display_cmd.send(await UniMessage().image(raw=img_bytes).export())
+        case Failure(err):
+            await anan_display_cmd.send(
+                await UniMessage()
+                .at(user_id=evt.get_user_id())
+                .text(" ")
+                .text(err)
+                .export()
+            )
+

konabot/plugins/memepack/drawing/display.py

@@ -27,6 +27,15 @@ SNAUR_QUAD_POINTS = np.float32(cast(Any, [
     [106, 1280],
 ]))
 
+anan_image_base = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "anan_base.png")
+anan_image_top  = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "anan_top.png")
+ANAN_QUAD_POINTS = np.float32([
+    [157, 585],
+    [793, 599],
+    [781, 908],
+    [160, 908]
+])
+
 def _draw_cao_display(image: PIL.Image.Image):
     src = np.array(image.convert("RGB"))
     h, w = src.shape[:2]
@@ -139,3 +148,52 @@ async def draw_snaur_display(
         opacity, saturation,
     )
 
+
+def _draw_anan_display(image: PIL.Image.Image) -> PIL.Image.Image:
+    src = np.array(image.convert("RGBA"))
+    h, w = src.shape[:2]
+
+    src_points = np.float32([
+        [0, 0],
+        [w, 0],
+        [w, h],
+        [0, h]
+    ])
+    dst_points = ANAN_QUAD_POINTS
+
+    M = cv2.getPerspectiveTransform(src_points, dst_points)
+    output_w, output_h = anan_image_top.size
+
+    src_rgb = cv2.cvtColor(src, cv2.COLOR_RGBA2RGB) if src.shape[2] == 4 else src
+    warped_rgb = cv2.warpPerspective(
+        src_rgb,
+        M,
+        (output_w, output_h),
+        flags=cv2.INTER_LINEAR,
+        borderMode=cv2.BORDER_CONSTANT,
+        borderValue=(0, 0, 0)
+    )
+
+    mask = np.zeros((h, w), dtype=np.uint8)
+    mask[:, :] = 255
+    warped_mask = cv2.warpPerspective(
+        mask,
+        M,
+        (output_w, output_h),
+        flags=cv2.INTER_LINEAR,
+        borderMode=cv2.BORDER_CONSTANT,
+        borderValue=0
+    )
+
+    warped_rgba = cv2.cvtColor(warped_rgb, cv2.COLOR_RGB2RGBA)
+    warped_rgba[:, :, 3] = warped_mask
+
+    warped_pil = PIL.Image.fromarray(warped_rgba, 'RGBA')
+
+    result = PIL.Image.alpha_composite(anan_image_base, warped_pil)
+    result = PIL.Image.alpha_composite(result, anan_image_top)
+    return result
+
+
+async def draw_anan_display(image: PIL.Image.Image) -> PIL.Image.Image:
+    return await asyncio.to_thread(_draw_anan_display, image)

konabot/plugins/simple_notify/__init__.py

@@ -15,10 +15,10 @@ from nonebot.adapters.console.event import MessageEvent as ConsoleMessageEvent
 from nonebot.adapters.discord import Bot as DiscordBot
 from nonebot.adapters.discord.event import MessageEvent as DiscordMessageEvent
 from nonebot.adapters.onebot.v11 import Bot as OnebotV11Bot
-from nonebot.adapters.onebot.v11.event import \
-    GroupMessageEvent as OnebotV11GroupMessageEvent
-from nonebot.adapters.onebot.v11.event import \
-    MessageEvent as OnebotV11MessageEvent
+from nonebot.adapters.onebot.v11.event import (
+    GroupMessageEvent as OnebotV11GroupMessageEvent,
+)
+from nonebot.adapters.onebot.v11.event import MessageEvent as OnebotV11MessageEvent
 from nonebot_plugin_alconna import UniMessage, UniMsg
 from pydantic import BaseModel
 
@@ -68,14 +68,14 @@ def save_notify_config(config: NotifyConfigFile):
 
 
 async def notify_now(notify: Notify):
-    if notify.platform == 'console':
+    if notify.platform == "console":
         bot = [b for b in nonebot.get_bots().values() if isinstance(b, ConsoleBot)]
         if len(bot) != 1:
             logger.warning(f"提醒未成功发送出去：{nonebot.get_bots()} {notify}")
             return False
         bot = bot[0]
         await bot.send_private_message(notify.target, f"代办通知：{notify.notify_msg}")
-    elif notify.platform == 'discord':
+    elif notify.platform == "discord":
         bot = [b for b in nonebot.get_bots().values() if isinstance(b, DiscordBot)]
         if len(bot) != 1:
             logger.warning(f"提醒未成功发送出去：{nonebot.get_bots()} {notify}")
@@ -83,7 +83,7 @@ async def notify_now(notify: Notify):
         bot = bot[0]
         channel = await bot.create_DM(recipient_id=int(notify.target))
         await bot.send_to(channel.id, f"代办通知：{notify.notify_msg}")
-    elif notify.platform == 'qq':
+    elif notify.platform == "qq":
         bot = [b for b in nonebot.get_bots().values() if isinstance(b, OnebotV11Bot)]
         if len(bot) != 1:
             logger.warning(f"提醒未成功发送出去：{nonebot.get_bots()} {notify}")
@@ -92,17 +92,22 @@ async def notify_now(notify: Notify):
         if notify.target_env is None:
             await bot.send_private_msg(
                 user_id=int(notify.target),
-                message=cast(Any, await UniMessage.text(f"代办通知：{notify.notify_msg}").export(
-                    bot=bot,
-                )),
+                message=cast(
+                    Any,
+                    await UniMessage.text(f"代办通知：{notify.notify_msg}").export(
+                        bot=bot,
+                    ),
+                ),
             )
         else:
             await bot.send_group_msg(
                 group_id=int(notify.target_env),
-                message=cast(Any,
-                    await UniMessage().at(
-                        notify.target
-                    ).text(f" 代办通知：{notify.notify_msg}").export(bot=bot)
+                message=cast(
+                    Any,
+                    await UniMessage()
+                    .at(notify.target)
+                    .text(f" 代办通知：{notify.notify_msg}")
+                    .export(bot=bot),
                 ),
             )
     else:
@@ -127,15 +132,17 @@ def create_notify_task(notify: Notify, fail2remove: bool = True):
             )
         res = await notify_now(notify)
         if fail2remove or res:
-            await DATA_FILE_LOCK.acquire()
-            cfg = load_notify_config()
-            cfg.notifies = [n for n in cfg.notifies if n.get_str() != notify.get_str()]
-            if not res:
-                cfg.unsent.append(notify)
-            save_notify_config(cfg)
-            DATA_FILE_LOCK.release()
+            async with DATA_FILE_LOCK:
+                cfg = load_notify_config()
+                cfg.notifies = [
+                    n for n in cfg.notifies if n.get_str() != notify.get_str()
+                ]
+                if not res:
+                    cfg.unsent.append(notify)
+                save_notify_config(cfg)
         else:
             pass
+
     return asynkio.create_task(mission())
 
 
@@ -155,7 +162,8 @@ async def _(msg: UniMsg, mEvt: Event):
     notify_time, notify_text = segments
     # target_time = get_target_time(notify_time)
     try:
-        target_time = ptimeparse.parse(notify_time)
+        # target_time = ptimeparse.parse(notify_time)
+        target_time = ptimeparse.Parser().parse(notify_time)
         logger.info(f"从 {notify_time} 解析出了时间：{target_time}")
     except Exception:
         logger.info(f"无法从 {notify_time} 中解析出时间")
@@ -201,8 +209,12 @@ async def _(msg: UniMsg, mEvt: Event):
     save_notify_config(cfg)
     DATA_FILE_LOCK.release()
 
-    await evt.send(await UniMessage().at(mEvt.get_user_id()).text(
-        f" 了解啦！将会在 {notify.notify_time} 提醒你哦~").export())
+    await evt.send(
+        await UniMessage()
+        .at(mEvt.get_user_id())
+        .text(f" 了解啦！将会在 {notify.notify_time} 提醒你哦~")
+        .export()
+    )
     logger.info(f"创建了一条于 {notify.notify_time} 的代办提醒")
 
 
@@ -253,8 +265,8 @@ async def _():
         logger.info("所有的代办提醒 Task 都已经退出了")
 
     for sig in (signal.SIGINT, signal.SIGTERM):
-        loop.add_signal_handler(sig, functools.partial(
-            asynkio.create_task, shutdown(sig)
-        ))
+        loop.add_signal_handler(
+            sig, functools.partial(asynkio.create_task, shutdown(sig))
+        )
 
     await asynkio.gather(*ASYNK_TASKS)

poetry.lock

@@ -2402,14 +2402,14 @@ reference = "mirrors"
 
 [[package]]
 name = "ptimeparse"
-version = "0.1.2"
+version = "0.2.1"
 description = "一个用于解析中文的时间表达的库"
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "ptimeparse-0.1.2-py3-none-any.whl", hash = "sha256:0eea791396e53b63330fadb40d9f0a2e6272bd5467246f10d1d6971bc606edff"},
-    {file = "ptimeparse-0.1.2.tar.gz", hash = "sha256:658be90a3cc2994c09c4ea2f276d257e7eb84bc330be79950baefe32b19779a2"},
+    {file = "ptimeparse-0.2.1-py3-none-any.whl", hash = "sha256:cf1115784d5d983da2d5b7af327108bf04c218c795d63291e71f76d7c6ffd2d4"},
+    {file = "ptimeparse-0.2.1.tar.gz", hash = "sha256:9b640e0a315d19b1e3821a290d236a051d8320348970ce3a835ed675bd2d832f"},
 ]
 
 [package.source]
@@ -3807,4 +3807,4 @@ reference = "mirrors"
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.12,<4.0"
-content-hash = "d6a325b769fb3ed207c1a8891e65ea20bae20166fa281d6fa620faf54ad15bd8"
+content-hash = "78a299c64ba07999fae807300b10a1c622d45b8b387aded5a34d17cf5550e777"

pyproject.toml

@@ -2,30 +2,28 @@
 name = "konabot"
 version = "0.1.0"
 description = "在 MTTU 内部使用的 bot"
-authors = [
-    {name = "passthem",email = "Passthem183@gmail.com"}
-]
+authors = [{ name = "passthem", email = "Passthem183@gmail.com" }]
 readme = "README.md"
 requires-python = ">=3.12,<4.0"
 dependencies = [
-    "nonebot2[all] (>=2.4.3,<3.0.0)",
-    "nonebot-adapter-onebot (>=2.4.6,<3.0.0)",
-    "nonebot-adapter-console (>=0.9.0,<0.10.0)",
-    "nonebot-adapter-discord (>=0.1.8,<0.2.0)",
-    "nonebot-adapter-minecraft (>=1.5.2,<2.0.0)",
-    "nonebot-plugin-alconna (>=0.59.4,<0.60.0)",
-    "nonebot-plugin-apscheduler (>=0.5.0,<0.6.0)",
-    "requests (>=2.32.5,<3.0.0)",
-    "beautifulsoup4 (>=4.13.5,<5.0.0)",
-    "lxml (>=6.0.2,<7.0.0)",
-    "pillow (>=11.3.0,<12.0.0)",
-    "imagetext-py (>=2.2.0,<3.0.0)",
-    "opencv-python-headless (>=4.12.0.88,<5.0.0.0)",
-    "returns (>=0.26.0,<0.27.0)",
-    "ptimeparse (>=0.1.1,<0.2.0)",
-    "skia-python (>=138.0,<139.0)",
-    "nonebot-plugin-analysis-bilibili (>=2.8.1,<3.0.0)",
-    "qrcode (>=8.2,<9.0)",
+  "nonebot2[all] (>=2.4.3,<3.0.0)",
+  "nonebot-adapter-onebot (>=2.4.6,<3.0.0)",
+  "nonebot-adapter-console (>=0.9.0,<0.10.0)",
+  "nonebot-adapter-discord (>=0.1.8,<0.2.0)",
+  "nonebot-adapter-minecraft (>=1.5.2,<2.0.0)",
+  "nonebot-plugin-alconna (>=0.59.4,<0.60.0)",
+  "nonebot-plugin-apscheduler (>=0.5.0,<0.6.0)",
+  "requests (>=2.32.5,<3.0.0)",
+  "beautifulsoup4 (>=4.13.5,<5.0.0)",
+  "lxml (>=6.0.2,<7.0.0)",
+  "pillow (>=11.3.0,<12.0.0)",
+  "imagetext-py (>=2.2.0,<3.0.0)",
+  "opencv-python-headless (>=4.12.0.88,<5.0.0.0)",
+  "returns (>=0.26.0,<0.27.0)",
+  "skia-python (>=138.0,<139.0)",
+  "nonebot-plugin-analysis-bilibili (>=2.8.1,<3.0.0)",
+  "qrcode (>=8.2,<9.0)",
+  "ptimeparse (>=0.2.1,<0.3.0)",
 ]
 
 [build-system]
@@ -43,4 +41,3 @@ url = "https://pypi.tuna.tsinghua.edu.cn/simple/"
 priority = "primary"
 
 [tool.poetry.dependencies]
-ptimeparse = {source = "pt-gitea-pypi"}