From 74b3bf376859fd14c1e3ed480667c64f1481e252 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 16 Feb 2018 21:44:17 +0200
Subject: [PATCH] Clean up some things

---
 mautrix_appservice/appservice.py | 10 +++++-----
 mautrix_telegram/__main__.py     |  4 +---
 mautrix_telegram/user.py         |  1 +
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/mautrix_appservice/appservice.py b/mautrix_appservice/appservice.py
index 1d26fbb2..37ea3ea4 100644
--- a/mautrix_appservice/appservice.py
+++ b/mautrix_appservice/appservice.py
@@ -47,8 +47,11 @@ class AppService:
         self.log = (logging.getLogger(log) if isinstance(log, str)
                     else log or logging.getLogger("mautrix_appservice"))
 
-        self.query_user = query_user or self.default_query_handler
-        self.query_alias = query_alias or self.default_query_handler
+        def default_query_handler(_):
+            return None
+
+        self.query_user = query_user or default_query_handler
+        self.query_alias = query_alias or default_query_handler
 
         self.event_handlers = []
 
@@ -60,9 +63,6 @@ class AppService:
 
         self.matrix_event_handler(self.update_state_store)
 
-    async def default_query_handler(self, param):
-        return None
-
     @property
     def http_session(self):
         if self._http_session is None:
diff --git a/mautrix_telegram/__main__.py b/mautrix_telegram/__main__.py
index a5415f5d..9af163e8 100644
--- a/mautrix_telegram/__main__.py
+++ b/mautrix_telegram/__main__.py
@@ -83,9 +83,7 @@ with appserv.run(config["appservice.hostname"], config["appservice.port"]) as st
     init_db(db_session)
     init_portal(context)
     init_puppet(context)
-    startup_actions = []
-    startup_actions += init_user(context)
-    startup_actions += [start]
+    startup_actions = init_user(context) + [start]
     try:
         loop.run_until_complete(asyncio.gather(*startup_actions, loop=loop))
         loop.run_forever()
diff --git a/mautrix_telegram/user.py b/mautrix_telegram/user.py
index 81025f05..b1cc5aea 100644
--- a/mautrix_telegram/user.py
+++ b/mautrix_telegram/user.py
@@ -52,6 +52,7 @@ class User:
 
         self.command_status = None
         self.connected = False
+        self.client = None
         self._init_client()
 
         self.is_admin = self.mxid in config.get("bridge.admins", [])