From 772e80f74c154c3e740c5f42f3930cea3bbc55ba Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sat, 10 Feb 2018 20:21:09 +0200
Subject: [PATCH] Add some missing awaits

---
 mautrix_telegram/matrix.py |  2 +-
 mautrix_telegram/portal.py | 11 ++++++-----
 mautrix_telegram/user.py   |  5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py
index ccc5d651..6765a8b7 100644
--- a/mautrix_telegram/matrix.py
+++ b/mautrix_telegram/matrix.py
@@ -83,7 +83,7 @@ class MatrixHandler:
             await puppet.intent.send_notice(room, "Portal to private chat created.")
         else:
             await puppet.intent.join_room(room)
-            await puppet.intent.send_notice(room, "This puppet will remain inactive until a"
+            await puppet.intent.send_notice(room, "This puppet will remain inactive until a "
                                                   "Telegram chat is created for this room.")
 
     async def handle_invite(self, room, user, inviter):
diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py
index 87a67a40..6b9a859d 100644
--- a/mautrix_telegram/portal.py
+++ b/mautrix_telegram/portal.py
@@ -367,7 +367,7 @@ class Portal:
             del self.by_tgid[self.tgid_full]
             del self.by_mxid[self.mxid]
         elif source and source.tgid != user.tgid:
-            target = user.get_input_entity(source)
+            target = await user.get_input_entity(source)
             if self.peer_type == "chat":
                 await source.client(DeleteChatUserRequest(chat_id=self.tgid, user_id=target))
             else:
@@ -456,8 +456,9 @@ class Portal:
                                                 invite_link=moderator, pin_messages=moderator,
                                                 add_admins=admin, manage_call=moderator)
                     await sender.client(
-                        EditAdminRequest(channel=self.get_input_entity(sender),
-                                         user_id=sender.client.get_input_entity(PeerUser(user_id)),
+                        EditAdminRequest(channel=await self.get_input_entity(sender),
+                                         user_id=await sender.client.get_input_entity(
+                                             PeerUser(user_id)),
                                          admin_rights=rights))
 
     async def handle_matrix_about(self, sender, about):
@@ -543,7 +544,7 @@ class Portal:
         if self.peer_type != "channel":
             raise ValueError("Only channels and supergroups have usernames.")
         await source.client(
-            UpdateUsernameRequest(self.get_input_entity(source), username))
+            UpdateUsernameRequest(await self.get_input_entity(source), username))
         if await self.update_username(username):
             self.save()
 
@@ -569,7 +570,7 @@ class Portal:
                                                                megagroup=supergroup))
             entity = updates.chats[0]
             await source.client(InviteToChannelRequest(
-                channel=source.client.get_input_entity(entity),
+                channel=await source.client.get_input_entity(entity),
                 users=invites))
         else:
             raise ValueError("Invalid peer type for Telegram chat creation")
diff --git a/mautrix_telegram/user.py b/mautrix_telegram/user.py
index 8fc05b15..d3a8eb06 100644
--- a/mautrix_telegram/user.py
+++ b/mautrix_telegram/user.py
@@ -127,7 +127,7 @@ class User:
         if changed:
             self.save()
 
-    def log_out(self):
+    async def log_out(self):
         self.connected = False
         if self.tgid:
             try:
@@ -136,7 +136,8 @@ class User:
                 pass
             self.tgid = None
             self.save()
-        return self.client.log_out()
+        await self.client.log_out()
+        # TODO kick user from portals
 
     async def sync_dialogs(self):
         dialogs = await self.client.get_dialogs(limit=30)