nonebot-plugin-shitbot 0.2__tar.gz → 0.3.1__tar.gz

{nonebot_plugin_shitbot-0.2 → nonebot_plugin_shitbot-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-shitbot
-Version: 0.2
+Version: 0.3.1
 Summary: NoneBot shitpost plugin
 Requires-Python: >=3.10
 License-File: LICENSE
@@ -11,7 +11,8 @@ Requires-Dist: nonebot-plugin-localstore>=0.3.0
 Requires-Dist: PixivPy-Async>=1.2.14
 Requires-Dist: Pillow>=12.2.0
 Requires-Dist: httpx>=0.28.1
-Requires-Dist: pydantic>=2.13.4
+Requires-Dist: python-magic>=0.4
+Requires-Dist: pydantic>=2
 Requires-Dist: PyYAML>=6.0.3
 Requires-Dist: ruamel.yaml>=0.18.0
 Dynamic: license-file

{nonebot_plugin_shitbot-0.2 → nonebot_plugin_shitbot-0.3.1}/README.md

@@ -61,8 +61,7 @@
 
 ## 配置
 
-插件启动时会自动从插件目录下的 `default_config.yaml` 复制默认配置到 `config.yaml`，
-之后编辑 `config.yaml` 即可。
+插件配置通过 NoneBot 标准的 dotenv / 环境变量读取。
 
 ### 安装
 
@@ -70,14 +69,17 @@
 nb plugin install nonebot-plugin-shitbot
 ```
 
-### 首次部署必填项
+### 环境变量
 
-| 配置项 | 类型 | 说明 |
-|---|---|---|
-| `bot_base` | 路径 | 插件的持久存储根目录（cache / data / config / 均存放于此） |
-| `client_base` | 路径 | 客户端侧的持久存储根目录（用于兼容容器部署） |
-| `owners` | 字符串列表 | 机器人所有者 QQ 号列表 |
-| `pixiv_access_token` | 字符串 | Pixiv API 访问令牌（可选填，使用 `/pixiv` 时必填） |
+在 NoneBot 项目的 `.env` 文件中配置，变量如下：
+
+| 配置项 | 类型 | 默认值 | 是否必填 | 说明 |
+|---|---|---|---|---|
+| `SHITBOT__CLIENT_CACHE` | 路径 | 本地缓存路径 | 否 | 容器端缓存路径。本地缓存路径为 `$LOCALSTORE_CACHE_DIR/nonebot_plugin_shitbot`，容器端需对应挂载 |
+| `SHITBOT__CLIENT_DATA` | 路径 | 本地数据路径 | 否 | 容器端数据路径。本地数据路径为 `$LOCALSTORE_DATA_DIR/nonebot_plugin_shitbot`，容器端需对应挂载 |
+| `SHITBOT__OWNERS` | JSON 字符串列表 | None | 是 | 机器人所有者 QQ 号列表，如 `'["114514"]'` |
+| `SHITBOT__MAX_MESSAGE_DEPTH` | 整数 | `16` | 否 | 消息解析最大递归深度 |
+| `SHITBOT__PIXIV_ACCESS_TOKEN` | 字符串 | "" | 部分必填 | Pixiv API 访问令牌（使用 `/pixiv` 时必填） |
 
 ### 触发规则
 

{nonebot_plugin_shitbot-0.2 → nonebot_plugin_shitbot-0.3.1}/nonebot_plugin_shitbot/__init__.py

@@ -5,11 +5,15 @@ from os import environ
 # (e.g. nonebot_plugin_htmlrender → get_driver()).  Pure-logic modules
 # like parser.py should remain importable without a running NoneBot.
 if not environ.get("PYTEST_RUNNING"):
+    from nonebot import require
     from nonebot.plugin import PluginMetadata
 
     from . import handlers  # noqa: F401
     from .config import ShitBotConfig
 
+    require("nonebot_plugin_htmlrender")
+    require("nonebot_plugin_localstore")
+
     __plugin_meta__ = PluginMetadata(
         name="shitbot",
         description="个人自用自己手搓框架的多功能bot, 还在开发中",

{nonebot_plugin_shitbot-0.2 → nonebot_plugin_shitbot-0.3.1}/nonebot_plugin_shitbot/commands/autoreply_cmd.py

@@ -1,15 +1,20 @@
 import asyncio
-import yaml
-
-from pathlib import Path
 
+import yaml
 from nonebot.adapters.onebot.v11 import Bot, Message, MessageEvent
 
 from ..command import BotCommand
-from ..session import BotSession
-from ..parser import BotArgParser
 from ..msgdatabase import BotMsgDataBase
-from ..msgutils import DumpedMsg, DumpedSeg, DataVariables, dump_message, msg_filter, modify_msg_data
+from ..msgutils import (
+    DataVariables,
+    DumpedMsg,
+    DumpedSeg,
+    dump_message,
+    modify_msg_data,
+    msg_filter,
+)
+from ..parser import BotArgParser
+from ..session import BotSession
 from ..tasks import autoreply_lock
 from .autoreply_main_cmd import BotCommandAutoReplyMain
 
@@ -17,6 +22,7 @@ from .autoreply_main_cmd import BotCommandAutoReplyMain
 class BotCommandAutoreply(BotCommand):
     _name = "autoreply"
     _autoreply_dir = BotCommandAutoReplyMain._autoreply_dir
+    _state_path = BotCommandAutoReplyMain._state_path
     _rule_path = BotCommandAutoReplyMain._rule_path
     _msg_table_path = BotCommandAutoReplyMain._msg_table_path
 
@@ -33,6 +39,8 @@ class BotCommandAutoreply(BotCommand):
         self._rp: list[str] = []
         self._T: list[str] = []
         self._t: list[str] = []
+        self._D: list[str] = []
+        self._d: list[str] = []
         self._K: list[str] = []
         self._k: list[str] = []
         self._R: list[str] = []
@@ -162,7 +170,7 @@ class BotCommandAutoreply(BotCommand):
         stop.set_rule(max=0)
         stop.add_opt("--auto", default=[0])
 
-        lst.set_rule(min=1,max=1)
+        lst.set_rule(min=1, max=1)
 
         info.set_rule(max=None)
 
@@ -176,14 +184,24 @@ class BotCommandAutoreply(BotCommand):
         delete.add_opt("--key", required=True, max_appeared=None)
         delete.add_opt("--rp", required=True, max_appeared=None)
 
-        reply.set_rule(min=1,max=1, need_subcmd=True)
+        reply.set_rule(min=1, max=1, need_subcmd=True)
         reply_start = reply.add_subparser("start")
         reply_stop = reply.add_subparser("stop")
         reply_modify = reply.add_subparser("modify")
 
-        key.set_rule(min=1,max=1)
-        key.add_opt("-T", required=True, choice=["delmark", "delspace", "upper", "lower"], max_appeared=None)
-        key.add_opt("-t", required=True, choice=["delmark", "delspace", "upper", "lower"], max_appeared=None)
+        key.set_rule(min=1, max=1)
+        key.add_opt(
+            "-T",
+            required=True,
+            choice=["delmark", "delspace", "upper", "lower"],
+            max_appeared=None,
+        )
+        key.add_opt(
+            "-t",
+            required=True,
+            choice=["delmark", "delspace", "upper", "lower"],
+            max_appeared=None,
+        )
         key.add_opt("-D", required=True, max_appeared=None)
         key.add_opt("-d", required=True, max_appeared=None)
         key.add_opt("-K", required=True, max_appeared=None)
@@ -217,7 +235,7 @@ class BotCommandAutoreply(BotCommand):
         if subsubcmd == "stop" and self._rstate != "start":
             return await super()._guard_state()
         return True
-        
+
     async def _start(self):
         autoreply_session = BotSession.make("public", "autoreply")
         main_command = BotCommandAutoReplyMain.make(
@@ -228,12 +246,9 @@ class BotCommandAutoreply(BotCommand):
         else:
             await main_command.run(Message())
         if self._auto:
-            from ruamel.yaml import YAML
-            config_path = Path(__file__).parent.parent / "config.yaml"
-            config_yaml = YAML()
-            data = config_yaml.load(config_path)
-            data["if_auto_start_autoreply"] = True
-            config_yaml.dump(data, config_path)
+            self._state_path.write_text(
+                yaml.safe_dump(True, allow_unicode=True), encoding="utf-8"
+            )
         await self.send_msg("自动回复已开启")
         self.unlock()
 
@@ -251,12 +266,9 @@ class BotCommandAutoreply(BotCommand):
 
         await _exe()
         if self._auto:
-            from ruamel.yaml import YAML
-            config_path = Path(__file__).parent.parent / "config.yaml"
-            config_yaml = YAML()
-            data = config_yaml.load(config_path)
-            data["if_auto_start_autoreply"] = False
-            config_yaml.dump(data, config_path)
+            self._state_path.write_text(
+                yaml.safe_dump(False, allow_unicode=True), encoding="utf-8"
+            )
         await self.send_msg("自动回复已关闭")
         self.unlock()
 
@@ -334,7 +346,9 @@ class BotCommandAutoreply(BotCommand):
             return
         self._rstate = "start"
         self._reply_name = reply_name
-        await self.send_msg(f"请发送仅包含图片或文字的信息, 或者发送 /autoreply reply {reply_name} stop 停止设置")
+        await self.send_msg(
+            f"请发送仅包含图片或文字的信息, 或者发送 /autoreply reply {reply_name} stop 停止设置"
+        )
         self._is_accept_msg = True
 
     async def _reply_stop(self, reply_name: str):
@@ -371,7 +385,7 @@ class BotCommandAutoreply(BotCommand):
                     "summary": DataVariables(self._sum),
                     "sub_type": DataVariables(self._st),
                 },
-                ["image"]
+                ["image"],
             )
             await self._set_reply(reply_name)
             self._temp_msg = []
@@ -383,6 +397,7 @@ class BotCommandAutoreply(BotCommand):
             await self.send_msg(f"错误: 键 {key_name} 不存在")
             self.unlock()
             return
+
         def _rm_dup(lst_A: list, lst_R: list):
             dup = []
             for elem in lst_A:
@@ -403,7 +418,12 @@ class BotCommandAutoreply(BotCommand):
                     lst.remove(elem)
             return lst
 
-        for (lst_A, lst_R) in [(self._T, self._t), (self._D, self._d), (self._K, self._k), (self._R, self._r)]:
+        for lst_A, lst_R in [
+            (self._T, self._t),
+            (self._D, self._d),
+            (self._K, self._k),
+            (self._R, self._r),
+        ]:
             _rm_dup(lst_A, lst_R)
         for lst in [self._R, self._r]:
             rem = []
@@ -414,9 +434,13 @@ class BotCommandAutoreply(BotCommand):
             for elem in rem:
                 lst.remove(elem)
         data = []
-        for (lst_S, lst_A, lst_R) in [(self._rule[key_name]["trans"], self._T, self._t), (self._rule[key_name]["dels"], self._D, self._d), (self._rule[key_name]["keywords"], self._K, self._k), (self._rule[key_name]["replys"], self._R, self._r)]:
+        for lst_S, lst_A, lst_R in [
+            (self._rule[key_name]["trans"], self._T, self._t),
+            (self._rule[key_name]["dels"], self._D, self._d),
+            (self._rule[key_name]["keywords"], self._K, self._k),
+            (self._rule[key_name]["replys"], self._R, self._r),
+        ]:
             data.append(_get_lst(lst_S, lst_A, lst_R))
-                
 
         _m = None
         if self._m == 0:
@@ -431,13 +455,11 @@ class BotCommandAutoreply(BotCommand):
                 dels=data[1],
                 is_contain=_m,
                 keywords=data[2],
-                replys=data[3]
+                replys=data[3],
             )
         await self.send_msg("修改成功")
         self.unlock()
 
-
-
     async def roger(self, event: MessageEvent):
         async with self._roger_lock:
             if not self._is_accept_msg:
@@ -453,11 +475,10 @@ class BotCommandAutoreply(BotCommand):
                     raise ValueError
                 asyncio.create_task(self.run(Message(f"reply {reply_name} stop")))
 
-
-
     async def run(self, args: Message):
         async with autoreply_lock:
             self._database = BotMsgDataBase(self._autoreply_dir)
+            self._state_path.touch(exist_ok=True)
             self._rule_path.touch(exist_ok=True)
             self._msg_table_path.touch(exist_ok=True)
             self._load_meta()
@@ -517,7 +538,6 @@ class BotCommandAutoreply(BotCommand):
             self._st = subsubparser.opts_value.get("--st", [])
             self._rstate = subsubcmd if subsubcmd != "modify" else ""
 
-
         if subcmd == "start":
             await self._start()
         if subcmd == "stop":
@@ -545,6 +565,3 @@ class BotCommandAutoreply(BotCommand):
         if subcmd == "key":
             key_name = subparser.value[0]
             await self._key_modify(key_name)
-
-
-

{nonebot_plugin_shitbot-0.2 → nonebot_plugin_shitbot-0.3.1}/nonebot_plugin_shitbot/commands/autoreply_main_cmd.py

@@ -1,5 +1,4 @@
 import random
-import re
 import unicodedata
 from typing import Any
 
@@ -25,6 +24,7 @@ _TERM_SCHEMA = {
 class BotCommandAutoReplyMain(BotCommand):
     _name = "autoreply_main_rec"
     _autoreply_dir = config.data / "autoreply"
+    _state_path = _autoreply_dir / "state.yaml"
     _rule_path = _autoreply_dir / "rule.yaml"
     _msg_table_path = _autoreply_dir / "msg_table.yaml"
     _rule: dict[str, dict[str, Any]]
@@ -94,6 +94,7 @@ class BotCommandAutoReplyMain(BotCommand):
         random.seed()
         async with autoreply_lock:
             self._database = BotMsgDataBase(self._autoreply_dir)
+            self._state_path.touch(exist_ok=True)
             self._rule_path.touch(exist_ok=True)
             self._msg_table_path.touch(exist_ok=True)
             self.load_meta()

{nonebot_plugin_shitbot-0.2 → nonebot_plugin_shitbot-0.3.1}/nonebot_plugin_shitbot/commands/convert_cmd.py

@@ -1,12 +1,14 @@
 from __future__ import annotations
 
 import asyncio
+import random
 import shutil
 import uuid
 from pathlib import Path
 from typing import TYPE_CHECKING
 
 import httpx
+import magic
 from nonebot.adapters.onebot.v11 import Bot, Message, MessageEvent, MessageSegment
 from nonebot.log import logger
 
@@ -20,7 +22,7 @@ from ..tasks import EndOfQueue, prod_cons
 if TYPE_CHECKING:
     from ..session import BotSession
 
-bash = shutil.which("bash") or "/bin/bash"
+ffmpeg = shutil.which("ffmpeg") or "ffmpeg"
 
 
 class BotCommandConvert(BotCommand):
@@ -94,26 +96,40 @@ class BotCommandConvert(BotCommand):
         if download_path == "":
             return ""
         png_path = png_dir / f"{uuid.uuid4().hex}.png"
+        mime = magic.from_file(download_path, mime=True)
         logger.info(
-            f"执行图片转png脚本: {config.script_p2png_path} {download_path} {png_path}"
+            f"检测文件类型: {mime}, 执行图片转 PNG: {download_path} -> {png_path}"
         )
+        if mime == "image/png":
+            shutil.copy(download_path, png_path)
+            logger.info(f"转换 PNG 成功: {png_path}")
+            return str(png_path)
         proc = await asyncio.create_subprocess_exec(
-            bash,
-            str(config.script_p2png_path),
+            ffmpeg,
+            "-y",
+            "-i",
             str(download_path),
+            "-vcodec",
+            "png",
+            "-pix_fmt",
+            "rgba",
+            "-update",
+            "1",
             str(png_path),
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
         )
         stdout, stderr = await proc.communicate()
         if stdout:
-            logger.info(f"脚本 stdout:\n{stdout.decode()}")
+            logger.info(f"ffmpeg stdout:\n{stdout.decode()}")
         if stderr:
-            logger.warning(f"脚本 stderr:\n{stderr.decode()}")
+            logger.warning(f"ffmpeg stderr:\n{stderr.decode()}")
         if proc.returncode != 0:
-            logger.error(f"转换失败: {stderr.decode()[:]}")
+            logger.error(
+                f"转换 PNG 失败 (returncode={proc.returncode}): {stderr.decode()[:] if stderr else ''}"
+            )
             return ""
-        logger.info(f"转换图片成功: {png_path}")
+        logger.info(f"转换 PNG 成功: {png_path}")
         return str(png_path)
 
     @staticmethod
@@ -121,24 +137,47 @@ class BotCommandConvert(BotCommand):
         if png_path == "":
             return ""
         video_path = video_dir / f"{uuid.uuid4().hex}.mp4"
-        logger.info(
-            f"执行图片转视频脚本: {config.script_png2v_path} {png_path} {video_path}"
-        )
+        duration = round(random.uniform(1, 5), 3)
+        logger.info(f"执行图片转视频 (ffmpeg, {duration}s): {png_path} -> {video_path}")
         proc = await asyncio.create_subprocess_exec(
-            bash,
-            str(config.script_png2v_path),
+            ffmpeg,
+            "-y",
+            "-loop",
+            "1",
+            "-i",
             str(png_path),
+            "-f",
+            "lavfi",
+            "-i",
+            "anullsrc",
+            "-c:v",
+            "libx264",
+            "-crf",
+            "1",
+            "-preset",
+            "ultrafast",
+            "-g",
+            "114514",
+            "-t",
+            str(duration),
+            "-pix_fmt",
+            "yuv420p",
+            "-vf",
+            "scale=trunc(iw/2)*2:trunc(ih/2)*2",
+            "-shortest",
             str(video_path),
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
         )
         stdout, stderr = await proc.communicate()
         if stdout:
-            logger.info(f"脚本 stdout:\n{stdout.decode()}")
+            logger.info(f"ffmpeg stdout:\n{stdout.decode()}")
         if stderr:
-            logger.warning(f"脚本 stderr:\n{stderr.decode()}")
+            logger.warning(f"ffmpeg stderr:\n{stderr.decode()}")
         if proc.returncode != 0:
-            logger.error(f"转换失败: {stderr.decode()[:]}")
+            logger.error(
+                f"转换视频失败 (returncode={proc.returncode}): {stderr.decode()[:] if stderr else ''}"
+            )
             return ""
         logger.info(f"转换视频成功: {video_path}")
         return str(video_path)
@@ -148,26 +187,31 @@ class BotCommandConvert(BotCommand):
         if png_path == "":
             return ""
         frame_path = frame_dir / f"{uuid.uuid4().hex}.png"
-        logger.info(
-            f"执行图片加框脚本: {config.script_png2fr_path} {png_path} {frame_path}"
-        )
+        border = random.randint(10, 50)
+        logger.info(f"执行图片加黑框 (ffmpeg, {border}px): {png_path} -> {frame_path}")
         proc = await asyncio.create_subprocess_exec(
-            bash,
-            str(config.script_png2fr_path),
+            ffmpeg,
+            "-i",
             str(png_path),
+            "-vf",
+            f"pad=iw+{border}:ih+{border}:(ow-iw)/2:(oh-ih)/2:black",
+            "-update",
+            "1",
             str(frame_path),
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
         )
         stdout, stderr = await proc.communicate()
         if stdout:
-            logger.info(f"脚本 stdout:\n{stdout.decode()}")
+            logger.info(f"ffmpeg stdout:\n{stdout.decode()}")
         if stderr:
-            logger.warning(f"脚本 stderr:\n{stderr.decode()}")
+            logger.warning(f"ffmpeg stderr:\n{stderr.decode()}")
         if proc.returncode != 0:
-            logger.error(f"转换失败: {stderr.decode()[:]}")
+            logger.error(
+                f"加框失败 (returncode={proc.returncode}): {stderr.decode()[:] if stderr else ''}"
+            )
             return ""
-        logger.info(f"转换方形图片成功: {frame_path}")
+        logger.info(f"加黑框成功: {frame_path}")
         return str(frame_path)
 
     async def _send_outputs(self):
@@ -195,9 +239,7 @@ class BotCommandConvert(BotCommand):
             if not output_file.exists():
                 logger.error(f"输出文件不存在: {output_file}")
                 continue
-            container_path = config.client_base / output_file.relative_to(
-                config.bot_base
-            )
+            container_path = config.client_cache / output_file.relative_to(config.cache)
             try:
                 if self._mode == "video":
                     await self.send_msg(

{nonebot_plugin_shitbot-0.2 → nonebot_plugin_shitbot-0.3.1}/nonebot_plugin_shitbot/commands/pixiv_cmd.py

@@ -30,7 +30,7 @@ class BotCommandPixiv(BotCommand):
         parser.set_rule(min=1, max=1, types=[int])
         parser.add_opt("-r", required=True, choice=["off", "on"], default=["off"])
         parser.add_opt(
-            "-s", required=True, choice=["regular", "original"], default=["regular"]
+            "-s", required=True, choice=["regular", "original"], default=["original"]
         )
         return parser
 

{nonebot_plugin_shitbot-0.2 → nonebot_plugin_shitbot-0.3.1}/nonebot_plugin_shitbot/commands/shitpost_cmd.py

@@ -103,8 +103,8 @@ class BotCommandShitpost(BotCommand):
                 media_path = media_dir / f"{uuid.uuid4().hex}"
                 async with httpx.AsyncClient() as client:
                     await stuff_download(client, url, media_path)
-                    container_path = config.client_base / media_path.relative_to(
-                        config.bot_base
+                    container_path = config.client_cache / media_path.relative_to(
+                        config.cache
                     )
                     medias_path.append(media_path)
                     medias.append(str(container_path))