Merge branch 'master' into next-native-replies
This commit is contained in:
@@ -752,7 +752,15 @@ class Portal:
|
|||||||
config["bridge.link_in_reply"],
|
config["bridge.link_in_reply"],
|
||||||
self.main_intent, reply_text="Edit")
|
self.main_intent, reply_text="Edit")
|
||||||
await sender.intent.set_typing(self.mxid, is_typing=False)
|
await sender.intent.set_typing(self.mxid, is_typing=False)
|
||||||
return await sender.intent.send_text(self.mxid, text, html=html, relates_to=relates_to)
|
response = await sender.intent.send_text(self.mxid, text, html=html, relates_to=relates_to)
|
||||||
|
|
||||||
|
mxid = response["event_id"]
|
||||||
|
tg_space = self.tgid if self.peer_type == "channel" else source.tgid
|
||||||
|
|
||||||
|
msg = DBMessage.query.get((evt.id, tg_space))
|
||||||
|
msg.mxid = mxid
|
||||||
|
msg.mx_room = self.mxid
|
||||||
|
self.db.commit()
|
||||||
|
|
||||||
async def handle_telegram_message(self, source, sender, evt):
|
async def handle_telegram_message(self, source, sender, evt):
|
||||||
if not self.mxid:
|
if not self.mxid:
|
||||||
|
|||||||
Reference in New Issue
Block a user