updated regex to exclude times as part of other words

Merge pull request #20 from rarDevelopment/dev

Author: rarDevelopment

TimeZoneBot.BusinessLayer/TimeHelpers.cs

@@ -7,7 +7,7 @@ namespace TimeZoneBot.BusinessLayer;
 public static class TimeHelpers
 {
     public const string TimeRegexPattern =
-        "(([0-1]?[0-9]|2[0-3]):[0-5][0-9]( |)(am|pm|)|([0-1]?[0-9]|2[0-3])( |)(am|pm))";
+        @"\b(([0-1]?[0-9]|2[0-3]):[0-5][0-9]( |)([ap]\.?m\.?)?|([0-1]?[0-9]|2[0-3])( |)([ap]\.?m\.?))\b";
     public const string TimeFormat = "h:mm tt";
     public const string TimeFormatNoMinutes = "h tt";
     public const string TimeFormat24Hour = "H:mm";
@@ -17,7 +17,7 @@ public static class TimeHelpers
 
     public static bool HasMeridiem(Meridiem meridiem, string time)
     {
-        return time.ToLower().Contains(meridiem.ToString().ToLower());
+        return time.Replace(".", "").ToLower().Contains(meridiem.ToString().ToLower());
     }
 
     public static bool HasAnyMeridiem(string time)

TimeZoneBot.BusinessLayer/TimeZoneBusinessLayer.cs

@@ -114,18 +114,12 @@ public async Task<bool> SetTimeZone(IUser user, string timeZone)
     private static string CleanTime(string time)
     {
         var multipleSpacesRegex = new Regex("[ ]{2,}");
-        var cleanedTime = time.Trim();
-        var meridiemFound = Meridiem.NoMeridiem;
+        var cleanedTime = time.Replace(".", "").Trim();
 
         var allMeridiems = TimeHelpers.GetAllMeridiems();
 
-        foreach (var meridiem in allMeridiems)
-        {
-            if (TimeHelpers.HasMeridiem(meridiem, time))
-            {
-                meridiemFound = meridiem;
-            }
-        }
+        var meridiemFound = allMeridiems.FirstOrDefault(meridiem => TimeHelpers.HasMeridiem(meridiem, cleanedTime));
+
         var indexOfMeridiem = cleanedTime.IndexOf(meridiemFound.ToString(), StringComparison.InvariantCultureIgnoreCase);
 
         if (meridiemFound != Meridiem.NoMeridiem && indexOfMeridiem > 0) //accounts for -1 meaning none found and AM or PM not in the first position (which would not be valid time anyway)

TimeZoneBot/appsettings.json

@@ -1,6 +1,6 @@
 {
   "Version": {
-    "VersionNumber": "7.5.1"
+    "VersionNumber": "7.5.2"
   },
   "Discord": {
     "BotToken": "token",