优化卵总展示光影

Reviewed-on: #26

.drone.yml

@@ -10,6 +10,10 @@ trigger:
     - master
 
 steps:
+  - name: submodules
+    image: alpine/git
+    commands:
+    - git submodule update --init --recursive
   - name: 构建 Docker 镜像
     image: plugins/docker:latest
     privileged: true
@@ -50,6 +54,10 @@ trigger:
     - tag
 
 steps:
+  - name: submodules
+    image: alpine/git
+    commands:
+    - git submodule update --init --recursive
   - name: 构建并推送 Release Docker 镜像
     image: plugins/docker:latest
     privileged: true

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "assets/lexicon/THUOCL"]
+	path = assets/lexicon/THUOCL
+	url = https://github.com/thunlp/THUOCL.git

assets/json/poll.json

@@ -0,0 +1 @@
+{"poll": {"0": {"create": 1760357553, "expiry": 1760443953, "options": {"0": "此方bot", "1": "testpilot", "2": "小镜bot", "3": "可怜bot"}, "polldata": {}, "qq": "2975499623", "title": "我~是~谁~？"}}}

bot.py

@@ -7,6 +7,10 @@ from nonebot.adapters.discord import Adapter as DiscordAdapter
 from nonebot.adapters.minecraft import Adapter as MinecraftAdapter
 from nonebot.adapters.onebot.v11 import Adapter as OnebotAdapter
 
+from konabot.common.log import init_logger
+from konabot.common.nb.exc import BotExceptionMessage
+from konabot.common.path import LOG_PATH
+
 dotenv.load_dotenv()
 env = os.environ.get("ENVIRONMENT", "prod")
 env_enable_console = os.environ.get("ENABLE_CONSOLE", "none")
@@ -14,7 +18,12 @@ env_enable_qq = os.environ.get("ENABLE_QQ", "none")
 env_enable_discord = os.environ.get("ENABLE_DISCORD", "none")
 env_enable_minecraft = os.environ.get("ENABLE_MINECRAFT", "none")
 
+
 def main():
+    init_logger(LOG_PATH, [
+        BotExceptionMessage,
+    ])
+
     nonebot.init()
 
     driver = nonebot.get_driver()
@@ -33,6 +42,7 @@ def main():
 
     # nonebot.load_builtin_plugin("echo")
     nonebot.load_plugins("konabot/plugins")
+    nonebot.load_plugin("nonebot_plugin_analysis_bilibili")
 
     nonebot.run()
 

konabot/common/log.py

@@ -0,0 +1,79 @@
+import sys
+from pathlib import Path
+from typing import TYPE_CHECKING, List, Type
+
+from loguru import logger
+
+if TYPE_CHECKING:
+    from loguru import Record
+
+
+def file_exception_filter(
+    record: "Record", 
+    ignored_exceptions: tuple[Type[Exception], ...]
+) -> bool:
+    """
+    一个自定义的 Loguru 过滤器函数。
+    如果日志记录包含异常信息，并且该异常的类型在 ignored_exceptions 中，则返回 False（忽略）。
+    否则，返回 True（允许记录）。
+    """
+    exception_info = record.get("exception")
+    
+    if exception_info:
+        exception_type = exception_info[0]
+
+        if exception_type and issubclass(exception_type, ignored_exceptions):
+            return False
+
+    return True
+
+
+def init_logger(
+    log_dir: Path, 
+    ignored_exceptions: List[Type[Exception]]
+) -> None:
+    """
+    配置全局 Loguru Logger。
+
+    Args:
+        log_dir (Path): 存放日志文件的文件夹路径，会自动创建。
+        ignored_exceptions (List[Type[Exception]]): 在 WARNING 级别文件日志中需要忽略的异常类型列表。
+    """
+
+    ignored_exceptions_tuple = tuple(ignored_exceptions)
+    logger.remove()
+
+    log_dir.mkdir(parents=True, exist_ok=True)
+
+    logger.add(
+        sys.stderr,
+        level="INFO",
+        colorize=True,
+        format="<green>{time:HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>",
+    )
+
+    info_log_path = log_dir / "log.log"
+    logger.add(
+        str(info_log_path),
+        level="INFO",
+        rotation="10 MB",
+        retention="7 days",
+        enqueue=True,
+        backtrace=False,
+        diagnose=False,
+    )
+
+    warning_error_log_path = log_dir / "error.log"
+    logger.add(
+        str(warning_error_log_path),
+        level="WARNING",
+        rotation="10 MB",
+        compression="zip",
+        enqueue=True,
+        filter=lambda record: file_exception_filter(record, ignored_exceptions_tuple),
+        backtrace=True,
+        diagnose=True,
+    )
+
+    logger.info("Loguru Logger 初始化完成！")
+    logger.info(f"控制台日志级别: INFO")

konabot/common/path.py

@@ -4,9 +4,18 @@ ASSETS_PATH = Path(__file__).resolve().parent.parent.parent / "assets"
 FONTS_PATH = ASSETS_PATH / "fonts"
 
 SRC_PATH = Path(__file__).resolve().parent.parent
+DATA_PATH = SRC_PATH.parent / "data"
+LOG_PATH = DATA_PATH / "logs"
 
 DOCS_PATH = SRC_PATH / "docs"
 DOCS_PATH_MAN1 = DOCS_PATH / "user"
 DOCS_PATH_MAN3 = DOCS_PATH / "lib"
 DOCS_PATH_MAN7 = DOCS_PATH / "concepts"
 DOCS_PATH_MAN8 = DOCS_PATH / "sys"
