iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add config option for plaintext highlight bridging

Browse Source
This commit is contained in:
Tulir Asokan
2018-03-08 20:33:13 +02:00
parent 9709768b17
commit 8bfb416735
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example-config.yaml
+4
View File
@@ -89,6 +89,10 @@ bridge:
# Use inline images instead of m.image to make rich captions possible. # Use inline images instead of m.image to make rich captions possible.
# N.B. Inline images are not supported on all clients (e.g. Riot iOS). # N.B. Inline images are not supported on all clients (e.g. Riot iOS).
inline_images: false inline_images: false
# Whether or not to bridge plaintext highlights.
# Only enable this if your displayname_template has some static part that the bridge can use to
# reliably identify what is a plaintext highlight.
plaintext_highlights: false
# The prefix for commands. Only required in non-management rooms. # The prefix for commands. Only required in non-management rooms.
command_prefix: "!tg" command_prefix: "!tg"
mautrix_telegram/formatter/from_matrix.py
+10 -4
View File
@@ -29,6 +29,7 @@ from .util import (add_surrogates, remove_surrogates, trim_reply_fallback_html,
trim_reply_fallback_text, html_to_unicode) trim_reply_fallback_text, html_to_unicode)
log = logging.getLogger("mau.fmt.mx") log = logging.getLogger("mau.fmt.mx")
should_bridge_plaintext_highlights = False
class MatrixParser(HTMLParser): class MatrixParser(HTMLParser):
@@ -224,8 +225,11 @@ plain_mention_regex = None
def matrix_text_to_telegram(text): def matrix_text_to_telegram(text):
text = command_regex.sub(r"\1/\2", text) text = command_regex.sub(r"\1/\2", text)
entities, pmr_replacer = plain_mention_to_text() if should_bridge_plaintext_highlights:
text = plain_mention_regex.sub(pmr_replacer, text) entities, pmr_replacer = plain_mention_to_text()
text = plain_mention_regex.sub(pmr_replacer, text)
else:
entities = []
return text, entities return text, entities
@@ -266,7 +270,8 @@ def matrix_to_telegram(html):
parser = MatrixParser() parser = MatrixParser()
html = html.replace("\n", "") html = html.replace("\n", "")
html = command_regex.sub(r"\1<command>\2</command>", html) html = command_regex.sub(r"\1<command>\2</command>", html)
html = plain_mention_regex.sub(plain_mention_to_html, html) if should_bridge_plaintext_highlights:
html = plain_mention_regex.sub(plain_mention_to_html, html)
parser.feed(add_surrogates(html)) parser.feed(add_surrogates(html))
return remove_surrogates(parser.text.strip()), parser.entities return remove_surrogates(parser.text.strip()), parser.entities
except Exception: except Exception:
@@ -297,8 +302,9 @@ def matrix_reply_to_telegram(content, tg_space, room_id=None):
def init_mx(context): def init_mx(context):
global plain_mention_regex global plain_mention_regex, should_bridge_plaintext_highlights
config = context.config config = context.config
dn_template = config.get("bridge.displayname_template", "{displayname} (Telegram)") dn_template = config.get("bridge.displayname_template", "{displayname} (Telegram)")
dn_template = re.escape(dn_template).replace(re.escape("{displayname}"), "[^>]+") dn_template = re.escape(dn_template).replace(re.escape("{displayname}"), "[^>]+")
plain_mention_regex = re.compile(f"(\s|^)({dn_template})") plain_mention_regex = re.compile(f"(\s|^)({dn_template})")
should_bridge_plaintext_highlights = config["bridge.plaintext_highlights"] or False