nonebot-plugin-latex 0.0.3__tar.gz → 0.0.3.1__tar.gz

{nonebot_plugin_latex-0.0.3 → nonebot_plugin_latex-0.0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nonebot-plugin-latex
-Version: 0.0.3
+Version: 0.0.3.1
 Summary: 通过互联网公共服务渲染LaTeX公式
 Author-email: Eilles <EillesWan@outlook.com>
 License:                 木兰宽松许可证, 第2版
@@ -136,10 +136,9 @@ Project-URL: Bug Tracker, https://github.com/EillesWan/nonebot-plugin-latex/issu
 Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: nonebot2
+Requires-Dist: nonebot2<1000.0.0,>=2.2.0
 Requires-Dist: httpx<0.28.0,>=0.27.0
-Requires-Dist: nonebot-adapter-onebot
-Requires-Dist: nonebot-plugin-alconna
+Requires-Dist: nonebot-plugin-alconna<1000.0.0,>=0.48.0
 
 # nonebot-plugin-latex
 

{nonebot_plugin_latex-0.0.3 → nonebot_plugin_latex-0.0.3.1}/nonebot_plugin_latex/__init__.py

@@ -14,25 +14,23 @@ See the Mulan PSL v2 for more details.
 """
 
 from nonebot import get_plugin_config, get_driver
-from nonebot.plugin import PluginMetadata
+from nonebot.plugin import PluginMetadata, inherit_supported_adapters
 
 from .config import Config
 from .converter import _converter, get_converter
 
-__version__ = "0.0.3"
+__version__ = "0.0.3.1"
 
 __author__ = "Eilles"
 
 __plugin_meta__ = PluginMetadata(
-    name="LaTeX图形渲染插件",
-    description="从互联网服务渲染LaTeX公式并发送",
+    name="LaTeX 在线渲染插件",
+    description="从互联网服务渲染 LaTeX 公式",
     usage="发送 latex 或 公式，后接内容或回复公式信息。",
     type="library",
     homepage="https://github.com/EillesWan/nonebot-plugin-latex",
     config=Config,
-    supported_adapters={
-        "~onebot.v11",
-    },
+    supported_adapters=inherit_supported_adapters("nonebot_plugin_alconna"),
     extra={"License": "Mulan PSL v2", "Author": __author__},
 )
 

{nonebot_plugin_latex-0.0.3 → nonebot_plugin_latex-0.0.3.1}/nonebot_plugin_latex/main.py

@@ -15,17 +15,17 @@ See the Mulan PSL v2 for more details.
 
 import nonebot
 
-from nonebot.adapters.onebot.v11 import MessageEvent
+from nonebot_plugin_alconna.uniseg import Text
 
-# from nonebot.matcher import Matcher
 
 nonebot.require("nonebot_plugin_alconna")
 
-# from nonebot_plugin_alconna.util import annotation
 from nonebot_plugin_alconna import (
     Image as Alconna_Image,
+    Reply,
     Text as Alconnna_Text,
     UniMessage,
+    UniMsg
 )
 
 from .data import LATEX_PATTERN
@@ -47,29 +47,16 @@ command_heads = (
 
 
 async def check_for_scan(
-    event: MessageEvent,
+    msg: UniMsg,
     # state: T_State,
 ) -> bool:
     """
     检查是否为 LaTeX 指令
     """
-
-    # print("检查消息满足渲染要求：", event)
-    if isinstance(event, MessageEvent):
-        # print("此为原始信息：", event.raw_message)
-        # event.message
-        for msg in event.message:
-            # print("这是其中一个信息---", msg)
-            if msg.type == "text" and (msgdata := msg.data["text"].strip()):
-                if msgdata.startswith(command_heads):
-
-                    # print("判断：这确实是指令发出")
-                    return True
-                else:
-                    # print("判断：这不是指令")
-                    return False
-        return False
-    return False
+    return any(
+        isinstance(seg, Text) and seg.text.strip().startswith(command_heads)
+        for seg in msg
+    )
 
 
 latexg = nonebot.on_message(
@@ -81,18 +68,19 @@ latexg = nonebot.on_message(
 
 @latexg.handle()
 async def handle_pic(
-    event: MessageEvent,
+    msgs: UniMsg,
     # state: T_State,
     # arg: Optional[Message] = CommandArg(),
 ):
     # print("正在解决reply指令……")
     latexes = []
-    if event.reply:
-        latexes.extend(LATEX_PATTERN.finditer(event.reply.message.extract_plain_text()))
+    if msgs.has(Reply):
+        i = msgs[Reply, 0]
+        if i.msg:
+            latexes.extend(LATEX_PATTERN.finditer(i.msg if isinstance(i.msg, str) else i.msg.extract_plain_text()))
 
     # print(arg)
-    if event.message:
-        latexes.extend(LATEX_PATTERN.finditer(event.message.extract_plain_text()))
+    latexes.extend(LATEX_PATTERN.finditer(msgs.extract_plain_text()))
 
     if not latexes:
         await latexg.finish(

{nonebot_plugin_latex-0.0.3 → nonebot_plugin_latex-0.0.3.1}/nonebot_plugin_latex.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nonebot-plugin-latex
-Version: 0.0.3
+Version: 0.0.3.1
 Summary: 通过互联网公共服务渲染LaTeX公式
 Author-email: Eilles <EillesWan@outlook.com>
 License:                 木兰宽松许可证, 第2版
@@ -136,10 +136,9 @@ Project-URL: Bug Tracker, https://github.com/EillesWan/nonebot-plugin-latex/issu
 Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: nonebot2
+Requires-Dist: nonebot2<1000.0.0,>=2.2.0
 Requires-Dist: httpx<0.28.0,>=0.27.0
-Requires-Dist: nonebot-adapter-onebot
-Requires-Dist: nonebot-plugin-alconna
+Requires-Dist: nonebot-plugin-alconna<1000.0.0,>=0.48.0
 
 # nonebot-plugin-latex
 

nonebot_plugin_latex-0.0.3.1/nonebot_plugin_latex.egg-info/requires.txt

@@ -0,0 +1,3 @@
+nonebot2<1000.0.0,>=2.2.0
+httpx<0.28.0,>=0.27.0
+nonebot-plugin-alconna<1000.0.0,>=0.48.0

{nonebot_plugin_latex-0.0.3 → nonebot_plugin_latex-0.0.3.1}/pyproject.toml

@@ -1,13 +1,12 @@
 [project]
 name = "nonebot-plugin-latex"
-version = "0.0.3"
+version = "0.0.3.1"
 description = "通过互联网公共服务渲染LaTeX公式"
 authors = [{ name = "Eilles", email = "EillesWan@outlook.com" }]
 dependencies = [
-    "nonebot2",
+    "nonebot2>=2.2.0,<1000.0.0",
     "httpx>=0.27.0,<0.28.0",
-    "nonebot-adapter-onebot",
-    "nonebot-plugin-alconna",
+    "nonebot-plugin-alconna>=0.48.0,<1000.0.0",
 ]
 requires-python = ">=3.9,<4.0"
 readme = "README.md"
@@ -16,3 +15,6 @@ license = { file = "LICENSE" }
 [project.urls]
 "Homepage" = "https://github.com/EillesWan/nonebot-plugin-latex"
 "Bug Tracker" = "https://github.com/EillesWan/nonebot-plugin-latex/issues"
+
+[tool.pyright]
+typeCheckingMode = "standard"

nonebot_plugin_latex-0.0.3/nonebot_plugin_latex.egg-info/requires.txt

@@ -1,4 +0,0 @@
-nonebot2
-httpx<0.28.0,>=0.27.0
-nonebot-adapter-onebot
-nonebot-plugin-alconna