Merge branch 'master' into asyncio

This commit is contained in:
Tulir Asokan 2018-02-25 11:50:14 +02:00
commit 731a2956df
2 changed files with 4 additions and 3 deletions

View File

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

View File

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