Merge branch 'master' into fix-interaction-channel-perms

Signed-off-by: Paillat <[email protected]>

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
   #          - --remove-duplicate-keys
   #          - --remove-unused-variables
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         exclude: \.(po|pot|yml|yaml)$

CHANGELOG.md

@@ -32,10 +32,12 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2590](https://github.com/Pycord-Development/pycord/pull/2590))
 - Added missing `with_counts` parameter to `fetch_guilds` method.
   ([#2615](https://github.com/Pycord-Development/pycord/pull/2615))
-- Added missing permissions: `Permissions.use_soundboard`,
-  `Permissions.use_external_sounds` and
+- Added the following missing permissions: `Permissions.use_soundboard`,
+  `Permissions.use_external_sounds`, and
   `Permissions.view_creator_monetization_analytics`.
   ([#2620](https://github.com/Pycord-Development/pycord/pull/2620))
+- Added helper methods to determine the authorizing party of an `Interaction`.
+  ([#2659](https://github.com/Pycord-Development/pycord/pull/2659))
 
 ### Fixed
 
@@ -54,7 +56,7 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2595](https://github.com/Pycord-Development/pycord/pull/2595))
 - Fixed `BucketType.category` cooldown commands not functioning correctly in private
   channels. ([#2603](https://github.com/Pycord-Development/pycord/pull/2603))
-- Fixed `SlashCommand`'s `ctx` parameter couldn't be `Union` type.
+- Fixed `ctx` parameter of a `SlashCommand` not being `Union` type.
   ([#2611](https://github.com/Pycord-Development/pycord/pull/2611))
 - Fixed `TypeError` when passing `skus` parameter in `Client.entitlements()`.
   ([#2627](https://github.com/Pycord-Development/pycord/issues/2627))
@@ -66,6 +68,9 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2635](https://github.com/Pycord-Development/pycord/issues/2635))
 - Fixed malformed properties in `Interaction.channel`.
   ([#2658](https://github.com/Pycord-Development/pycord/pull/2658))
+- Fixed an error when responding non-ephemerally with a `Paginator` to an ephemerally
+  deferred interaction.
+  ([#2661](https://github.com/Pycord-Development/pycord/pull/2661))
 
 ### Changed
 
@@ -79,6 +84,8 @@ These changes are available on the `master` branch, but have not yet been releas
 - Replaced audioop (deprecated module) implementation of `PCMVolumeTransformer.read`
   method with a pure Python equivalent.
   ([#2176](https://github.com/Pycord-Development/pycord/pull/2176))
+- Updated `Guild.filesize_limit` to 10 MB instead of 25 MB following Discord's API
+  changes. ([#2671](https://github.com/Pycord-Development/pycord/pull/2671))
 
 ### Deprecated
 
@@ -392,7 +399,7 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2075](https://github.com/Pycord-Development/pycord/pull/2075))
 - Fixed `before_invoke` not being run for `SlashCommandGroup`.
   ([#2091](https://github.com/Pycord-Development/pycord/pull/2091))
-- Fixed `AttributeError` when accessing a `Select` object's values when it hasn't been
+- Fixed `AttributeError` when accessing a `Select` object's values when it has not been
   interacted with. ([#2104](https://github.com/Pycord-Development/pycord/pull/2104))
 - Fixed `before_invoke` being run twice for slash subcommands.
   ([#2139](https://github.com/Pycord-Development/pycord/pull/2139))
@@ -423,7 +430,7 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2196](https://github.com/Pycord-Development/pycord/pull/2196))
 - Fixed `AttributeError` when running permission checks without the `bot` scope.
   ([#2113](https://github.com/Pycord-Development/pycord/issues/2113))
-- Fixed `Option` not working on bridge commands because `ext.commands.Command` doesn't
+- Fixed `Option` not working on bridge commands because `ext.commands.Command` does not
   recognize them. ([#2256](https://github.com/Pycord-Development/pycord/pull/2256))
 - Fixed offset-aware tasks causing `TypeError` when being prepared.
   ([#2271](https://github.com/Pycord-Development/pycord/pull/2271))
@@ -523,7 +530,7 @@ These changes are available on the `master` branch, but have not yet been releas
 ### Fixed
 
 - Fixed bugs in `Page.update_files` where file objects stored in memory were causing an
-  `AttributeError`, and `io.BytesIO` files didn't send properly more than once.
+  `AttributeError`, and `io.BytesIO` files did not send properly more than once.
   ([#1869](https://github.com/Pycord-Development/pycord/pull/1869) &
   [#1881](https://github.com/Pycord-Development/pycord/pull/1881))
 - Fixed bridge groups missing the `parent` attribute.
@@ -878,9 +885,9 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#1453](https://github.com/Pycord-Development/pycord/pull/1453))
 - Update `thread.members` on `thread.fetch_members`.
   ([#1464](https://github.com/Pycord-Development/pycord/pull/1464))
-- Fix the error when Discord doesn't send the `app_permissions` data in `Interaction`.
+- Fix the error when Discord does not send the `app_permissions` data in `Interaction`.
   ([#1467](https://github.com/Pycord-Development/pycord/pull/1467))
-- Fix AttributeError when voice client `play()` function isn't completed yet.
+- Fix AttributeError when voice client `play()` function is not completed yet.
   ([#1360](https://github.com/Pycord-Development/pycord/pull/1360))
 
 ## [2.0.0-rc.1] - 2022-05-17

discord/commands/context.py

@@ -345,6 +345,40 @@ def cog(self) -> Cog | None:
 
         return self.command.cog
 
+    def is_guild_authorised(self) -> bool:
+        """:class:`bool`: Checks if the invoked command is guild-installed.
+        This is a shortcut for :meth:`Interaction.is_guild_authorised`.
+
+        There is an alias for this called :meth:`.is_guild_authorized`.
+
+        .. versionadded:: 2.7
+        """
+        return self.interaction.is_guild_authorised()
+
+    def is_user_authorised(self) -> bool:
+        """:class:`bool`: Checks if the invoked command is user-installed.
+        This is a shortcut for :meth:`Interaction.is_user_authorised`.
+
+        There is an alias for this called :meth:`.is_user_authorized`.
+
+        .. versionadded:: 2.7
+        """
+        return self.interaction.is_user_authorised()
+
+    def is_guild_authorized(self) -> bool:
+        """:class:`bool`: An alias for :meth:`.is_guild_authorised`.
+
+        .. versionadded:: 2.7
+        """
+        return self.is_guild_authorised()
+
+    def is_user_authorized(self) -> bool:
+        """:class:`bool`: An alias for :meth:`.is_user_authorised`.
+
+        .. versionadded:: 2.7
+        """
+        return self.is_user_authorised()
+
 
 class AutocompleteContext:
     """Represents context for a slash command's option autocomplete.

discord/ext/pages/pagination.py

@@ -1202,7 +1202,7 @@ async def respond(
                 )
                 # convert from WebhookMessage to Message reference to bypass
                 # 15min webhook token timeout (non-ephemeral messages only)
-                if not ephemeral:
+                if not ephemeral and not msg.flags.ephemeral:
                     msg = await msg.channel.fetch_message(msg.id)
             else:
                 msg = await interaction.response.send_message(

discord/guild.py

@@ -289,11 +289,11 @@ class Guild(Hashable):
     )
 
     _PREMIUM_GUILD_LIMITS: ClassVar[dict[int | None, _GuildLimit]] = {
-        None: _GuildLimit(emoji=50, stickers=5, bitrate=96e3, filesize=26214400),
-        0: _GuildLimit(emoji=50, stickers=5, bitrate=96e3, filesize=26214400),
-        1: _GuildLimit(emoji=100, stickers=15, bitrate=128e3, filesize=26214400),
-        2: _GuildLimit(emoji=150, stickers=30, bitrate=256e3, filesize=52428800),
-        3: _GuildLimit(emoji=250, stickers=60, bitrate=384e3, filesize=104857600),
+        None: _GuildLimit(emoji=50, stickers=5, bitrate=96e3, filesize=10_485_760),
+        0: _GuildLimit(emoji=50, stickers=5, bitrate=96e3, filesize=10_485_760),
+        1: _GuildLimit(emoji=100, stickers=15, bitrate=128e3, filesize=10_485_760),
+        2: _GuildLimit(emoji=150, stickers=30, bitrate=256e3, filesize=52_428_800),
+        3: _GuildLimit(emoji=250, stickers=60, bitrate=384e3, filesize=104_857_600),
     }
 
     def __init__(self, *, data: GuildPayload, state: ConnectionState):

discord/interactions.py

@@ -367,6 +367,48 @@ def followup(self) -> Webhook:
         }
         return Webhook.from_state(data=payload, state=self._state)
 
+    def is_guild_authorised(self) -> bool:
+        """:class:`bool`: Checks if the interaction is guild authorised.
+
+        There is an alias for this called :meth:`.is_guild_authorized`.
+
+        .. versionadded:: 2.7
+        """
+        if self.guild_id:
+            return self.authorizing_integration_owners.guild_id == self.guild_id
+        return False
+
+    def is_user_authorised(self) -> bool:
+        """:class:`bool`: Checks if the interaction is user authorised.
+
+        There is an alias for this called :meth:`.is_user_authorized`.
+
+        .. versionadded:: 2.7
+        """
+        if self.user:
+            return self.authorizing_integration_owners.user_id == self.user.id
+
+        # This return should not be called but to make sure it returns the expected value
+        return False
+
+    def is_guild_authorized(self) -> bool:
+        """:class:`bool`: Checks if the interaction is guild authorized.
+
+        There is an alias for this called :meth:`.is_guild_authorised`.
+
+        .. versionadded:: 2.7
+        """
+        return self.is_guild_authorised()
+
+    def is_user_authorized(self) -> bool:
+        """:class:`bool`: Checks if the interaction is user authorized.
+
+        There is an alias for this called :meth:`.is_user_authorised`.
+
+        .. versionadded:: 2.7
+        """
+        return self.is_user_authorised()
+
     async def original_response(self) -> InteractionMessage:
         """|coro|
 

requirements/dev.txt

@@ -1,9 +1,9 @@
 -r _.txt
-pylint~=3.3.2
+pylint~=3.3.3
 pytest~=8.3.4
 pytest-asyncio~=0.23.8
 # pytest-order~=1.0.1
-mypy~=1.13.0
+mypy~=1.14.0
 coverage~=7.6
 pre-commit==4.0.1
 codespell==2.3.0