Renamed Emoji -> GuildEmoji

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

@@ -6,7 +6,7 @@ using Model = Discord.API.Emoji;
 namespace Discord
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
-    public struct Emoji
+    public struct GuildEmoji
     {
         public ulong Id { get; }
         public string Name { get; }
@@ -14,7 +14,7 @@ namespace Discord
         public bool RequireColons { get; }
         public IReadOnlyList<ulong> RoleIds { get; }
 
-        private Emoji(ulong id, string name, bool isManaged, bool requireColons, IReadOnlyList<ulong> roleIds)
+        private GuildEmoji(ulong id, string name, bool isManaged, bool requireColons, IReadOnlyList<ulong> roleIds)
         {
             Id = id;
             Name = name;
@@ -22,9 +22,9 @@ namespace Discord
             RequireColons = requireColons;
             RoleIds = roleIds;
         }
-        internal static Emoji Create(Model model)
+        internal static GuildEmoji Create(Model model)
         {
-            return new Emoji(model.Id, model.Name, model.Managed, model.RequireColons, ImmutableArray.Create(model.Roles));
+            return new GuildEmoji(model.Id, model.Name, model.Managed, model.RequireColons, ImmutableArray.Create(model.Roles));
         }
 
         public override string ToString() => Name;

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

@@ -46,7 +46,7 @@ namespace Discord
         /// <summary> Gets the built-in role containing all users in this guild. </summary>
         IRole EveryoneRole { get; }
         /// <summary> Gets a collection of all custom emojis for this guild. </summary>
-        IReadOnlyCollection<Emoji> Emojis { get; }
+        IReadOnlyCollection<GuildEmoji> Emojis { get; }
         /// <summary> Gets a collection of all extra features added to this guild. </summary>
         IReadOnlyCollection<string> Features { get; }
         /// <summary> Gets a collection of all roles in this guild. </summary>