diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj index ed613a419..703014726 100644 --- a/src/Discord.Net.Net45/Discord.Net.csproj +++ b/src/Discord.Net.Net45/Discord.Net.csproj @@ -148,6 +148,9 @@ Collections\Users.cs + + DiscordAPIClient.cs + DiscordClient.API.cs @@ -163,17 +166,17 @@ DiscordClientConfig.cs - - DiscordSimpleClient.cs + + DiscordWebSocketClient.cs - - DiscordSimpleClient.Events.cs + + DiscordWebSocketClient.Events.cs - - DiscordSimpleClient.Voice.cs + + DiscordWebSocketClient.Voice.cs - - DiscordSimpleClientConfig.cs + + DiscordWebSocketClientConfig.cs Helpers\EpochTime.cs @@ -244,9 +247,6 @@ Net\DataWebSockets.Events.cs - - Net\DiscordAPIClient.cs - Net\HttpException.cs diff --git a/src/Discord.Net/Net/DiscordAPIClient.cs b/src/Discord.Net/DiscordAPIClient.cs similarity index 99% rename from src/Discord.Net/Net/DiscordAPIClient.cs rename to src/Discord.Net/DiscordAPIClient.cs index bb5f0fb06..81a50114e 100644 --- a/src/Discord.Net/Net/DiscordAPIClient.cs +++ b/src/Discord.Net/DiscordAPIClient.cs @@ -1,11 +1,12 @@ using Discord.API; +using Discord.Net; using System; using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -namespace Discord.Net +namespace Discord { /// A lightweight wrapper around the Discord API. public class DiscordAPIClient diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index f32fdd487..d402ed573 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -12,13 +12,13 @@ using System.Threading.Tasks; namespace Discord { /// Provides a connection to the DiscordApp service. - public partial class DiscordClient : DiscordSimpleClient + public partial class DiscordClient : DiscordWebSocketClient { protected readonly DiscordAPIClient _api; private readonly Random _rand; private readonly JsonSerializer _serializer; private readonly ConcurrentQueue _pendingMessages; - private readonly ConcurrentDictionary _voiceClients; + private readonly ConcurrentDictionary _voiceClients; private bool _sentInitialLog; private uint _nextVoiceClientId; private string _status; @@ -59,7 +59,7 @@ namespace Discord if (Config.UseMessageQueue) _pendingMessages = new ConcurrentQueue(); if (Config.EnableVoiceMultiserver) - _voiceClients = new ConcurrentDictionary(); + _voiceClients = new ConcurrentDictionary(); object cacheLock = new object(); _channels = new Channels(this, cacheLock); @@ -747,7 +747,7 @@ namespace Discord return null; } - DiscordSimpleClient client; + DiscordWebSocketClient client; if (_voiceClients.TryGetValue(serverId, out client)) return client; else @@ -768,7 +768,7 @@ namespace Discord config.EnableVoiceMultiserver = false; config.VoiceOnly = true; config.VoiceClientId = unchecked(++_nextVoiceClientId); - return new DiscordSimpleClient(config, serverId); + return new DiscordWebSocketClient(config, serverId); }); client.LogMessage += (s, e) => RaiseOnLog(e.Severity, e.Source, $"(#{client.Config.VoiceClientId}) {e.Message}"); await client.Connect(_gateway, _token).ConfigureAwait(false); @@ -799,7 +799,7 @@ namespace Discord if (Config.EnableVoiceMultiserver) { - DiscordSimpleClient client; + DiscordWebSocketClient client; if (_voiceClients.TryRemove(serverId, out client)) await client.Disconnect(); } diff --git a/src/Discord.Net/DiscordClientConfig.cs b/src/Discord.Net/DiscordClientConfig.cs index a425a6b46..6396b5c82 100644 --- a/src/Discord.Net/DiscordClientConfig.cs +++ b/src/Discord.Net/DiscordClientConfig.cs @@ -1,6 +1,6 @@ namespace Discord { - public class DiscordClientConfig : DiscordSimpleClientConfig + public class DiscordClientConfig : DiscordWebSocketClientConfig { /// Gets or sets the time (in milliseconds) to wait when the message queue is empty before checking again. public int MessageQueueInterval { get { return _messageQueueInterval; } set { SetValue(ref _messageQueueInterval, value); } } diff --git a/src/Discord.Net/DiscordSimpleClient.Events.cs b/src/Discord.Net/DiscordWebSocketClient.Events.cs similarity index 98% rename from src/Discord.Net/DiscordSimpleClient.Events.cs rename to src/Discord.Net/DiscordWebSocketClient.Events.cs index 739ed3a0f..ad9d69fd6 100644 --- a/src/Discord.Net/DiscordSimpleClient.Events.cs +++ b/src/Discord.Net/DiscordWebSocketClient.Events.cs @@ -73,7 +73,7 @@ namespace Discord } } - public partial class DiscordSimpleClient + public partial class DiscordWebSocketClient { public event EventHandler Connected; private void RaiseConnected() diff --git a/src/Discord.Net/DiscordSimpleClient.Voice.cs b/src/Discord.Net/DiscordWebSocketClient.Voice.cs similarity index 97% rename from src/Discord.Net/DiscordSimpleClient.Voice.cs rename to src/Discord.Net/DiscordWebSocketClient.Voice.cs index a30b8b869..e6e2c72a3 100644 --- a/src/Discord.Net/DiscordSimpleClient.Voice.cs +++ b/src/Discord.Net/DiscordWebSocketClient.Voice.cs @@ -23,7 +23,7 @@ namespace Discord Task WaitVoice(); } - public partial class DiscordSimpleClient : IDiscordVoiceClient + public partial class DiscordWebSocketClient : IDiscordVoiceClient { IDiscordVoiceBuffer IDiscordVoiceClient.OutputBuffer => _voiceSocket.OutputBuffer; diff --git a/src/Discord.Net/DiscordSimpleClient.cs b/src/Discord.Net/DiscordWebSocketClient.cs similarity index 96% rename from src/Discord.Net/DiscordSimpleClient.cs rename to src/Discord.Net/DiscordWebSocketClient.cs index 9dde13ef0..45cac4f17 100644 --- a/src/Discord.Net/DiscordSimpleClient.cs +++ b/src/Discord.Net/DiscordWebSocketClient.cs @@ -17,7 +17,7 @@ namespace Discord } /// Provides a barebones connection to the Discord service - public partial class DiscordSimpleClient + public partial class DiscordWebSocketClient { internal readonly DataWebSocket _dataSocket; internal readonly VoiceWebSocket _voiceSocket; @@ -32,8 +32,8 @@ namespace Discord private bool _wasDisconnectUnexpected; /// Returns the configuration object used to make this client. Note that this object cannot be edited directly - to change the configuration of this client, use the DiscordClient(DiscordClientConfig config) constructor. - public DiscordSimpleClientConfig Config => _config; - protected readonly DiscordSimpleClientConfig _config; + public DiscordWebSocketClientConfig Config => _config; + protected readonly DiscordWebSocketClientConfig _config; /// Returns the id of the current logged-in user. public string CurrentUserId => _currentUserId; @@ -50,9 +50,9 @@ namespace Discord private CancellationToken _cancelToken; /// Initializes a new instance of the DiscordClient class. - public DiscordSimpleClient(DiscordSimpleClientConfig config = null) + public DiscordWebSocketClient(DiscordWebSocketClientConfig config = null) { - _config = config ?? new DiscordSimpleClientConfig(); + _config = config ?? new DiscordWebSocketClientConfig(); _config.Lock(); _enableVoice = _config.EnableVoice; @@ -66,7 +66,7 @@ namespace Discord if (_enableVoice) _voiceSocket = CreateVoiceSocket(); } - internal DiscordSimpleClient(DiscordSimpleClientConfig config = null, string voiceServerId = null) + internal DiscordWebSocketClient(DiscordWebSocketClientConfig config = null, string voiceServerId = null) : this(config) { _voiceServerId = voiceServerId; diff --git a/src/Discord.Net/DiscordSimpleClientConfig.cs b/src/Discord.Net/DiscordWebSocketClientConfig.cs similarity index 98% rename from src/Discord.Net/DiscordSimpleClientConfig.cs rename to src/Discord.Net/DiscordWebSocketClientConfig.cs index 863840b96..b788b3a7b 100644 --- a/src/Discord.Net/DiscordSimpleClientConfig.cs +++ b/src/Discord.Net/DiscordWebSocketClientConfig.cs @@ -12,7 +12,7 @@ namespace Discord Both = Outgoing | Incoming } - public class DiscordSimpleClientConfig + public class DiscordWebSocketClientConfig { /// Specifies the minimum log level severity that will be sent to the LogMessage event. Warning: setting this to debug will really hurt performance but should help investigate any internal issues. public LogMessageSeverity LogLevel { get { return _logLevel; } set { SetValue(ref _logLevel, value); } } diff --git a/src/Discord.Net/Net/DataWebSocket.cs b/src/Discord.Net/Net/DataWebSocket.cs index d95423348..2c800efa5 100644 --- a/src/Discord.Net/Net/DataWebSocket.cs +++ b/src/Discord.Net/Net/DataWebSocket.cs @@ -13,7 +13,7 @@ namespace Discord.Net public string SessionId => _sessionId; private string _sessionId; - public DataWebSocket(DiscordSimpleClient client) + public DataWebSocket(DiscordWebSocketClient client) : base(client) { } diff --git a/src/Discord.Net/Net/VoiceWebSocket.cs b/src/Discord.Net/Net/VoiceWebSocket.cs index 59f48da47..a8074e399 100644 --- a/src/Discord.Net/Net/VoiceWebSocket.cs +++ b/src/Discord.Net/Net/VoiceWebSocket.cs @@ -45,7 +45,7 @@ namespace Discord.Net public string CurrentChannelId => _channelId; public VoiceBuffer OutputBuffer => _sendBuffer; - public VoiceWebSocket(DiscordSimpleClient client) + public VoiceWebSocket(DiscordWebSocketClient client) : base(client) { _rand = new Random(); diff --git a/src/Discord.Net/Net/WebSocket.cs b/src/Discord.Net/Net/WebSocket.cs index cf93518c3..2bb8dfc71 100644 --- a/src/Discord.Net/Net/WebSocket.cs +++ b/src/Discord.Net/Net/WebSocket.cs @@ -34,7 +34,7 @@ namespace Discord.Net internal abstract partial class WebSocket { protected readonly IWebSocketEngine _engine; - protected readonly DiscordSimpleClient _client; + protected readonly DiscordWebSocketClient _client; protected readonly LogMessageSeverity _logLevel; protected readonly ManualResetEventSlim _connectedEvent; @@ -56,7 +56,7 @@ namespace Discord.Net public WebSocketState State => (WebSocketState)_state; protected int _state; - public WebSocket(DiscordSimpleClient client) + public WebSocket(DiscordWebSocketClient client) { _client = client; _logLevel = client.Config.LogLevel;