Made API models internal. Removed Discord.Net.API.

src/Discord.Net.WebSocket/API/Gateway/ExtendedGuild.cs

@@ -0,0 +1,25 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+using System;
+
+namespace Discord.API.Gateway
+{
+    internal class ExtendedGuild : Guild
+    {
+        [JsonProperty("unavailable")]
+        public bool? Unavailable { get; set; }
+        [JsonProperty("member_count")]
+        public int MemberCount { get; set; }
+        [JsonProperty("large")]
+        public bool Large { get; set; }
+
+        [JsonProperty("presences")]
+        public Presence[] Presences { get; set; }
+        [JsonProperty("members")]
+        public GuildMember[] Members { get; set; }
+        [JsonProperty("channels")]
+        public Channel[] Channels { get; set; }
+        [JsonProperty("joined_at")]
+        public DateTimeOffset JoinedAt { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GatewayOpCode.cs

@@ -0,0 +1,33 @@
+#pragma warning disable CS1591
+namespace Discord.API.Gateway
+{
+    internal enum GatewayOpCode : byte
+    {
+        /// <summary> C←S - Used to send most events. </summary>
+        Dispatch = 0,
+        /// <summary> C↔S - Used to keep the connection alive and measure latency. </summary>
+        Heartbeat = 1,
+        /// <summary> C→S - Used to associate a connection with a token and specify configuration. </summary>
+        Identify = 2,
+        /// <summary> C→S - Used to update client's status and current game id. </summary>
+        StatusUpdate = 3,
+        /// <summary> C→S - Used to join a particular voice channel. </summary>
+        VoiceStateUpdate = 4,
+        /// <summary> C→S - Used to ensure the guild's voice server is alive. </summary>
+        VoiceServerPing = 5,
+        /// <summary> C→S - Used to resume a connection after a redirect occurs. </summary>
+        Resume = 6,
+        /// <summary> C←S - Used to notify a client that they must reconnect to another gateway. </summary>
+        Reconnect = 7,
+        /// <summary> C→S - Used to request members that were withheld by large_threshold </summary>
+        RequestGuildMembers = 8,
+        /// <summary> C←S - Used to notify the client that their session has expired and cannot be resumed. </summary>
+        InvalidSession = 9,
+        /// <summary> C←S - Used to provide information to the client immediately on connection. </summary>
+        Hello = 10,
+        /// <summary> C←S - Used to reply to a client's heartbeat. </summary>
+        HeartbeatAck = 11,
+        /// <summary> C→S - Used to request presence updates from particular guilds. </summary>
+        GuildSync = 12
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GuildBanEvent.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class GuildBanEvent
+    {
+        [JsonProperty("guild_id")]
+        public ulong GuildId { get; set; }
+        [JsonProperty("user")]
+        public User User { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GuildEmojiUpdateEvent.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class GuildEmojiUpdateEvent
+    {
+        [JsonProperty("guild_id")]
+        public ulong GuildId { get; set; }
+        [JsonProperty("emojis")]
+        public Emoji[] Emojis { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GuildMemberAddEvent.cs

@@ -0,0 +1,11 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class GuildMemberAddEvent : GuildMember
+    {
+        [JsonProperty("guild_id")]
+        public ulong GuildId { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GuildMemberRemoveEvent.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class GuildMemberRemoveEvent
+    {
+        [JsonProperty("guild_id")]
+        public ulong GuildId { get; set; }
+        [JsonProperty("user")]
+        public User User { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GuildMemberUpdateEvent.cs

@@ -0,0 +1,11 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class GuildMemberUpdateEvent : GuildMember
+    {
+        [JsonProperty("guild_id")]
+        public ulong GuildId { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GuildMembersChunkEvent.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class GuildMembersChunkEvent
+    {
+        [JsonProperty("guild_id")]
+        public ulong GuildId { get; set; }
+        [JsonProperty("members")]
+        public GuildMember[] Members { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GuildRoleCreateEvent.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class GuildRoleCreateEvent
+    {
+        [JsonProperty("guild_id")]
+        public ulong GuildId { get; set; }
+        [JsonProperty("role")]
+        public Role Role { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GuildRoleDeleteEvent.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class GuildRoleDeleteEvent
+    {
+        [JsonProperty("guild_id")]
+        public ulong GuildId { get; set; }
+        [JsonProperty("role_id")]
+        public ulong RoleId { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GuildRoleUpdateEvent.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class GuildRoleUpdateEvent
+    {
+		[JsonProperty("guild_id")]
+        public ulong GuildId { get; set; }
+        [JsonProperty("role")]
+        public Role Role { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/GuildSyncEvent.cs

@@ -0,0 +1,18 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class GuildSyncEvent
+    {
+        [JsonProperty("id")]
+        public ulong Id { get; set; }
+        [JsonProperty("large")]
+        public bool Large { get; set; }
+
+        [JsonProperty("presences")]
+        public Presence[] Presences { get; set; }
+        [JsonProperty("members")]
+        public GuildMember[] Members { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/HelloEvent.cs

@@ -0,0 +1,11 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class HelloEvent
+    {
+        [JsonProperty("heartbeat_interval")]
+        public int HeartbeatInterval { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/IdentifyParams.cs

@@ -0,0 +1,21 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Discord.API.Gateway
+{
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    internal class IdentifyParams
+    {
+        [JsonProperty("token")]
+        public string Token { get; set; }
+        [JsonProperty("properties")]
+        public IDictionary<string, string> Properties { get; set; }
+        [JsonProperty("large_threshold")]
+        public int LargeThreshold { get; set; }
+        [JsonProperty("compress")]
+        public bool UseCompression { get; set; }
+        [JsonProperty("shard")]
+        public Optional<int[]> ShardingParams { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/MessageDeleteBulkEvent.cs

@@ -0,0 +1,14 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Discord.API.Gateway
+{
+    internal class MessageDeleteBulkEvent
+    {
+        [JsonProperty("channel_id")]
+        public ulong ChannelId { get; set; }
+        [JsonProperty("ids")]
+        public IEnumerable<ulong> Ids { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/Reaction.cs

@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class Reaction
+    {
+        [JsonProperty("user_id")]
+        public ulong UserId { get; set; }
+        [JsonProperty("message_id")]
+        public ulong MessageId { get; set; }
+        [JsonProperty("channel_id")]
+        public ulong ChannelId { get; set; }
+        [JsonProperty("emoji")]
+        public Emoji Emoji { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/ReadyEvent.cs

@@ -0,0 +1,38 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class ReadyEvent
+    {
+        public class ReadState
+        {
+            [JsonProperty("id")]
+            public string ChannelId { get; set; }
+            [JsonProperty("mention_count")]
+            public int MentionCount { get; set; }
+            [JsonProperty("last_message_id")]
+            public string LastMessageId { get; set; }
+        }
+
+        [JsonProperty("v")]
+        public int Version { get; set; }
+        [JsonProperty("user")]
+        public User User { get; set; }
+        [JsonProperty("session_id")]
+        public string SessionId { get; set; }
+        [JsonProperty("read_state")]
+        public ReadState[] ReadStates { get; set; }
+        [JsonProperty("guilds")]
+        public ExtendedGuild[] Guilds { get; set; }
+        [JsonProperty("private_channels")]
+        public Channel[] PrivateChannels { get; set; }
+        [JsonProperty("relationships")]
+        public Relationship[] Relationships { get; set; }
+
+        //Ignored
+        /*[JsonProperty("user_settings")]
+        [JsonProperty("user_guild_settings")]
+        [JsonProperty("tutorial")]*/
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/RecipientEvent.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class RecipientEvent
+    {
+        [JsonProperty("user")]
+        public User User { get; set; }
+        [JsonProperty("channel_id")]
+        public ulong ChannelId { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/RemoveAllReactionsEvent.cs

@@ -0,0 +1,12 @@
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class RemoveAllReactionsEvent
+    {
+        [JsonProperty("channel_id")]
+        public ulong ChannelId { get; set; }
+        [JsonProperty("message_id")]
+        public ulong MessageId { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/RequestMembersParams.cs

@@ -0,0 +1,18 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Discord.API.Gateway
+{
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    internal class RequestMembersParams
+    {
+        [JsonProperty("query")]
+        public string Query { get; set; }
+        [JsonProperty("limit")]
+        public int Limit { get; set; }
+
+        [JsonProperty("guild_id")]
+        public IEnumerable<ulong> GuildIds { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/ResumeParams.cs

@@ -0,0 +1,16 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    internal class ResumeParams
+    {
+        [JsonProperty("token")]
+        public string Token { get; set; }
+        [JsonProperty("session_id")]
+        public string SessionId { get; set; }
+        [JsonProperty("seq")]
+        public int Sequence { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/ResumedEvent.cs

@@ -0,0 +1,11 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class ResumedEvent 
+    { 
+        [JsonProperty("heartbeat_interval")]
+        public int HeartbeatInterval { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/StatusUpdateParams.cs

@@ -0,0 +1,18 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    internal class StatusUpdateParams
+    {
+        [JsonProperty("status")]
+        public UserStatus Status { get; set; }
+        [JsonProperty("since"), Int53]
+        public long? IdleSince { get; set; }
+        [JsonProperty("afk")]
+        public bool IsAFK { get; set; }
+        [JsonProperty("game")]
+        public Game Game { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/TypingStartEvent.cs

@@ -0,0 +1,15 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class TypingStartEvent
+    {
+        [JsonProperty("user_id")]
+        public ulong UserId { get; set; }
+        [JsonProperty("channel_id")]
+        public ulong ChannelId { get; set; }
+        [JsonProperty("timestamp")]
+        public int Timestamp { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/VoiceServerUpdateEvent.cs

@@ -0,0 +1,15 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    internal class VoiceServerUpdateEvent
+	{
+		[JsonProperty("guild_id")]
+		public ulong GuildId { get; set; }
+        [JsonProperty("endpoint")]
+		public string Endpoint { get; set; }
+        [JsonProperty("token")]
+		public string Token { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Gateway/VoiceStateUpdateParams.cs

@@ -0,0 +1,19 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Gateway
+{
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    internal class VoiceStateUpdateParams
+    {
+        [JsonProperty("self_mute")]
+        public bool SelfMute { get; set; }
+        [JsonProperty("self_deaf")]
+        public bool SelfDeaf { get; set; }
+
+        [JsonProperty("guild_id")]
+        public ulong? GuildId { get; set; }
+        [JsonProperty("channel_id")]
+        public ulong? ChannelId { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Voice/IdentifyParams.cs

@@ -0,0 +1,17 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Voice
+{
+    internal class IdentifyParams
+    {
+        [JsonProperty("server_id")]
+        public ulong GuildId { get; set; }
+        [JsonProperty("user_id")]
+        public ulong UserId { get; set; }
+        [JsonProperty("session_id")]
+        public string SessionId { get; set; }
+        [JsonProperty("token")]
+        public string Token { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Voice/ReadyEvent.cs

@@ -0,0 +1,17 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Voice
+{
+    internal class ReadyEvent
+    {
+        [JsonProperty("ssrc")]
+        public uint SSRC { get; set; }
+        [JsonProperty("port")]
+        public ushort Port { get; set; }
+        [JsonProperty("modes")]
+        public string[] Modes { get; set; }
+        [JsonProperty("heartbeat_interval")]
+        public int HeartbeatInterval { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Voice/SelectProtocolParams.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Voice
+{
+    internal class SelectProtocolParams
+    {
+        [JsonProperty("protocol")]
+        public string Protocol { get; set; }
+        [JsonProperty("data")]
+        public UdpProtocolInfo Data { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Voice/SessionDescriptionEvent.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Voice
+{
+    internal class SessionDescriptionEvent
+    {
+        [JsonProperty("secret_key")]
+        public byte[] SecretKey { get; set; }
+        [JsonProperty("mode")]
+        public string Mode { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Voice/SpeakingParams.cs

@@ -0,0 +1,13 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Voice
+{
+    internal class SpeakingParams
+    {
+        [JsonProperty("speaking")]
+        public bool IsSpeaking { get; set; }
+        [JsonProperty("delay")]
+        public int Delay { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Voice/UdpProtocolInfo.cs

@@ -0,0 +1,15 @@
+#pragma warning disable CS1591
+using Newtonsoft.Json;
+
+namespace Discord.API.Voice
+{
+    internal class UdpProtocolInfo
+    {
+        [JsonProperty("address")]
+        public string Address { get; set; }
+        [JsonProperty("port")]
+        public int Port { get; set; }
+        [JsonProperty("mode")]
+        public string Mode { get; set; }
+    }
+}

src/Discord.Net.WebSocket/API/Voice/VoiceOpCode.cs

@@ -0,0 +1,21 @@
+#pragma warning disable CS1591
+namespace Discord.API.Voice
+{
+    internal enum VoiceOpCode : byte
+    {
+        /// <summary> C→S - Used to associate a connection with a token. </summary>
+        Identify = 0,
+        /// <summary> C→S - Used to specify configuration. </summary>
+        SelectProtocol = 1,
+        /// <summary> C←S - Used to notify that the voice connection was successful and informs the client of available protocols. </summary>
+        Ready = 2,
+        /// <summary> C→S - Used to keep the connection alive and measure latency. </summary>
+        Heartbeat = 3,
+        /// <summary> C←S - Used to reply to a client's heartbeat. </summary>
+        HeartbeatAck = 3,
+        /// <summary> C←S - Used to provide an encryption key to the client. </summary>
+        SessionDescription = 4,
+        /// <summary> C↔S - Used to inform that a certain user is speaking. </summary>
+        Speaking = 5
+    }
+}