From bfd767cf0a26576752008a473094e52fdacf8828 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Thu, 28 Dec 2023 13:53:51 +0300 Subject: [PATCH] Revert "small changes" This reverts commit fb3cefb7c8959c22f20d649cfca88b497c1511ec. --- src/Commands/RemindCommandGroup.cs | 2 +- src/Parsers/TimeSpanParser.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Commands/RemindCommandGroup.cs b/src/Commands/RemindCommandGroup.cs index 1a6b496..5a8c3fb 100644 --- a/src/Commands/RemindCommandGroup.cs +++ b/src/Commands/RemindCommandGroup.cs @@ -17,7 +17,7 @@ using Remora.Discord.Extensions.Embeds; using Remora.Discord.Extensions.Formatting; using Remora.Rest.Core; using Remora.Results; -using Octobot.Parsers; +using TimeSpanParser = Octobot.Parsers.TimeSpanParser; namespace Octobot.Commands; diff --git a/src/Parsers/TimeSpanParser.cs b/src/Parsers/TimeSpanParser.cs index f6651c5..a8d2aa5 100644 --- a/src/Parsers/TimeSpanParser.cs +++ b/src/Parsers/TimeSpanParser.cs @@ -22,14 +22,13 @@ public partial class TimeSpanParser : AbstractTypeParser public static Result TryParse(string timeSpanString, CancellationToken ct = default) { - var timeSpan = TimeSpan.Zero; - timeSpanString = timeSpanString.Trim(); - if (timeSpanString.StartsWith('-')) { - return timeSpan; + return TimeSpan.Zero; } + timeSpanString = timeSpanString.Trim(); + if (TimeSpan.TryParse(timeSpanString, DateTimeFormatInfo.InvariantInfo, out var parsedTimeSpan)) { return parsedTimeSpan; @@ -38,9 +37,10 @@ public partial class TimeSpanParser : AbstractTypeParser var matches = ParseRegex().Matches(timeSpanString); if (matches.Count is 0) { - return timeSpan; + return TimeSpan.Zero; } + var timeSpan = TimeSpan.Zero; foreach (var groups in matches.Select(match => match.Groups .Cast() .Where(g => g.Success) @@ -50,7 +50,7 @@ public partial class TimeSpanParser : AbstractTypeParser foreach ((var key, var groupValue) in groups) { return !double.TryParse(groupValue, out var parsedGroupValue) - ? timeSpan + ? TimeSpan.Zero : ParseFromRegex(timeSpan, key, groupValue, parsedGroupValue); } }