Skip to content
This repository has been archived by the owner on Sep 7, 2024. It is now read-only.

Commit

Permalink
🚨 auto fix by pre-commit hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] committed Jun 3, 2024
1 parent dd356aa commit 64029fb
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 21 deletions.
5 changes: 3 additions & 2 deletions src/nonebot_adapter_onebot_pretender/v11/adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ async def handle_event(bot: BaseBot, event: BaseEvent) -> bool:

@classmethod
@abstractmethod
def get_pretender_type(cls) -> Type["OB11Pretender[T_ActualAdapter, T_ActualBot]"]:
...
def get_pretender_type(
cls,
) -> Type["OB11Pretender[T_ActualAdapter, T_ActualBot]"]: ...

def get_actual_bot(self, bot: OB11Bot) -> Optional[T_ActualBot]:
return self.actual_adapter.bots.get(bot.self_id)
Expand Down
36 changes: 19 additions & 17 deletions src/nonebot_adapter_onebot_pretender/v11/impl/red/__init__.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import json
from pathlib import Path
from base64 import b64decode
from datetime import datetime
from pathlib import Path
from typing import Dict, List, Type, Union, Optional
from urllib.parse import urlencode, urlunsplit
from typing import Dict, List, Type, Union, Optional

from nonebot.adapters.onebot.v11 import ActionFailed
from nonebot.adapters.onebot.v11 import Message as OB11Msg
from nonebot.adapters.onebot.v11 import MessageSegment as OB11MS
from nonebot.adapters.onebot.v11 import event as ob11_event
from nonebot.adapters.onebot.v11.event import Reply, Sender
from nonebot.adapters.red import Adapter as RedAdapter
from nonebot.adapters.red import Bot as RedBot
from nonebot.adapters.red import Message as RedMsg
from nonebot.adapters.red import MessageSegment as RedMS
from nonebot.adapters.red import event as red_event
from nonebot.adapters.red.api.model import ChatType
from nonebot.adapters.red.message import ForwardNode, MediaMessageSegment
from nonebot.adapters.onebot.v11 import ActionFailed
from nonebot.adapters.red import Adapter as RedAdapter
from nonebot.adapters.red import MessageSegment as RedMS
from nonebot.adapters.onebot.v11 import Message as OB11Msg
from nonebot.utils import DataclassEncoder, logger_wrapper
from nonebot.adapters.onebot.v11 import event as ob11_event
from nonebot.adapters.onebot.v11.event import Reply, Sender
from nonebot.adapters.onebot.v11 import MessageSegment as OB11MS
from nonebot.adapters.red.message import ForwardNode, MediaMessageSegment

from ....webapi import red # noqa: F401
from ...factory import register_ob11_pretender
from ...pretender import OB11Pretender, event_handler, api_call_handler
from ....data.ob11_msg import OB11MsgModel, load_ob11_msg, save_ob11_msg
from ....webapi import red # noqa: F401

log = logger_wrapper("OneBot V11 Pretender (RedProtocol)")

Expand Down Expand Up @@ -262,9 +262,11 @@ async def _send_forward_msg(
messages: Union[List[Dict], List[OB11MS], OB11Msg],
) -> Dict:
messages = [
json.loads(json.dumps(seg, cls=DataclassEncoder))
if isinstance(seg, OB11MS)
else seg
(
json.loads(json.dumps(seg, cls=DataclassEncoder))
if isinstance(seg, OB11MS)
else seg
)
for seg in messages
] # 将Message转换为List

Expand Down Expand Up @@ -294,8 +296,8 @@ async def _send_forward_msg(
ForwardNode(
uin=str(data.get("uin") or data.get("user_id")),
name=data.get("name")
or data.get("nickname")
or str(data.get("uin") or data.get("user_id")),
or data.get("nickname")
or str(data.get("uin") or data.get("user_id")),
group=0,
message=self.convert_outgoing_msg(
OB11Msg(OB11MS(**raw_seg) for raw_seg in data["content"])
Expand Down Expand Up @@ -365,7 +367,7 @@ async def get_group_list(self, bot: RedBot, **data: Dict) -> List:
async def get_group_member_list(
self, bot: RedBot, *, group_id: int, **data: Dict
) -> List:
members = await bot.get_members(group_id, 2 ** 16 - 1)
members = await bot.get_members(group_id, 2**16 - 1)
return [
{
"group_id": group_id,
Expand Down
3 changes: 1 addition & 2 deletions src/nonebot_adapter_onebot_pretender/v11/pretender.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ def log(cls, level: str, content: str, exc: Optional[BaseException] = None):

@classmethod
@abstractmethod
def get_actual_adapter_type(cls) -> Type[T_ActualAdapter]:
...
def get_actual_adapter_type(cls) -> Type[T_ActualAdapter]: ...

async def handle_api_call(self, bot: OB11Bot, api: str, **data: Any) -> Any:
handler = self._api_call_handler_mapping.get(api)
Expand Down

0 comments on commit 64029fb

Please sign in to comment.