diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 712f4b9..9f75d97 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,15 +7,15 @@ ci: autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks" repos: - repo: https://github.com/pycqa/isort - rev: 5.13.2 + rev: 9.0.1 hooks: - id: isort - stages: [commit] - - repo: https://github.com/psf/black - rev: 24.8.0 + stages: [pre-commit] + - repo: https://github.com/psf/black-pre-commit-mirror + rev: 26.5.1 hooks: - id: black - stages: [commit] + stages: [pre-commit] - repo: https://github.com/nonebot/nonemoji rev: v0.1.4 hooks: diff --git a/OlivOS/nonebot/middlewares/__init__.py b/OlivOS/nonebot/middlewares/__init__.py index cbbf427..91e4c7a 100644 --- a/OlivOS/nonebot/middlewares/__init__.py +++ b/OlivOS/nonebot/middlewares/__init__.py @@ -4,10 +4,9 @@ from abc import ABC, abstractmethod from typing import Any, Dict, Type, Union, Callable, Optional, Coroutine -from pydantic import BaseModel - from nonebot import get_bot from nonebot.log import logger +from pydantic import BaseModel from nonebot.adapters import Bot, Event middlewares_map = {"OneBot V11": "onebot", "Telegram": "telegram"} @@ -111,23 +110,23 @@ def process_event(self, event: Event): def process_message(self): if self.plugin_info["func_type"] in ["private_message", "group_message"]: if ( - self.data.message_sdk.mode_rx # type:ignore + self.data.message_sdk.mode_rx # type: ignore == self.plugin_info["message_mode_tx"] ): - self.data.message = self.data.message_sdk.data_raw # type:ignore + self.data.message = self.data.message_sdk.data_raw # type: ignore else: - self.data.message = self.data.message_sdk.get( # type:ignore + self.data.message = self.data.message_sdk.get( # type: ignore self.plugin_info["message_mode_tx"] ) if ( - self.data.raw_message_sdk.mode_rx # type:ignore + self.data.raw_message_sdk.mode_rx # type: ignore == self.plugin_info["message_mode_tx"] ): self.data.raw_message = ( - self.data.raw_message_sdk.data_raw # type:ignore + self.data.raw_message_sdk.data_raw # type: ignore ) else: - self.data.raw_message = self.data.raw_message_sdk.get( # type:ignore + self.data.raw_message = self.data.raw_message_sdk.get( # type: ignore self.plugin_info["message_mode_tx"] ) diff --git a/OlivOS/nonebot/middlewares/onebot.py b/OlivOS/nonebot/middlewares/onebot.py index 6b8fa4f..091e601 100644 --- a/OlivOS/nonebot/middlewares/onebot.py +++ b/OlivOS/nonebot/middlewares/onebot.py @@ -4,9 +4,8 @@ from typing import Dict, Type, Optional, cast -from OlivOS.messageAPI import Message_templet - from nonebot import get_bot +from OlivOS.messageAPI import Message_templet from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.event import ( diff --git a/OlivOS/nonebot/middlewares/telegram.py b/OlivOS/nonebot/middlewares/telegram.py index fc580c1..679a65a 100644 --- a/OlivOS/nonebot/middlewares/telegram.py +++ b/OlivOS/nonebot/middlewares/telegram.py @@ -5,9 +5,8 @@ from datetime import datetime from typing import Dict, Type, Optional -from OlivOS.messageAPI import Message_templet - from nonebot import get_bot +from OlivOS.messageAPI import Message_templet from nonebot.adapters.telegram.bot import Bot from nonebot.adapters.telegram.message import Message from nonebot.adapters.telegram.event import ( @@ -70,5 +69,5 @@ def reply(self, message: MSG): def send(self, message: MSG): self.call_api( - "sendMessage", chat_id=self.data.chat.id, text=message # type:ignore + "sendMessage", chat_id=self.data.chat.id, text=message # type: ignore )