Prevent codeblock multi-lines from uploading

Author: Headline

IRC-Relay/Discord.cs

@@ -124,12 +124,34 @@ public async Task OnDiscordMessage(SocketMessage messageParam)
             }
 
             /* Santize discord-specific notation to human readable things */
-            string formatted = await DoURLMessage(messageParam.Content, message);
+            string formatted = RemoveCodeblock(messageParam.Content, message, out string code);
             formatted = MentionToNickname(formatted, message);
             formatted = EmojiToName(formatted, message);
             formatted = ChannelMentionToName(formatted, message);
             formatted = Unescape(formatted);
 
+            string[] parts = formatted.Split('\n');
+            if (parts.Length > 3) // don't spam IRC, please.
+            {
+                await messageParam.Channel.SendMessageAsync(messageParam.Author.Mention + ": Too many lines! If you're meaning to post" +
+                    " code blocks, please use \\`\\`\\` to open & close the codeblock." +
+                    "\nYour message has been deleted and was not relayed to IRC. Please try again.");
+                await messageParam.DeleteAsync();
+
+                await messageParam.Author.SendMessageAsync("To prevent you from having to re-type your message,"
+                    + " here's what you tried to send: \n ```"
+                    + messageParam.Content
+                    + "```");
+
+                return;
+            }
+
+            if (Program.HasMember(config, "StikkedCreateUrlAndKey") && config.StikkedCreateUrlAndKey.Length > 0)
+                await DoStikkedUpload(code, message);
+            else
+                DoHastebinUpload(code, message);
+
+
             if (Program.HasMember(config, "SpamFilter")) //bcompat for older configurations
             {
                 foreach (string badstr in config.SpamFilter)
@@ -151,22 +173,6 @@ public async Task OnDiscordMessage(SocketMessage messageParam)
                 return;
             }
 
-            string[] parts = formatted.Split('\n');
-            if (parts.Length > 3) // don't spam IRC, please.
-            {
-                await messageParam.Channel.SendMessageAsync(messageParam.Author.Mention + ": Too many lines! If you're meaning to post" +
-                    " code blocks, please use \\`\\`\\` to open & close the codeblock." +
-                    "\nYour message has been deleted and was not relayed to IRC. Please try again.");
-                await messageParam.DeleteAsync();
-
-                await messageParam.Author.SendMessageAsync("To prevent you from having to re-type your message,"
-                    + " here's what you tried to send: \n ```"
-                    + messageParam.Content
-                    + "```");
-
-                return;
-            }
-
             string username = (messageParam.Author as SocketGuildUser)?.Nickname ?? message.Author.Username;
             if (config.IRCLogMessages)
                 LogManager.WriteLog(MsgSendType.DiscordToIRC, username, formatted, "log.txt");
@@ -200,21 +206,17 @@ public void Dispose()
 
         /**     Helper methods      **/
 
-        public async Task<string> DoURLMessage(string input, SocketUserMessage msg)
+        public string RemoveCodeblock(string input, SocketUserMessage msg, out string codeout)
         {
+            codeout = "";
             string text = "```";
             if (input.Contains("```"))
             {
                 int start = input.IndexOf(text, StringComparison.CurrentCulture);
                 int end = input.IndexOf(text, start + text.Length, StringComparison.CurrentCulture);
 
                 string code = input.Substring(start + text.Length, (end - start) - text.Length);
-
-                if (Program.HasMember(config, "StikkedCreateUrlAndKey") && config.StikkedCreateUrlAndKey.Length > 0)
-                    await DoStikkedUpload(code, msg);
-                else
-                    DoHastebinUpload(code, msg);
-
+                codeout = code; //await DoStikkedUpload(code, msg);
                 input = input.Remove(start, (end - start) + text.Length);
             }
             return input;
@@ -246,11 +248,6 @@ private async Task DoStikkedUpload(string input, SocketUserMessage msg)
                 var content = new FormUrlEncodedContent(values);
                 var response = await client.PostAsync(config.StikkedCreateUrlAndKey, content); // config.StikkedCreateUrlAndKey
                 var url = await response.Content.ReadAsStringAsync();
-
-                if (config.IRCLogMessages)
-                    LogManager.WriteLog(MsgSendType.DiscordToIRC, username, url, "log.txt");
-
-                session.SendMessage(Session.TargetBot.IRC, url, username);
             }
         }