feat: 删除代码中对 mirai 的引用

pkg/pipeline/cntfilter/cntfilter.py

@@ -1,9 +1,5 @@
 from __future__ import annotations
 
-# import mirai
-# import mirai.models
-# import mirai.models.message
-
 from ...core import app
 
 from .. import stage, entities, stagemgr

pkg/pipeline/controller.py

@@ -4,7 +4,6 @@ import asyncio
 import typing
 import traceback
 
-# import mirai
 
 from ..core import app, entities
 from . import entities as pipeline_entities

pkg/pipeline/entities.py

@@ -4,7 +4,6 @@ import enum
 import typing
 
 import pydantic
-# import mirai
 from ..platform.types import message as platform_message
 
 from ..core import entities
@@ -28,10 +27,6 @@ class StageProcessResult(pydantic.BaseModel):
     user_notice: typing.Optional[typing.Union[str, list[platform_message.MessageComponent], platform_message.MessageChain, None]] = []
     """只要设置了就会发送给用户"""
 
-    # TODO delete
-    # admin_notice: typing.Optional[typing.Union[str, list[mirai_message.MessageComponent], mirai.MessageChain, None]] = []
-    """只要设置了就会发送给管理员"""
-
     console_notice: typing.Optional[str] = ''
     """只要设置了就会输出到控制台"""
 

pkg/pipeline/longtext/longtext.py

@@ -3,7 +3,6 @@ import os
 import traceback
 
 from PIL import Image, ImageDraw, ImageFont
-# from mirai.models.message import MessageComponent, Plain, MessageChain
 
 from ...core import app
 from . import strategy

pkg/pipeline/longtext/strategies/forward.py

@@ -2,9 +2,6 @@
 from __future__ import annotations
 import typing
 
-# from mirai.models import MessageChain
-# from mirai.models.message import MessageComponent, ForwardMessageNode
-# from mirai.models.base import MiraiBaseModel
 import pydantic
 
 from .. import strategy as strategy_model

pkg/pipeline/longtext/strategies/image.py

@@ -8,8 +8,6 @@ import re
 
 from PIL import Image, ImageDraw, ImageFont
 
-# from mirai.models import MessageChain, Image as ImageComponent
-# from mirai.models.message import MessageComponent
 from ....platform.types import message as platform_message
 
 from .. import strategy as strategy_model

pkg/pipeline/longtext/strategy.py

@@ -2,8 +2,6 @@ from __future__ import annotations
 import abc
 import typing
 
-# import mirai
-# from mirai.models.message import MessageComponent
 
 from ...core import app
 from ...core import entities as core_entities

pkg/pipeline/pool.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import asyncio
 
-# import mirai
 
 from ..core import entities
 from ..platform import adapter as msadapter

pkg/pipeline/preproc/preproc.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-# import mirai
 
 from .. import stage, entities, stagemgr
 from ...core import entities as core_entities

pkg/pipeline/process/handlers/chat.py

@@ -5,7 +5,6 @@ import time
 import traceback
 import json
 
-# import mirai
 
 from .. import handler
 from ... import entities

pkg/pipeline/process/handlers/command.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 import typing
 
-# import mirai
 
 from .. import handler
 from ... import entities

pkg/pipeline/respback/respback.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import random
 import asyncio
 
-# import mirai
 
 from ...core import app
 

pkg/pipeline/resprule/entities.py

@@ -1,5 +1,4 @@
 import pydantic
-# import mirai
 
 from ...platform.types import message as platform_message
 

pkg/pipeline/resprule/resprule.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-# import mirai
 
 from ...core import app
 from . import entities as rule_entities, rule

pkg/pipeline/resprule/rule.py

@@ -2,8 +2,6 @@ from __future__ import annotations
 import abc
 import typing
 
-# import mirai
-
 from ...core import app, entities as core_entities
 from . import entities
 

pkg/pipeline/resprule/rules/atbot.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-# import mirai
 
 from .. import rule as rule_model
 from .. import entities

pkg/pipeline/resprule/rules/prefix.py

@@ -1,4 +1,3 @@
-# import mirai
 
 from .. import rule as rule_model
 from .. import entities

pkg/pipeline/resprule/rules/random.py

@@ -1,6 +1,5 @@
 import random
 
-# import mirai
 
 from .. import rule as rule_model
 from .. import entities

pkg/pipeline/resprule/rules/regexp.py

@@ -1,6 +1,5 @@
 import re
 
-# import mirai
 
 from .. import rule as rule_model
 from .. import entities

pkg/pipeline/wrapper/wrapper.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import typing
 
-# import mirai
 
 from ...core import app, entities as core_entities
 from .. import entities
@@ -46,19 +45,14 @@ class ResponseWrapper(stage.PipelineStage):
         else:
         
             if query.resp_messages[-1].role == 'command':
-                # query.resp_message_chain.append(mirai.MessageChain("[bot] "+query.resp_messages[-1].content))
-                query.resp_message_chain.append(query.resp_messages[-1].get_content_mirai_message_chain(prefix_text='[bot] '))
+                query.resp_message_chain.append(query.resp_messages[-1].get_content_platform_message_chain(prefix_text='[bot] '))
 
                 yield entities.StageProcessResult(
                     result_type=entities.ResultType.CONTINUE,
                     new_query=query
                 )
             elif query.resp_messages[-1].role == 'plugin':
-                # if not isinstance(query.resp_messages[-1].content, mirai.MessageChain):
-                #     query.resp_message_chain.append(mirai.MessageChain(query.resp_messages[-1].content))
-                # else:
-                #     query.resp_message_chain.append(query.resp_messages[-1].content)
-                query.resp_message_chain.append(query.resp_messages[-1].get_content_mirai_message_chain())
+                query.resp_message_chain.append(query.resp_messages[-1].get_content_platform_message_chain())
 
                 yield entities.StageProcessResult(
                     result_type=entities.ResultType.CONTINUE,
@@ -73,7 +67,7 @@ class ResponseWrapper(stage.PipelineStage):
                     reply_text = ''
 
                     if result.content:  # 有内容
-                        reply_text = str(result.get_content_mirai_message_chain())
+                        reply_text = str(result.get_content_platform_message_chain())
 
                         # ============= 触发插件事件 ===============
                         event_ctx = await self.ap.plugin_mgr.emit_event(
@@ -101,7 +95,7 @@ class ResponseWrapper(stage.PipelineStage):
 
                             else:
 
-                                query.resp_message_chain.append(result.get_content_mirai_message_chain())
+                                query.resp_message_chain.append(result.get_content_platform_message_chain())
 
                             yield entities.StageProcessResult(
                                 result_type=entities.ResultType.CONTINUE,