`")
+ try:
+ await evt.sender.ensure_started(even_if_no_session=True)
+ first_name, last_name = evt.sender.command_status["full_name"]
+ user = await evt.sender.client.sign_up(evt.args[0], first_name, last_name)
+ asyncio.ensure_future(evt.sender.post_login(user), loop=evt.loop)
+ evt.sender.command_status = None
+ return await evt.reply(f"Successfully registered to Telegram.")
+ except PhoneNumberOccupiedError:
+ return await evt.reply("That phone number has already been registered. "
+ "You can log in with `$cmdprefix+sp login`.")
+ except FirstNameInvalidError:
+ return await evt.reply("Invalid name. Please set a Matrix displayname before registering.")
+ except PhoneCodeExpiredError:
+ return await evt.reply(
+ "Phone code expired. Try again with `$cmdprefix+sp register `.")
+ except PhoneCodeInvalidError:
+ return await evt.reply("Invalid phone code.")
+ except Exception:
+ evt.log.exception("Error sending phone code")
+ return await evt.reply("Unhandled exception while sending code. "
+ "Check console for more details.")
+
+
@command_handler(needs_auth=False, management_only=True)
async def login(evt):
if evt.sender.logged_in:
@@ -80,22 +124,12 @@ async def login(evt):
return await evt.reply("This bridge instance has been configured to not allow logging in.")
-@command_handler(needs_auth=False)
-async def enter_phone(evt):
- if len(evt.args) == 0:
- return await evt.reply("**Usage:** `$cmdprefix+sp enter-phone `")
- elif not evt.config.get("bridge.allow_matrix_login", True):
- return await evt.reply("This bridge instance does not allow in-Matrix login. "
- "Please use `$cmdprefix+sp login` to get login instructions")
-
- phone_number = evt.args[0]
+async def request_code(evt, phone_number, next_status):
+ ok = False
try:
await evt.sender.ensure_started(even_if_no_session=True)
await evt.sender.client.sign_in(phone_number)
- evt.sender.command_status = {
- "next": enter_code,
- "action": "Login",
- }
+ ok = True
return await evt.reply(f"Login code sent to {phone_number}. Please send the code here.")
except PhoneNumberAppSignupForbiddenError:
return await evt.reply(
@@ -109,17 +143,31 @@ async def enter_phone(evt):
"Your phone number has been temporarily blocked for flooding. "
f"Please wait for {format_duration(e.seconds)} before trying again.")
except PhoneNumberBannedError:
- return await evt.reply("Your phone number has been banned from Telegram.")
+ return await evt.reply("Your phone number has been banned from Telegram.")
except PhoneNumberUnoccupiedError:
- return await evt.reply("That phone number has not been registered. "
- "Please register with `$cmdprefix+sp register `.")
+ return await evt.reply("That phone number has not been registered. "
+ "Please register with `$cmdprefix+sp register `.")
except Exception:
evt.log.exception("Error requesting phone code")
return await evt.reply("Unhandled exception while requesting code. "
"Check console for more details.")
finally:
- if evt.sender.command_status["next"] == enter_phone:
- evt.sender.command_status = None
+ evt.sender.command_status = next_status if ok else None
+
+
+@command_handler(needs_auth=False)
+async def enter_phone(evt):
+ if len(evt.args) == 0:
+ return await evt.reply("**Usage:** `$cmdprefix+sp enter-phone `")
+ elif not evt.config.get("bridge.allow_matrix_login", True):
+ return await evt.reply("This bridge instance does not allow in-Matrix login. "
+ "Please use `$cmdprefix+sp login` to get login instructions")
+
+ phone_number = evt.args[0]
+ await request_code(evt, phone_number, {
+ "next": enter_code,
+ "action": "Login",
+ })
@command_handler(needs_auth=False)
@@ -136,8 +184,7 @@ async def enter_code(evt):
evt.sender.command_status = None
return await evt.reply(f"Successfully logged in as @{user.username}")
except PhoneCodeExpiredError:
- return await evt.reply(
- "Phone code expired. Try again with `$cmdprefix+sp login `.")
+ return await evt.reply("Phone code expired. Try again with `$cmdprefix+sp login`.")
except PhoneCodeInvalidError:
return await evt.reply("Invalid phone code.")
except SessionPasswordNeededError:
@@ -160,7 +207,6 @@ async def enter_password(evt):
elif not evt.config.get("bridge.allow_matrix_login", True):
return await evt.reply("This bridge instance does not allow in-Matrix login. "
"Please use `$cmdprefix+sp login` to get login instructions")
-
try:
await evt.sender.ensure_started(even_if_no_session=True)
user = await evt.sender.client.sign_in(password=evt.args[0])
diff --git a/mautrix_telegram/commands/clean_rooms.py b/mautrix_telegram/commands/clean_rooms.py
index 5c515645..71ef2a91 100644
--- a/mautrix_telegram/commands/clean_rooms.py
+++ b/mautrix_telegram/commands/clean_rooms.py
@@ -3,17 +3,17 @@
# Copyright (C) 2018 Tulir Asokan
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see [mxid]`")
+ except ValueError:
+ return await evt.reply("The level must be an integer.")
+ levels = await evt.az.intent.get_power_levels(evt.room_id)
+ mxid = evt.args[1] if len(evt.args) > 1 else evt.sender.mxid
+ levels["users"][mxid] = level
+ try:
+ await evt.az.intent.set_power_levels(evt.room_id, levels)
+ except MatrixRequestError:
+ evt.log.exception("Failed to set power level.")
+ return await evt.reply("Failed to set power level.")
+
+
@command_handler()
async def invite_link(evt: CommandEvent):
portal = po.Portal.get_by_mxid(evt.room_id)
diff --git a/mautrix_telegram/commands/telegram.py b/mautrix_telegram/commands/telegram.py
index 7be428e0..34e81c0a 100644
--- a/mautrix_telegram/commands/telegram.py
+++ b/mautrix_telegram/commands/telegram.py
@@ -3,17 +3,17 @@
# Copyright (C) 2018 Tulir Asokan
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see \2 ", html)
+ if should_bridge_plaintext_highlights:
+ html = plain_mention_regex.sub(plain_mention_to_html, html)
parser.feed(add_surrogates(html))
return remove_surrogates(parser.text.strip()), parser.entities
except Exception:
log.exception("Failed to convert Matrix format:\nhtml=%s", html)
-def matrix_reply_to_telegram(content, tg_space, room_id=None):
+def matrix_reply_to_telegram(content: dict, tg_space: int, room_id: Optional[str] = None
+ ) -> Optional[int]:
try:
reply = content["m.relates_to"]["m.in_reply_to"]
room_id = room_id or reply["room_id"]
event_id = reply["event_id"]
+
+ try:
+ if content["format"] == "org.matrix.custom.html":
+ content["formatted_body"] = trim_reply_fallback_html(content["formatted_body"])
+ except KeyError:
+ pass
+ content["body"] = trim_reply_fallback_text(content["body"])
+
message = DBMessage.query.filter(DBMessage.mxid == event_id,
DBMessage.tg_space == tg_space,
DBMessage.mx_room == room_id).one_or_none()
@@ -242,3 +300,44 @@ def matrix_reply_to_telegram(content, tg_space, room_id=None):
except KeyError:
pass
return None
+
+
+def matrix_text_to_telegram(text: str) -> Tuple[str, List[TypeMessageEntity]]:
+ text = command_regex.sub(r"\1/\2", text)
+ if should_bridge_plaintext_highlights:
+ entities, pmr_replacer = plain_mention_to_text()
+ text = plain_mention_regex.sub(pmr_replacer, text)
+ else:
+ entities = []
+ return text, entities
+
+
+def plain_mention_to_text() -> Tuple[List[TypeMessageEntity], Callable[[str], str]]:
+ entities = []
+
+ def replacer(match):
+ puppet = pu.Puppet.find_by_displayname(match.group(2))
+ if puppet:
+ offset = match.start()
+ length = match.end() - offset
+ if puppet.username:
+ entity = MessageEntityMention(offset, length)
+ text = f"@{puppet.username}"
+ else:
+ entity = InputMessageEntityMentionName(offset, length,
+ user_id=InputUser(puppet.tgid, 0))
+ text = puppet.displayname
+ entities.append(entity)
+ return text
+ return "".join(match.groups())
+
+ return entities, replacer
+
+
+def init_mx(context: Context):
+ global plain_mention_regex, should_bridge_plaintext_highlights
+ config = context.config
+ dn_template = config.get("bridge.displayname_template", "{displayname} (Telegram)")
+ dn_template = re.escape(dn_template).replace(re.escape("{displayname}"), "[^>]+")
+ plain_mention_regex = re.compile(f"(\s|^)({dn_template})")
+ should_bridge_plaintext_highlights = config["bridge.plaintext_highlights"] or False
diff --git a/mautrix_telegram/formatter/from_telegram.py b/mautrix_telegram/formatter/from_telegram.py
index 82b38c10..4cd6de00 100644
--- a/mautrix_telegram/formatter/from_telegram.py
+++ b/mautrix_telegram/formatter/from_telegram.py
@@ -3,31 +3,55 @@
# Copyright (C) 2018 Tulir Asokan
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see s since we just want to hide deletions.
+ new_html = re.sub(".+?", "", new_html)
+ return new_html
+
+
+async def _add_reply_header(source: u.User, text: str, html: str, evt: Message, relates_to: dict,
+ main_intent: IntentAPI, is_edit: bool) -> Tuple[str, str]:
space = (evt.to_id.channel_id
if isinstance(evt, Message) and isinstance(evt.to_id, PeerChannel)
else source.tgid)
@@ -77,52 +117,71 @@ async def _add_reply_header(source, text, html, evt, relates_to,
if not msg:
return text, html
- if native_replies:
- relates_to["m.in_reply_to"] = {
- "event_id": msg.mxid,
- "room_id": msg.mx_room,
- }
- if reply_text == "Edit":
- html = f"Edit: {html or escape(text)}"
- text = f"Edit: {text}"
- return text, html
+ relates_to["m.in_reply_to"] = {
+ "event_id": msg.mxid,
+ "room_id": msg.mx_room,
+ }
- reply_displayname = "unknown user"
try:
event = await main_intent.get_event(msg.mx_room, msg.mxid)
+
content = event["content"]
- body = (content["formatted_body"]
- if "formatted_body" in content
- else content["body"])
- sender = event['sender']
- puppet = pu.Puppet.get_by_mxid(sender, create=False)
- reply_displayname = puppet.displayname if puppet else sender
- reply_to_user = f"{reply_displayname}"
- reply_to_msg = (("{reply_text}")
- if message_link_in_reply else "Reply")
- quote = f"{reply_to_msg} to {reply_to_user}{body}
"
+ r_sender = event["sender"]
+
+ r_text_body = trim_reply_fallback_text(content["body"])
+ r_html_body = trim_reply_fallback_html(content["formatted_body"]
+ if "formatted_body" in content
+ else escape(content["body"]))
+
+ puppet = pu.Puppet.get_by_mxid(r_sender, create=False)
+ r_displayname = puppet.displayname if puppet else r_sender
+ r_sender_link = f"{r_displayname}"
+
+ if is_edit and should_highlight_edits:
+ html = highlight_edits(html or escape(text), r_html_body)
except (ValueError, KeyError, MatrixRequestError):
- quote = f"{reply_text} to unknown user (Failed to fetch message):
"
- if not html:
- html = escape(text)
- html = quote + html
- text = f"{reply_text} to {reply_displayname}:\n{text}"
- return text, html
+ r_sender_link = "unknown user"
+ # r_sender = "unknown user"
+ r_text_body = "Failed to fetch message"
+ r_html_body = "Failed to fetch message"
+
+ if is_edit:
+ html = f"Edit: {html or escape(text)}"
+ text = f"Edit: {text}"
+
+ r_keyword = "In reply to" if not is_edit else "Edit to"
+ r_msg_link = f"{r_keyword}"
+ html = (f"{r_msg_link} {r_sender_link}\n{r_html_body}
"
+ + (html or escape(text)))
+
+ lines = r_text_body.strip().split("\n")
+ text_with_quote = f"> <{r_displayname}> {lines.pop(0)}"
+ for line in lines:
+ if line:
+ text_with_quote += f"\n> {line}"
+ text_with_quote += "\n\n"
+ text_with_quote += text
+ return text_with_quote, html
-async def telegram_to_matrix(evt, source, native_replies=False, message_link_in_reply=False,
- main_intent=None, reply_text="Reply"):
+async def telegram_to_matrix(evt: Message, source: u.User, main_intent: Optional[IntentAPI] = None,
+ is_edit: bool = False, prefix_text: Optional[str] = None,
+ prefix_html: Optional[str] = None) -> Tuple[str, str, dict]:
text = add_surrogates(evt.message)
html = _telegram_entities_to_matrix_catch(text, evt.entities) if evt.entities else None
relates_to = {}
+ if prefix_html:
+ html = prefix_html + (html or escape(text))
+ if prefix_text:
+ text = prefix_text + text
+
if evt.fwd_from:
text, html = await _add_forward_header(source, text, html, evt.fwd_from.from_id)
if evt.reply_to_msg_id:
- text, html = await _add_reply_header(source, text, html, evt, relates_to, native_replies,
- message_link_in_reply, main_intent, reply_text)
+ text, html = await _add_reply_header(source, text, html, evt, relates_to, main_intent,
+ is_edit)
if isinstance(evt, Message) and evt.post and evt.post_author:
if not html:
@@ -130,13 +189,16 @@ async def telegram_to_matrix(evt, source, native_replies=False, message_link_in_
text += f"\n- {evt.post_author}"
html += f"
- {evt.post_author}"
+ html = unicode_to_html(text, html, "\u0336", "del")
+ html = unicode_to_html(text, html, "\u0332", "u")
+
if html:
html = html.replace("\n", "
")
return remove_surrogates(text), remove_surrogates(html), relates_to
-def _telegram_entities_to_matrix_catch(text, entities):
+def _telegram_entities_to_matrix_catch(text: str, entities: List[TypeMessageEntity]) -> str:
try:
return _telegram_entities_to_matrix(text, entities)
except Exception:
@@ -146,7 +208,7 @@ def _telegram_entities_to_matrix_catch(text, entities):
text, entities)
-def _telegram_entities_to_matrix(text, entities):
+def _telegram_entities_to_matrix(text: str, entities: List[TypeMessageEntity]) -> str:
if not entities:
return text
html = []
@@ -190,7 +252,7 @@ def _telegram_entities_to_matrix(text, entities):
return "".join(html)
-def _parse_pre(html, entity_text, language):
+def _parse_pre(html: List[str], entity_text: str, language: str) -> bool:
if language:
html.append(""
f"{entity_text}"
@@ -200,7 +262,7 @@ def _parse_pre(html, entity_text, language):
return False
-def _parse_mention(html, entity_text):
+def _parse_mention(html: List[str], entity_text: str) -> bool:
username = entity_text[1:]
user = u.User.find_by_username(username) or pu.Puppet.find_by_username(username)
@@ -217,7 +279,7 @@ def _parse_mention(html, entity_text):
return False
-def _parse_name_mention(html, entity_text, user_id):
+def _parse_name_mention(html: List[str], entity_text: str, user_id: int) -> bool:
user = u.User.get_by_tgid(user_id)
if user:
mxid = user.mxid
@@ -231,9 +293,14 @@ def _parse_name_mention(html, entity_text, user_id):
return False
-def _parse_url(html, entity_text, url):
+def _parse_url(html: List[str], entity_text: str, url: str) -> bool:
url = escape(url) if url else entity_text
if not url.startswith(("https://", "http://", "ftp://", "magnet://")):
url = "http://" + url
html.append(f"{entity_text}")
return False
+
+
+def init_tg(context: Context):
+ global should_highlight_edits
+ should_highlight_edits = htmldiff and context.config["bridge.highlight_edits"]
diff --git a/mautrix_telegram/formatter/util.py b/mautrix_telegram/formatter/util.py
index ff35519d..f10146b4 100644
--- a/mautrix_telegram/formatter/util.py
+++ b/mautrix_telegram/formatter/util.py
@@ -1,16 +1,84 @@
-# Unicode surrogate handling
-# From https://github.com/LonamiWebs/Telethon/blob/master/telethon/extensions/markdown.py
+# -*- coding: future_fstrings -*-
+# mautrix-telegram - A Matrix-Telegram puppeting bridge
+# Copyright (C) 2018 Tulir Asokan
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see Optional[str]:
if text is None:
return None
return text.encode("utf-16", "surrogatepass").decode("utf-16")
+
+
+def trim_reply_fallback_text(text: str) -> str:
+ if not text.startswith("> ") or "\n" not in text:
+ return text
+ lines = text.split("\n")
+ while len(lines) > 0 and lines[0].startswith("> "):
+ lines.pop(0)
+ return "\n".join(lines)
+
+
+html_reply_fallback_regex = re.compile(r"^[\s\S]+?
")
+
+
+def trim_reply_fallback_html(html: str) -> str:
+ return html_reply_fallback_regex.sub("", html)
+
+
+def unicode_to_html(text: str, html: str, ctrl: str, tag: str) -> str:
+ if ctrl not in text:
+ return html
+ if not html:
+ html = escape(text)
+ tag_start = f"<{tag}>"
+ tag_end = f""
+ characters = html.split(ctrl)
+ html = ""
+ in_tag = False
+ for char in characters:
+ if not in_tag:
+ if len(char) > 1:
+ html += char[0:-1]
+ char = char[-1]
+ html += tag_start
+ in_tag = True
+ html += char
+ else:
+ if len(char) > 1:
+ html += tag_end
+ in_tag = False
+ html += char
+ if in_tag:
+ html += tag_end
+ return html
+
+
+def html_to_unicode(text: str, ctrl: str) -> str:
+ return ctrl.join(text) + ctrl
diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py
index fb7911d0..aca86ec7 100644
--- a/mautrix_telegram/matrix.py
+++ b/mautrix_telegram/matrix.py
@@ -3,17 +3,17 @@
# Copyright (C) 2018 Tulir Asokan
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see 
",
+ prefix_text="Inline image: ")
+ await intent.set_typing(self.mxid, is_typing=False)
+ return await intent.send_text(self.mxid, text, html=html, relates_to=relates_to)
info = {
"h": largest_size.h,
"w": largest_size.w,
@@ -842,25 +913,40 @@ class Portal:
return await intent.send_image(self.mxid, file.mxc, info=info, text=name,
relates_to=relates_to)
- async def handle_telegram_document(self, source, intent, evt, relates_to=None):
+ async def handle_telegram_document(self, source, intent, evt: Message, relates_to=None):
document = evt.media.document
- file = await util.transfer_file_to_matrix(self.db, source.client, intent, document)
+ file = await util.transfer_file_to_matrix(self.db, source.client, intent, document,
+ document.thumb)
if not file:
return None
name = evt.message
+ width, height = file.width, file.height
for attr in document.attributes:
- if not name and isinstance(attr, DocumentAttributeFilename):
- name = attr.file_name
+ if isinstance(attr, DocumentAttributeFilename):
+ name = name or attr.file_name
if not file.was_converted:
(mime_from_name, _) = mimetypes.guess_type(name)
file.mime_type = mime_from_name or file.mime_type
elif isinstance(attr, DocumentAttributeSticker):
name = f"Sticker for {attr.alt}"
+ elif isinstance(attr, DocumentAttributeVideo) and (not width or not height):
+ width, height = attr.w, attr.h
mime_type = document.mime_type or file.mime_type
info = {
- "size": document.size,
+ "size": file.size,
"mimetype": mime_type,
}
+ if file.thumbnail:
+ info["thumbnail_url"] = file.thumbnail.mxc
+ info["thumbnail_info"] = {
+ "mimetype": file.thumbnail.mime_type,
+ "h": file.thumbnail.height or document.thumb.h,
+ "w": file.thumbnail.width or document.thumb.w,
+ "size": file.thumbnail.size,
+ }
+ if height and width:
+ info["h"] = height
+ info["w"] = width
type = "m.file"
if mime_type.startswith("video/"):
type = "m.video"
@@ -900,11 +986,7 @@ class Portal:
async def handle_telegram_text(self, source, intent, evt):
self.log.debug(f"Sending {evt.message} to {self.mxid} by {intent.mxid}")
- text, html, relates_to = await formatter.telegram_to_matrix(
- evt, source,
- config["bridge.native_replies"],
- config["bridge.link_in_reply"],
- self.main_intent)
+ text, html, relates_to = await formatter.telegram_to_matrix(evt, source, self.main_intent)
await intent.set_typing(self.mxid, is_typing=False)
return await intent.send_text(self.mxid, text, html=html, relates_to=relates_to)
@@ -928,11 +1010,8 @@ class Portal:
return
evt.reply_to_msg_id = evt.id
- text, html, relates_to = await formatter.telegram_to_matrix(
- evt, source,
- config["bridge.native_replies"],
- config["bridge.link_in_reply"],
- self.main_intent, reply_text="Edit")
+ text, html, relates_to = await formatter.telegram_to_matrix(evt, source, self.main_intent,
+ is_edit=True)
intent = sender.intent if sender else self.main_intent
await intent.set_typing(self.mxid, is_typing=False)
response = await intent.send_text(self.mxid, text, html=html, relates_to=relates_to)
@@ -966,7 +1045,9 @@ class Portal:
DBMessage(tgid=evt.id, mx_room=self.mxid, mxid=mxid, tg_space=tg_space))
self.db.commit()
return
- media = evt.media if hasattr(evt, "media") else None
+ allowed_media = (MessageMediaPhoto, MessageMediaDocument, MessageMediaGeo)
+ media = evt.media if hasattr(evt, "media") and isinstance(evt.media,
+ allowed_media) else None
intent = sender.intent if sender else self.main_intent
if not media and evt.message:
response = await self.handle_telegram_text(source, intent, evt)
@@ -988,7 +1069,7 @@ class Portal:
if not response:
return
-
+ self.log.debug("Handled Telegram message: %s", evt)
mxid = response["event_id"]
DBMessage.query \
.filter(DBMessage.mx_room == self.mxid,
@@ -1013,7 +1094,6 @@ class Portal:
or self.is_duplicate_action(update))
if should_ignore:
return
-
# TODO figure out how to see changes to about text / channel username
if isinstance(action, MessageActionChatEditTitle):
await self.update_title(action.title, save=True)
@@ -1031,6 +1111,8 @@ class Portal:
self.peer_type = "channel"
self.migrate_and_save(action.channel_id)
await sender.intent.send_emote(self.mxid, "upgraded this group to a supergroup.")
+ elif isinstance(action, MessageActionPinMessage):
+ await self.receive_telegram_pin_sender(sender)
else:
self.log.debug("Unhandled Telegram action in %s: %s", self.title, action)
@@ -1045,13 +1127,30 @@ class Portal:
levels["users"][puppet.mxid] = 50
await self.main_intent.set_power_levels(self.mxid, levels)
- async def update_telegram_pin(self, source, id):
- space = self.tgid if self.peer_type == "channel" else source.tgid
- message = DBMessage.query.get((id, space))
+ async def receive_telegram_pin_sender(self, sender):
+ self._temp_pinned_message_sender = sender
+ if self._temp_pinned_message_id:
+ await self.update_telegram_pin()
+
+ async def update_telegram_pin(self):
+ intent = (self._temp_pinned_message_sender.intent
+ if self._temp_pinned_message_sender else self.main_intent)
+ id = self._temp_pinned_message_id
+ self._temp_pinned_message_id = None
+ self._temp_pinned_message_sender = None
+
+ message = DBMessage.query.get((id, self.tgid))
if message:
- await self.main_intent.set_pinned_messages(self.mxid, [message.mxid])
+ await intent.set_pinned_messages(self.mxid, [message.mxid])
else:
- await self.main_intent.set_pinned_messages(self.mxid, [])
+ await intent.set_pinned_messages(self.mxid, [])
+
+ async def receive_telegram_pin_id(self, id):
+ if id == 0:
+ return await self.update_telegram_pin()
+ self._temp_pinned_message_id = id
+ if self._temp_pinned_message_sender:
+ await self.update_telegram_pin()
@staticmethod
def _get_level_from_participant(participant, _):
diff --git a/mautrix_telegram/public/__init__.py b/mautrix_telegram/public/__init__.py
index 3f57e369..8a4d9e8d 100644
--- a/mautrix_telegram/public/__init__.py
+++ b/mautrix_telegram/public/__init__.py
@@ -3,17 +3,17 @@
# Copyright (C) 2018 Tulir Asokan
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see