+
+if not DATA_PATH.exists():
+    DATA_PATH.mkdir()
+
+if not LOG_PATH.exists():
+    LOG_PATH.mkdir()
+

konabot/docs/user/giftool.txt

@@ -5,17 +5,17 @@
     giftool [图片] [选项]
 
 示例
-    回复一张 GIF 并发送：  
-        `giftool --ss 1.5 -t 2.0`  
+    回复一张 GIF 并发送：
+        `giftool --ss 1.5 -t 2.0`
         从 1.5 秒处开始，截取 2 秒长度的片段。
 
-    `giftool [图片] --ss 0:10 -to 0:15`  
+    `giftool [图片] --ss 0:10 -to 0:15`
         截取从 10 秒到 15 秒之间的片段（支持 MM:SS 或 HH:MM:SS 格式）。
 
-    `giftool [图片] --frames:v 10`  
+    `giftool [图片] --frames:v 10`
         将整张 GIF 均匀抽帧，最终保留 10 帧。
 
-    `giftool [图片] --ss 2 --frames:v 5`  
+    `giftool [图片] --ss 2 --frames:v 5`
         从第 2 秒开始截取，并将结果抽帧为 5 帧。
 
 参数说明
@@ -45,8 +45,8 @@
         - 帧数必须为正整数（> 0）。
         - 若原始帧数 ≤ 指定帧数，则保留全部帧。
 
-    --s <速度>（可选）
-        - 调整 gif 图的速度
+    --speed <速度>（可选）
+        - 调整 gif 图的速度。若为负数，则代表倒放
 
 使用方式
     1. 发送指令前，请确保：

konabot/docs/user/发起投票.txt

@@ -0,0 +1,11 @@
+指令介绍
+    发起投票 - 发起一个投票
+
+格式
+    发起投票 <投票标题> <选项1> <选项2> ...
+
+示例
+    `发起投票 这是一个投票 A B C` 发起标题为“这是一个投票”，选项为“A”、“B”、“C”的投票
+
+说明
+    投票各个选项之间用空格分隔，选项数量为2-15项。投票的默认有效期为24小时。

konabot/docs/user/投票.txt

@@ -0,0 +1,12 @@
+指令介绍
+    投票 - 参与已发起的投票
+
+格式
+    投票 <投票ID/标题> <选项文本>
+
+示例
+    `投票 1 A` 在ID为1的投票中，投给“A”
+    `投票 这是一个投票 B` 在标题为“这是一个投票”的投票中，投给“B”
+
+说明
+    目前不支持单人多投，每个人只能投一项。

konabot/docs/user/查看投票.txt

@@ -0,0 +1,12 @@
+指令介绍
+    查看投票 - 查看已发起的投票
+
+格式
+    查看投票 <投票ID或标题>
+
+示例
+    `查看投票 1` 查看ID为1的投票
+    `查看投票 这是一个投票` 查看标题为“这是一个投票”的投票
+
+说明
+    投票在进行时，使用此命令可以看到投票的各个选项；投票结束后，则可以看到各项的票数。

konabot/docs/user/生成二维码.txt

@@ -0,0 +1,8 @@
+指令介绍
+    生成二维码 - 将文本内容转换为二维码
+
+格式
+    生成二维码 <文本内容>
+
+示例
+    `生成二维码 嗨嗨嗨` 生成扫描结果为“嗨嗨嗨”的二维码图片

konabot/plugins/bilibili_fetch/__init__.py

@@ -0,0 +1,39 @@
+import re
+
+from nonebot import on_message
+from nonebot_plugin_alconna import Reference, Reply, UniMsg
+
+from nonebot.adapters import Event
+
+
+matcher_fix = on_message()
+
+pattern = (
+    r"^(?:(?:av|cv)\d+|BV[a-zA-Z0-9]{10})|"
+    r"(?:b23\.tv|bili(?:22|23|33|2233)\.cn|\.bilibili\.com|QQ小程序(?:]|]|\])哔哩哔哩).{0,500}"
+)
+
+
+@matcher_fix.handle()
+async def _(msg: UniMsg, event: Event):
+    to_search = msg.exclude(Reply, Reference).dump(json=True)
+    to_search2 = msg.exclude(Reply, Reference).extract_plain_text()
+    if not re.search(pattern, to_search) and not re.search(pattern, to_search2):
+        return
+
+    from nonebot_plugin_analysis_bilibili import handle_analysis
+
+    await handle_analysis(event)
+
+    # b_url: str
+    # b_page: str | None
+    # b_time: str | None
+    #
+    # from nonebot_plugin_analysis_bilibili.analysis_bilibili import extract as bilibili_extract
+    #
+    # b_url, b_page, b_time = bilibili_extract(to_search)
+    # if b_url is None:
+    #     return
+    #
+    # await matcher_fix.send(await UniMessage().text(b_url).export())
+

konabot/plugins/gen_qrcode/__init__.py

