github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: rest client add webporxy config, keep the processing logic with WebSocketProvider (#2974)

Browse Source
This commit is contained in:
trueai-org
2024-09-15 00:25:40 +08:00
committed by GitHub
parent 8a2ea4bb58
commit 292f8c40eb
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Discord.Net.Rest/Net/DefaultRestClient.cs
View File

@@ -24,7 +24,7 @@ namespace Discord.Net.Rest
private CancellationToken _cancelToken; private CancellationToken _cancelToken;
private bool _isDisposed; private bool _isDisposed;
public DefaultRestClient(string baseUrl, bool useProxy = false) public DefaultRestClient(string baseUrl, bool useProxy = false, IWebProxy webProxy = null)
{ {
_baseUrl = baseUrl; _baseUrl = baseUrl;
@@ -34,6 +34,7 @@ namespace Discord.Net.Rest
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate, AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
UseCookies = false, UseCookies = false,
UseProxy = useProxy, UseProxy = useProxy,
Proxy = webProxy
}); });
#pragma warning restore IDISP014 #pragma warning restore IDISP014
SetHeader("accept-encoding", "gzip, deflate"); SetHeader("accept-encoding", "gzip, deflate");

5
src/Discord.Net.Rest/Net/DefaultRestClientProvider.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using System.Net;
namespace Discord.Net.Rest namespace Discord.Net.Rest
{ {
@@ -7,13 +8,13 @@ namespace Discord.Net.Rest
public static readonly RestClientProvider Instance = Create(); public static readonly RestClientProvider Instance = Create();
/// <exception cref="PlatformNotSupportedException">The default RestClientProvider is not supported on this platform.</exception> /// <exception cref="PlatformNotSupportedException">The default RestClientProvider is not supported on this platform.</exception>
public static RestClientProvider Create(bool useProxy = false) public static RestClientProvider Create(bool useProxy = false, IWebProxy webProxy = null)
{ {
return url => return url =>
{ {
try try
{ {
return new DefaultRestClient(url, useProxy); return new DefaultRestClient(url, useProxy, webProxy);
} }
catch (PlatformNotSupportedException ex) catch (PlatformNotSupportedException ex)
{ {