diff --git a/src/Discord.Net/Entities/Common/Channels/ChannelType.cs b/src/Discord.Net/Common/Entities/Channels/ChannelType.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Channels/ChannelType.cs
rename to src/Discord.Net/Common/Entities/Channels/ChannelType.cs
diff --git a/src/Discord.Net/Entities/Common/Channels/IChannel.cs b/src/Discord.Net/Common/Entities/Channels/IChannel.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Channels/IChannel.cs
rename to src/Discord.Net/Common/Entities/Channels/IChannel.cs
diff --git a/src/Discord.Net/Entities/Common/Channels/IDMChannel.cs b/src/Discord.Net/Common/Entities/Channels/IDMChannel.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Channels/IDMChannel.cs
rename to src/Discord.Net/Common/Entities/Channels/IDMChannel.cs
diff --git a/src/Discord.Net/Entities/Common/Channels/IGuildChannel.cs b/src/Discord.Net/Common/Entities/Channels/IGuildChannel.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Channels/IGuildChannel.cs
rename to src/Discord.Net/Common/Entities/Channels/IGuildChannel.cs
diff --git a/src/Discord.Net/Entities/Common/Channels/IMessageChannel.cs b/src/Discord.Net/Common/Entities/Channels/IMessageChannel.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Channels/IMessageChannel.cs
rename to src/Discord.Net/Common/Entities/Channels/IMessageChannel.cs
diff --git a/src/Discord.Net/Entities/Common/Channels/ITextChannel.cs b/src/Discord.Net/Common/Entities/Channels/ITextChannel.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Channels/ITextChannel.cs
rename to src/Discord.Net/Common/Entities/Channels/ITextChannel.cs
diff --git a/src/Discord.Net/Entities/Common/Channels/IVoiceChannel.cs b/src/Discord.Net/Common/Entities/Channels/IVoiceChannel.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Channels/IVoiceChannel.cs
rename to src/Discord.Net/Common/Entities/Channels/IVoiceChannel.cs
diff --git a/src/Discord.Net/Entities/Common/Guilds/Emoji.cs b/src/Discord.Net/Common/Entities/Guilds/Emoji.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Guilds/Emoji.cs
rename to src/Discord.Net/Common/Entities/Guilds/Emoji.cs
diff --git a/src/Discord.Net/Entities/Common/Guilds/IGuild.cs b/src/Discord.Net/Common/Entities/Guilds/IGuild.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Guilds/IGuild.cs
rename to src/Discord.Net/Common/Entities/Guilds/IGuild.cs
diff --git a/src/Discord.Net/Entities/Common/Guilds/IGuildEmbed.cs b/src/Discord.Net/Common/Entities/Guilds/IGuildEmbed.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Guilds/IGuildEmbed.cs
rename to src/Discord.Net/Common/Entities/Guilds/IGuildEmbed.cs
diff --git a/src/Discord.Net/Entities/Common/Guilds/IGuildIntegration.cs b/src/Discord.Net/Common/Entities/Guilds/IGuildIntegration.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Guilds/IGuildIntegration.cs
rename to src/Discord.Net/Common/Entities/Guilds/IGuildIntegration.cs
diff --git a/src/Discord.Net/Entities/Common/Guilds/IIntegrationAccount.cs b/src/Discord.Net/Common/Entities/Guilds/IIntegrationAccount.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Guilds/IIntegrationAccount.cs
rename to src/Discord.Net/Common/Entities/Guilds/IIntegrationAccount.cs
diff --git a/src/Discord.Net/Entities/Common/Guilds/IUserGuild.cs b/src/Discord.Net/Common/Entities/Guilds/IUserGuild.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Guilds/IUserGuild.cs
rename to src/Discord.Net/Common/Entities/Guilds/IUserGuild.cs
diff --git a/src/Discord.Net/Entities/Common/Guilds/IVoiceRegion.cs b/src/Discord.Net/Common/Entities/Guilds/IVoiceRegion.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Guilds/IVoiceRegion.cs
rename to src/Discord.Net/Common/Entities/Guilds/IVoiceRegion.cs
diff --git a/src/Discord.Net/Entities/Common/IDeletable.cs b/src/Discord.Net/Common/Entities/IDeletable.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/IDeletable.cs
rename to src/Discord.Net/Common/Entities/IDeletable.cs
diff --git a/src/Discord.Net/Entities/Common/IEntity.cs b/src/Discord.Net/Common/Entities/IEntity.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/IEntity.cs
rename to src/Discord.Net/Common/Entities/IEntity.cs
diff --git a/src/Discord.Net/Entities/Common/IMentionable.cs b/src/Discord.Net/Common/Entities/IMentionable.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/IMentionable.cs
rename to src/Discord.Net/Common/Entities/IMentionable.cs
diff --git a/src/Discord.Net/Entities/Common/ISnowflakeEntity.cs b/src/Discord.Net/Common/Entities/ISnowflakeEntity.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/ISnowflakeEntity.cs
rename to src/Discord.Net/Common/Entities/ISnowflakeEntity.cs
diff --git a/src/Discord.Net/Entities/Common/IUpdateable.cs b/src/Discord.Net/Common/Entities/IUpdateable.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/IUpdateable.cs
rename to src/Discord.Net/Common/Entities/IUpdateable.cs
diff --git a/src/Discord.Net/Entities/Common/Invites/IGuildInvite.cs b/src/Discord.Net/Common/Entities/Invites/IGuildInvite.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Invites/IGuildInvite.cs
rename to src/Discord.Net/Common/Entities/Invites/IGuildInvite.cs
diff --git a/src/Discord.Net/Entities/Common/Invites/IInvite.cs b/src/Discord.Net/Common/Entities/Invites/IInvite.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Invites/IInvite.cs
rename to src/Discord.Net/Common/Entities/Invites/IInvite.cs
diff --git a/src/Discord.Net/Entities/Common/Invites/IPublicInvite.cs b/src/Discord.Net/Common/Entities/Invites/IPublicInvite.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Invites/IPublicInvite.cs
rename to src/Discord.Net/Common/Entities/Invites/IPublicInvite.cs
diff --git a/src/Discord.Net/Entities/Common/Messages/Attachment.cs b/src/Discord.Net/Common/Entities/Messages/Attachment.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Messages/Attachment.cs
rename to src/Discord.Net/Common/Entities/Messages/Attachment.cs
diff --git a/src/Discord.Net/Entities/Common/Messages/Direction.cs b/src/Discord.Net/Common/Entities/Messages/Direction.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Messages/Direction.cs
rename to src/Discord.Net/Common/Entities/Messages/Direction.cs
diff --git a/src/Discord.Net/Entities/Common/Messages/Embed.cs b/src/Discord.Net/Common/Entities/Messages/Embed.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Messages/Embed.cs
rename to src/Discord.Net/Common/Entities/Messages/Embed.cs
diff --git a/src/Discord.Net/Entities/Common/Messages/EmbedProvider.cs b/src/Discord.Net/Common/Entities/Messages/EmbedProvider.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Messages/EmbedProvider.cs
rename to src/Discord.Net/Common/Entities/Messages/EmbedProvider.cs
diff --git a/src/Discord.Net/Entities/Common/Messages/EmbedThumbnail.cs b/src/Discord.Net/Common/Entities/Messages/EmbedThumbnail.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Messages/EmbedThumbnail.cs
rename to src/Discord.Net/Common/Entities/Messages/EmbedThumbnail.cs
diff --git a/src/Discord.Net/Entities/Common/Messages/IMessage.cs b/src/Discord.Net/Common/Entities/Messages/IMessage.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Messages/IMessage.cs
rename to src/Discord.Net/Common/Entities/Messages/IMessage.cs
diff --git a/src/Discord.Net/Entities/Common/Permissions/ChannelPermission.cs b/src/Discord.Net/Common/Entities/Permissions/ChannelPermission.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Permissions/ChannelPermission.cs
rename to src/Discord.Net/Common/Entities/Permissions/ChannelPermission.cs
diff --git a/src/Discord.Net/Entities/Common/Permissions/ChannelPermissions.cs b/src/Discord.Net/Common/Entities/Permissions/ChannelPermissions.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Permissions/ChannelPermissions.cs
rename to src/Discord.Net/Common/Entities/Permissions/ChannelPermissions.cs
diff --git a/src/Discord.Net/Entities/Common/Permissions/GuildPermission.cs b/src/Discord.Net/Common/Entities/Permissions/GuildPermission.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Permissions/GuildPermission.cs
rename to src/Discord.Net/Common/Entities/Permissions/GuildPermission.cs
diff --git a/src/Discord.Net/Entities/Common/Permissions/GuildPermissions.cs b/src/Discord.Net/Common/Entities/Permissions/GuildPermissions.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Permissions/GuildPermissions.cs
rename to src/Discord.Net/Common/Entities/Permissions/GuildPermissions.cs
diff --git a/src/Discord.Net/Entities/Common/Permissions/Overwrite.cs b/src/Discord.Net/Common/Entities/Permissions/Overwrite.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Permissions/Overwrite.cs
rename to src/Discord.Net/Common/Entities/Permissions/Overwrite.cs
diff --git a/src/Discord.Net/Entities/Common/Permissions/OverwritePermissions.cs b/src/Discord.Net/Common/Entities/Permissions/OverwritePermissions.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Permissions/OverwritePermissions.cs
rename to src/Discord.Net/Common/Entities/Permissions/OverwritePermissions.cs
diff --git a/src/Discord.Net/Entities/Common/Permissions/PermValue.cs b/src/Discord.Net/Common/Entities/Permissions/PermValue.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Permissions/PermValue.cs
rename to src/Discord.Net/Common/Entities/Permissions/PermValue.cs
diff --git a/src/Discord.Net/Entities/Common/Permissions/PermissionTarget.cs b/src/Discord.Net/Common/Entities/Permissions/PermissionTarget.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Permissions/PermissionTarget.cs
rename to src/Discord.Net/Common/Entities/Permissions/PermissionTarget.cs
diff --git a/src/Discord.Net/Entities/Common/Permissions/PermissionUtilities.cs b/src/Discord.Net/Common/Entities/Permissions/PermissionUtilities.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Permissions/PermissionUtilities.cs
rename to src/Discord.Net/Common/Entities/Permissions/PermissionUtilities.cs
diff --git a/src/Discord.Net/Entities/Common/Roles/Color.cs b/src/Discord.Net/Common/Entities/Roles/Color.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Roles/Color.cs
rename to src/Discord.Net/Common/Entities/Roles/Color.cs
diff --git a/src/Discord.Net/Entities/Common/Roles/IRole.cs b/src/Discord.Net/Common/Entities/Roles/IRole.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Roles/IRole.cs
rename to src/Discord.Net/Common/Entities/Roles/IRole.cs
diff --git a/src/Discord.Net/Entities/Common/Users/IConnection.cs b/src/Discord.Net/Common/Entities/Users/IConnection.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Users/IConnection.cs
rename to src/Discord.Net/Common/Entities/Users/IConnection.cs
diff --git a/src/Discord.Net/Entities/Common/Users/IDMUser.cs b/src/Discord.Net/Common/Entities/Users/IDMUser.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Users/IDMUser.cs
rename to src/Discord.Net/Common/Entities/Users/IDMUser.cs
diff --git a/src/Discord.Net/Entities/Common/Users/IGuildUser.cs b/src/Discord.Net/Common/Entities/Users/IGuildUser.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Users/IGuildUser.cs
rename to src/Discord.Net/Common/Entities/Users/IGuildUser.cs
diff --git a/src/Discord.Net/Entities/Common/Users/ISelfUser.cs b/src/Discord.Net/Common/Entities/Users/ISelfUser.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Users/ISelfUser.cs
rename to src/Discord.Net/Common/Entities/Users/ISelfUser.cs
diff --git a/src/Discord.Net/Entities/Common/Users/IUser.cs b/src/Discord.Net/Common/Entities/Users/IUser.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Users/IUser.cs
rename to src/Discord.Net/Common/Entities/Users/IUser.cs
diff --git a/src/Discord.Net/Entities/Common/Users/IVoiceState.cs.old b/src/Discord.Net/Common/Entities/Users/IVoiceState.cs.old
similarity index 100%
rename from src/Discord.Net/Entities/Common/Users/IVoiceState.cs.old
rename to src/Discord.Net/Common/Entities/Users/IVoiceState.cs.old
diff --git a/src/Discord.Net/Entities/Common/Users/UserStatus.cs b/src/Discord.Net/Common/Entities/Users/UserStatus.cs
similarity index 100%
rename from src/Discord.Net/Entities/Common/Users/UserStatus.cs
rename to src/Discord.Net/Common/Entities/Users/UserStatus.cs
diff --git a/src/Discord.Net/Events/LogMessageEventArgs.cs b/src/Discord.Net/Common/Events/LogMessageEventArgs.cs
similarity index 100%
rename from src/Discord.Net/Events/LogMessageEventArgs.cs
rename to src/Discord.Net/Common/Events/LogMessageEventArgs.cs
diff --git a/src/Discord.Net/Events/SentRequestEventArgs.cs b/src/Discord.Net/Common/Events/SentRequestEventArgs.cs
similarity index 100%
rename from src/Discord.Net/Events/SentRequestEventArgs.cs
rename to src/Discord.Net/Common/Events/SentRequestEventArgs.cs
diff --git a/src/Discord.Net/Helpers/DateTimeHelper.cs b/src/Discord.Net/Common/Helpers/DateTimeHelper.cs
similarity index 100%
rename from src/Discord.Net/Helpers/DateTimeHelper.cs
rename to src/Discord.Net/Common/Helpers/DateTimeHelper.cs
diff --git a/src/Discord.Net/Helpers/EventExtensions.cs b/src/Discord.Net/Common/Helpers/EventExtensions.cs
similarity index 100%
rename from src/Discord.Net/Helpers/EventExtensions.cs
rename to src/Discord.Net/Common/Helpers/EventExtensions.cs
diff --git a/src/Discord.Net/Helpers/MentionHelper.cs b/src/Discord.Net/Common/Helpers/MentionHelper.cs
similarity index 100%
rename from src/Discord.Net/Helpers/MentionHelper.cs
rename to src/Discord.Net/Common/Helpers/MentionHelper.cs
diff --git a/src/Discord.Net/Entities/Shared/Helpers/PermissionHelper.cs b/src/Discord.Net/Common/Helpers/PermissionHelper.cs
similarity index 100%
rename from src/Discord.Net/Entities/Shared/Helpers/PermissionHelper.cs
rename to src/Discord.Net/Common/Helpers/PermissionHelper.cs
diff --git a/src/Discord.Net/Discord.Net.csproj b/src/Discord.Net/Discord.Net.csproj
index 81e14b2d3..a178e7f8e 100644
--- a/src/Discord.Net/Discord.Net.csproj
+++ b/src/Discord.Net/Discord.Net.csproj
@@ -95,76 +95,76 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -186,13 +186,13 @@
-
-
-
+
+
+
-
+
diff --git a/src/Discord.Net/DiscordConfig.cs b/src/Discord.Net/DiscordConfig.cs
index e79919d60..eef0bc638 100644
--- a/src/Discord.Net/DiscordConfig.cs
+++ b/src/Discord.Net/DiscordConfig.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using Discord.Net.Rest;
+using System.Reflection;
namespace Discord
{
@@ -23,5 +24,8 @@ namespace Discord
/// Gets or sets the minimum log level severity that will be sent to the LogMessage event.
public LogSeverity LogLevel { get; set; } = LogSeverity.Info;
+
+ /// Gets or sets the provider used to generate new REST connections.
+ public RestClientProvider RestClientProvider { get; set; } = (url, ct) => new DefaultRestClient(url, ct);
}
}
diff --git a/src/Discord.Net/DiscordRestClient.cs b/src/Discord.Net/Rest/DiscordClient.cs
similarity index 97%
rename from src/Discord.Net/DiscordRestClient.cs
rename to src/Discord.Net/Rest/DiscordClient.cs
index 091e0cb00..5b0e0d119 100644
--- a/src/Discord.Net/DiscordRestClient.cs
+++ b/src/Discord.Net/Rest/DiscordClient.cs
@@ -1,7 +1,6 @@
using Discord.API.Rest;
using Discord.Logging;
using Discord.Net.Rest;
-using Discord.Rest;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -10,9 +9,9 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-namespace Discord
+namespace Discord.Rest
{
- public sealed class DiscordRestClient : IDiscordClient, IDisposable
+ public sealed class DiscordClient : IDiscordClient, IDisposable
{
public event EventHandler Log;
public event EventHandler LoggedIn, LoggedOut;
@@ -28,12 +27,12 @@ namespace Discord
internal API.DiscordRawClient BaseClient { get; private set; }
internal SelfUser CurrentUser { get; private set; }
- public DiscordRestClient(DiscordConfig config = null)
+ public DiscordClient(DiscordConfig config = null)
{
if (config == null)
config = new DiscordConfig();
- _restClientProvider = (baseUrl, cancelToken) => new DefaultRestClient(baseUrl, cancelToken);
+ _restClientProvider = config.RestClientProvider;
_connectionLock = new SemaphoreSlim(1, 1);
_log = new LogManager(config.LogLevel);
diff --git a/src/Discord.Net/Entities/Rest/Channels/DMChannel.cs b/src/Discord.Net/Rest/Entities/Channels/DMChannel.cs
similarity index 97%
rename from src/Discord.Net/Entities/Rest/Channels/DMChannel.cs
rename to src/Discord.Net/Rest/Entities/Channels/DMChannel.cs
index 48510acbc..743af93ab 100644
--- a/src/Discord.Net/Entities/Rest/Channels/DMChannel.cs
+++ b/src/Discord.Net/Rest/Entities/Channels/DMChannel.cs
@@ -13,7 +13,7 @@ namespace Discord.Rest
{
///
public ulong Id { get; }
- internal DiscordRestClient Discord { get; }
+ internal DiscordClient Discord { get; }
///
public DMUser Recipient { get; private set; }
@@ -23,7 +23,7 @@ namespace Discord.Rest
///
public IEnumerable Users => ImmutableArray.Create(Discord.CurrentUser, Recipient);
- internal DMChannel(DiscordRestClient discord, Model model)
+ internal DMChannel(DiscordClient discord, Model model)
{
Id = model.Id;
Discord = discord;
diff --git a/src/Discord.Net/Entities/Rest/Channels/GuildChannel.cs b/src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs
similarity index 99%
rename from src/Discord.Net/Entities/Rest/Channels/GuildChannel.cs
rename to src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs
index 746fb62b3..0361ec8c2 100644
--- a/src/Discord.Net/Entities/Rest/Channels/GuildChannel.cs
+++ b/src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs
@@ -26,7 +26,7 @@ namespace Discord.Rest
public DateTime CreatedAt => DateTimeHelper.FromSnowflake(Id);
///
public IReadOnlyDictionary PermissionOverwrites => _overwrites;
- internal DiscordRestClient Discord => Guild.Discord;
+ internal DiscordClient Discord => Guild.Discord;
internal GuildChannel(Guild guild, Model model)
{
diff --git a/src/Discord.Net/Entities/Rest/Channels/TextChannel.cs b/src/Discord.Net/Rest/Entities/Channels/TextChannel.cs
similarity index 100%
rename from src/Discord.Net/Entities/Rest/Channels/TextChannel.cs
rename to src/Discord.Net/Rest/Entities/Channels/TextChannel.cs
diff --git a/src/Discord.Net/Entities/Rest/Channels/VoiceChannel.cs b/src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs
similarity index 100%
rename from src/Discord.Net/Entities/Rest/Channels/VoiceChannel.cs
rename to src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs
diff --git a/src/Discord.Net/Entities/Rest/Guilds/Guild.cs b/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
similarity index 99%
rename from src/Discord.Net/Entities/Rest/Guilds/Guild.cs
rename to src/Discord.Net/Rest/Entities/Guilds/Guild.cs
index 182091f72..bcc73e993 100644
--- a/src/Discord.Net/Entities/Rest/Guilds/Guild.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
@@ -19,7 +19,7 @@ namespace Discord.Rest
///
public ulong Id { get; }
- internal DiscordRestClient Discord { get; }
+ internal DiscordClient Discord { get; }
///
public string Name { get; private set; }
@@ -56,7 +56,7 @@ namespace Discord.Rest
/// Gets a collection of all roles in this guild.
public IEnumerable Roles => _roles?.Select(x => x.Value) ?? Enumerable.Empty();
- internal Guild(DiscordRestClient discord, Model model)
+ internal Guild(DiscordClient discord, Model model)
{
Id = model.Id;
Discord = discord;
diff --git a/src/Discord.Net/Entities/Rest/Guilds/GuildEmbed.cs b/src/Discord.Net/Rest/Entities/Guilds/GuildEmbed.cs
similarity index 84%
rename from src/Discord.Net/Entities/Rest/Guilds/GuildEmbed.cs
rename to src/Discord.Net/Rest/Entities/Guilds/GuildEmbed.cs
index f455e4f6a..f3045e10d 100644
--- a/src/Discord.Net/Entities/Rest/Guilds/GuildEmbed.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/GuildEmbed.cs
@@ -12,12 +12,12 @@ namespace Discord.Rest
///
public ulong? ChannelId { get; private set; }
- internal DiscordRestClient Discord { get; }
+ internal DiscordClient Discord { get; }
///
public DateTime CreatedAt => DateTimeHelper.FromSnowflake(Id);
- internal GuildEmbed(DiscordRestClient discord, Model model)
+ internal GuildEmbed(DiscordClient discord, Model model)
{
Discord = discord;
Update(model);
diff --git a/src/Discord.Net/Entities/Rest/Guilds/GuildIntegration.cs b/src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs
similarity index 97%
rename from src/Discord.Net/Entities/Rest/Guilds/GuildIntegration.cs
rename to src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs
index 8de8d09c9..35482d96d 100644
--- a/src/Discord.Net/Entities/Rest/Guilds/GuildIntegration.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs
@@ -32,7 +32,7 @@ namespace Discord.Rest
public User User { get; private set; }
///
public IntegrationAccount Account { get; private set; }
- internal DiscordRestClient Discord => Guild.Discord;
+ internal DiscordClient Discord => Guild.Discord;
internal GuildIntegration(Guild guild, Model model)
{
diff --git a/src/Discord.Net/Entities/Rest/Guilds/IntegrationAccount.cs b/src/Discord.Net/Rest/Entities/Guilds/IntegrationAccount.cs
similarity index 100%
rename from src/Discord.Net/Entities/Rest/Guilds/IntegrationAccount.cs
rename to src/Discord.Net/Rest/Entities/Guilds/IntegrationAccount.cs
diff --git a/src/Discord.Net/Entities/Rest/Guilds/UserGUild.cs b/src/Discord.Net/Rest/Entities/Guilds/UserGUild.cs
similarity index 93%
rename from src/Discord.Net/Entities/Rest/Guilds/UserGUild.cs
rename to src/Discord.Net/Rest/Entities/Guilds/UserGUild.cs
index a5c30afcf..7e4f41fbd 100644
--- a/src/Discord.Net/Entities/Rest/Guilds/UserGUild.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/UserGUild.cs
@@ -10,7 +10,7 @@ namespace Discord.Rest
///
public ulong Id { get; }
- internal DiscordRestClient Discord { get; }
+ internal DiscordClient Discord { get; }
///
public string Name { get; private set; }
@@ -22,7 +22,7 @@ namespace Discord.Rest
///
public string IconUrl => API.CDN.GetGuildIconUrl(Id, _iconId);
- internal UserGuild(DiscordRestClient discord, Model model)
+ internal UserGuild(DiscordClient discord, Model model)
{
Discord = discord;
Id = model.Id;
diff --git a/src/Discord.Net/Entities/Rest/Guilds/VoiceRegion.cs b/src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs
similarity index 100%
rename from src/Discord.Net/Entities/Rest/Guilds/VoiceRegion.cs
rename to src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs
diff --git a/src/Discord.Net/Entities/Rest/Invites/GuildInvite.cs b/src/Discord.Net/Rest/Entities/Invites/GuildInvite.cs
similarity index 95%
rename from src/Discord.Net/Entities/Rest/Invites/GuildInvite.cs
rename to src/Discord.Net/Rest/Entities/Invites/GuildInvite.cs
index 59871da42..98087d694 100644
--- a/src/Discord.Net/Entities/Rest/Invites/GuildInvite.cs
+++ b/src/Discord.Net/Rest/Entities/Invites/GuildInvite.cs
@@ -21,7 +21,7 @@ namespace Discord.Rest
///
public int Uses { get; private set; }
- internal override DiscordRestClient Discord => Guild.Discord;
+ internal override DiscordClient Discord => Guild.Discord;
internal GuildInvite(Guild guild, Model model)
: base(model)
diff --git a/src/Discord.Net/Entities/Rest/Invites/Invite.cs b/src/Discord.Net/Rest/Entities/Invites/Invite.cs
similarity index 95%
rename from src/Discord.Net/Entities/Rest/Invites/Invite.cs
rename to src/Discord.Net/Rest/Entities/Invites/Invite.cs
index bba63dd9c..2e13b0542 100644
--- a/src/Discord.Net/Entities/Rest/Invites/Invite.cs
+++ b/src/Discord.Net/Rest/Entities/Invites/Invite.cs
@@ -17,7 +17,7 @@ namespace Discord.Rest
///
public string XkcdUrl => XkcdCode != null ? $"{DiscordConfig.InviteUrl}/{XkcdCode}" : null;
- internal abstract DiscordRestClient Discord { get; }
+ internal abstract DiscordClient Discord { get; }
internal Invite(Model model)
{
diff --git a/src/Discord.Net/Entities/Rest/Invites/PublicInvite.cs b/src/Discord.Net/Rest/Entities/Invites/PublicInvite.cs
similarity index 87%
rename from src/Discord.Net/Entities/Rest/Invites/PublicInvite.cs
rename to src/Discord.Net/Rest/Entities/Invites/PublicInvite.cs
index 052a146e6..8a767dc20 100644
--- a/src/Discord.Net/Entities/Rest/Invites/PublicInvite.cs
+++ b/src/Discord.Net/Rest/Entities/Invites/PublicInvite.cs
@@ -15,9 +15,9 @@ namespace Discord.Rest
///
public ulong ChannelId => _channelId;
- internal override DiscordRestClient Discord { get; }
+ internal override DiscordClient Discord { get; }
- internal PublicInvite(DiscordRestClient discord, Model model)
+ internal PublicInvite(DiscordClient discord, Model model)
: base(model)
{
Discord = discord;
diff --git a/src/Discord.Net/Entities/Rest/Message.cs b/src/Discord.Net/Rest/Entities/Message.cs
similarity index 97%
rename from src/Discord.Net/Entities/Rest/Message.cs
rename to src/Discord.Net/Rest/Entities/Message.cs
index 9ad797de0..43abbebc7 100644
--- a/src/Discord.Net/Entities/Rest/Message.cs
+++ b/src/Discord.Net/Rest/Entities/Message.cs
@@ -43,7 +43,7 @@ namespace Discord.Rest
public DateTime CreatedAt => DateTimeHelper.FromSnowflake(Id);
///
public bool IsAuthor => Discord.CurrentUser.Id == Author.Id;
- internal DiscordRestClient Discord => (Channel as TextChannel)?.Discord ?? (Channel as DMChannel).Discord;
+ internal DiscordClient Discord => (Channel as TextChannel)?.Discord ?? (Channel as DMChannel).Discord;
internal Message(IMessageChannel channel, Model model)
{
diff --git a/src/Discord.Net/Entities/Rest/Role.cs b/src/Discord.Net/Rest/Entities/Role.cs
similarity index 97%
rename from src/Discord.Net/Entities/Rest/Role.cs
rename to src/Discord.Net/Rest/Entities/Role.cs
index bca559225..7e77f455c 100644
--- a/src/Discord.Net/Entities/Rest/Role.cs
+++ b/src/Discord.Net/Rest/Entities/Role.cs
@@ -33,7 +33,7 @@ namespace Discord.Rest
public bool IsEveryone => Id == Guild.Id;
///
public string Mention => MentionHelper.Mention(this);
- internal DiscordRestClient Discord => Guild.Discord;
+ internal DiscordClient Discord => Guild.Discord;
internal Role(Guild guild, Model model)
{
diff --git a/src/Discord.Net/Entities/Rest/Users/Connection.cs b/src/Discord.Net/Rest/Entities/Users/Connection.cs
similarity index 100%
rename from src/Discord.Net/Entities/Rest/Users/Connection.cs
rename to src/Discord.Net/Rest/Entities/Users/Connection.cs
diff --git a/src/Discord.Net/Entities/Rest/Users/DMUser.cs b/src/Discord.Net/Rest/Entities/Users/DMUser.cs
similarity index 83%
rename from src/Discord.Net/Entities/Rest/Users/DMUser.cs
rename to src/Discord.Net/Rest/Entities/Users/DMUser.cs
index d613a0272..67bc534f3 100644
--- a/src/Discord.Net/Entities/Rest/Users/DMUser.cs
+++ b/src/Discord.Net/Rest/Entities/Users/DMUser.cs
@@ -7,7 +7,7 @@ namespace Discord.Rest
///
public DMChannel Channel { get; }
- internal override DiscordRestClient Discord => Channel.Discord;
+ internal override DiscordClient Discord => Channel.Discord;
internal DMUser(DMChannel channel, Model model)
: base(model)
diff --git a/src/Discord.Net/Entities/Rest/Users/GuildUser.cs b/src/Discord.Net/Rest/Entities/Users/GuildUser.cs
similarity index 97%
rename from src/Discord.Net/Entities/Rest/Users/GuildUser.cs
rename to src/Discord.Net/Rest/Entities/Users/GuildUser.cs
index 858a41295..1df857695 100644
--- a/src/Discord.Net/Entities/Rest/Users/GuildUser.cs
+++ b/src/Discord.Net/Rest/Entities/Users/GuildUser.cs
@@ -24,7 +24,7 @@ namespace Discord.Rest
///
public IReadOnlyList Roles => _roles;
- internal override DiscordRestClient Discord => Guild.Discord;
+ internal override DiscordClient Discord => Guild.Discord;
internal GuildUser(Guild guild, Model model)
: base(model.User)
diff --git a/src/Discord.Net/Entities/Rest/Users/PublicUser.cs b/src/Discord.Net/Rest/Entities/Users/PublicUser.cs
similarity index 59%
rename from src/Discord.Net/Entities/Rest/Users/PublicUser.cs
rename to src/Discord.Net/Rest/Entities/Users/PublicUser.cs
index 1334115d8..20f9a3919 100644
--- a/src/Discord.Net/Entities/Rest/Users/PublicUser.cs
+++ b/src/Discord.Net/Rest/Entities/Users/PublicUser.cs
@@ -4,9 +4,9 @@ namespace Discord.Rest
{
public class PublicUser : User
{
- internal override DiscordRestClient Discord { get; }
+ internal override DiscordClient Discord { get; }
- internal PublicUser(DiscordRestClient discord, Model model)
+ internal PublicUser(DiscordClient discord, Model model)
: base(model)
{
Discord = discord;
diff --git a/src/Discord.Net/Entities/Rest/Users/SelfUser.cs b/src/Discord.Net/Rest/Entities/Users/SelfUser.cs
similarity index 90%
rename from src/Discord.Net/Entities/Rest/Users/SelfUser.cs
rename to src/Discord.Net/Rest/Entities/Users/SelfUser.cs
index 8bffc25f9..513acf0d2 100644
--- a/src/Discord.Net/Entities/Rest/Users/SelfUser.cs
+++ b/src/Discord.Net/Rest/Entities/Users/SelfUser.cs
@@ -7,14 +7,14 @@ namespace Discord.Rest
{
public class SelfUser : User, ISelfUser
{
- internal override DiscordRestClient Discord { get; }
+ internal override DiscordClient Discord { get; }
///
public string Email { get; private set; }
///
public bool IsVerified { get; private set; }
- internal SelfUser(DiscordRestClient discord, Model model)
+ internal SelfUser(DiscordClient discord, Model model)
: base(model)
{
Discord = discord;
diff --git a/src/Discord.Net/Entities/Rest/Users/User.cs b/src/Discord.Net/Rest/Entities/Users/User.cs
similarity index 96%
rename from src/Discord.Net/Entities/Rest/Users/User.cs
rename to src/Discord.Net/Rest/Entities/Users/User.cs
index 2f7800997..df596360a 100644
--- a/src/Discord.Net/Entities/Rest/Users/User.cs
+++ b/src/Discord.Net/Rest/Entities/Users/User.cs
@@ -11,7 +11,7 @@ namespace Discord.Rest
///
public ulong Id { get; }
- internal abstract DiscordRestClient Discord { get; }
+ internal abstract DiscordClient Discord { get; }
///
public ushort Discriminator { get; private set; }