@@ -0,0 +1,69 @@
+import qrcode
+# from pyzbar.pyzbar import decode
+# from PIL import Image
+import requests
+from io import BytesIO
+
+from nonebot_plugin_alconna import (Alconna, Args, Field, MultiVar, UniMessage,
+                                    on_alconna)
+from nonebot_plugin_alconna.uniseg import UniMsg, At, Reply
+
+async def download_img(url):
+    resp = requests.get(url.replace("https://multimedia.nt.qq","http://multimedia.nt.qq")) # bim获取QQ的图片时避免SSLv3报错
+    img_bytes = BytesIO()
+    with open(img_bytes,"wb") as f:
+        f.write(resp.content)
+    return img_bytes
+
+def genqr(data):
+    qr = qrcode.QRCode(version=1,error_correction=qrcode.constants.ERROR_CORRECT_L,box_size=8,border=4)
+    qr.add_data(data)
+    qr.make(fit=True)
+    img = qr.make_image(fill_color="black", back_color="white")
+    img_bytes = BytesIO()
+    img.save(img_bytes, format="PNG")
+    return img_bytes
+
+"""
+async def recqr(url):
+    im_path = "assets/img/qrcode/2.jpg"
+    data = await download_img(url)
+    img = Image.open(im_path)
+    decoded_objects = decode(img)
+    data = ""
+    for obj in decoded_objects:
+        data += obj.data.decode('utf-8')
+    return data
+"""
+
+gqrc = on_alconna(Alconna(
+    "genqr",
+    Args["saying", MultiVar(str, '+'), Field(
+        missing_tips=lambda: "请输入你要转换为二维码的文字！"
+    )],
+    # UniMessage[]
+), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=False, aliases={"生成二维码","genqrcode"})
+
+@gqrc.handle()
+async def _(saying: list):
+    """
+    img = await draw_pt("\n".join(saying))
+    img_bytes = BytesIO()
+    img.save(img_bytes, format="PNG")
+
+    await pt.send(await UniMessage().image(raw=img_bytes).export())
+    
+    # print(saying)
+    # 二维码识别
+    if type(saying[0]) == 'image':
+        data = await recqr(saying[0].data['url'])
+        if data == "":
+            await gqrc.send("二维码图片解析失败！")
+        else:
+            await gqrc.send(recqr(saying[0].data['url']))
+    
+    # 二维码生成
+    else:
+    """
+        # genqr("\n".join(saying))
+    await gqrc.send(await UniMessage().image(raw=genqr("\n".join(saying))).export())

konabot/plugins/idiomgame/__init__.py

