From baf09e2f3807c9aa3fbd652f344399fee835eb89 Mon Sep 17 00:00:00 2001
From: runebaas <runebaas@gmail.com>
Date: Wed, 25 Nov 2020 15:21:55 +0100
Subject: [PATCH] Remove the ability to create quotes from message ids

---
 src/Bot/Commands/Utils/Quote/Quote.cs  | 35 ++------------------------
 src/Bot/Localization/Quote.Designer.cs |  9 -------
 src/Bot/Localization/Quote.de-ch.resx  |  3 ---
 src/Bot/Localization/Quote.resx        |  3 ---
 4 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/src/Bot/Commands/Utils/Quote/Quote.cs b/src/Bot/Commands/Utils/Quote/Quote.cs
index 0b197cd..a5f2e3c 100644
--- a/src/Bot/Commands/Utils/Quote/Quote.cs
+++ b/src/Bot/Commands/Utils/Quote/Quote.cs
@@ -74,22 +74,6 @@ namespace Geekbot.Bot.Commands.Utils.Quote
         {
             await QuoteFromMention(user, false);
         }
-
-        [Command("add")]
-        [Alias("save")]
-        [Summary("Add a quote from a message id")]
-        public async Task AddQuote([Summary("message-ID")] ulong messageId)
-        {
-            await QuoteFromMessageId(messageId, true);
-        }
-        
-        [Command("make")]
-        [Alias("preview")]
-        [Summary("Preview a quote from a message id")]
-        public async Task ReturnSpecifiedQuote([Summary("message-ID")] ulong messageId)
-        {
-            await QuoteFromMessageId(messageId, false);
-        }
         
         [Command("add")]
         [Alias("save")]
@@ -208,21 +192,7 @@ namespace Geekbot.Bot.Commands.Utils.Quote
             
         }
 
-        private async Task QuoteFromMessageId(ulong messageId, bool saveToDb)
-        {
-            try
-            {
-                var message = await Context.Channel.GetMessageAsync(messageId);
-
-                await ProcessQuote(message, saveToDb, true);
-            }
-            catch (Exception e)
-            {
-                await ErrorHandler.HandleCommandException(e, Context, "I couldn't find a message with that id :disappointed:");
-            }
-        }
-        
-        private async Task QuoteFromMessageLink(string messageLink, bool saveToDb)
+       private async Task QuoteFromMessageLink(string messageLink, bool saveToDb)
         {
             try
             {
@@ -253,7 +223,7 @@ namespace Geekbot.Bot.Commands.Utils.Quote
             }
         }
 
-        private async Task ProcessQuote(IMessage message, bool saveToDb, bool showMessageIdWarning = false)
+        private async Task ProcessQuote(IMessage message, bool saveToDb)
         {
             if (message.Author.Id == Context.Message.Author.Id && saveToDb && !_isDev)
             {
@@ -278,7 +248,6 @@ namespace Geekbot.Bot.Commands.Utils.Quote
             
             var sb = new StringBuilder();
             if (saveToDb) sb.AppendLine(Localization.Quote.QuoteAdded);
-            if (showMessageIdWarning) sb.AppendLine(Localization.Quote.MessageIdDeprecation);
             
             await ReplyAsync(sb.ToString(), false, embed.Build());
         }
diff --git a/src/Bot/Localization/Quote.Designer.cs b/src/Bot/Localization/Quote.Designer.cs
index d0926ae..342c181 100644
--- a/src/Bot/Localization/Quote.Designer.cs
+++ b/src/Bot/Localization/Quote.Designer.cs
@@ -78,15 +78,6 @@ namespace Geekbot.Bot.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to :warning: Creating quotes by message ID is deprecated in favour of message links and will be removed on 1 December 2020.
-        /// </summary>
-        internal static string MessageIdDeprecation {
-            get {
-                return ResourceManager.GetString("MessageIdDeprecation", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Most quoted person.
         /// </summary>
diff --git a/src/Bot/Localization/Quote.de-ch.resx b/src/Bot/Localization/Quote.de-ch.resx
index c7e3b8b..99fd959 100644
--- a/src/Bot/Localization/Quote.de-ch.resx
+++ b/src/Bot/Localization/Quote.de-ch.resx
@@ -44,7 +44,4 @@
     <data name="OnlyQuoteFromSameServer" xml:space="preserve">
         <value>Du chasch numme nachrichte vom gliche server quote</value>
     </data>
-    <data name="MessageIdDeprecation" xml:space="preserve">
-        <value>:warning: Es mache vo quotes mit message-IDs isch zgunste vo message-links veraltet und wird am 1. dezember 2020 entfernt</value>
-    </data>
 </root>
\ No newline at end of file
diff --git a/src/Bot/Localization/Quote.resx b/src/Bot/Localization/Quote.resx
index 215f0ea..b51d79c 100644
--- a/src/Bot/Localization/Quote.resx
+++ b/src/Bot/Localization/Quote.resx
@@ -51,7 +51,4 @@
     <data name="OnlyQuoteFromSameServer" xml:space="preserve">
         <value>You can only quote messages from the same server</value>
     </data>
-    <data name="MessageIdDeprecation" xml:space="preserve">
-        <value>:warning: Creating quotes by message ID is deprecated in favour of message links and will be removed on 1 December 2020</value>
-    </data>
 </root>
\ No newline at end of file