Proxy webhooks and interactions (#1655)

Author: BobDotCom

CHANGELOG.md

@@ -9,12 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - New Guild Feature `INVITES_DISABLED` ([#1613](https://github.com/Pycord-Development/pycord/pull/1613))
 - `suppress` kwarg to `Messageable.send()` ([#1587](https://github.com/Pycord-Development/pycord/pull/1587))
+- `proxy` and `proxy_auth` params to many Webhook related methods.
+  ([#1655](https://github.com/Pycord-Development/pycord/pull/1655))
 
 ### Fixed
 - Various fixes to ext.bridge groups ([#1633](https://github.com/Pycord-Development/pycord/pull/1633) &
   [#1631](https://github.com/Pycord-Development/pycord/pull/1631))
 - Fix `VOICE_SERVER_UPDATE` error ([#1624](https://github.com/Pycord-Development/pycord/pull/1624))
 - Removed unnecessary instance check in autocomplete. ([#1643](https://github.com/Pycord-Development/pycord/pull/1643))
+- Interaction responses are now passed the respective `proxy` and `proxy_auth` params as defined in `Client`.
+  ([#1655](https://github.com/Pycord-Development/pycord/pull/1655))
 
 ## [2.1.3] - 2022-09-06
 ### Fixed

discord/interactions.py

@@ -296,10 +296,13 @@ async def original_message(self) -> InteractionMessage:
             raise ClientException("Channel for message could not be resolved")
 
         adapter = async_context.get()
+        http = self._state.http
         data = await adapter.get_original_interaction_response(
             application_id=self.application_id,
             token=self.token,
             session=self._session,
+            proxy=http.proxy,
+            proxy_auth=http.proxy_auth,
         )
         state = _InteractionMessageState(self, self._state)
         message = InteractionMessage(state=state, channel=channel, data=data)  # type: ignore
@@ -387,10 +390,13 @@ async def edit_original_message(
             previous_allowed_mentions=previous_mentions,
         )
         adapter = async_context.get()
+        http = self._state.http
         data = await adapter.edit_original_interaction_response(
             self.application_id,
             self.token,
             session=self._session,
+            proxy=http.proxy,
+            proxy_auth=http.proxy_auth,
             payload=params.payload,
             multipart=params.multipart,
             files=params.files,
@@ -429,10 +435,13 @@ async def delete_original_message(self, *, delay: Optional[float] = None) -> Non
             Deleted a message that is not yours.
         """
         adapter = async_context.get()
+        http = self._state.http
         func = adapter.delete_original_interaction_response(
             self.application_id,
             self.token,
             session=self._session,
+            proxy=http.proxy,
+            proxy_auth=http.proxy_auth,
         )
 
         if delay is not None:
@@ -566,13 +575,16 @@ async def defer(self, *, ephemeral: bool = False, invisible: bool = True) -> Non
 
         if defer_type:
             adapter = async_context.get()
+            http = parent._state.http
             await self._locked_response(
                 adapter.create_interaction_response(
                     parent.id,
                     parent.token,
                     session=parent._session,
                     type=defer_type,
                     data=data,
+                    proxy=http.proxy,
+                    proxy_auth=http.proxy_auth,
                 )
             )
             self._responded = True
@@ -597,11 +609,14 @@ async def pong(self) -> None:
         parent = self._parent
         if parent.type is InteractionType.ping:
             adapter = async_context.get()
+            http = parent._state.http
             await self._locked_response(
                 adapter.create_interaction_response(
                     parent.id,
                     parent.token,
                     session=parent._session,
+                    proxy=http.proxy,
+                    proxy_auth=http.proxy_auth,
                     type=InteractionResponseType.pong.value,
                 )
             )
@@ -723,13 +738,16 @@ async def send_message(
 
         parent = self._parent
         adapter = async_context.get()
+        http = parent._state.http
         try:
             await self._locked_response(
                 adapter.create_interaction_response(
                     parent.id,
                     parent.token,
                     session=parent._session,
                     type=InteractionResponseType.channel_message.value,
+                    proxy=http.proxy,
+                    proxy_auth=http.proxy_auth,
                     data=payload,
                     files=files,
                 )
@@ -852,13 +870,16 @@ async def edit_message(
                 payload["attachments"] = [a.to_dict() for a in msg.attachments]
 
         adapter = async_context.get()
+        http = parent._state.http
         try:
             await self._locked_response(
                 adapter.create_interaction_response(
                     parent.id,
                     parent.token,
                     session=parent._session,
                     type=InteractionResponseType.message_update.value,
+                    proxy=http.proxy,
+                    proxy_auth=http.proxy_auth,
                     data=payload,
                     files=files,
                 )
@@ -906,11 +927,14 @@ async def send_autocomplete_result(
         payload = {"choices": [c.to_dict() for c in choices]}
 
         adapter = async_context.get()
+        http = parent._state.http
         await self._locked_response(
             adapter.create_interaction_response(
                 parent.id,
                 parent.token,
                 session=parent._session,
+                proxy=http.proxy,
+                proxy_auth=http.proxy_auth,
                 type=InteractionResponseType.auto_complete_result.value,
                 data=payload,
             )
@@ -938,13 +962,18 @@ async def send_modal(self, modal: Modal) -> Interaction:
         if self._responded:
             raise InteractionResponded(self._parent)
 
+        parent = self._parent
+
         payload = modal.to_dict()
         adapter = async_context.get()
+        http = parent._state.http
         await self._locked_response(
             adapter.create_interaction_response(
-                self._parent.id,
-                self._parent.token,
-                session=self._parent._session,
+                parent.id,
+                parent.token,
+                session=parent._session,
+                proxy=http.proxy,
+                proxy_auth=http.proxy_auth,
                 type=InteractionResponseType.modal.value,
                 data=payload,
             )