优化卵总展示光影

konabot/docs/user/giftool.txt

@@ -45,7 +45,7 @@
         - 帧数必须为正整数（> 0）。
         - 若原始帧数 ≤ 指定帧数，则保留全部帧。
 
-    --s <速度>（可选）
+    --speed <速度>（可选）
         - 调整 gif 图的速度。若为负数，则代表倒放
 
 使用方式

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/bilibili_fetch_fix.py

@@ -1,25 +0,0 @@
-import re
-from loguru import logger
-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)
-    if not re.search(pattern, to_search):
-        return
-    logger.info("检测到有 Bilibili 相关的消息，直接进行一个调用")
-    _module = __import__("nonebot_plugin_analysis_bilibili")
-    await _module.handle_analysis(event)
-

konabot/plugins/idiomgame/__init__.py

@@ -99,17 +99,17 @@ evt = on_alconna(Alconna(
 ), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=True)
 
 @evt.handle()
-async def _(event: BaseEvent):
+async def play_game(event: BaseEvent, force = False):
     global NOW_PLAYING, LAST_CHAR, INITED
-    if not be_able_to_play():
+    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
-    if NOW_PLAYING:
-        await evt.send(await UniMessage().text("当前已有成语接龙游戏在进行中，请稍后再试！").export())
-        return
     NOW_PLAYING = True
     await evt.send(await UniMessage().text("你小子，还真有意思！\n好，成语接龙游戏开始！我说一个成语，请大家接下去！").export())
     # 选择一个随机成语
@@ -118,6 +118,15 @@ async def _(event: BaseEvent):
     # 发布成语
     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)
@@ -183,13 +192,22 @@ async def _(event: BaseEvent, msg: UniMsg):
 
 async def handle_send_info(event: BaseEvent, msg: UniMsg):
     global NOW_PLAYING, LAST_CHAR, SCORE_BOARD, ALL_BUFF_SCORE
-    if not NOW_PLAYING:
-        return
-    if LOCK:
-        return
     user_idiom = msg.extract_plain_text().strip()
     if(user_idiom not in ALL_IDIOMS and user_idiom not in ALL_WORDS):
-        await evt.send(await UniMessage().text("接不上！这个不一样！").export())
+        # 扣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):

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.common.nb.extract_image import PIL_Image, extract_image_from_message
-from konabot.plugins.memepack.drawing.display import draw_cao_display
+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)
+