Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 7 additions & 8 deletions OlivOS/nonebot/middlewares/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down Expand Up @@ -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"]
)

Expand Down
3 changes: 1 addition & 2 deletions OlivOS/nonebot/middlewares/onebot.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
5 changes: 2 additions & 3 deletions OlivOS/nonebot/middlewares/telegram.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
)