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

Use concatenation with f-strings in parantheses for future-fstrings compatibility

Browse Source
This commit is contained in:
Tulir Asokan
2018-01-29 19:38:19 +02:00
parent bef850e924
commit 63070624f6
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/commands.py
+5 -5
View File
@@ -48,7 +48,7 @@ class CommandHandler:
except:
self.reply("Fatal error while handling command. Check logs for more details.")
self.log.exception(f"Fatal error handling command "
f"'$cmdprefix {command} {''.join(args)}' from {sender.mxid}")
+ f"'$cmdprefix {command} {''.join(args)}' from {sender.mxid}")
@contextmanager
def handler(self, sender, room, command, args, is_management, is_portal):
@@ -297,14 +297,14 @@ class CommandHandler:
elif (not levels or not levels["users"] or self.az.intent.mxid not in levels["users"] or
levels["users"][self.az.intent.mxid] < 100):
return self.reply(f"Please give "
f"[the bridge bot](https://matrix.to/#/{self.az.intent.mxid}) "
f"a power level of 100 before creating a Telegram chat.")
+ f"[the bridge bot](https://matrix.to/#/{self.az.intent.mxid}) "
+ f"a power level of 100 before creating a Telegram chat.")
else:
for user, level in levels["users"].items():
if level >= 100 and user != self.az.intent.mxid:
return self.reply(f"Please make sure only the bridge bot has power level above"
f"99 before creating a Telegram chat.\n\n"
f"Use power level 95 instead of 100 for admins.")
+ f"99 before creating a Telegram chat.\n\n"
+ f"Use power level 95 instead of 100 for admins.")
supergroup = type == "supergroup"
types = {
mautrix_telegram/formatter.py
+3 -3
View File
@@ -214,7 +214,7 @@ def telegram_event_to_matrix(evt, source):
if not fwd_from:
fwd_from = "Unknown user"
html = (f"Forwarded message from <b>{fwd_from}</b><br/>"
f"<blockquote>{html}</blockquote>")
+ f"<blockquote>{html}</blockquote>")
if evt.reply_to_msg_id:
msg = DBMessage.query.get((evt.reply_to_msg_id, source.tgid))
@@ -261,8 +261,8 @@ def _telegram_to_matrix(text, entities):
elif entity_type == MessageEntityPre:
if entity.language:
html.append("<pre>"
f"<code class='language-{entity.language}'>{entity_text}</code>"
"</pre>")
+ f"<code class='language-{entity.language}'>{entity_text}</code>"
+ "</pre>")
else:
html.append(f"<pre><code>{entity_text}</code></pre>")
elif entity_type == MessageEntityMention:
mautrix_telegram/matrix.py
+7 -6
View File
@@ -65,8 +65,8 @@ class MatrixHandler:
if len(members) > 1:
puppet.intent.error_and_leave(room, text=None, html=(
f"Please invite "
f"<a href='https://matrix.to/#/{self.az.intent.mxid}'>the bridge bot</a> "
f"first if you want to create a Telegram chat."))
+ f"<a href='https://matrix.to/#/{self.az.intent.mxid}'>the bridge bot</a> "
+ f"first if you want to create a Telegram chat."))
return
puppet.intent.join_room(room)
@@ -76,15 +76,16 @@ class MatrixHandler:
puppet.intent.invite(existing_portal.mxid, inviter.mxid)
puppet.intent.send_notice(room, text=None, html=(
"You already have a private chat with me: "
f"<a href='https://matrix.to/#/{existing_portal.mxid}'>"
"Link to room"
"</a>"))
+ f"<a href='https://matrix.to/#/{existing_portal.mxid}'>"
+ "Link to room"
+ "</a>"))
puppet.intent.leave_room(room)
return
except MatrixRequestError:
existing_portal.delete()
portal = Portal(tgid=puppet.tgid, tg_receiver=inviter.tgid, peer_type="user", mxid=room)
portal = Portal(tgid=puppet.tgid, tg_receiver=inviter.tgid, peer_type="user",
mxid=room)
portal.save()
puppet.intent.send_notice(room, "Portal to private chat created.")
else: