Merge branch 'master' into asyncio

telethon/events/__init__.py

@@ -155,6 +155,8 @@ class Raw(_EventBuilder):
     """
     Represents a raw event. The event is the update itself.
     """
+    async def resolve(self, client):
+        pass
 
     def build(self, update):
         return update

telethon/telegram_client.py

@@ -486,9 +486,8 @@ class TelegramClient(TelegramBareClient):
                 self._self_input_peer = utils.get_input_peer(
                     me, allow_self=False
                 )
-                if input_peer:
-                    return self._self_input_peer
-            return me
+
+            return self._self_input_peer if input_peer else me
         except UnauthorizedError:
             return None