Merge remote-tracking branch 'origin/master'

delivrance · delivrance · commit 9c670841706e · 2021-12-24T16:29:35.000+01:00
diff --git a/pyrogram/types/bots_and_keyboards/inline_keyboard_button.py b/pyrogram/types/bots_and_keyboards/inline_keyboard_button.py
@@ -158,7 +158,7 @@ async def write(self, client: "pyrogram.Client"):
         if self.login_url is not None:
             return self.login_url.write(
                 text=self.text,
-                bot=await client.resolve_peer(self.login_url.bot_username)
+                bot=await client.resolve_peer(self.login_url.bot_username or "self")
             )
 
         if self.user_id is not None:
diff --git a/pyrogram/types/bots_and_keyboards/login_url.py b/pyrogram/types/bots_and_keyboards/login_url.py
@@ -31,7 +31,8 @@ class LoginUrl(Object):
         url (``str``):
             An HTTP URL to be opened with user authorization data added to the query string when the button is pressed.
             If the user refuses to provide authorization data, the original URL without information about the user will
-            be opened. The data added is the same as described in Receiving authorization data.
+            be opened. The data added is the same as described in
+            `Receiving authorization data <https://core.telegram.org/widgets/login#receiving-authorization-data>`.
 
             **NOTE**: You **must** always check the hash of the received data to verify the authentication and the
             integrity of the data as described in
@@ -42,7 +43,7 @@ class LoginUrl(Object):
 
         bot_username (``str``, *optional*):
             Username of a bot, which will be used for user authorization.
-            See `Setting up <https://core.telegram.org/widgets/login#setting-up-a-bot>`_ a bot for more details.
+            See `Setting up a bot <https://core.telegram.org/widgets/login#setting-up-a-bot>`_ for more details.
             If not specified, the current bot's username will be assumed. The url's domain must be the same as the
             domain linked with the bot.
             See `Linking your domain to the bot <https://core.telegram.org/widgets/login#linking-your-domain-to-the-bot>`_

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ async def write(self, client: "pyrogram.Client"):`
`158`	`158`	`if self.login_url is not None:`
`159`	`159`	`return self.login_url.write(`
`160`	`160`	`text=self.text,`
`161`		`- bot=await client.resolve_peer(self.login_url.bot_username)`
	`161`	`+ bot=await client.resolve_peer(self.login_url.bot_username or "self")`
`162`	`162`	`)`
`163`	`163`
`164`	`164`	`if self.user_id is not None:`