From d512d96408b02b7455c1985a4b60cfb6afd2237a Mon Sep 17 00:00:00 2001 From: RogueException Date: Sun, 6 Dec 2015 20:33:48 -0400 Subject: [PATCH] Renamed DataWebSocket and combined Bans API into Users --- src/Discord.Net.Audio/AudioService.cs | 6 +++--- src/Discord.Net.Audio/DiscordAudioClient.cs | 16 ++++++++-------- src/Discord.Net/API/Auth.cs | 2 +- src/Discord.Net/API/Bans.cs | 10 ---------- src/Discord.Net/API/Users.cs | 2 ++ src/Discord.Net/DiscordClient.cs | 8 ++++---- .../{DataWebSocket.cs => GatewayWebSocket.cs} | 4 ++-- ...ets.Events.cs => GatewayWebSockets.Events.cs} | 2 +- 8 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 src/Discord.Net/API/Bans.cs rename src/Discord.Net/Net/WebSockets/{DataWebSocket.cs => GatewayWebSocket.cs} (97%) rename src/Discord.Net/Net/WebSockets/{DataWebSockets.Events.cs => GatewayWebSockets.Events.cs} (93%) diff --git a/src/Discord.Net.Audio/AudioService.cs b/src/Discord.Net.Audio/AudioService.cs index 40eba3d16..07d0e1309 100644 --- a/src/Discord.Net.Audio/AudioService.cs +++ b/src/Discord.Net.Audio/AudioService.cs @@ -149,9 +149,9 @@ namespace Discord.Audio { int id = unchecked(++_nextClientId); var logger = Client.Log().CreateLogger($"Voice #{id}"); - DataWebSocket dataSocket = null; + GatewayWebSocket dataSocket = null; var voiceSocket = new VoiceWebSocket(Client.Config, _config, logger); - var voiceClient = new DiscordAudioClient(this, id, logger, dataSocket, voiceSocket); + var voiceClient = new DiscordAudioClient(this, id, logger, gatewaySocket, voiceSocket); voiceClient.SetServerId(server.Id); voiceSocket.OnPacket += (s, e) => @@ -166,7 +166,7 @@ namespace Discord.Audio return voiceClient; }); - //await client.Connect(dataSocket.Host, _client.Token).ConfigureAwait(false); + //await client.Connect(gatewaySocket.Host, _client.Token).ConfigureAwait(false); return Task.FromResult(client); } diff --git a/src/Discord.Net.Audio/DiscordAudioClient.cs b/src/Discord.Net.Audio/DiscordAudioClient.cs index f3fca3cb6..6054ed37c 100644 --- a/src/Discord.Net.Audio/DiscordAudioClient.cs +++ b/src/Discord.Net.Audio/DiscordAudioClient.cs @@ -10,19 +10,19 @@ namespace Discord.Audio public int Id => _id; private readonly AudioService _service; - private readonly DataWebSocket _dataSocket; + private readonly GatewayWebSocket _gatewaySocket; private readonly VoiceWebSocket _voiceSocket; private readonly Logger _logger; public long? ServerId => _voiceSocket.ServerId; public long? ChannelId => _voiceSocket.ChannelId; - public DiscordAudioClient(AudioService service, int id, Logger logger, DataWebSocket dataSocket, VoiceWebSocket voiceSocket) + public DiscordAudioClient(AudioService service, int id, Logger logger, GatewayWebSocket gatewaySocket, VoiceWebSocket voiceSocket) { _service = service; _id = id; _logger = logger; - _dataSocket = dataSocket; + _gatewaySocket = gatewaySocket; _voiceSocket = voiceSocket; /*_voiceSocket.Connected += (s, e) => RaiseVoiceConnected(); @@ -30,7 +30,7 @@ namespace Discord.Audio { _voiceSocket.CurrentServerId; if (voiceServerId != null) - _dataSocket.SendLeaveVoice(voiceServerId.Value); + _gatewaySocket.SendLeaveVoice(voiceServerId.Value); await _voiceSocket.Disconnect().ConfigureAwait(false); RaiseVoiceDisconnected(socket.CurrentServerId.Value, e); if (e.WasUnexpected) @@ -59,7 +59,7 @@ namespace Discord.Audio _voiceSocket.ParentCancelToken = _cancelToken; };*/ - _dataSocket.ReceivedEvent += async (s, e) => + _gatewaySocket.ReceivedEvent += async (s, e) => { try { @@ -74,7 +74,7 @@ namespace Discord.Audio var client = _service.Client; string token = e.Payload.Value("token"); _voiceSocket.Host = "wss://" + e.Payload.Value("endpoint").Split(':')[0]; - await _voiceSocket.Login(client.CurrentUser.Id, _dataSocket.SessionId, token, client.CancelToken).ConfigureAwait(false); + await _voiceSocket.Login(client.CurrentUser.Id, _gatewaySocket.SessionId, token, client.CancelToken).ConfigureAwait(false); } } break; @@ -82,7 +82,7 @@ namespace Discord.Audio } catch (Exception ex) { - _dataSocket.Logger.Log(LogSeverity.Error, $"Error handling {e.Type} event", ex); + _gatewaySocket.Logger.Log(LogSeverity.Error, $"Error handling {e.Type} event", ex); } }; } @@ -106,7 +106,7 @@ namespace Discord.Audio await _voiceSocket.Disconnect().ConfigureAwait(false); _voiceSocket.ChannelId = channel.Id; - _dataSocket.SendJoinVoice(channel.Server.Id, channel.Id); + _gatewaySocket.SendJoinVoice(channel.Server.Id, channel.Id); await _voiceSocket.WaitForConnection(_service.Config.ConnectionTimeout).ConfigureAwait(false); } diff --git a/src/Discord.Net/API/Auth.cs b/src/Discord.Net/API/Auth.cs index ce62d8eb2..8265d750d 100644 --- a/src/Discord.Net/API/Auth.cs +++ b/src/Discord.Net/API/Auth.cs @@ -12,7 +12,7 @@ namespace Discord.API [JsonProperty("url")] public string Url; } - + //Login public sealed class LoginRequest { diff --git a/src/Discord.Net/API/Bans.cs b/src/Discord.Net/API/Bans.cs deleted file mode 100644 index f6afd0201..000000000 --- a/src/Discord.Net/API/Bans.cs +++ /dev/null @@ -1,10 +0,0 @@ -//Ignore unused/unassigned variable warnings -#pragma warning disable CS0649 -#pragma warning disable CS0169 - -namespace Discord.API -{ - //Events - internal sealed class BanAddEvent : MemberReference { } - internal sealed class BanRemoveEvent : MemberReference { } -} diff --git a/src/Discord.Net/API/Users.cs b/src/Discord.Net/API/Users.cs index ee507ef77..cf10147e7 100644 --- a/src/Discord.Net/API/Users.cs +++ b/src/Discord.Net/API/Users.cs @@ -46,4 +46,6 @@ namespace Discord.API //Events internal sealed class UserUpdateEvent : UserInfo { } + internal sealed class BanAddEvent : MemberReference { } + internal sealed class BanRemoveEvent : MemberReference { } } diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index fac224d05..d65b43633 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -82,8 +82,8 @@ namespace Discord private readonly DiscordAPIClient _api; /// Returns the internal websocket object. - public DataWebSocket WebSocket => _webSocket; - private readonly DataWebSocket _webSocket; + public GatewayWebSocket WebSocket => _webSocket; + private readonly GatewayWebSocket _webSocket; public string GatewayUrl => _gateway; private string _gateway; @@ -257,9 +257,9 @@ namespace Discord } } - private DataWebSocket CreateWebSocket() + private GatewayWebSocket CreateWebSocket() { - var socket = new DataWebSocket(_config, _log.CreateLogger("WebSocket")); + var socket = new GatewayWebSocket(_config, _log.CreateLogger("WebSocket")); var settings = new JsonSerializerSettings(); socket.Connected += (s, e) => { diff --git a/src/Discord.Net/Net/WebSockets/DataWebSocket.cs b/src/Discord.Net/Net/WebSockets/GatewayWebSocket.cs similarity index 97% rename from src/Discord.Net/Net/WebSockets/DataWebSocket.cs rename to src/Discord.Net/Net/WebSockets/GatewayWebSocket.cs index a27f0a357..4c544adae 100644 --- a/src/Discord.Net/Net/WebSockets/DataWebSocket.cs +++ b/src/Discord.Net/Net/WebSockets/GatewayWebSocket.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Discord.Net.WebSockets { - public partial class DataWebSocket : WebSocket + public partial class GatewayWebSocket : WebSocket { internal enum OpCodes : byte { @@ -26,7 +26,7 @@ namespace Discord.Net.WebSockets public string SessionId => _sessionId; private string _sessionId; - public DataWebSocket(DiscordConfig config, Logger logger) + public GatewayWebSocket(DiscordConfig config, Logger logger) : base(config, logger) { } diff --git a/src/Discord.Net/Net/WebSockets/DataWebSockets.Events.cs b/src/Discord.Net/Net/WebSockets/GatewayWebSockets.Events.cs similarity index 93% rename from src/Discord.Net/Net/WebSockets/DataWebSockets.Events.cs rename to src/Discord.Net/Net/WebSockets/GatewayWebSockets.Events.cs index 232c7e4c0..5721bdd2a 100644 --- a/src/Discord.Net/Net/WebSockets/DataWebSockets.Events.cs +++ b/src/Discord.Net/Net/WebSockets/GatewayWebSockets.Events.cs @@ -14,7 +14,7 @@ namespace Discord.Net.WebSockets } } - public partial class DataWebSocket + public partial class GatewayWebSocket { public event EventHandler ReceivedEvent; private void RaiseReceivedEvent(string type, JToken payload)