From 41a38abd3be2dd6601b7d8c306f3a1efe13f3b73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Brawa=C5=84ski?= <matiz100@windowslive.com>
Date: Sun, 1 Oct 2017 23:23:43 +0200
Subject: [PATCH] Removed emoji listing endpoint, as per @foxbot's request.

---
 src/Discord.Net.Core/Entities/Guilds/IGuild.cs           | 2 --
 src/Discord.Net.Rest/DiscordRestApiClient.cs             | 9 ---------
 src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs      | 8 --------
 src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs        | 2 --
 src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs | 2 --
 5 files changed, 23 deletions(-)

diff --git a/src/Discord.Net.Core/Entities/Guilds/IGuild.cs b/src/Discord.Net.Core/Entities/Guilds/IGuild.cs
index e2fd475f7..6b2d24cc6 100644
--- a/src/Discord.Net.Core/Entities/Guilds/IGuild.cs
+++ b/src/Discord.Net.Core/Entities/Guilds/IGuild.cs
@@ -118,8 +118,6 @@ namespace Discord
         /// <summary> Removes all users from this guild if they have not logged on in a provided number of days or, if simulate is true, returns the number of users that would be removed. </summary>
         Task<int> PruneUsersAsync(int days = 30, bool simulate = false, RequestOptions options = null);
 
-        /// <summary> Gets a collection of all emotes in this guild. </summary>
-        Task<IReadOnlyCollection<GuildEmote>> ListEmotesAsync(RequestOptions options = null);
         /// <summary> Gets a specific emote from this guild. </summary>
         Task<GuildEmote> GetEmoteAsync(ulong id, RequestOptions options = null);
         /// <summary> Creates a new emote in this guild. </summary>
diff --git a/src/Discord.Net.Rest/DiscordRestApiClient.cs b/src/Discord.Net.Rest/DiscordRestApiClient.cs
index 03c75c8bf..4e65b19d2 100644
--- a/src/Discord.Net.Rest/DiscordRestApiClient.cs
+++ b/src/Discord.Net.Rest/DiscordRestApiClient.cs
@@ -1067,15 +1067,6 @@ namespace Discord.API
         }
 
         //Guild emoji
-        public async Task<IReadOnlyCollection<Emoji>> ListGuildEmotesAsync(ulong guildId, RequestOptions options = null)
-        {
-            Preconditions.NotEqual(guildId, 0, nameof(guildId));
-            options = RequestOptions.CreateOrClone(options);
-
-            var ids = new BucketIds(guildId: guildId);
-            return await SendAsync<IReadOnlyCollection<Emoji>>("GET", () => $"guilds/{guildId}/emojis", ids, options: options);
-        }
-
         public async Task<Emoji> GetGuildEmoteAsync(ulong guildId, ulong emoteId, RequestOptions options = null)
         {
             Preconditions.NotEqual(guildId, 0, nameof(guildId));
diff --git a/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs b/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs
index b7bac196c..58b7ed7f9 100644
--- a/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs
+++ b/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs
@@ -255,14 +255,6 @@ namespace Discord.Rest
         }
 
         //Emotes
-        public static async Task<IReadOnlyCollection<GuildEmote>> ListEmotesAsync(IGuild guild, BaseDiscordClient client, RequestOptions options)
-        {
-            var model = await client.ApiClient.ListGuildEmotesAsync(guild.Id, options);
-            var emotes = ImmutableArray.CreateBuilder<GuildEmote>(model.Count);
-            foreach (var xm in model)
-                emotes.Add(xm.ToEntity());
-            return emotes;
-        }
         public static async Task<GuildEmote> GetEmoteAsync(IGuild guild, BaseDiscordClient client, ulong id, RequestOptions options)
         {
             var emote = await client.ApiClient.GetGuildEmoteAsync(guild.Id, id, options);
diff --git a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
index be6d4ff4c..de4b89e39 100644
--- a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
+++ b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
@@ -261,8 +261,6 @@ namespace Discord.Rest
         private string DebuggerDisplay => $"{Name} ({Id})";
 
         //Emotes
-        public Task<IReadOnlyCollection<GuildEmote>> ListEmotesAsync(RequestOptions options = null)
-            => GuildHelper.ListEmotesAsync(this, Discord, options);
         public Task<GuildEmote> GetEmoteAsync(ulong id, RequestOptions options = null)
             => GuildHelper.GetEmoteAsync(this, Discord, id, options);
         public Task<GuildEmote> CreateEmoteAsync(string name, Image image, Optional<IEnumerable<IRole>> roles = default(Optional<IEnumerable<IRole>>), RequestOptions options = null)
diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
index 04c4fd94c..b639a9cf7 100644
--- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
+++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
@@ -434,8 +434,6 @@ namespace Discord.WebSocket
         }
 
         //Emotes
-        public Task<IReadOnlyCollection<GuildEmote>> ListEmotesAsync(RequestOptions options = null)
-            => GuildHelper.ListEmotesAsync(this, Discord, options);
         public Task<GuildEmote> GetEmoteAsync(ulong id, RequestOptions options = null)
             => GuildHelper.GetEmoteAsync(this, Discord, id, options);
         public Task<GuildEmote> CreateEmoteAsync(string name, Image image, Optional<IEnumerable<IRole>> roles = default(Optional<IEnumerable<IRole>>), RequestOptions options = null)