From 66ea585a3cecf5e9f1ca79d24173360d92884167 Mon Sep 17 00:00:00 2001
From: Deukhoofd <deukhoofd@gmail.com>
Date: Thu, 25 Jul 2019 13:20:30 +0200
Subject: [PATCH] Fixed reminder regex to not be as greedy

---
 .../CommandHandler/CommandHandler.cs          |  2 +-
 DeukBot4/MessageHandlers/ReminderHandler.cs   | 20 +++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/DeukBot4/MessageHandlers/CommandHandler/CommandHandler.cs b/DeukBot4/MessageHandlers/CommandHandler/CommandHandler.cs
index 25f8cfd..f7c5c90 100644
--- a/DeukBot4/MessageHandlers/CommandHandler/CommandHandler.cs
+++ b/DeukBot4/MessageHandlers/CommandHandler/CommandHandler.cs
@@ -81,7 +81,7 @@ namespace DeukBot4.MessageHandlers.CommandHandler
                     }
                     catch (Exception e)
                     {
-                        await Logger.Main.Log("An error occured: \n" + e);
+                        await Logger.Main.LogError(e);
                     }
                     break;
                 case CommandRequest.RequestCode.UnknownCommand:
diff --git a/DeukBot4/MessageHandlers/ReminderHandler.cs b/DeukBot4/MessageHandlers/ReminderHandler.cs
index 5e90f35..8342af8 100644
--- a/DeukBot4/MessageHandlers/ReminderHandler.cs
+++ b/DeukBot4/MessageHandlers/ReminderHandler.cs
@@ -10,8 +10,24 @@ namespace DeukBot4.MessageHandlers
     {
         private static readonly Regex ReminderMatcher =
             new Regex(
-                @".*(remind\s*((?<recipient>me)|<@!*(?<recipient>\d*)>)\s*)(\s+to(?<action>.+)|\s+in\s+(?<time>.+)){2}",
+@".*(remind\s*((?<recipient>me)|<@!*(?<recipient>\d*)>)\s*)(\s+to(?<action>.+)|\s+in\s+(?<time>((?!to).)*)){2}",
                 RegexOptions.IgnoreCase);
+        
+        /*
+         * Regex explained:
+         * .*
+         *      grab any token preceding
+         * (remind\s*
+         *      look for the word "remind", followed by a whitespace
+         * ((?<recipient>me)|<@!*(?<recipient>\d*)>)\s*)
+         *      look for either "me", or a discord ping or id, and save it as "recipient" group
+         * (\s+to(?<action>.+)
+         *      look for the word "to", then followed by a string of what we should remember to do
+         * \s+in\s+(?<time>((?!to).)*))
+         *      in a specified time. We do a negative lookup for the word "to" here, so that they don't get eaten
+         * (\s+to(?<action>.+)|\s+in\s+(?<time>[^to]*)){2}
+         *      The action and time can be in either order.
+         */
 
         public static async Task HandleReminder(ReceivedMessage receivedMessage)
         {
@@ -58,7 +74,7 @@ namespace DeukBot4.MessageHandlers
             message.Channel.SendMessageAsync(embed: embed.Build());
         }
 
-        private static Regex TimespanMatcher =
+        private static readonly Regex TimespanMatcher =
             new Regex(@"(?<timeNumber>\d+.?\d*|[\w\s-]+)\s*(?<timeId>minutes*|hours*|days*|weeks*|months*|years*)\W*(and )*",
                 RegexOptions.IgnoreCase);
         private static TimeSpan? ParseTime(string message)