From b7ed3c18ad6f8ffb61e9d28ea2b991142011ca89 Mon Sep 17 00:00:00 2001 From: RogueException Date: Thu, 1 Oct 2015 18:27:47 -0300 Subject: [PATCH] Moved UserAgent to Config --- src/Discord.Net/API/RestClient.cs | 6 ++---- src/Discord.Net/DiscordAPIClient.cs | 4 ++-- src/Discord.Net/DiscordClient.cs | 2 +- src/Discord.Net/DiscordClientConfig.cs | 10 ++++++++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Discord.Net/API/RestClient.cs b/src/Discord.Net/API/RestClient.cs index 8c97e40b9..28dd38de5 100644 --- a/src/Discord.Net/API/RestClient.cs +++ b/src/Discord.Net/API/RestClient.cs @@ -21,12 +21,10 @@ namespace Discord.API private readonly LogMessageSeverity _logLevel; private CancellationToken _cancelToken; - public RestClient(LogMessageSeverity logLevel, int timeout) + public RestClient(LogMessageSeverity logLevel, string userAgent, int timeout) { _logLevel = logLevel; - - string version = typeof(RestClient).GetTypeInfo().Assembly.GetName().Version.ToString(2); - string userAgent = $"Discord.Net/{version} (https://github.com/RogueException/Discord.Net)"; + #if DNXCORE50 _engine = new BuiltInRestEngine(userAgent, timeout); #else diff --git a/src/Discord.Net/DiscordAPIClient.cs b/src/Discord.Net/DiscordAPIClient.cs index 36d7cb93d..f8c87126b 100644 --- a/src/Discord.Net/DiscordAPIClient.cs +++ b/src/Discord.Net/DiscordAPIClient.cs @@ -11,9 +11,9 @@ namespace Discord internal RestClient RestClient => _rest; private readonly RestClient _rest; - public DiscordAPIClient(LogMessageSeverity logLevel, int timeout) + public DiscordAPIClient(LogMessageSeverity logLevel, string userAgent, int timeout) { - _rest = new RestClient(logLevel, timeout); + _rest = new RestClient(logLevel, userAgent, timeout); } private string _token; diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index 098f4e158..e93ca1f38 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -54,7 +54,7 @@ namespace Discord : base(config) { _rand = new Random(); - _api = new DiscordAPIClient(_config.LogLevel, _config.APITimeout); + _api = new DiscordAPIClient(_config.LogLevel, _config.UserAgent, _config.APITimeout); if (_config.UseMessageQueue) _pendingMessages = new ConcurrentQueue(); if (_config.EnableVoiceMultiserver) diff --git a/src/Discord.Net/DiscordClientConfig.cs b/src/Discord.Net/DiscordClientConfig.cs index 8c9bfebc8..c4a67597b 100644 --- a/src/Discord.Net/DiscordClientConfig.cs +++ b/src/Discord.Net/DiscordClientConfig.cs @@ -1,4 +1,5 @@ using System; +using System.Reflection; namespace Discord { @@ -68,6 +69,15 @@ namespace Discord internal uint VoiceClientId { get { return _voiceClientId; } set { SetValue(ref _voiceClientId, value); } } private uint _voiceClientId; + internal string UserAgent + { + get + { + string version = typeof(DiscordClientConfig).GetTypeInfo().Assembly.GetName().Version.ToString(2); + return $"Discord.Net/{version} (https://github.com/RogueException/Discord.Net)"; + } + } + //Lock private bool _isLocked; internal void Lock() { _isLocked = true; }