From 81a0c12f4829436fb99e0c761317d38491c565bb Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Fri, 7 Oct 2016 16:56:27 -0300
Subject: [PATCH] Moved RPC ClientId/Origin out of config

---
 src/Discord.Net.Rpc/DiscordRpcClient.cs | 11 ++++++-----
 src/Discord.Net.Rpc/DiscordRpcConfig.cs | 13 +------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/Discord.Net.Rpc/DiscordRpcClient.cs b/src/Discord.Net.Rpc/DiscordRpcClient.cs
index 263d20b44..eedc98718 100644
--- a/src/Discord.Net.Rpc/DiscordRpcClient.cs
+++ b/src/Discord.Net.Rpc/DiscordRpcClient.cs
@@ -29,10 +29,11 @@ namespace Discord.Rpc
         public new API.DiscordRpcApiClient ApiClient => base.ApiClient as API.DiscordRpcApiClient;
 
         /// <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>
-        public DiscordRpcClient(DiscordRpcConfig config)
-            : base(config, CreateApiClient(config))
+        public DiscordRpcClient(string clientId, string origin, DiscordRpcConfig config)
+            : base(config, CreateApiClient(clientId, origin, config))
         {
             ConnectionTimeout = config.ConnectionTimeout;
             _rpcLogger = LogManager.CreateLogger("RPC");
@@ -57,8 +58,8 @@ namespace Discord.Rpc
                     await _rpcLogger.WarningAsync($"Connection Closed").ConfigureAwait(false);
             };
         }
-        private static API.DiscordRpcApiClient CreateApiClient(DiscordRpcConfig config)
-            => new API.DiscordRpcApiClient(config.ClientId, DiscordRestConfig.UserAgent, config.Origin, config.RestClientProvider, config.WebSocketProvider, requestQueue: new RequestQueue());
+        private static API.DiscordRpcApiClient CreateApiClient(string clientId, string origin, DiscordRpcConfig config)
+            => new API.DiscordRpcApiClient(clientId, DiscordRestConfig.UserAgent, origin, config.RestClientProvider, config.WebSocketProvider, requestQueue: new RequestQueue());
 
         /// <inheritdoc />
         public Task ConnectAsync() => ConnectAsync(false);
diff --git a/src/Discord.Net.Rpc/DiscordRpcConfig.cs b/src/Discord.Net.Rpc/DiscordRpcConfig.cs
index ac54551ed..8ca1ae32e 100644
--- a/src/Discord.Net.Rpc/DiscordRpcConfig.cs
+++ b/src/Discord.Net.Rpc/DiscordRpcConfig.cs
@@ -9,18 +9,7 @@ namespace Discord.Rpc
 
         public const int PortRangeStart = 6463;
         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>
         public int ConnectionTimeout { get; set; } = 30000;