Merge branch 'master' into python3.5

mautrix_telegram/user.py

@@ -114,6 +114,15 @@ class User:
         self.to_db()
         self.db.commit()
 
+    def delete(self):
+        try:
+            del self.by_mxid[self.mxid]
+            del self.by_tgid[self.tgid]
+        except KeyError:
+            pass
+        self.db.delete(self.to_db())
+        self.db.commit()
+
     @classmethod
     def from_db(cls, db_user):
         return User(db_user.mxid, db_user.tgid, db_user.tg_username, db_user.contacts,
@@ -138,6 +147,10 @@ class User:
         self.connected = await self.client.connect()
         if self.logged_in:
             asyncio.ensure_future(self.post_login(), loop=self.loop)
+        else:
+            # User not logged in -> forget user
+            self.client.disconnect()
+            self.client.session.delete()
         return self
 
     async def post_login(self, info=None):
@@ -187,8 +200,7 @@ class User:
         ok = await self.client.log_out()
         if not ok:
             return False
-        self._init_client()
-        await self.start()
+        self.delete()
         return True
 
     def _search_local(self, query, max_results=5, min_similarity=45):
@@ -374,7 +386,7 @@ class User:
                                                tg_receiver=self.tgid)
             else:
                 portal = po.Portal.get_by_entity(update.to_id, receiver_id=self.tgid)
-            sender = pu.Puppet.get(update.from_id)
+            sender = pu.Puppet.get(update.from_id) if update.from_id else None
         else:
             self.log.warning(
                 f"Unexpected message type in User#get_message_details: {type(update)}")
@@ -393,11 +405,12 @@ class User:
                            sender.id)
             return portal.handle_telegram_action(self, sender, update.action)
 
+        user = sender.tgid if sender else "admin"
         if isinstance(original_update, (UpdateEditMessage, UpdateEditChannelMessage)):
-            self.log.debug("Handling edit %s to %s by %d", update, portal.tgid_log, sender.tgid)
+            self.log.debug("Handling edit %s to %s by %s", update, portal.tgid_log, user)
             return portal.handle_telegram_edit(self, sender, update)
 
-        self.log.debug("Handling message %s to %s by %d", update, portal.tgid_log, sender.tgid)
+        self.log.debug("Handling message %s to %s by %s", update, portal.tgid_log, user)
         return portal.handle_telegram_message(self, sender, update)
 
     # endregion