diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj index 8b2b605bc..d92fa3858 100644 --- a/src/Discord.Net.Net45/Discord.Net.csproj +++ b/src/Discord.Net.Net45/Discord.Net.csproj @@ -169,17 +169,17 @@ DiscordClientConfig.cs - - DiscordWebSocketClient.cs + + DiscordWSClient.cs - - DiscordWebSocketClient.Events.cs + + DiscordWSClient.Events.cs - - DiscordWebSocketClient.Voice.cs + + DiscordWSClient.Voice.cs - - DiscordWebSocketClientConfig.cs + + DiscordWSClientConfig.cs Helpers\EpochTime.cs diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index 428a6239b..f44fe86a1 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -14,13 +14,13 @@ using System.Threading.Tasks; namespace Discord { /// Provides a connection to the DiscordApp service. - public partial class DiscordClient : DiscordWebSocketClient + public partial class DiscordClient : DiscordWSClient { 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; @@ -61,7 +61,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); @@ -749,7 +749,7 @@ namespace Discord return null; } - DiscordWebSocketClient client; + DiscordWSClient client; if (_voiceClients.TryGetValue(serverId, out client)) return client; else @@ -769,7 +769,7 @@ namespace Discord config.LogLevel = _config.LogLevel;// (LogMessageSeverity)Math.Min((int)_config.LogLevel, (int)LogMessageSeverity.Warning); config.VoiceOnly = true; config.VoiceClientId = unchecked(++_nextVoiceClientId); - return new DiscordWebSocketClient(config, serverId); + return new DiscordWSClient(config, serverId); }); client.LogMessage += (s, e) => RaiseOnLog(e.Severity, e.Source, $"(#{client.Config.VoiceClientId}) {e.Message}"); await client.Connect(_gateway, _token).ConfigureAwait(false); @@ -800,7 +800,7 @@ namespace Discord if (Config.EnableVoiceMultiserver) { - DiscordWebSocketClient client; + DiscordWSClient 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 e5f2cdbac..8e09e0fe0 100644 --- a/src/Discord.Net/DiscordClientConfig.cs +++ b/src/Discord.Net/DiscordClientConfig.cs @@ -1,6 +1,6 @@ namespace Discord { - public class DiscordClientConfig : DiscordWebSocketClientConfig + public class DiscordClientConfig : DiscordWSClientConfig { /// 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/DiscordWebSocketClient.Events.cs b/src/Discord.Net/DiscordWSClient.Events.cs similarity index 98% rename from src/Discord.Net/DiscordWebSocketClient.Events.cs rename to src/Discord.Net/DiscordWSClient.Events.cs index ad9d69fd6..3c5e24390 100644 --- a/src/Discord.Net/DiscordWebSocketClient.Events.cs +++ b/src/Discord.Net/DiscordWSClient.Events.cs @@ -73,7 +73,7 @@ namespace Discord } } - public partial class DiscordWebSocketClient + public partial class DiscordWSClient { public event EventHandler Connected; private void RaiseConnected() diff --git a/src/Discord.Net/DiscordWebSocketClient.Voice.cs b/src/Discord.Net/DiscordWSClient.Voice.cs similarity index 96% rename from src/Discord.Net/DiscordWebSocketClient.Voice.cs rename to src/Discord.Net/DiscordWSClient.Voice.cs index c45339a11..f290809e2 100644 --- a/src/Discord.Net/DiscordWebSocketClient.Voice.cs +++ b/src/Discord.Net/DiscordWSClient.Voice.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; namespace Discord { - public partial class DiscordWebSocketClient : IDiscordVoiceClient + public partial class DiscordWSClient : IDiscordVoiceClient { IDiscordVoiceBuffer IDiscordVoiceClient.OutputBuffer => _voiceSocket.OutputBuffer; diff --git a/src/Discord.Net/DiscordWebSocketClient.cs b/src/Discord.Net/DiscordWSClient.cs similarity index 95% rename from src/Discord.Net/DiscordWebSocketClient.cs rename to src/Discord.Net/DiscordWSClient.cs index 7ab63a12f..ba24c0271 100644 --- a/src/Discord.Net/DiscordWebSocketClient.cs +++ b/src/Discord.Net/DiscordWSClient.cs @@ -17,8 +17,8 @@ namespace Discord Disconnecting } - /// Provides a barebones connection to the Discord service - public partial class DiscordWebSocketClient + /// Provides a minimalistic websocket connection to the Discord service. + public partial class DiscordWSClient { internal readonly DataWebSocket _dataSocket; internal readonly VoiceWebSocket _voiceSocket; @@ -33,8 +33,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 DiscordWebSocketClientConfig Config => _config; - protected readonly DiscordWebSocketClientConfig _config; + public DiscordWSClientConfig Config => _config; + protected readonly DiscordWSClientConfig _config; /// Returns the id of the current logged-in user. public string CurrentUserId => _currentUserId; @@ -51,9 +51,9 @@ namespace Discord private CancellationToken _cancelToken; /// Initializes a new instance of the DiscordClient class. - public DiscordWebSocketClient(DiscordWebSocketClientConfig config = null) + public DiscordWSClient(DiscordWSClientConfig config = null) { - _config = config ?? new DiscordWebSocketClientConfig(); + _config = config ?? new DiscordWSClientConfig(); _config.Lock(); _enableVoice = _config.EnableVoice; @@ -67,7 +67,7 @@ namespace Discord if (_enableVoice) _voiceSocket = CreateVoiceSocket(); } - internal DiscordWebSocketClient(DiscordWebSocketClientConfig config = null, string voiceServerId = null) + internal DiscordWSClient(DiscordWSClientConfig config = null, string voiceServerId = null) : this(config) { _voiceServerId = voiceServerId; diff --git a/src/Discord.Net/DiscordWebSocketClientConfig.cs b/src/Discord.Net/DiscordWSClientConfig.cs similarity index 93% rename from src/Discord.Net/DiscordWebSocketClientConfig.cs rename to src/Discord.Net/DiscordWSClientConfig.cs index 601ad8c21..5a053e8ed 100644 --- a/src/Discord.Net/DiscordWebSocketClientConfig.cs +++ b/src/Discord.Net/DiscordWSClientConfig.cs @@ -12,7 +12,7 @@ namespace Discord Both = Outgoing | Incoming } - public class DiscordWebSocketClientConfig : DiscordAPIClientConfig + public class DiscordWSClientConfig : DiscordAPIClientConfig { /// Max time in milliseconds to wait for DiscordClient to connect and initialize. public int ConnectionTimeout { get { return _connectionTimeout; } set { SetValue(ref _connectionTimeout, value); } } @@ -47,9 +47,9 @@ namespace Discord internal virtual bool EnableVoice => _voiceMode != DiscordVoiceMode.Disabled; - public new DiscordWebSocketClientConfig Clone() + public new DiscordWSClientConfig Clone() { - var config = MemberwiseClone() as DiscordWebSocketClientConfig; + var config = MemberwiseClone() as DiscordWSClientConfig; config._isLocked = false; return config; } diff --git a/src/Discord.Net/Net/WebSockets/DataWebSocket.cs b/src/Discord.Net/Net/WebSockets/DataWebSocket.cs index 8976948e0..10ac57b22 100644 --- a/src/Discord.Net/Net/WebSockets/DataWebSocket.cs +++ b/src/Discord.Net/Net/WebSockets/DataWebSocket.cs @@ -13,7 +13,7 @@ namespace Discord.Net.WebSockets public string SessionId => _sessionId; private string _sessionId; - public DataWebSocket(DiscordWebSocketClient client) + public DataWebSocket(DiscordWSClient client) : base(client) { } diff --git a/src/Discord.Net/Net/WebSockets/VoiceWebSocket.cs b/src/Discord.Net/Net/WebSockets/VoiceWebSocket.cs index 3dc7fed89..78ee27271 100644 --- a/src/Discord.Net/Net/WebSockets/VoiceWebSocket.cs +++ b/src/Discord.Net/Net/WebSockets/VoiceWebSocket.cs @@ -46,7 +46,7 @@ namespace Discord.Net.WebSockets public string CurrentChannelId => _channelId; public VoiceBuffer OutputBuffer => _sendBuffer; - public VoiceWebSocket(DiscordWebSocketClient client) + public VoiceWebSocket(DiscordWSClient client) : base(client) { _rand = new Random(); diff --git a/src/Discord.Net/Net/WebSockets/WebSocket.cs b/src/Discord.Net/Net/WebSockets/WebSocket.cs index e673e42cb..7eeb9acfd 100644 --- a/src/Discord.Net/Net/WebSockets/WebSocket.cs +++ b/src/Discord.Net/Net/WebSockets/WebSocket.cs @@ -19,7 +19,7 @@ namespace Discord.Net.WebSockets internal abstract partial class WebSocket { protected readonly IWebSocketEngine _engine; - protected readonly DiscordWebSocketClient _client; + protected readonly DiscordWSClient _client; protected readonly LogMessageSeverity _logLevel; protected readonly ManualResetEventSlim _connectedEvent; @@ -41,7 +41,7 @@ namespace Discord.Net.WebSockets public WebSocketState State => (WebSocketState)_state; protected int _state; - public WebSocket(DiscordWebSocketClient client) + public WebSocket(DiscordWSClient client) { _client = client; _logLevel = client.Config.LogLevel; diff --git a/src/Discord.Net/Net/WebSockets/WebSocketSharpEngine.cs b/src/Discord.Net/Net/WebSockets/WebSocketSharpEngine.cs index 0538d160a..37dc68d8a 100644 --- a/src/Discord.Net/Net/WebSockets/WebSocketSharpEngine.cs +++ b/src/Discord.Net/Net/WebSockets/WebSocketSharpEngine.cs @@ -10,7 +10,7 @@ namespace Discord.Net.WebSockets { internal class WebSocketSharpEngine : IWebSocketEngine { - private readonly DiscordWebSocketClientConfig _config; + private readonly DiscordWSClientConfig _config; private readonly ConcurrentQueue _sendQueue; private readonly WebSocket _parent; private WSSharpNWebSocket _webSocket; @@ -22,7 +22,7 @@ namespace Discord.Net.WebSockets ProcessMessage(this, new WebSocketMessageEventArgs(msg)); } - internal WebSocketSharpEngine(WebSocket parent, DiscordWebSocketClientConfig config) + internal WebSocketSharpEngine(WebSocket parent, DiscordWSClientConfig config) { _parent = parent; _config = config;