@@ -0,0 +1,229 @@
+import base64
+import secrets
+import json
+from typing import Literal
+
+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)
+
+from konabot.common.path import ASSETS_PATH
+
+ALL_WORDS = [] # 所有四字词语
+ALL_IDIOMS = [] # 所有成语
+IDIOM_FIRST_CHAR = {} # 成语首字字典
+
+INITED = False
+
+def init_lexicon():
+    global ALL_WORDS, ALL_IDIOMS, IDIOM_FIRST_CHAR
+    # 成语大表
+    with open(ASSETS_PATH / "lexicon" / "idiom.json", "r", encoding="utf-8") as f:
+        ALL_IDIOMS_INFOS = json.load(f)
+
+    # 词语大表
+    with open(ASSETS_PATH / "lexicon" / "ci.json", "r", encoding="utf-8") as f:
+        ALL_WORDS = json.load(f)
+    
+    COMMON_WORDS = []
+    # 读取 COMMON 词语大表
+    with open(ASSETS_PATH / "lexicon" / "common.txt", "r", encoding="utf-8") as f:
+        for line in f:
+            word = line.strip()
+            if len(word) == 4:
+                COMMON_WORDS.append(word)
+
+    # 读取 THUOCL 成语库
+    with open(ASSETS_PATH / "lexicon" / "THUOCL" / "data" / "THUOCL_chengyu.txt", "r", encoding="utf-8") as f:
+        THUOCL_IDIOMS = [line.split(" ")[0].strip() for line in f]
+
+    # 读取 THUOCL 剩下的所有 txt 文件，只保留四字词
+    THUOCL_WORDS = []
+    import os
+    for filename in os.listdir(ASSETS_PATH / "lexicon" / "THUOCL" / "data"):
+        if filename.endswith(".txt") and filename != "THUOCL_chengyu.txt":
+            with open(ASSETS_PATH / "lexicon" / "THUOCL" / "data" / filename, "r", encoding="utf-8") as f:
+                for line in f:
+                    word = line.lstrip().split(" ")[0].strip()
+                    if len(word) == 4:
+                        THUOCL_WORDS.append(word)
+
+
+    # 只有成语的大表
+    ALL_IDIOMS = [idiom["word"] for idiom in ALL_IDIOMS_INFOS] + THUOCL_IDIOMS
+    ALL_IDIOMS = list(set(ALL_IDIOMS)) # 去重
+
+    # 其他四字词语表，仅表示可以有这个词
+    ALL_WORDS = [word for word in ALL_WORDS if len(word) == 4] + THUOCL_WORDS + COMMON_WORDS
+    ALL_WORDS = list(set(ALL_WORDS)) # 去重
+
+    # 根据成语大表，划分出成语首字字典
+    IDIOM_FIRST_CHAR = {}
+    for idiom in ALL_IDIOMS + ALL_WORDS:
+        if idiom[0] not in IDIOM_FIRST_CHAR:
+            IDIOM_FIRST_CHAR[idiom[0]] = []
+        IDIOM_FIRST_CHAR[idiom[0]].append(idiom)
+
+NOW_PLAYING = False
+
+SCORE_BOARD = {}
+
+LAST_CHAR = ""
+
+USER_NAME_CACHE = {} # 缓存用户名称，避免多次获取
+
+REMAIN_PLAYING_TIMES = 1
+LAST_PLAY_DATE = ""
+
+LOCK = False
+
+ALL_BUFF_SCORE = 0 # 全体分数
+
+import datetime
+
+def be_able_to_play():
+    global REMAIN_PLAYING_TIMES, LAST_PLAY_DATE
+    if(LAST_PLAY_DATE != datetime.date.today()):
+        LAST_PLAY_DATE = datetime.date.today()
+        REMAIN_PLAYING_TIMES = 1
+    if(REMAIN_PLAYING_TIMES > 0):
+        REMAIN_PLAYING_TIMES -= 1
+        return True
+    return False
+
+evt = on_alconna(Alconna(
+    "我要玩成语接龙"
+), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=True)
+
+@evt.handle()
+async def play_game(event: BaseEvent, force = False):
+    global NOW_PLAYING, LAST_CHAR, INITED
+    if NOW_PLAYING:
+        await evt.send(await UniMessage().text("当前已有成语接龙游戏在进行中，请稍后再试！").export())
+        return
+    if not be_able_to_play() and not force:
+        await evt.send(await UniMessage().text("玩玩玩，就知道玩，快去睡觉！").export())
+        return
+    if not INITED:
+        init_lexicon()
+        INITED = True
+    NOW_PLAYING = True
+    await evt.send(await UniMessage().text("你小子，还真有意思！\n好，成语接龙游戏开始！我说一个成语，请大家接下去！").export())
+    # 选择一个随机成语
+    idiom = secrets.choice(ALL_IDIOMS)
+    LAST_CHAR = idiom[-1]
+    # 发布成语
+    await evt.send(await UniMessage().text(f"第一个成语：「{idiom}」，请接！").export())
+
+evt = on_alconna(Alconna(
+    "老子就是要玩成语接龙！！！"
+), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=True)
+
+@evt.handle()
+async def force_play_game(event: BaseEvent):
+    await play_game(event, force=True)
+    
+
+evt = on_alconna(Alconna(
+    "不玩了"
+), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=True)
+
+@evt.handle()
+async def _(event: BaseEvent):
+    global NOW_PLAYING, SCORE_BOARD, LAST_CHAR, ALL_BUFF_SCORE
+    if NOW_PLAYING:
+        NOW_PLAYING = False
+        # 发送好吧狗图片
+        # 打开好吧狗本地文件
+        with open(ASSETS_PATH / "img" / "dog" / "haoba_dog.jpg", "rb") as f:
+            img_data = f.read()
+        await evt.send(await UniMessage().image(raw=img_data).export())
+        result_text = UniMessage().text("游戏结束！\n最终得分榜：\n")
+        if len(SCORE_BOARD) == 0:
+            result_text += "无人得分！"
+        else:
+            # 按分数排序，名字用 at 的方式
+            sorted_score = sorted(SCORE_BOARD.items(), key=lambda x: x[1]["score"], reverse=True)
+            for i, (user_id, info) in enumerate(sorted_score):
+                result_text += f"{i+1}. " + UniMessage().at(user_id) + f": {info['score'] + ALL_BUFF_SCORE} 分\n"
+        await evt.send(await result_text.export())
+        # 重置分数板
+        SCORE_BOARD = {}
+        LAST_CHAR = ""
+    else:
+        await evt.send(await UniMessage().text("当前没有成语接龙游戏在进行中！").export())
+
+# 跳过
+evt = on_alconna(Alconna(
+    "跳过成语"
+), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=True)
+
+@evt.handle()
+async def _(event: BaseEvent):
+    global NOW_PLAYING, LAST_CHAR, ALL_BUFF_SCORE
+    if not NOW_PLAYING:
+        return
+    await evt.send(await UniMessage().text("你们太菜了！全部扣100分！").export())
+    ALL_BUFF_SCORE -= 100
+    # 选择下一个成语
+    idiom = secrets.choice(ALL_IDIOMS)
+    LAST_CHAR = idiom[-1]
+    await evt.send(await UniMessage().text(f"重新开始，下一个成语是「{idiom}」").export())
+
+# 直接读取消息
+evt = on_message()
+
+@evt.handle()
+async def _(event: BaseEvent, msg: UniMsg):
+    global NOW_PLAYING, LAST_CHAR, LOCK
+    if not NOW_PLAYING:
+        return
+    user_idiom = msg.extract_plain_text().strip()
+    if(user_idiom[0] != LAST_CHAR):
+        return
+    if LOCK:
+        return
+    LOCK = True
+    await handle_send_info(event, msg)
+    LOCK = False
+
+async def handle_send_info(event: BaseEvent, msg: UniMsg):
+    global NOW_PLAYING, LAST_CHAR, SCORE_BOARD, ALL_BUFF_SCORE
+    user_idiom = msg.extract_plain_text().strip()
+    if(user_idiom not in ALL_IDIOMS and user_idiom not in ALL_WORDS):
+        # 扣0.1分
+        if isinstance(event, DiscordMessageEvent):
+            user_id = str(event.author.id)
+            user_name = str(event.author.name)
+        else:
+            user_id = str(event.get_user_id())
+            user_name = str(event.get_user_id())
+        if user_id not in SCORE_BOARD:
+            SCORE_BOARD[user_id] = {
+                "name": user_name,
+                "score": 0
+            }
+        SCORE_BOARD[user_id]["score"] -= 0.1
+        await evt.send(await UniMessage().at(user_id).text("接不上！这个不一样！你被扣了 0.1 分！").export())
+        return
+    # 成功接上
+    if isinstance(event, DiscordMessageEvent):
+        user_id = str(event.author.id)
+        user_name = str(event.author.name)
+    else:
+        user_id = str(event.get_user_id())
+        user_name = str(event.get_user_id())
+
+    if user_id not in SCORE_BOARD:
+        SCORE_BOARD[user_id] = {
+            "name": user_name,
+            "score": 0
+        }
+    SCORE_BOARD[user_id]["score"] += 1
+    # at 指定玩家
+    await evt.send(await UniMessage().at(user_id).text(f"接对了！你有 {SCORE_BOARD[user_id]['score'] + ALL_BUFF_SCORE} 分！").export())
+    LAST_CHAR = user_idiom[-1]
+    await evt.send(await UniMessage().text(f"下一个成语请以「{LAST_CHAR}」开头！").export())

