diff --git a/mautrix_telegram/commands/handler.py b/mautrix_telegram/commands/handler.py index cb39a37b..fe820a56 100644 --- a/mautrix_telegram/commands/handler.py +++ b/mautrix_telegram/commands/handler.py @@ -285,15 +285,10 @@ class CommandHandler: def command_handler(_func: Optional[Callable[[CommandEvent], Awaitable[Dict]]] = None, *, - needs_auth: bool = True, - needs_puppeting: bool = True, - needs_matrix_puppeting: bool = False, - needs_admin: bool = False, - management_only: bool = False, - name: Optional[str] = None, - help_text: str = "", - help_args: str = "", - help_section: HelpSection = None, + needs_auth: bool = True, needs_puppeting: bool = True, + needs_matrix_puppeting: bool = False, needs_admin: bool = False, + management_only: bool = False, name: Optional[str] = None, + help_text: str = "", help_args: str = "", help_section: HelpSection = None ) -> Callable[[Callable[[CommandEvent], Awaitable[Optional[Dict]]]], CommandHandler]: def decorator(func: Callable[[CommandEvent], Awaitable[Optional[Dict]]]) -> CommandHandler: diff --git a/mautrix_telegram/formatter/from_telegram.py b/mautrix_telegram/formatter/from_telegram.py index 27f264da..2afe7a6e 100644 --- a/mautrix_telegram/formatter/from_telegram.py +++ b/mautrix_telegram/formatter/from_telegram.py @@ -44,7 +44,6 @@ try: except ImportError: htmldiff = None # type: ignore - log = logging.getLogger("mau.fmt.tg") # type: logging.Logger should_highlight_edits = False # type: bool @@ -258,9 +257,9 @@ def _telegram_entities_to_matrix(text: str, entities: List[TypeMessageEntity]) - elif entity_type == MessageEntityItalic: html.append(f"{entity_text}") elif entity_type == MessageEntityCode: - html.append(f"
{entity_text}"
- if "\n" in entity_text
- else f"{entity_text}")
+ html.append(("{entity_text}"
+ if "\n" in entity_text
+ else "{entity_text}").format(entity_text=entity_text))
elif entity_type == MessageEntityPre:
skip_entity = _parse_pre(html, entity_text, entity.language)
elif entity_type == MessageEntityMention: