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

src/Discord.Net.API/AssemblyInfo.cs

@@ -1,8 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Discord.Net.Core")]
-[assembly: InternalsVisibleTo("Discord.Net.Rest")]
-[assembly: InternalsVisibleTo("Discord.Net.Rpc")]
-[assembly: InternalsVisibleTo("Discord.Net.WebSocket")]
-[assembly: InternalsVisibleTo("Discord.Net.Commands")]
-[assembly: InternalsVisibleTo("Discord.Net.Tests")]

src/Discord.Net.Commands/Discord.Net.Commands.csproj

@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Description>A Discord.Net extension adding support for bot commands.</Description>
     <VersionPrefix>1.0.0-beta2</VersionPrefix>
@@ -16,7 +16,6 @@
     <EmbeddedResource Include="**\*.resx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Discord.Net.API\Discord.Net.API.csproj" />
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

src/Discord.Net.Commands/ModuleBase.cs

@@ -10,7 +10,7 @@ namespace Discord.Commands
     {
         public T Context { get; private set; }
 
-        protected virtual async Task<IUserMessage> ReplyAsync(string message, bool isTTS = false, EmbedBuilder embed = null, RequestOptions options = null)
+        protected virtual async Task<IUserMessage> ReplyAsync(string message, bool isTTS = false, Embed embed = null, RequestOptions options = null)
         {
             return await Context.Channel.SendMessageAsync(message, isTTS, embed, options).ConfigureAwait(false);
         }

src/Discord.Net.Core/Audio/AudioInStream.cs

@@ -0,0 +1,8 @@
+using System.IO;
+
+namespace Discord.Audio
+{
+    public abstract class AudioInStream : Stream
+    {
+    }
+}

src/Discord.Net.Core/Discord.Net.Core.csproj

@@ -15,9 +15,6 @@
     <Compile Include="**\*.cs" />
     <EmbeddedResource Include="**\*.resx" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Discord.Net.API\Discord.Net.API.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />

src/Discord.Net.Core/Entities/Channels/IGuildChannel.cs

@@ -1,5 +1,4 @@
-using Discord.API.Rest;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 

src/Discord.Net.Core/Entities/Channels/IMessageChannel.cs

@@ -8,7 +8,7 @@ namespace Discord
     public interface IMessageChannel : IChannel
     {
         /// <summary> Sends a message to this message channel. </summary>
-        Task<IUserMessage> SendMessageAsync(string text, bool isTTS = false, EmbedBuilder embed = null, RequestOptions options = null);
+        Task<IUserMessage> SendMessageAsync(string text, bool isTTS = false, Embed embed = null, RequestOptions options = null);
 #if NETSTANDARD1_3
         /// <summary> Sends a file to this text channel, with an optional caption. </summary>
         Task<IUserMessage> SendFileAsync(string filePath, string text = null, bool isTTS = false, RequestOptions options = null);

src/Discord.Net.Core/Entities/Channels/ITextChannel.cs

@@ -1,5 +1,4 @@
-using Discord.API.Rest;
-using System;
+using System;
 using System.Threading.Tasks;
 
 namespace Discord

src/Discord.Net.Core/Entities/Channels/IVoiceChannel.cs

@@ -1,5 +1,4 @@
-using Discord.API.Rest;
-using Discord.Audio;
+using Discord.Audio;
 using System;
 using System.Threading.Tasks;
 

src/Discord.Net.Core/Entities/Guilds/GuildEmoji.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Diagnostics;
-using Model = Discord.API.Emoji;
 
 namespace Discord
 {
@@ -14,7 +12,7 @@ namespace Discord
         public bool RequireColons { get; }
         public IReadOnlyList<ulong> RoleIds { get; }
 
-        private GuildEmoji(ulong id, string name, bool isManaged, bool requireColons, IReadOnlyList<ulong> roleIds)
+        internal GuildEmoji(ulong id, string name, bool isManaged, bool requireColons, IReadOnlyList<ulong> roleIds)
         {
             Id = id;
             Name = name;
@@ -22,10 +20,6 @@ namespace Discord
             RequireColons = requireColons;
             RoleIds = roleIds;
         }
-        internal static GuildEmoji Create(Model model)
-        {
-            return new GuildEmoji(model.Id.Value, model.Name, model.Managed, model.RequireColons, ImmutableArray.Create(model.Roles));
-        }
 
         public override string ToString() => Name;
         private string DebuggerDisplay => $"{Name} ({Id})";

src/Discord.Net.Core/Entities/Guilds/IGuild.cs

@@ -1,5 +1,4 @@
-using Discord.API.Rest;
-using Discord.Audio;
+using Discord.Audio;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

src/Discord.Net.Core/Entities/Image.cs

@@ -1,6 +1,4 @@
 using System.IO;
-using Model = Discord.API.Image;
-
 namespace Discord
 {
     /// <summary>
@@ -30,10 +28,5 @@ namespace Discord
             Stream = File.OpenRead(path);
         }
 #endif
-
-        public Model ToModel()
-        {
-            return new Model(Stream);
-        }
     }
 }

src/Discord.Net.Core/Entities/Messages/Embed.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Immutable;
+using System.Diagnostics;
+
+namespace Discord
+{
+    [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
+    public class Embed : IEmbed
+    {
+        public string Type { get; }
+
+        public string Description { get; internal set; }
+        public string Url { get; internal set; }
+        public string Title { get; internal set; }
+        public DateTimeOffset? Timestamp { get; internal set; }
+        public Color? Color { get; internal set; }
+        public EmbedImage? Image { get; internal set; }
+        public EmbedVideo? Video { get; internal set; }
+        public EmbedAuthor? Author { get; internal set; }
+        public EmbedFooter? Footer { get; internal set; }
+        public EmbedProvider? Provider { get; internal set; }
+        public EmbedThumbnail? Thumbnail { get; internal set; }
+        public ImmutableArray<EmbedField> Fields { get; internal set; }
+
+        internal Embed(string type)
+        {
+            Type = type;
+            Fields = ImmutableArray.Create<EmbedField>();
+        }
+        internal Embed(string type, 
+            string title,
+            string description,
+            string url,
+            DateTimeOffset? timestamp,
+            Color? color,
+            EmbedImage? image,
+            EmbedVideo? video,
+            EmbedAuthor? author, 
+            EmbedFooter? footer, 
+            EmbedProvider? provider, 
+            EmbedThumbnail? thumbnail, 
+            ImmutableArray<EmbedField> fields)
+        {
+            Type = type;
+            Title = title;
+            Description = description;
+            Url = url;
+            Color = color;
+            Timestamp = timestamp;
+            Image = image;
+            Video = video;
+            Author = author;
+            Footer = footer;
+            Provider = provider;
+            Thumbnail = thumbnail;
+            Fields = fields;
+        }
+
+        public override string ToString() => Title;
+        private string DebuggerDisplay => $"{Title} ({Type})";
+    }
+}

src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs

@@ -1,27 +1,22 @@
 using System.Diagnostics;
-using Model = Discord.API.EmbedAuthor;
 
 namespace Discord
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public struct EmbedAuthor
     {
-        public string Name { get; set; }
-        public string Url { get; set; }
-        public string IconUrl { get; set; }
-        public string ProxyIconUrl { get; set; }
+        public string Name { get; internal set; }
+        public string Url { get; internal set; }
+        public string IconUrl { get; internal set; }
+        public string ProxyIconUrl { get; internal set; }
 
-        private EmbedAuthor(string name, string url, string iconUrl, string proxyIconUrl)
+        internal EmbedAuthor(string name, string url, string iconUrl, string proxyIconUrl)
         {
             Name = name;
             Url = url;
             IconUrl = iconUrl;
             ProxyIconUrl = proxyIconUrl;
         }
-        internal static EmbedAuthor Create(Model model)
-        {
-            return new EmbedAuthor(model.Name, model.Url, model.IconUrl, model.ProxyIconUrl);
-        }
 
         private string DebuggerDisplay => $"{Name} ({Url})";
         public override string ToString() => Name;

src/Discord.Net.Core/Entities/Messages/EmbedField.cs

@@ -1,25 +1,20 @@
 using System.Diagnostics;
-using Model = Discord.API.EmbedField;
 
 namespace Discord
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public struct EmbedField
     {
-        public string Name { get; set; }
-        public string Value { get; set; }
-        public bool Inline { get; set; }
+        public string Name { get; internal set; }
+        public string Value { get; internal set; }
+        public bool Inline { get; internal set; }
 
-        private EmbedField(string name, string value, bool inline)
+        internal EmbedField(string name, string value, bool inline)
         {
             Name = name;
             Value = value;
             Inline = inline;
         }
-        internal static EmbedField Create(Model model)
-        {
-            return new EmbedField(model.Name, model.Value, model.Inline);
-        }
 
         private string DebuggerDisplay => $"{Name} ({Value}";
         public override string ToString() => Name;

src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs

@@ -1,25 +1,20 @@
 using System.Diagnostics;
-using Model = Discord.API.EmbedFooter;
 
 namespace Discord
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public struct EmbedFooter
     {
-        public string Text { get; set; }
-        public string IconUrl { get; set; }
-        public string ProxyUrl { get; set; }
+        public string Text { get; internal set; }
+        public string IconUrl { get; internal set; }
+        public string ProxyUrl { get; internal set; }
 
-        private EmbedFooter(string text, string iconUrl, string proxyUrl)
+        internal EmbedFooter(string text, string iconUrl, string proxyUrl)
         {
             Text = text;
             IconUrl = iconUrl;
             ProxyUrl = proxyUrl;
         }
-        internal static EmbedFooter Create(Model model)
-        {
-            return new EmbedFooter(model.Text, model.IconUrl, model.ProxyIconUrl);
-        }
 
         private string DebuggerDisplay => $"{Text} ({IconUrl})";
         public override string ToString() => Text;

src/Discord.Net.Core/Entities/Messages/EmbedImage.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using Model = Discord.API.EmbedImage;
 
 namespace Discord
 {
@@ -11,19 +10,13 @@ namespace Discord
         public int? Height { get; }
         public int? Width { get; }
 
-        private EmbedImage(string url, string proxyUrl, int? height, int? width)
+        internal EmbedImage(string url, string proxyUrl, int? height, int? width)
         {
             Url = url;
             ProxyUrl = proxyUrl;
             Height = height;
             Width = width;
         }
-        internal static EmbedImage Create(Model model)
-        {
-            return new EmbedImage(model.Url, model.ProxyUrl,
-                  model.Height.IsSpecified ? model.Height.Value : (int?)null,
-                  model.Width.IsSpecified ? model.Width.Value : (int?)null);
-        }
 
         private string DebuggerDisplay => $"{Url} ({(Width != null && Height != null ? $"{Width}x{Height}" : "0x0")})";
         public override string ToString() => Url;

src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using Model = Discord.API.EmbedProvider;
 
 namespace Discord
 {
@@ -9,15 +8,11 @@ namespace Discord
         public string Name { get; }
         public string Url { get; }
 
-        private EmbedProvider(string name, string url)
+        internal EmbedProvider(string name, string url)
         {
             Name = name;
             Url = url;
         }
-        internal static EmbedProvider Create(Model model)
-        {
-            return new EmbedProvider(model.Name, model.Url);
-        }
 
         private string DebuggerDisplay => $"{Name} ({Url})";
         public override string ToString() => Name;

src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using Model = Discord.API.EmbedThumbnail;
 
 namespace Discord
 {
@@ -11,19 +10,13 @@ namespace Discord
         public int? Height { get; }
         public int? Width { get; }
 
-        private EmbedThumbnail(string url, string proxyUrl, int? height, int? width)
+        internal EmbedThumbnail(string url, string proxyUrl, int? height, int? width)
         {
             Url = url;
             ProxyUrl = proxyUrl;
             Height = height;
             Width = width;
         }
-        internal static EmbedThumbnail Create(Model model)
-        {
-            return new EmbedThumbnail(model.Url, model.ProxyUrl,
-                  model.Height.IsSpecified ? model.Height.Value : (int?)null,
-                  model.Width.IsSpecified ? model.Width.Value : (int?)null);
-        }
 
         private string DebuggerDisplay => $"{Url} ({(Width != null && Height != null ? $"{Width}x{Height}" : "0x0")})";
         public override string ToString() => Url;

src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using Model = Discord.API.EmbedVideo;
 
 namespace Discord
 {
@@ -10,18 +9,12 @@ namespace Discord
         public int? Height { get; }
         public int? Width { get; }
 
-        private EmbedVideo(string url, int? height, int? width)
+        internal EmbedVideo(string url, int? height, int? width)
         {
             Url = url;
             Height = height;
             Width = width;
         }
-        internal static EmbedVideo Create(Model model)
-        {
-            return new EmbedVideo(model.Url,
-                  model.Height.IsSpecified ? model.Height.Value : (int?)null,
-                  model.Width.IsSpecified ? model.Width.Value : (int?)null);
-        }
 
         private string DebuggerDisplay => $"{Url} ({(Width != null && Height != null ? $"{Width}x{Height}" : "0x0")})";
         public override string ToString() => Url;

src/Discord.Net.Core/Entities/Messages/Emoji.cs

@@ -1,28 +1,22 @@
-using Discord.API;
-using System;
+using System;
 using System.Diagnostics;
 using System.Globalization;
-using Model = Discord.API.Emoji;
 
 namespace Discord
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public struct Emoji
     {
-        public ulong Id { get; }
+        public ulong? Id { get; }
         public string Name { get; }
 
-        public string Url => CDN.GetEmojiUrl(Id);
+        public string Url => Id != null ? CDN.GetEmojiUrl(Id.Value) : null;
 
-        internal Emoji(ulong id, string name)
+        internal Emoji(ulong? id, string name)
         {
             Id = id;
             Name = name;
         }
-        internal static Emoji Create(Model emoji)
-        {
-            return new Emoji(emoji.Id.GetValueOrDefault(), emoji.Name);
-        }
 
         public static Emoji Parse(string text)
         {

src/Discord.Net.Core/Entities/Messages/MessageProperties.cs

@@ -32,6 +32,6 @@
         /// <summary>
         /// The embed the message should display
         /// </summary>
-        public Optional<EmbedBuilder> Embed { get; set; }
+        public Optional<Embed> Embed { get; set; }
     }
 }

src/Discord.Net.Core/Entities/Permissions/Overwrite.cs

@@ -1,6 +1,4 @@
-using Model = Discord.API.Overwrite;
-
-namespace Discord
+namespace Discord
 {
     public struct Overwrite
     {
@@ -18,8 +16,5 @@ namespace Discord
             TargetType = targetType;
             Permissions = permissions;
         }
-
-        public Overwrite(Model model)
-            : this(model.TargetId, model.TargetType, new OverwritePermissions(model.Allow, model.Deny)) { }
     }
 }

src/Discord.Net.Core/Entities/Roles/IRole.cs

@@ -1,5 +1,4 @@
-using Discord.API.Rest;
-using System;
+using System;
 using System.Threading.Tasks;
 
 namespace Discord

src/Discord.Net.Core/Entities/Users/Game.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using Model = Discord.API.Game;
 
 namespace Discord
 {
@@ -18,12 +17,6 @@ namespace Discord
         }
         private Game(string name)
             : this(name, null, StreamType.NotStreaming) { }
-        internal static Game Create(Model model)
-        {
-            return new Game(model.Name, 
-                model.StreamUrl.GetValueOrDefault(null), 
-                model.StreamType.GetValueOrDefault(null) ?? StreamType.NotStreaming);
-        }
 
         public override string ToString() => Name;
         private string DebuggerDisplay => StreamUrl != null ? $"{Name} ({StreamUrl})" : Name;

src/Discord.Net.Core/Entities/Users/IGuildUser.cs

@@ -1,5 +1,4 @@
-using Discord.API.Rest;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 

src/Discord.Net.API/Common/Application.cs → src/Discord.Net.Rest/API/Common/Application.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Application
+    internal class Application
     {
         [JsonProperty("description")]
         public string Description { get; set; }

src/Discord.Net.API/Common/Attachment.cs → src/Discord.Net.Rest/API/Common/Attachment.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Attachment
+    internal class Attachment
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/Ban.cs → src/Discord.Net.Rest/API/Common/Ban.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Ban
+    internal class Ban
     {
         [JsonProperty("user")]
         public User User { get; set; }

src/Discord.Net.API/Common/Channel.cs → src/Discord.Net.Rest/API/Common/Channel.cs

@@ -4,7 +4,7 @@ using System;
 
 namespace Discord.API
 {
-    public class Channel
+    internal class Channel
     {
         //Shared
         [JsonProperty("id")]

src/Discord.Net.API/Common/Connection.cs → src/Discord.Net.Rest/API/Common/Connection.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Discord.API
 {
-    public class Connection
+    internal class Connection
     {
         [JsonProperty("id")]
         public string Id { get; set; }

src/Discord.Net.API/Common/Embed.cs → src/Discord.Net.Rest/API/Common/Embed.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Embed
+    internal class Embed
     {
         [JsonProperty("title")]
         public string Title { get; set; }

src/Discord.Net.API/Common/EmbedAuthor.cs → src/Discord.Net.Rest/API/Common/EmbedAuthor.cs

@@ -2,7 +2,7 @@
 
 namespace Discord.API
 {
-    public class EmbedAuthor
+    internal class EmbedAuthor
     {
         [JsonProperty("name")]
         public string Name { get; set; }

src/Discord.Net.API/Common/EmbedField.cs → src/Discord.Net.Rest/API/Common/EmbedField.cs

@@ -2,7 +2,7 @@
 
 namespace Discord.API
 {
-    public class EmbedField
+    internal class EmbedField
     {
         [JsonProperty("name")]
         public string Name { get; set; }

src/Discord.Net.API/Common/EmbedFooter.cs → src/Discord.Net.Rest/API/Common/EmbedFooter.cs

@@ -2,7 +2,7 @@
 
 namespace Discord.API
 {
-    public class EmbedFooter
+    internal class EmbedFooter
     {
         [JsonProperty("text")]
         public string Text { get; set; }

src/Discord.Net.API/Common/EmbedImage.cs → src/Discord.Net.Rest/API/Common/EmbedImage.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class EmbedImage
+    internal class EmbedImage
     {
         [JsonProperty("url")]
         public string Url { get; set; }

src/Discord.Net.API/Common/EmbedProvider.cs → src/Discord.Net.Rest/API/Common/EmbedProvider.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class EmbedProvider
+    internal class EmbedProvider
     {
         [JsonProperty("name")]
         public string Name { get; set; }

src/Discord.Net.API/Common/EmbedThumbnail.cs → src/Discord.Net.Rest/API/Common/EmbedThumbnail.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class EmbedThumbnail
+    internal class EmbedThumbnail
     {
         [JsonProperty("url")]
         public string Url { get; set; }

src/Discord.Net.API/Common/EmbedVideo.cs → src/Discord.Net.Rest/API/Common/EmbedVideo.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class EmbedVideo
+    internal class EmbedVideo
     {
         [JsonProperty("url")]
         public string Url { get; set; }

src/Discord.Net.API/Common/Emoji.cs → src/Discord.Net.Rest/API/Common/Emoji.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Emoji
+    internal class Emoji
     {
         [JsonProperty("id")]
         public ulong? Id { get; set; }

src/Discord.Net.API/Common/Game.cs → src/Discord.Net.Rest/API/Common/Game.cs

@@ -5,7 +5,7 @@ using System.Runtime.Serialization;
 
 namespace Discord.API
 {
-    public class Game
+    internal class Game
     {
         [JsonProperty("name")]
         public string Name { get; set; }

src/Discord.Net.API/Common/Guild.cs → src/Discord.Net.Rest/API/Common/Guild.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Guild
+    internal class Guild
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/GuildEmbed.cs → src/Discord.Net.Rest/API/Common/GuildEmbed.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class GuildEmbed
+    internal class GuildEmbed
     {
         [JsonProperty("enabled")]
         public bool Enabled { get; set; }

src/Discord.Net.API/Common/GuildMember.cs → src/Discord.Net.Rest/API/Common/GuildMember.cs

@@ -4,7 +4,7 @@ using System;
 
 namespace Discord.API
 {
-    public class GuildMember
+    internal class GuildMember
     {
         [JsonProperty("user")]
         public User User { get; set; }

src/Discord.Net.API/Common/Integration.cs → src/Discord.Net.Rest/API/Common/Integration.cs

@@ -4,7 +4,7 @@ using System;
 
 namespace Discord.API
 {
-    public class Integration
+    internal class Integration
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/IntegrationAccount.cs → src/Discord.Net.Rest/API/Common/IntegrationAccount.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class IntegrationAccount
+    internal class IntegrationAccount
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/Invite.cs → src/Discord.Net.Rest/API/Common/Invite.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Invite
+    internal class Invite
     {
         [JsonProperty("code")]
         public string Code { get; set; }

src/Discord.Net.API/Common/InviteChannel.cs → src/Discord.Net.Rest/API/Common/InviteChannel.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class InviteChannel
+    internal class InviteChannel
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/InviteGuild.cs → src/Discord.Net.Rest/API/Common/InviteGuild.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class InviteGuild
+    internal class InviteGuild
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/InviteMetadata.cs → src/Discord.Net.Rest/API/Common/InviteMetadata.cs

@@ -4,7 +4,7 @@ using System;
 
 namespace Discord.API
 {
-    public class InviteMetadata : Invite
+    internal class InviteMetadata : Invite
     {
         [JsonProperty("inviter")]
         public User Inviter { get; set; }

src/Discord.Net.API/Common/Message.cs → src/Discord.Net.Rest/API/Common/Message.cs

@@ -4,7 +4,7 @@ using System;
 
 namespace Discord.API
 {
-    public class Message
+    internal class Message
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/Overwrite.cs → src/Discord.Net.Rest/API/Common/Overwrite.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Overwrite
+    internal class Overwrite
     {
         [JsonProperty("id")]
         public ulong TargetId { get; set; }

src/Discord.Net.API/Common/Presence.cs → src/Discord.Net.Rest/API/Common/Presence.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Presence
+    internal class Presence
     {
         [JsonProperty("user")]
         public User User { get; set; }

src/Discord.Net.API/Common/Reaction.cs → src/Discord.Net.Rest/API/Common/Reaction.cs

@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Reaction
+    internal class Reaction
     {
         [JsonProperty("count")]
         public int Count { get; set; }

src/Discord.Net.API/Common/ReadState.cs → src/Discord.Net.Rest/API/Common/ReadState.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class ReadState
+    internal class ReadState
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/Relationship.cs → src/Discord.Net.Rest/API/Common/Relationship.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Relationship
+    internal class Relationship
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/RelationshipType.cs → src/Discord.Net.Rest/API/Common/RelationshipType.cs

@@ -1,7 +1,7 @@
 #pragma warning disable CS1591
 namespace Discord.API
 {
-    public enum RelationshipType
+    internal enum RelationshipType
     {
         Friend = 1,
         Blocked = 2,

src/Discord.Net.API/Common/Role.cs → src/Discord.Net.Rest/API/Common/Role.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class Role
+    internal class Role
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/User.cs → src/Discord.Net.Rest/API/Common/User.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class User
+    internal class User
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/UserGuild.cs → src/Discord.Net.Rest/API/Common/UserGuild.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class UserGuild
+    internal class UserGuild
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Common/VoiceRegion.cs → src/Discord.Net.Rest/API/Common/VoiceRegion.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class VoiceRegion
+    internal class VoiceRegion
     {
         [JsonProperty("id")]
         public string Id { get; set; }

src/Discord.Net.API/Common/VoiceState.cs → src/Discord.Net.Rest/API/Common/VoiceState.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API
 {
-    public class VoiceState
+    internal class VoiceState
     {
         [JsonProperty("guild_id")]
         public ulong? GuildId { get; set; }

src/Discord.Net.API/EntityOrId.cs → src/Discord.Net.Rest/API/EntityOrId.cs

@@ -1,6 +1,6 @@
 namespace Discord.API
 {
-    public struct EntityOrId<T>
+    internal struct EntityOrId<T>
     {
         public ulong Id { get; }
         public T Object { get; }

src/Discord.Net.API/Image.cs → src/Discord.Net.Rest/API/Image.cs

@@ -2,7 +2,7 @@
 
 namespace Discord.API
 {
-    public struct Image
+    internal struct Image
     {
         public Stream Stream { get; }
         public string Hash { get; }

src/Discord.Net.API/Int53Attribute.cs → src/Discord.Net.Rest/API/Int53Attribute.cs

@@ -4,5 +4,5 @@ using System;
 namespace Discord.API
 {
     [AttributeUsage(AttributeTargets.Property)]
-    public class Int53Attribute : Attribute { }
+    internal class Int53Attribute : Attribute { }
 }

src/Discord.Net.API/Net/MultipartFile.cs → src/Discord.Net.Rest/API/Net/MultipartFile.cs

@@ -2,7 +2,7 @@
 
 namespace Discord.Net.Rest
 {
-    struct MultipartFile
+    internal struct MultipartFile
     {
         public Stream Stream { get; }
         public string Filename { get; }

src/Discord.Net.API/Rest/CreateChannelInviteParams.cs → src/Discord.Net.Rest/API/Rest/CreateChannelInviteParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class CreateChannelInviteParams
+    internal class CreateChannelInviteParams
     {
         [JsonProperty("max_age")]
         public Optional<int> MaxAge { get; set; }

src/Discord.Net.API/Rest/CreateDMChannelParams.cs → src/Discord.Net.Rest/API/Rest/CreateDMChannelParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class CreateDMChannelParams
+    internal class CreateDMChannelParams
     {
         [JsonProperty("recipient_id")]
         public ulong RecipientId { get; }

src/Discord.Net.API/Rest/CreateGuildBanParams.cs → src/Discord.Net.Rest/API/Rest/CreateGuildBanParams.cs

@@ -1,7 +1,7 @@
 #pragma warning disable CS1591
 namespace Discord.API.Rest
 {
-    public class CreateGuildBanParams
+    internal class CreateGuildBanParams
     {
         public Optional<int> DeleteMessageDays { get; set; }
     }

src/Discord.Net.API/Rest/CreateGuildChannelParams.cs → src/Discord.Net.Rest/API/Rest/CreateGuildChannelParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class CreateGuildChannelParams
+    internal class CreateGuildChannelParams
     {
         [JsonProperty("name")]
         public string Name { get; }

src/Discord.Net.API/Rest/CreateGuildIntegrationParams.cs → src/Discord.Net.Rest/API/Rest/CreateGuildIntegrationParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class CreateGuildIntegrationParams
+    internal class CreateGuildIntegrationParams
     {
         [JsonProperty("id")]
         public ulong Id { get; }

src/Discord.Net.API/Rest/CreateGuildParams.cs → src/Discord.Net.Rest/API/Rest/CreateGuildParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class CreateGuildParams
+    internal class CreateGuildParams
     {
         [JsonProperty("name")]
         public string Name { get; }

src/Discord.Net.API/Rest/CreateMessageParams.cs → src/Discord.Net.Rest/API/Rest/CreateMessageParams.cs

@@ -1,11 +1,10 @@
 #pragma warning disable CS1591
-using System;
 using Newtonsoft.Json;
 
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class CreateMessageParams
+    internal class CreateMessageParams
     {
         [JsonProperty("content")]
         public string Content { get; }

src/Discord.Net.API/Rest/DeleteMessagesParams.cs → src/Discord.Net.Rest/API/Rest/DeleteMessagesParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class DeleteMessagesParams
+    internal class DeleteMessagesParams
     {
         [JsonProperty("messages")]
         public ulong[] MessageIds { get; }

src/Discord.Net.API/Rest/GetBotGatewayResponse.cs → src/Discord.Net.Rest/API/Rest/GetBotGatewayResponse.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API.Rest
 {
-    public class GetBotGatewayResponse
+    internal class GetBotGatewayResponse
     {
         [JsonProperty("url")]
         public string Url { get; set; }

src/Discord.Net.API/Rest/GetChannelMessagesParams.cs → src/Discord.Net.Rest/API/Rest/GetChannelMessagesParams.cs

@@ -1,7 +1,7 @@
 #pragma warning disable CS1591
 namespace Discord.API.Rest
 {
-    public class GetChannelMessagesParams
+    internal class GetChannelMessagesParams
     {
         public Optional<int> Limit { get; set; }
         public Optional<Direction> RelativeDirection { get; set; }

src/Discord.Net.API/Rest/GetGatewayResponse.cs → src/Discord.Net.Rest/API/Rest/GetGatewayResponse.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API.Rest
 {
-    public class GetGatewayResponse
+    internal class GetGatewayResponse
     {
         [JsonProperty("url")]
         public string Url { get; set; }

src/Discord.Net.API/Rest/GetGuildMembersParams.cs → src/Discord.Net.Rest/API/Rest/GetGuildMembersParams.cs

@@ -1,7 +1,7 @@
 #pragma warning disable CS1591
 namespace Discord.API.Rest
 {
-    public class GetGuildMembersParams
+    internal class GetGuildMembersParams
     {
         public Optional<int> Limit { get; set; }
         public Optional<ulong> AfterUserId { get; set; }

src/Discord.Net.API/Rest/GetGuildPruneCountResponse.cs → src/Discord.Net.Rest/API/Rest/GetGuildPruneCountResponse.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Discord.API.Rest
 {
-    public class GetGuildPruneCountResponse
+    internal class GetGuildPruneCountResponse
     {
         [JsonProperty("pruned")]
         public int Pruned { get; set; }

src/Discord.Net.API/Rest/GetReactionUsersParams.cs → src/Discord.Net.Rest/API/Rest/GetReactionUsersParams.cs

@@ -1,6 +1,6 @@
 namespace Discord.API.Rest
 {
-    public class GetReactionUsersParams
+    internal class GetReactionUsersParams
     {
         public Optional<int> Limit { get; set; }
         public Optional<ulong> AfterUserId { get; set; }

src/Discord.Net.API/Rest/GuildPruneParams.cs → src/Discord.Net.Rest/API/Rest/GuildPruneParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class GuildPruneParams
+    internal class GuildPruneParams
     {
         [JsonProperty("days")]
         public int Days { get; }

src/Discord.Net.API/Rest/ModifyChannelPermissionsParams.cs → src/Discord.Net.Rest/API/Rest/ModifyChannelPermissionsParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class ModifyChannelPermissionsParams
+    internal class ModifyChannelPermissionsParams
     {
         [JsonProperty("type")]
         public string Type { get; }

src/Discord.Net.API/Rest/ModifyCurrentUserNickParams.cs → src/Discord.Net.Rest/API/Rest/ModifyCurrentUserNickParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class ModifyCurrentUserNickParams
+    internal class ModifyCurrentUserNickParams
     {
         [JsonProperty("nick")]
         public string Nickname { get; }

src/Discord.Net.API/Rest/ModifyCurrentUserParams.cs → src/Discord.Net.Rest/API/Rest/ModifyCurrentUserParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class ModifyCurrentUserParams
+    internal class ModifyCurrentUserParams
     {
         [JsonProperty("username")]
         public Optional<string> Username { get; set; }

src/Discord.Net.API/Rest/ModifyGuildChannelParams.cs → src/Discord.Net.Rest/API/Rest/ModifyGuildChannelParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class ModifyGuildChannelParams
+    internal class ModifyGuildChannelParams
     {
         [JsonProperty("name")]
         public Optional<string> Name { get; set; }

src/Discord.Net.API/Rest/ModifyGuildChannelsParams.cs → src/Discord.Net.Rest/API/Rest/ModifyGuildChannelsParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class ModifyGuildChannelsParams
+    internal class ModifyGuildChannelsParams
     {
         [JsonProperty("id")]
         public ulong Id { get; set; }

src/Discord.Net.API/Rest/ModifyGuildEmbedParams.cs → src/Discord.Net.Rest/API/Rest/ModifyGuildEmbedParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class ModifyGuildEmbedParams
+    internal class ModifyGuildEmbedParams
     {        
         [JsonProperty("enabled")]
         public Optional<bool> Enabled { get; set; }

src/Discord.Net.API/Rest/ModifyGuildIntegrationParams.cs → src/Discord.Net.Rest/API/Rest/ModifyGuildIntegrationParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class ModifyGuildIntegrationParams
+    internal class ModifyGuildIntegrationParams
     {
         [JsonProperty("expire_behavior")]
         public Optional<int> ExpireBehavior { get; set; }

src/Discord.Net.API/Rest/ModifyGuildMemberParams.cs → src/Discord.Net.Rest/API/Rest/ModifyGuildMemberParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class ModifyGuildMemberParams
+    internal class ModifyGuildMemberParams
     {
         [JsonProperty("mute")]
         public Optional<bool> Mute { get; set; }

src/Discord.Net.API/Rest/ModifyGuildParams.cs → src/Discord.Net.Rest/API/Rest/ModifyGuildParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class ModifyGuildParams
+    internal class ModifyGuildParams
     {
         [JsonProperty("username")]
         public Optional<string> Username { get; set; }

src/Discord.Net.API/Rest/ModifyGuildRoleParams.cs → src/Discord.Net.Rest/API/Rest/ModifyGuildRoleParams.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 namespace Discord.API.Rest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class ModifyGuildRoleParams
+    internal class ModifyGuildRoleParams
     {
         [JsonProperty("name")]
         public Optional<string> Name { get; set; }