konabot/plugins/idiomgame/base/path.py

@@ -0,0 +1,3 @@
+from pathlib import Path
+
+ASSETS = Path(__file__).parent.parent / "assets"

konabot/plugins/image_process/__init__.py

@@ -71,8 +71,11 @@ async def _(
         raise BotExceptionMessage("错误：出点时间小于入点")
     if frame_count is not None and frame_count <= 0:
         raise BotExceptionMessage("错误：帧数量应该大于 0")
-    if speed_factor <= 0:
-        raise BotExceptionMessage("错误：--speed 必须大于 0")
+    if speed_factor == 0:
+        raise BotExceptionMessage("错误：速度不能为 0")
+
+    is_rev = speed_factor < 0
+    speed_factor = abs(speed_factor)
 
     if not getattr(image, "is_animated", False):
         raise BotExceptionMessage("错误：输入的不是动图（GIF）")
@@ -171,6 +174,24 @@ async def _(
         rframes.append(selected_frames[max(2, len(selected_frames) // 2)])
         rdur.append(20)
 
+    transparency_flag = False
+    for f in rframes:
+        if f.mode == "RGBA":
+            if any(pix < 255 for pix in f.getchannel("A").getdata()):
+                transparency_flag = True
+                break
+        elif f.mode == "P" and "transparency" in f.info:
+            transparency_flag = True
+            break
+
+    tf = {}
+    if transparency_flag:
+        tf['transparency'] = 0
+
+    if is_rev:
+        rframes = rframes[::-1]
+        rdur = rdur[::-1]
+
     if rframes:
         rframes[0].save(
             output_img,
@@ -181,7 +202,7 @@ async def _(
             loop=0,
             optimize=False,
             disposal=2,
-            transparency=0,
+            **tf,
         )
     else:
         raise BotExceptionMessage("错误：没有可输出的帧")

konabot/plugins/memepack/__init__.py

@@ -2,11 +2,11 @@ from io import BytesIO
 from typing import Iterable, cast
 
 from nonebot import on_message
-from nonebot_plugin_alconna import (Alconna, Args, Field, MultiVar, Text,
+from nonebot_plugin_alconna import (Alconna, Args, Field, Image, MultiVar, Text,
                                     UniMessage, UniMsg, on_alconna)
 
-from konabot.common.nb.extract_image import extract_image_from_message
-from konabot.plugins.memepack.drawing.display import draw_cao_display
+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)
@@ -139,3 +139,17 @@ async def _(msg: UniMsg, evt: Event, bot: Bot):
                     .text(err)
                     .export()
             )
+
+
+snaur_display_cmd = on_alconna(Alconna(
+    "卵总展示",
+    Args["image", Image | None],
+))
+
+@snaur_display_cmd.handle()
+async def _(img: PIL_Image):
+    img_processed = await draw_snaur_display(img)
+    img_data = BytesIO()
+    img_processed.save(img_data, "PNG")
+    await snaur_display_cmd.send(await UniMessage().image(raw=img_data).export())
+

konabot/plugins/memepack/drawing/display.py

@@ -4,10 +4,12 @@ from typing import Any, cast
 import cv2
 import numpy as np
 import PIL.Image
+import PIL.ImageChops
+import PIL.ImageEnhance
 
 from konabot.common.path import ASSETS_PATH
 
-cao_image = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "caoimg1.png")
+cao_image       = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "caoimg1.png")
 CAO_QUAD_POINTS = np.float32(cast(Any, [
     [392, 540],
     [577, 557],
@@ -15,6 +17,16 @@ CAO_QUAD_POINTS = np.float32(cast(Any, [
     [381, 687],
 ]))
 
+snaur_image_base  = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "snaur_1_base.png")
+snaur_image_top   = PIL.Image.open(ASSETS_PATH / "img" / "meme" / "snaur_1_top.png")
+SNAUR_RATIO       = (1 / 2) ** .5
+SNAUR_QUAD_POINTS = np.float32(cast(Any, [
+    [0,   466 ],
+    [673, 471 ],
+    [640, 1196],
+    [106, 1280],
+]))
+
 def _draw_cao_display(image: PIL.Image.Image):
     src = np.array(image.convert("RGB"))
     h, w = src.shape[:2]
@@ -43,3 +55,68 @@ def _draw_cao_display(image: PIL.Image.Image):
 
 async def draw_cao_display(image: PIL.Image.Image):
     return await asyncio.to_thread(_draw_cao_display, image)
+
+
+def _draw_snaur_display(image: PIL.Image.Image):
+    src = np.array(image.convert("RGB"))
+    _h, _w = src.shape[:2]
+
+    if _w / _h < SNAUR_RATIO:
+        _w_target = _w
+        _h_target = int(_w / SNAUR_RATIO)
+    else:
+        _w_target = int(_h * SNAUR_RATIO)
+        _h_target = _h
+
+    x_center = _w / 2
+    y_center = _h / 2
+
+    x1 = int(x_center - _w_target / 2)
+    x2 = int(x_center + _w_target / 2)
+    y1 = int(y_center - _h_target / 2)
+    y2 = int(y_center + _h_target / 2)
+
+    src = src[y1:y2, x1:x2, :]
+
+    h, w = src.shape[:2]
+    src_points = np.float32(cast(Any, [
+        [0, 0],
+        [w, 0],
+        [w, h],
+        [0, h],
+    ]))
+    dst_points = SNAUR_QUAD_POINTS
+    M = cv2.getPerspectiveTransform(cast(Any, src_points), cast(Any, dst_points))
+    output_size = snaur_image_top.size
+    output_w, output_h = output_size
+    warped = cv2.warpPerspective(
+        src,
+        M,
+        (output_w, output_h),
+        flags=cv2.INTER_LINEAR,
+        borderMode=cv2.BORDER_CONSTANT,
+        borderValue=(0, 0, 0)
+    )
+
+    result = PIL.Image.fromarray(warped, 'RGB').convert('RGBA')
+    result = PIL.ImageChops.multiply(result, snaur_image_base)
+
+    r, g, b, a = result.split()
+    a = a.point(lambda p: int(p * 0.8))
+    f2 = lambda p: int(p * 0.8 + 0.2)
+    r = r.point(f2)
+    g = g.point(f2)
+    b = b.point(f2)
+    result = PIL.Image.merge('RGBA', (r, g, b, a))
+    result = PIL.Image.alpha_composite(snaur_image_base, result)
+
+    enhancer = PIL.ImageEnhance.Color(result)
+    result = enhancer.enhance(0.85)
+
+    result = PIL.Image.alpha_composite(result, snaur_image_top)
+    return result
+
+
+async def draw_snaur_display(image: PIL.Image.Image) -> PIL.Image.Image:
+    return await asyncio.to_thread(_draw_snaur_display, image)
+

konabot/plugins/poll/__init__.py

@@ -0,0 +1,166 @@
+import json, time
+
+from nonebot_plugin_alconna import Alconna, Args, Field, MultiVar, on_alconna
+from nonebot.adapters.onebot.v11 import Event
+
+from konabot.common.path import ASSETS_PATH, DATA_PATH
+
+
+POLL_TEMPLATE_FILE = ASSETS_PATH / "json" / "poll.json"
+POLL_DATA_FILE = DATA_PATH / "poll.json"
+
+if not POLL_DATA_FILE.exists():
+    POLL_DATA_FILE.write_bytes(POLL_TEMPLATE_FILE.read_bytes())
+
+
+poll_list = json.loads(POLL_DATA_FILE.read_text())['poll']
+
+async def createpoll(title,qqid,options):
+    polllength = len(poll_list)
+    pollid = str(polllength)
+    poll_create = int(time.time())
+    poll_expiry = poll_create + 24*3600
+    polljson = {"title":title,"qq":qqid,"create":poll_create,"expiry":poll_expiry,"options":options,"polldata":{}}
+    poll_list[pollid] = polljson
+    writeback()
+    return pollid
+
+def getpolldata(pollid_or_title):
+    # 初始化“被指定的投票项目”
+    thepoll = {}
+    polnum = -1
+    # 判断是ID还是标题
+    if str.isdigit(pollid_or_title):
+        if pollid_or_title in poll_list:
+            thepoll = poll_list[pollid_or_title]
+            polnum = pollid_or_title
+        else:
+            return [{},-1]
+    else:
+        for i in poll_list:
+            if poll_list[i]["title"] == pollid_or_title:
+                thepoll = poll_list[i]
+                polnum = i
+                break
+        if polnum == -1:
+            return [{},-1]
+    return [thepoll,polnum]
+
+def writeback():
+    # file = open(poll_json_path,"w",encoding="utf-8")
+    # json.dump({'poll':poll_list},file,ensure_ascii=False,sort_keys=True)
+    POLL_DATA_FILE.write_text(json.dumps({
+        'poll': poll_list,
+    }, ensure_ascii=False, sort_keys=True))
+
+async def pollvote(polnum,optionnum,qqnum):
+    optiond = poll_list[polnum]["polldata"]
+    if optionnum not in optiond:
+        poll_list[polnum]["polldata"][optionnum] = []
+    poll_list[polnum]["polldata"][optionnum].append(qqnum)
+    writeback()
+    return
+
+poll = on_alconna(Alconna(
+    "poll",
+    Args["saying", MultiVar(str, '+'), Field(
+        missing_tips=lambda: "参数错误。用法：发起投票 <投票标题> <选项1> <选项2> ..."
+    )],
+), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=False, aliases={"发起投票","createpoll"})
+@poll.handle()
+async def _(saying: list, event: Event):
+    if (len(saying) < 3):
+        await poll.send("请提供至少两个投票选项！")
+    elif (len(saying) < 17):
+        title = saying[0]
+        saying.remove(title)
+        options = {}
+        for i in saying:
+            options[saying.index(i)] = i
+        qqid = event.get_user_id()
+        result = await createpoll(title,qqid,options)
+        await poll.send("已创建投票。回复 查看投票 "+str(result)+" 查看该投票。")
+    else:
+        await poll.send("投票选项太多了！请减少到15个选项以内。")
+
+viewpoll = on_alconna(Alconna(
+    "viewpoll",
+    Args["saying", MultiVar(str, '+'), Field(
+        missing_tips=lambda: "请指定投票ID或标题！。用法：查看投票 <投票ID或标题>"
+    )],
+), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=False, aliases={"查看投票"})
+@viewpoll.handle()
+async def _(saying: list):
+    # 参数，投票ID或者标题
+    # pollid_or_title = params[0]
+    polldata = getpolldata(saying[0])
+    # 被指定的投票项目
+    thepoll = polldata[0]
+    polnum = polldata[1]
+    if polnum == -1:
+        await viewpoll.send("该投票不存在！")
+    else:
+        # 检查投票是否已结束
+        pollended = 0
+        if time.time() > thepoll["expiry"]:
+            pollended = 1
+        # 回复内容
+        reply = "投票："+thepoll["title"]+" [ID: "+str(polnum)+"]"
+        # 如果投票已结束
+        if pollended:
+            for i in thepoll["options"]:
+                reply += "\n"
+                # 检查该选项是否有人投票
+                if i in thepoll["polldata"]:
+                    reply += "["+str(len(thepoll["polldata"][i]))+" 票]"
+                else:
+                    reply += "[0 票]"
+                reply += " "+thepoll["options"][i]
+            reply += "\n\n此投票已结束。"
+        else:
+            for i in thepoll["options"]:
+                reply += "\n"
+                reply += "- "+thepoll["options"][i]
+            # reply += "\n\n小提示：向bot私聊发送 /viewpoll "+str(polnum)+" 可查看已投票数哦！"
+            reply += "\n\n发送 投票 "+str(polnum)+" <选项文本> 即可参与投票！"
+        await viewpoll.send(reply)
+
+vote = on_alconna(Alconna(
+    "vote",
+    Args["saying", MultiVar(str, '+'), Field(
+        missing_tips=lambda: "参数错误。用法：投票 <投票ID/标题> <选项文本>"
+    )],
+), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=False, aliases={"投票","参与投票"})
+@vote.handle()
+async def _(saying: list, event: Event):
+    if (len(saying) < 2):
+        await vote.send("请指定投给哪一项！")
+    else:
+        polldata = getpolldata(saying[0])
+        # 被指定的投票项目
+        thepoll = polldata[0]
+        polnum = polldata[1]
+        if polnum == -1:
+            await viewpoll.finish("没有找到这个投票！")
+        # thepolldata = thepoll["polldata"]
+        # 查找对应的投票项
+        optionnum = -1
+        for i in thepoll["options"]:
+            if saying[1] == thepoll["options"][i]:
+                optionnum = i
+                break
+        if optionnum == -1:
+            reply = "此投票里面没有这一项！可用的选项有："
+            for i in thepoll["options"]:
+                reply += "\n"
+                reply += "- "+thepoll["options"][i]
+            await viewpoll.send(reply)
+        # 检查是否符合投票条件（该qq号是否已参与过投票、投票是否过期）
+        elif time.time() > thepoll["expiry"]:
+            await viewpoll.send("此投票已经结束！请发送 查看投票 "+polnum+" 查看结果。")
+        elif str(event.get_user_id()) in str(thepoll["polldata"]):
+            await viewpoll.send("你已参与过此投票！请在投票结束后发送 查看投票 "+polnum+" 查看结果。")
+        # 写入项目
+        else:
+            await pollvote(polnum,optionnum,event.get_user_id())
+            await viewpoll.send("投票成功！你投给了 "+saying[1])

konabot/plugins/roll_dice/roll_dice.py

@@ -309,7 +309,7 @@ async def generate_dice_image(number: str) -> BytesIO:
     if(len(text) > 50):
         output = BytesIO()
         push_image = Image.open(ASSETS_PATH / "img" / "dice" / "stick.png")
-        push_image.save(output,format='PNG')
+        push_image.save(output,format='GIF')
         output.seek(0)
         return output
 

konabot/plugins/simple_notify/__init__.py

@@ -1,8 +1,10 @@
-import asyncio
+import asyncio as asynkio
 import datetime
+import functools
 from pathlib import Path
 from typing import Any, Literal, cast
 
+import signal
 import nonebot
 import ptimeparse
 from loguru import logger
@@ -24,7 +26,9 @@ evt = on_message()
 
 (Path(__file__).parent.parent.parent.parent / "data").mkdir(exist_ok=True)
 DATA_FILE_PATH = Path(__file__).parent.parent.parent.parent / "data" / "notify.json"
-DATA_FILE_LOCK = asyncio.Lock()
+DATA_FILE_LOCK = asynkio.Lock()
+
+ASYNK_TASKS: set[asynkio.Task[Any]] = set()
 
 
 class Notify(BaseModel):
@@ -107,11 +111,20 @@ async def notify_now(notify: Notify):
     return True
 
 
-async def create_notify_task(notify: Notify, fail2remove: bool = True):
+def create_notify_task(notify: Notify, fail2remove: bool = True):
     async def mission():
         begin_time = datetime.datetime.now()
         if begin_time < notify.notify_time:
-            await asyncio.sleep((notify.notify_time - begin_time).total_seconds())
+            try:
+                await asynkio.sleep((notify.notify_time - begin_time).total_seconds())
+            except asynkio.CancelledError:
+                logger.debug("代办提醒被信号中止，任务退出")
+                return
+        else:
+            logger.warning(
+                f"期望在 {notify.notify_time} 在平台 {notify.platform} {notify.target_env}"
+                f" {notify.target} 的代办通知 {notify.notify_msg} 已经超时，将会直接通知！"
+            )
         res = await notify_now(notify)
         if fail2remove or res:
             await DATA_FILE_LOCK.acquire()
@@ -123,7 +136,7 @@ async def create_notify_task(notify: Notify, fail2remove: bool = True):
             DATA_FILE_LOCK.release()
         else:
             pass
-    return asyncio.create_task(mission())
+    return asynkio.create_task(mission())
 
 
 @evt.handle()
@@ -143,6 +156,7 @@ async def _(msg: UniMsg, mEvt: Event):
     # target_time = get_target_time(notify_time)
     try:
         target_time = ptimeparse.parse(notify_time)
+        logger.info(f"从 {notify_time} 解析出了时间：{target_time}")
     except Exception:
         logger.info(f"无法从 {notify_time} 中解析出时间")
         return
@@ -154,7 +168,7 @@ async def _(msg: UniMsg, mEvt: Event):
 
     await DATA_FILE_LOCK.acquire()
     cfg = load_notify_config()
-    
+
     if isinstance(mEvt, ConsoleMessageEvent):
         platform = "console"
         target = mEvt.get_user_id()
@@ -181,7 +195,7 @@ async def _(msg: UniMsg, mEvt: Event):
         notify_time=target_time,
         notify_msg=notify_text,
     )
-    await create_notify_task(notify)
+    create_notify_task(notify)
 
     cfg.notifies.append(notify)
     save_notify_config(cfg)
@@ -189,6 +203,7 @@ async def _(msg: UniMsg, mEvt: Event):
 
     await evt.send(await UniMessage().at(mEvt.get_user_id()).text(
         f" 了解啦！将会在 {notify.notify_time} 提醒你哦~").export())
+    logger.info(f"创建了一条于 {notify.notify_time} 的代办提醒")
 
 
 driver = nonebot.get_driver()
@@ -205,15 +220,41 @@ async def _():
 
     NOTIFIED_FLAG["task_added"] = True
 
-    await asyncio.sleep(10)
+    DELTA = 2
+    logger.info(f"第一次探测到 Bot 连接，等待 {DELTA} 秒后开始通知")
+    await asynkio.sleep(DELTA)
+
     await DATA_FILE_LOCK.acquire()
-    tasks = []
+
+    # tasks: set[asynkio.Task[Any]] = set()
     cfg = load_notify_config()
     if cfg.version == 1:
+        logger.info("将配置文件的版本升级为 2")
         cfg.version = 2
     else:
-        for notify in cfg.notifies:
-            tasks.append(create_notify_task(notify, fail2remove=False))
+        counter = 0
+        for notify in [*cfg.notifies]:
+            task = create_notify_task(notify, fail2remove=False)
+            ASYNK_TASKS.add(task)
+            task.add_done_callback(lambda self: ASYNK_TASKS.remove(self))
+            counter += 1
+        logger.info(f"成功创建了 {counter} 条代办事项")
+    save_notify_config(cfg)
     DATA_FILE_LOCK.release()
 
-    await asyncio.gather(*tasks)
+    loop = asynkio.get_running_loop()
+
+    # 解决 asynk task 没有被 cancel 的问题
+    async def shutdown(sig: signal.Signals):
+        logger.info(f"收到 {sig.name} 指令，正在关闭所有的东西")
+        for task in ASYNK_TASKS:
+            task.cancel()
+        await asynkio.gather(*ASYNK_TASKS, return_exceptions=True)
+        logger.info("所有的代办提醒 Task 都已经退出了")
+
+    for sig in (signal.SIGINT, signal.SIGTERM):
+        loop.add_signal_handler(sig, functools.partial(
+            asynkio.create_task, shutdown(sig)
+        ))
+
+    await asynkio.gather(*ASYNK_TASKS)

pyproject.toml

@@ -24,6 +24,8 @@ dependencies = [
     "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)",
 ]
 
 [build-system]
@@ -35,5 +37,10 @@ name = "pt-gitea-pypi"
 url = "https://gitea.service.jazzwhom.top/api/packages/Passthem/pypi/simple/"
 priority = "supplemental"
 
+[[tool.poetry.source]]
+name = "mirrors"
+url = "https://pypi.tuna.tsinghua.edu.cn/simple/"
+priority = "primary"
+
 [tool.poetry.dependencies]
 ptimeparse = {source = "pt-gitea-pypi"}