diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj index 63bb83a09..30baabd50 100644 --- a/src/Discord.Net.Net45/Discord.Net.csproj +++ b/src/Discord.Net.Net45/Discord.Net.csproj @@ -535,8 +535,8 @@ ProfileEventArgs.cs - - RelativeDirection.cs + + Relative.cs RoleEventArgs.cs diff --git a/src/Discord.Net/Legacy.cs b/src/Discord.Net/Legacy.cs index 45eda9b42..8b0f3b78e 100644 --- a/src/Discord.Net/Legacy.cs +++ b/src/Discord.Net/Legacy.cs @@ -163,7 +163,7 @@ namespace Discord.Legacy } [Obsolete("Use Channel.DownloadMessages")] - public static Task DownloadMessages(this DiscordClient client, Channel channel, int limit = 100, ulong? relativeMessageId = null, RelativeDirection relativeDir = RelativeDirection.Before, bool useCache = true) + public static Task DownloadMessages(this DiscordClient client, Channel channel, int limit = 100, ulong? relativeMessageId = null, Relative relativeDir = Relative.Before, bool useCache = true) { if (channel == null) throw new ArgumentNullException(nameof(channel)); return channel.DownloadMessages(limit, relativeMessageId, relativeDir, useCache); diff --git a/src/Discord.Net/Models/Channel.cs b/src/Discord.Net/Models/Channel.cs index b64fce45f..cb41988fa 100644 --- a/src/Discord.Net/Models/Channel.cs +++ b/src/Discord.Net/Models/Channel.cs @@ -283,7 +283,7 @@ namespace Discord } public async Task DownloadMessages(int limit = 100, ulong? relativeMessageId = null, - RelativeDirection relativeDir = RelativeDirection.Before, bool useCache = true) + Relative relativeDir = Relative.Before, bool useCache = true) { if (limit < 0) throw new ArgumentOutOfRangeException(nameof(limit)); if (limit == 0 || Type != ChannelType.Text) return new Message[0]; @@ -293,7 +293,7 @@ namespace Discord var request = new GetMessagesRequest(Id) { Limit = limit, - RelativeDir = relativeMessageId.HasValue ? relativeDir == RelativeDirection.Before ? "before" : "after" : null, + RelativeDir = relativeMessageId.HasValue ? relativeDir == Relative.Before ? "before" : "after" : null, RelativeId = relativeMessageId ?? 0 }; var msgs = await Client.ClientAPI.Send(request).ConfigureAwait(false); diff --git a/src/Discord.Net/Relative.cs b/src/Discord.Net/Relative.cs new file mode 100644 index 000000000..4bd44c5ab --- /dev/null +++ b/src/Discord.Net/Relative.cs @@ -0,0 +1,7 @@ +namespace Discord +{ + public enum Relative + { + Before, After + } +} diff --git a/src/Discord.Net/RelativeDirection.cs b/src/Discord.Net/RelativeDirection.cs deleted file mode 100644 index 787ad5844..000000000 --- a/src/Discord.Net/RelativeDirection.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Discord -{ - public enum RelativeDirection - { - Before, After - } -}