Blacken and isort code
This commit is contained in:
@@ -17,14 +17,14 @@ from __future__ import annotations
|
||||
|
||||
import re
|
||||
|
||||
from telethon.tl.types import MessageEntityItalic, TypeMessageEntity
|
||||
from telethon.helpers import add_surrogate, del_surrogate
|
||||
from telethon import TelegramClient
|
||||
from telethon.helpers import add_surrogate, del_surrogate
|
||||
from telethon.tl.types import MessageEntityItalic, TypeMessageEntity
|
||||
|
||||
from mautrix.types import RoomID, MessageEventContent
|
||||
from mautrix.types import MessageEventContent, RoomID
|
||||
|
||||
from ...types import TelegramID
|
||||
from ...db import Message as DBMessage
|
||||
from ...types import TelegramID
|
||||
from .parser import MatrixParser
|
||||
|
||||
command_regex = re.compile(r"^!([A-Za-z0-9@]+)")
|
||||
|
||||
@@ -19,13 +19,13 @@ import logging
|
||||
|
||||
from telethon import TelegramClient
|
||||
|
||||
from mautrix.types import UserID, RoomID
|
||||
from mautrix.types import RoomID, UserID
|
||||
from mautrix.util.formatter import MatrixParser as BaseMatrixParser, RecursionContext
|
||||
from mautrix.util.formatter.html_reader_htmlparser import read_html, HTMLNode
|
||||
from mautrix.util.formatter.html_reader_htmlparser import HTMLNode, read_html
|
||||
from mautrix.util.logging import TraceLogger
|
||||
|
||||
from ... import user as u, puppet as pu, portal as po
|
||||
from .telegram_message import TelegramMessage, TelegramEntityType
|
||||
from ... import portal as po, puppet as pu, user as u
|
||||
from .telegram_message import TelegramEntityType, TelegramMessage
|
||||
|
||||
log: TraceLogger = logging.getLogger("mau.fmt.mx")
|
||||
|
||||
@@ -48,8 +48,9 @@ class MatrixParser(BaseMatrixParser[TelegramMessage]):
|
||||
return None
|
||||
|
||||
async def user_pill_to_fstring(self, msg: TelegramMessage, user_id: UserID) -> TelegramMessage:
|
||||
user = (await pu.Puppet.get_by_mxid(user_id)
|
||||
or await u.User.get_by_mxid(user_id, create=False))
|
||||
user = await pu.Puppet.get_by_mxid(user_id) or await u.User.get_by_mxid(
|
||||
user_id, create=False
|
||||
)
|
||||
if not user:
|
||||
return msg
|
||||
if user.tg_username:
|
||||
|
||||
@@ -18,20 +18,30 @@ from __future__ import annotations
|
||||
from typing import Any, Type
|
||||
from enum import Enum
|
||||
|
||||
from telethon.tl.types import (MessageEntityMention as Mention, MessageEntityBotCommand as Command,
|
||||
MessageEntityMentionName as MentionName, MessageEntityUrl as URL,
|
||||
MessageEntityEmail as Email, MessageEntityTextUrl as TextURL,
|
||||
MessageEntityBold as Bold, MessageEntityItalic as Italic,
|
||||
MessageEntityCode as Code, MessageEntityPre as Pre,
|
||||
MessageEntityStrike as Strike, MessageEntityUnderline as Underline,
|
||||
MessageEntityBlockquote as Blockquote, TypeMessageEntity,
|
||||
InputMessageEntityMentionName as InputMentionName)
|
||||
from telethon.tl.types import (
|
||||
InputMessageEntityMentionName as InputMentionName,
|
||||
MessageEntityBlockquote as Blockquote,
|
||||
MessageEntityBold as Bold,
|
||||
MessageEntityBotCommand as Command,
|
||||
MessageEntityCode as Code,
|
||||
MessageEntityEmail as Email,
|
||||
MessageEntityItalic as Italic,
|
||||
MessageEntityMention as Mention,
|
||||
MessageEntityMentionName as MentionName,
|
||||
MessageEntityPre as Pre,
|
||||
MessageEntityStrike as Strike,
|
||||
MessageEntityTextUrl as TextURL,
|
||||
MessageEntityUnderline as Underline,
|
||||
MessageEntityUrl as URL,
|
||||
TypeMessageEntity,
|
||||
)
|
||||
|
||||
from mautrix.util.formatter import EntityString, SemiAbstractEntity
|
||||
|
||||
|
||||
class TelegramEntityType(Enum):
|
||||
"""EntityType is a Matrix formatting entity type."""
|
||||
|
||||
BOLD = Bold
|
||||
ITALIC = Italic
|
||||
STRIKETHROUGH = Strike
|
||||
@@ -54,8 +64,13 @@ class TelegramEntityType(Enum):
|
||||
class TelegramEntity(SemiAbstractEntity):
|
||||
internal: TypeMessageEntity
|
||||
|
||||
def __init__(self, type: TelegramEntityType | Type[TypeMessageEntity],
|
||||
offset: int, length: int, extra_info: dict[str, Any]) -> None:
|
||||
def __init__(
|
||||
self,
|
||||
type: TelegramEntityType | Type[TypeMessageEntity],
|
||||
offset: int,
|
||||
length: int,
|
||||
extra_info: dict[str, Any],
|
||||
) -> None:
|
||||
if isinstance(type, TelegramEntityType):
|
||||
if isinstance(type.value, int):
|
||||
raise ValueError(f"Can't create Entity with non-Telegram EntityType {type}")
|
||||
@@ -70,8 +85,12 @@ class TelegramEntity(SemiAbstractEntity):
|
||||
extra_info["url"] = self.internal.url
|
||||
elif isinstance(self.internal, (MentionName, InputMentionName)):
|
||||
extra_info["user_id"] = self.internal.user_id
|
||||
return TelegramEntity(type(self.internal), offset=self.internal.offset,
|
||||
length=self.internal.length, extra_info=extra_info)
|
||||
return TelegramEntity(
|
||||
type(self.internal),
|
||||
offset=self.internal.offset,
|
||||
length=self.internal.length,
|
||||
extra_info=extra_info,
|
||||
)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return str(self.internal)
|
||||
|
||||
Reference in New Issue
Block a user