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

Moved RPC ClientId/Origin out of config

Browse Source
This commit is contained in:
RogueException
2016-10-07 16:56:27 -03:00
parent edad75cef1
commit 81a0c12f48
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Discord.Net.Rpc/DiscordRpcClient.cs
View File

@@ -29,10 +29,11 @@ namespace Discord.Rpc
public new API.DiscordRpcApiClient ApiClient => base.ApiClient as API.DiscordRpcApiClient; public new API.DiscordRpcApiClient ApiClient => base.ApiClient as API.DiscordRpcApiClient;
/// <summary> Creates a new RPC discord client. </summary> /// <summary> Creates a new RPC discord client. </summary>
public DiscordRpcClient(string clientId, string origin) : this(new DiscordRpcConfig(clientId, origin)) { } public DiscordRpcClient(string clientId, string origin)
: this(clientId, origin, new DiscordRpcConfig()) { }
/// <summary> Creates a new RPC discord client. </summary> /// <summary> Creates a new RPC discord client. </summary>
public DiscordRpcClient(DiscordRpcConfig config) public DiscordRpcClient(string clientId, string origin, DiscordRpcConfig config)
: base(config, CreateApiClient(config)) : base(config, CreateApiClient(clientId, origin, config))
{ {
ConnectionTimeout = config.ConnectionTimeout; ConnectionTimeout = config.ConnectionTimeout;
_rpcLogger = LogManager.CreateLogger("RPC"); _rpcLogger = LogManager.CreateLogger("RPC");
@@ -57,8 +58,8 @@ namespace Discord.Rpc
await _rpcLogger.WarningAsync($"Connection Closed").ConfigureAwait(false); await _rpcLogger.WarningAsync($"Connection Closed").ConfigureAwait(false);
}; };
} }
private static API.DiscordRpcApiClient CreateApiClient(DiscordRpcConfig config) private static API.DiscordRpcApiClient CreateApiClient(string clientId, string origin, DiscordRpcConfig config)
=> new API.DiscordRpcApiClient(config.ClientId, DiscordRestConfig.UserAgent, config.Origin, config.RestClientProvider, config.WebSocketProvider, requestQueue: new RequestQueue()); => new API.DiscordRpcApiClient(clientId, DiscordRestConfig.UserAgent, origin, config.RestClientProvider, config.WebSocketProvider, requestQueue: new RequestQueue());
/// <inheritdoc /> /// <inheritdoc />
public Task ConnectAsync() => ConnectAsync(false); public Task ConnectAsync() => ConnectAsync(false);

13
src/Discord.Net.Rpc/DiscordRpcConfig.cs
View File

@@ -9,18 +9,7 @@ namespace Discord.Rpc
public const int PortRangeStart = 6463; public const int PortRangeStart = 6463;
public const int PortRangeEnd = 6472; public const int PortRangeEnd = 6472;
public DiscordRpcConfig(string clientId, string origin)
{
ClientId = clientId;
Origin = origin;
}
/// <summary> Gets or sets the Discord client/application id used for this RPC connection. </summary>
public string ClientId { get; }
/// <summary> Gets or sets the origin used for this RPC connection. </summary>
public string Origin { get; }
/// <summary> Gets or sets the time, in milliseconds, to wait for a connection to complete before aborting. </summary> /// <summary> Gets or sets the time, in milliseconds, to wait for a connection to complete before aborting. </summary>
public int ConnectionTimeout { get; set; } = 30000; public int ConnectionTimeout { get; set; } = 30000;