fix: properly pass in proxy to http client (#1544)

AstreaTSS · web-flow · commit de72911ff610 · 2023-08-27T00:39:10.000+10:00
This also fixes the typehint for the http client
diff --git a/interactions/api/http/http_client.py b/interactions/api/http/http_client.py
@@ -218,7 +218,7 @@ def __init__(
         connector: BaseConnector | None = None,
         logger: Logger = MISSING,
         show_ratelimit_tracebacks: bool = False,
-        proxy: tuple[str, BasicAuth] | None = None,
+        proxy: tuple[str | None, BasicAuth | None] | None = None,
     ) -> None:
         self.connector: BaseConnector | None = connector
         self.__session: ClientSession | None = None
@@ -233,7 +233,7 @@ def __init__(
         self.user_agent: str = (
             f"DiscordBot ({__repo_url__} {__version__} Python/{__py_version__}) aiohttp/{aiohttp.__version__}"
         )
-        self.proxy: tuple[str, BasicAuth] | None = proxy
+        self.proxy: tuple[str | None, BasicAuth | None] | None = proxy
         self.__proxy_validated: bool = False
 
         if logger is MISSING:
diff --git a/interactions/client/client.py b/interactions/client/client.py
@@ -348,8 +348,9 @@ def __init__(
         if isinstance(proxy_auth, tuple):
             proxy_auth = BasicAuth(*proxy_auth)
 
+        proxy = (proxy_url, proxy_auth) if proxy_url or proxy_auth else None
         self.http: HTTPClient = HTTPClient(
-            logger=self.logger, show_ratelimit_tracebacks=show_ratelimit_tracebacks, proxy=(proxy_url, proxy_auth)
+            logger=self.logger, show_ratelimit_tracebacks=show_ratelimit_tracebacks, proxy=proxy
         )
         """The HTTP client to use when interacting with discord endpoints"""
 

Original file line number	Diff line number	Diff line change
`@@ -348,8 +348,9 @@ def __init__(`
`348`	`348`	`if isinstance(proxy_auth, tuple):`
`349`	`349`	`proxy_auth = BasicAuth(*proxy_auth)`
`350`	`350`
	`351`	`+ proxy = (proxy_url, proxy_auth) if proxy_url or proxy_auth else None`
`351`	`352`	`self.http: HTTPClient = HTTPClient(`
`352`		`- logger=self.logger, show_ratelimit_tracebacks=show_ratelimit_tracebacks, proxy=(proxy_url, proxy_auth)`
	`353`	`+ logger=self.logger, show_ratelimit_tracebacks=show_ratelimit_tracebacks, proxy=proxy`
`353`	`354`	`)`
`354`	`355`	`"""The HTTP client to use when interacting with discord endpoints"""`
`355`	`356`