From b4d795f84320a53955334d6ad4b311f22a4a7029 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sun, 6 May 2018 18:54:06 +0200 Subject: [PATCH] Allow for floats in timespan pattern matching --- .../CommandHandler/RequestStructure/ParameterMatcher.cs | 2 +- DeukBot4/Utilities/TimespanParser.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DeukBot4/MessageHandlers/CommandHandler/RequestStructure/ParameterMatcher.cs b/DeukBot4/MessageHandlers/CommandHandler/RequestStructure/ParameterMatcher.cs index c379146..a9867b5 100644 --- a/DeukBot4/MessageHandlers/CommandHandler/RequestStructure/ParameterMatcher.cs +++ b/DeukBot4/MessageHandlers/CommandHandler/RequestStructure/ParameterMatcher.cs @@ -49,7 +49,7 @@ namespace DeukBot4.MessageHandlers.CommandHandler.RequestStructure case ParameterType.User: return $" *(?:<@(?<{index}>\\d+)>|(?<{index}>\\d+)(?:$| |\n))"; case ParameterType.Timespan: - return $" *(?<{index}>\\d+[smhd])"; + return $" *(?<{index}>\\d+.*d*[smhd])"; default: throw new ArgumentOutOfRangeException(nameof(type), type, null); } diff --git a/DeukBot4/Utilities/TimespanParser.cs b/DeukBot4/Utilities/TimespanParser.cs index f86e22e..c8075d1 100644 --- a/DeukBot4/Utilities/TimespanParser.cs +++ b/DeukBot4/Utilities/TimespanParser.cs @@ -9,7 +9,7 @@ namespace DeukBot4.Utilities { var timeIndicator = s.Last(); var numberStr = s.Remove(s.Length - 1, 1); - if (!int.TryParse(numberStr, out var number)) + if (!float.TryParse(numberStr, out var number)) { return null; }