Merge branch 'master' into feat-media-channels

Author: plun1331

.github/workflows/docs-localization-download.yml

@@ -40,7 +40,7 @@ jobs:
         working-directory: ./docs
       - name: "Crowdin"
         id: crowdin
-        uses: crowdin/[email protected].0
+        uses: crowdin/[email protected].1
         with:
           upload_sources: false
           upload_translations: false

.github/workflows/docs-localization-upload.yml

@@ -44,7 +44,7 @@ jobs:
           sphinx-intl update -p ./build/locales ${{ vars.SPHINX_LANGUAGES }}
         working-directory: ./docs
       - name: "Crowdin"
-        uses: crowdin/[email protected].0
+        uses: crowdin/[email protected].1
         with:
           upload_sources: true
           upload_translations: false

.github/workflows/todo-checks.yml

@@ -23,7 +23,7 @@ jobs:
       - name: "Checkout Repository"
         uses: actions/checkout@v4
       - name: "Track TODO Action"
-        uses: ribtoks/[email protected].13-beta
+        uses: ribtoks/[email protected].14-beta
         with:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO: ${{ github.repository }}

CHANGELOG.md

@@ -77,6 +77,8 @@ These changes are available on the `master` branch, but have not yet been releas
   apps. ([#2650](https://github.com/Pycord-Development/pycord/pull/2650))
 - Fixed type annotations of cached properties.
   ([#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))

discord/interactions.py

@@ -119,7 +119,7 @@ class Interaction:
         The interaction type.
     guild_id: Optional[:class:`int`]
         The guild ID the interaction was sent from.
-    channel: Optional[Union[:class:`abc.GuildChannel`, :class:`abc.PrivateChannel`, :class:`Thread`]]
+    channel: Optional[Union[:class:`abc.GuildChannel`, :class:`abc.PrivateChannel`, :class:`Thread`, :class:`PartialMessageable`]]
         The channel the interaction was sent from.
     channel_id: Optional[:class:`int`]
         The ID of the channel the interaction was sent from.
@@ -261,20 +261,23 @@ def _from_data(self, data: InteractionPayload):
             except KeyError:
                 pass
 
-        if channel := data.get("channel"):
-            if (ch_type := channel.get("type")) is not None:
-                factory, ch_type = _threaded_channel_factory(ch_type)
+        channel = data.get("channel")
+        data_ch_type: int | None = channel.get("type") if channel else None
 
-                if ch_type in (ChannelType.group, ChannelType.private):
-                    self.channel = factory(
-                        me=self.user, data=channel, state=self._state
-                    )
-                elif self.guild:
-                    self.channel = factory(
-                        guild=self.guild, state=self._state, data=channel
-                    )
-        else:
-            self.channel = self.cached_channel
+        if data_ch_type is not None:
+            factory, ch_type = _threaded_channel_factory(data_ch_type)
+            if ch_type in (ChannelType.group, ChannelType.private):
+                self.channel = factory(me=self.user, data=channel, state=self._state)
+
+        if self.channel is None and self.guild:
+            self.channel = self.guild._resolve_channel(self.channel_id)
+        if self.channel is None and self.channel_id is not None:
+            ch_type = (
+                ChannelType.text if self.guild_id is not None else ChannelType.private
+            )
+            self.channel = PartialMessageable(
+                state=self._state, id=self.channel_id, type=ch_type
+            )
 
         self._channel_data = channel
 
@@ -306,12 +309,12 @@ def is_component(self) -> bool:
         return self.type == InteractionType.component
 
     @utils.cached_slot_property("_cs_channel")
+    @utils.deprecated("Interaction.channel", "2.7", stacklevel=4)
     def cached_channel(self) -> InteractionChannel | None:
-        """The channel the
-        interaction was sent from.
+        """The cached channel from which the interaction was sent.
+        DM channels are not resolved. These are :class:`PartialMessageable` instead.
 
-        Note that due to a Discord limitation, DM channels are not resolved since there is
-        no data to complete them. These are :class:`PartialMessageable` instead.
+        .. deprecated:: 2.7
         """
         guild = self.guild
         channel = guild and guild._resolve_channel(self.channel_id)

requirements/dev.txt

@@ -5,7 +5,7 @@ pytest-asyncio~=0.23.8
 # pytest-order~=1.0.1
 mypy~=1.14.1
 coverage~=7.6
-pre-commit==4.0.1
+pre-commit==4.1.0
 codespell==2.3.0
-bandit==1.8.0
+bandit==1.8.2
 flake8==7.1.1