From 00ec35989eea0fded690fbae2345d106c8043455 Mon Sep 17 00:00:00 2001
From: quin lynch <lynchquin@gmail.com>
Date: Sat, 27 Nov 2021 08:57:53 -0400
Subject: [PATCH] Update from Discord.Net dev - fix merge conflicts

---
 src/Discord.Net.WebSocket/ClientState.cs      | 28 -------------------
 .../Entities/Channels/SocketVoiceChannel.cs   |  2 --
 2 files changed, 30 deletions(-)

diff --git a/src/Discord.Net.WebSocket/ClientState.cs b/src/Discord.Net.WebSocket/ClientState.cs
index 562f10de3..c40ae3f92 100644
--- a/src/Discord.Net.WebSocket/ClientState.cs
+++ b/src/Discord.Net.WebSocket/ClientState.cs
@@ -170,33 +170,5 @@ namespace Discord.WebSocket
             foreach (var id in ids)
                 _commands.TryRemove(id, out var _);
         }
-
-        internal SocketApplicationCommand GetCommand(ulong id)
-        {
-            if (_commands.TryGetValue(id, out SocketApplicationCommand command))
-                return command;
-            return null;
-        }
-        internal void AddCommand(SocketApplicationCommand command)
-        {
-            _commands[command.Id] = command;
-        }
-        internal SocketApplicationCommand GetOrAddCommand(ulong id, Func<ulong, SocketApplicationCommand> commandFactory)
-        {
-            return _commands.GetOrAdd(id, commandFactory);
-        }
-        internal SocketApplicationCommand RemoveCommand(ulong id)
-        {
-            if (_commands.TryRemove(id, out SocketApplicationCommand command))
-                return command;
-            return null;
-        }
-        internal void PurgeCommands(Func<SocketApplicationCommand, bool> precondition)
-        {
-            var ids = _commands.Where(x => precondition(x.Value)).Select(x => x.Key);
-
-            foreach (var id in ids)
-                _commands.TryRemove(id, out var _);
-        }
     }
 }
diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs
index 54788c629..08b976bfe 100644
--- a/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs
+++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs
@@ -36,8 +36,6 @@ namespace Discord.WebSocket
         /// <inheritdoc />
         public string Mention => MentionUtils.MentionChannel(Id);
 
-        /// <inheritdoc />
-        public string Mention => MentionUtils.MentionChannel(Id);
         /// <inheritdoc />
         public Task SyncPermissionsAsync(RequestOptions options = null)
             => ChannelHelper.SyncPermissionsAsync(this, Discord, options);