From 5b72ebaad50a1f344706cf4842f663143915919c Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Sun, 8 Sep 2024 08:23:43 -0400 Subject: [PATCH] delete: remove deprecated files --- model/command/adapter/nonebot/command_arg.py | 2 - model/command/adapter/nonebot/common.py | 32 ---- model/command/adapter/nonebot/driver.py | 11 -- model/command/adapter/onebot/bot.py | 2 - model/command/adapter/onebot/message.py | 2 - model/command/adapter/onebot/message_event.py | 2 - .../command/adapter/onebot/message_segment.py | 2 - model/command/adapter/protocol_adapter.py | 138 ------------------ 8 files changed, 191 deletions(-) delete mode 100644 model/command/adapter/nonebot/command_arg.py delete mode 100644 model/command/adapter/nonebot/common.py delete mode 100644 model/command/adapter/nonebot/driver.py delete mode 100644 model/command/adapter/onebot/bot.py delete mode 100644 model/command/adapter/onebot/message.py delete mode 100644 model/command/adapter/onebot/message_event.py delete mode 100644 model/command/adapter/onebot/message_segment.py delete mode 100644 model/command/adapter/protocol_adapter.py diff --git a/model/command/adapter/nonebot/command_arg.py b/model/command/adapter/nonebot/command_arg.py deleted file mode 100644 index 3f6e8a305..000000000 --- a/model/command/adapter/nonebot/command_arg.py +++ /dev/null @@ -1,2 +0,0 @@ -class CommandArg: - pass \ No newline at end of file diff --git a/model/command/adapter/nonebot/common.py b/model/command/adapter/nonebot/common.py deleted file mode 100644 index ac7532768..000000000 --- a/model/command/adapter/nonebot/common.py +++ /dev/null @@ -1,32 +0,0 @@ -import sys -from types import ModuleType -import asyncio -from pyppeteer import launch - - -async def template_to_pic(template_path, template_name, templates, pages, wait, type, quality, device_scale_factor): - browser = await launch() - page = await browser.newPage() - await page.setViewport(pages["viewport"]) - await page.goto(pages["base_url"]) - await asyncio.sleep(wait) - await page.evaluate('''(templates) => { - // 在页面中执行 JavaScript 代码，将数据注入到模板中 - // 这里的示例代码仅供参考，具体需要根据实际情况修改 - document.getElementById('css').innerText = templates.css; - document.getElementById('data').innerText = JSON.stringify(templates.data); - document.getElementById('detail').innerText = templates.detail; - }''', templates) - screenshot = await page.screenshot({ - 'type': type, - 'quality': quality, - 'deviceScaleFactor': device_scale_factor - }) - await browser.close() - return screenshot - -def require(module_str: str): - module = ModuleType(module_str) - sys.modules[module_str] = module - if module_str == 'nonebot_plugin_htmlrender': - module.template_to_pic = template_to_pic diff --git a/model/command/adapter/nonebot/driver.py b/model/command/adapter/nonebot/driver.py deleted file mode 100644 index a184fbcaf..000000000 --- a/model/command/adapter/nonebot/driver.py +++ /dev/null @@ -1,11 +0,0 @@ -class Driver: - def __init__(self) -> None: - self.config = {} - - def on_startup(self, func): - pass - def on_bot_connect(self, func): - pass - -def get_driver(): - return Driver() \ No newline at end of file diff --git a/model/command/adapter/onebot/bot.py b/model/command/adapter/onebot/bot.py deleted file mode 100644 index 19be4bcb3..000000000 --- a/model/command/adapter/onebot/bot.py +++ /dev/null @@ -1,2 +0,0 @@ -class Bot: - pass \ No newline at end of file diff --git a/model/command/adapter/onebot/message.py b/model/command/adapter/onebot/message.py deleted file mode 100644 index 574b0ce16..000000000 --- a/model/command/adapter/onebot/message.py +++ /dev/null @@ -1,2 +0,0 @@ -class Message: - pass \ No newline at end of file diff --git a/model/command/adapter/onebot/message_event.py b/model/command/adapter/onebot/message_event.py deleted file mode 100644 index 11712e075..000000000 --- a/model/command/adapter/onebot/message_event.py +++ /dev/null @@ -1,2 +0,0 @@ -class MessageEvent: - pass \ No newline at end of file diff --git a/model/command/adapter/onebot/message_segment.py b/model/command/adapter/onebot/message_segment.py deleted file mode 100644 index 2905a1757..000000000 --- a/model/command/adapter/onebot/message_segment.py +++ /dev/null @@ -1,2 +0,0 @@ -class MessageSegment: - pass \ No newline at end of file diff --git a/model/command/adapter/protocol_adapter.py b/model/command/adapter/protocol_adapter.py deleted file mode 100644 index 3e182d4d7..000000000 --- a/model/command/adapter/protocol_adapter.py +++ /dev/null @@ -1,138 +0,0 @@ -import sys -from types import ModuleType -import asyncio -from pyppeteer import launch - -from model.platform.qqchan import QQChan - -from .nonebot.driver import Driver, get_driver -from .onebot.message import Message -from .onebot.message_event import MessageEvent -from .onebot.message_segment import MessageSegment -from .nonebot.command_arg import CommandArg -from .onebot.bot import Bot -from .nonebot.common import require - -from nakuru import ( - GuildMessage, - GroupMessage, - FriendMessage -) - -from typing import Union - -NONEBOT = "nonebot" - -class UnifiedBotCompatibleLayer(): - def __init__(self, platform_qq_sdk: QQChan) -> None: - # 初始化兼容层 - self.plugins: dict[str, CommandOper] = {} - self.platform_qq_sdk = platform_qq_sdk - self._nonebot() - self.load_plugins() - - async def check_commands(self, message: str, message_obj: Union[GroupMessage, FriendMessage, GuildMessage]): - for k in self.plugins: - if message.startswith(k): - if self.plugins[k].framework_name == NONEBOT: - await self._nonebot_plugins_oper(message, message_obj, k) - - async def _nonebot_plugins_oper(self, message: str, message_obj: Union[GroupMessage, FriendMessage, GuildMessage], plugin_name: str = None): - # bad implementation - # 高并发场景下，下面的代码是不安全的 - while self.plugins[plugin_name].message_obj is not None: - await asyncio.sleep(1) - self.plugins[plugin_name].message_obj = message_obj - bot, event, arg = self._nonebot_adapter(message_obj) - await self.plugins[plugin_name].exec(bot, event, arg) # wrapper - - def load_plugins(self): - import nonebot_plugin_gspanel.nonebot_plugin_gspanel - - def _nonebot(self): - # 模拟 nonebot 模块 - nonebot_module = ModuleType('nonebot') - sys.modules['nonebot'] = nonebot_module - - nonebot_log_module = ModuleType('nonebot.log') - sys.modules['nonebot.log'] = nonebot_log_module - - nonebot_adapter_module = ModuleType('nonebot.adapters') - sys.modules['nonebot.adapters'] = nonebot_adapter_module - - nonebot_params_module = ModuleType('nonebot.params') - sys.modules['nonebot.params'] = nonebot_params_module - - nonebot_drivers_module = ModuleType('nonebot.drivers') - sys.modules['nonebot.drivers'] = nonebot_drivers_module - - nonebot_plugin_module = ModuleType('nonebot.plugin') - sys.modules['nonebot.plugin'] = nonebot_plugin_module - - nonebot_adapter_onebot_v11_module = ModuleType('nonebot.adapters.onebot.v11') - sys.modules['nonebot.adapters.onebot.v11'] = nonebot_adapter_onebot_v11_module - - nonebot_adapter_onebot_v11_event_module = ModuleType('nonebot.adapters.onebot.v11.event') - sys.modules['nonebot.adapters.onebot.v11.event'] = nonebot_adapter_onebot_v11_event_module - - nonebot_adapter_onebot_v11_message_module = ModuleType('nonebot.adapters.onebot.v11.message') - sys.modules['nonebot.adapters.onebot.v11.message'] = nonebot_adapter_onebot_v11_message_module - - nonebot_log_module.logger = lambda: None - nonebot_adapter_module.Message = Message - nonebot_params_module.CommandArg = CommandArg - on_command = wrap_on_command(self) - nonebot_plugin_module.on_command = on_command - nonebot_adapter_onebot_v11_module.Bot = Bot - nonebot_adapter_onebot_v11_event_module.MessageEvent = MessageEvent - nonebot_adapter_onebot_v11_message_module.MessageSegment = MessageSegment - nonebot_module.get_driver = get_driver - nonebot_module.require = require - nonebot_drivers_module.Driver = Driver - - def _nonebot_adapter(self, message_obj): - bot = Bot() - event = MessageEvent() - arg = CommandArg() - # tododssss - return bot, event, arg - - -class BaseBot(): - def __init__(self, framework_name) -> None: - self.framework_name = framework_name - -class CommandOper(BaseBot): - ''' - CommandOper for NoneBot - ''' - def __init__(self, name, aliases=None, priority=1, block=False, _ubcl: UnifiedBotCompatibleLayer = None) -> None: - super().__init__("nonebot") - self.name = name - self.aliases = aliases - self.priority = priority - self.block = block - self.exec = None - self._ubcl = _ubcl - self.message_obj: Union[GroupMessage, FriendMessage, GuildMessage] = None - _ubcl.plugins[name] = self - - def handle(self): - def decorator(func): - async def wrapper(bot: Bot, event: MessageEvent, arg: Message = CommandArg(), *args, **kwargs): - # 你可以在这里添加自定义的处理逻辑 - print(f"Command {self.name} is executed.") - await func(bot, event, arg, *args, **kwargs) - self.exec = wrapper - return wrapper - return decorator - - async def finish(self, msg, at_sender = True): - if self.message_obj is not None: - self._ubcl.platform_qq_sdk.send(self.message_obj, msg) - self.message_obj = None - -def wrap_on_command(_ubcl: UnifiedBotCompatibleLayer): - def on_command(name, aliases=None, priority=1, block=False): - return CommandOper(name, aliases, priority, block, _ubcl = _ubcl) - return on_command