From d55e0309a0abb2896a435ef202380a45b9b5777a Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 7 Jun 2016 21:28:38 -0300
Subject: [PATCH] Renamed OpCode enums

---
 src/Discord.Net/API/DiscordAPIClient.cs          | 16 +++++++---------
 .../{GatewayOpCodes.cs => GatewayOpCode.cs}      |  2 +-
 .../Voice/{VoiceOpCodes.cs => VoiceOpCode.cs}    |  4 ++--
 3 files changed, 10 insertions(+), 12 deletions(-)
 rename src/Discord.Net/API/Gateway/{GatewayOpCodes.cs => GatewayOpCode.cs} (97%)
 rename src/Discord.Net/API/Voice/{VoiceOpCodes.cs => VoiceOpCode.cs} (91%)

diff --git a/src/Discord.Net/API/DiscordAPIClient.cs b/src/Discord.Net/API/DiscordAPIClient.cs
index eaa403fa3..9f8af48e1 100644
--- a/src/Discord.Net/API/DiscordAPIClient.cs
+++ b/src/Discord.Net/API/DiscordAPIClient.cs
@@ -27,7 +27,7 @@ namespace Discord.API
     {
         public event Func<string, string, double, Task> SentRequest;
         public event Func<int, Task> SentGatewayMessage;
-        public event Func<GatewayOpCodes, string, JToken, Task> ReceivedGatewayEvent;
+        public event Func<GatewayOpCode, string, JToken, Task> ReceivedGatewayEvent;
 
         private readonly RequestQueue _requestQueue;
         private readonly JsonSerializer _serializer;
@@ -66,14 +66,14 @@ namespace Discord.API
                         using (var reader = new StreamReader(decompressed))
                         {
                             var msg = JsonConvert.DeserializeObject<WebSocketMessage>(reader.ReadToEnd());
-                            await ReceivedGatewayEvent.Raise((GatewayOpCodes)msg.Operation, msg.Type, msg.Payload as JToken).ConfigureAwait(false);
+                            await ReceivedGatewayEvent.Raise((GatewayOpCode)msg.Operation, msg.Type, msg.Payload as JToken).ConfigureAwait(false);
                         }
                     }
                 };
                 _gatewayClient.TextMessage += async text =>
                 {
                     var msg = JsonConvert.DeserializeObject<WebSocketMessage>(text);
-                    await ReceivedGatewayEvent.Raise((GatewayOpCodes)msg.Operation, msg.Type, msg.Payload as JToken).ConfigureAwait(false);
+                    await ReceivedGatewayEvent.Raise((GatewayOpCode)msg.Operation, msg.Type, msg.Payload as JToken).ConfigureAwait(false);
                 };
             }
 
@@ -198,8 +198,6 @@ namespace Discord.API
                 var url = $"{gatewayResponse.Url}?v={DiscordConfig.GatewayAPIVersion}&encoding={DiscordConfig.GatewayEncoding}";
                 await _gatewayClient.Connect(url).ConfigureAwait(false);
 
-                await SendIdentify().ConfigureAwait(false);
-
                 ConnectionState = ConnectionState.Connected;
             }
             catch (Exception)
@@ -321,13 +319,13 @@ namespace Discord.API
             return responseStream;
         }
 
-        public Task SendGateway(GatewayOpCodes opCode, object payload, 
+        public Task SendGateway(GatewayOpCode opCode, object payload, 
             GlobalBucket bucket = GlobalBucket.GeneralGateway, RequestOptions options = null)
             => SendGateway(opCode, payload, BucketGroup.Global, (int)bucket, 0, options);
-        public Task SendGateway(GatewayOpCodes opCode, object payload, 
+        public Task SendGateway(GatewayOpCode opCode, object payload, 
             GuildBucket bucket, ulong guildId, RequestOptions options = null)
             => SendGateway(opCode, payload, BucketGroup.Guild, (int)bucket, guildId, options);
-        private async Task SendGateway(GatewayOpCodes opCode, object payload, 
+        private async Task SendGateway(GatewayOpCode opCode, object payload, 
             BucketGroup group, int bucketId, ulong guildId, RequestOptions options)
         {
             //TODO: Add ETF
@@ -363,7 +361,7 @@ namespace Discord.API
                 LargeThreshold = largeThreshold,
                 UseCompression = useCompression
             };
-            await SendGateway(GatewayOpCodes.Identify, msg, options: options).ConfigureAwait(false);
+            await SendGateway(GatewayOpCode.Identify, msg, options: options).ConfigureAwait(false);
         }
 
         //Channels
diff --git a/src/Discord.Net/API/Gateway/GatewayOpCodes.cs b/src/Discord.Net/API/Gateway/GatewayOpCode.cs
similarity index 97%
rename from src/Discord.Net/API/Gateway/GatewayOpCodes.cs
rename to src/Discord.Net/API/Gateway/GatewayOpCode.cs
index f4d932d90..ac1a21e1d 100644
--- a/src/Discord.Net/API/Gateway/GatewayOpCodes.cs
+++ b/src/Discord.Net/API/Gateway/GatewayOpCode.cs
@@ -1,6 +1,6 @@
 namespace Discord.API.Gateway
 {
-    public enum GatewayOpCodes : byte
+    public enum GatewayOpCode : byte
     {
         /// <summary> C←S - Used to send most events. </summary>
         Dispatch = 0,
diff --git a/src/Discord.Net/API/Voice/VoiceOpCodes.cs b/src/Discord.Net/API/Voice/VoiceOpCode.cs
similarity index 91%
rename from src/Discord.Net/API/Voice/VoiceOpCodes.cs
rename to src/Discord.Net/API/Voice/VoiceOpCode.cs
index 73c7eda0c..b1526b463 100644
--- a/src/Discord.Net/API/Voice/VoiceOpCodes.cs
+++ b/src/Discord.Net/API/Voice/VoiceOpCode.cs
@@ -1,6 +1,6 @@
-namespace Discord.API.Gateway
+namespace Discord.API.Voice
 {
-    public enum VoiceOpCodes : byte
+    public enum VoiceOpCode : byte
     {
         /// <summary> C→S - Used to associate a connection with a token. </summary>
         Identify = 0,