From 61f859ef0da87737b97f322b55b33c7461f37e59 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 29 Jan 2018 19:45:19 +0200 Subject: [PATCH] Fix creating private chat portals by inviting puppet --- mautrix_telegram/matrix.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py index a30cd99d..ef765fc6 100644 --- a/mautrix_telegram/matrix.py +++ b/mautrix_telegram/matrix.py @@ -70,10 +70,10 @@ class MatrixHandler: return puppet.intent.join_room(room) - existing_portal = Portal.get_by_tgid(puppet.tgid, inviter.tgid, "user") - if existing_portal: + portal = Portal.get_by_tgid(puppet.tgid, inviter.tgid, "user") + if portal.mxid: try: - puppet.intent.invite(existing_portal.mxid, inviter.mxid) + puppet.intent.invite(portal.mxid, inviter.mxid) puppet.intent.send_notice(room, text=None, html=( "You already have a private chat with me: " + f"" @@ -82,10 +82,8 @@ class MatrixHandler: 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) + pass + portal.mxid = room portal.save() puppet.intent.send_notice(room, "Portal to private chat created.") else: