From bada2976eed34a2530bc09683d2de17c71c744a8 Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Mon, 30 Aug 2021 19:42:10 +0000 Subject: some fixes + some more error stuff --- src/lib/utils/BushConstants.ts | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/lib/utils') diff --git a/src/lib/utils/BushConstants.ts b/src/lib/utils/BushConstants.ts index dcc551e..f2ca327 100644 --- a/src/lib/utils/BushConstants.ts +++ b/src/lib/utils/BushConstants.ts @@ -68,37 +68,37 @@ export class BushConstants { // Somewhat stolen from @Mzato0001 public static TimeUnits: { [key: string]: { match: RegExp; value: number } } = { - years: { - match: / (?:(?-?(?:\d+)?\.?\d+) *(?:years?|y))/im, - value: 1000 * 60 * 60 * 24 * 365.25 //leap years - }, - months: { - match: / (?:(?-?(?:\d+)?\.?\d+) *(?:months?|mon|mo?))/im, - value: 1000 * 60 * 60 * 24 * 30.4375 // average of days in months including leap years + milliseconds: { + match: / (?:(?-?(?:\d+)?\.?\d+) *(?:milliseconds?|msecs?|ms))/im, + value: 1 }, - weeks: { - match: / (?:(?-?(?:\d+)?\.?\d+) *(?:weeks?|w))/im, - value: 1000 * 60 * 60 * 24 * 7 + seconds: { + match: / (?:(?-?(?:\d+)?\.?\d+) *(?:seconds?|secs?|s))/im, + value: 1000 }, - days: { - match: / (?:(?-?(?:\d+)?\.?\d+) *(?:days?|d))/im, - value: 1000 * 60 * 60 * 24 + minutes: { + match: / (?:(?-?(?:\d+)?\.?\d+) *(?:minutes?|mins?))/im, + value: 1000 * 60 }, hours: { match: / (?:(?-?(?:\d+)?\.?\d+) *(?:hours?|hrs?|h))/im, value: 1000 * 60 * 60 }, - minutes: { - match: / (?:(?-?(?:\d+)?\.?\d+) *(?:minutes?|mins?))/im, - value: 1000 * 60 + days: { + match: / (?:(?-?(?:\d+)?\.?\d+) *(?:days?|d))/im, + value: 1000 * 60 * 60 * 24 }, - seconds: { - match: / (?:(?-?(?:\d+)?\.?\d+) *(?:seconds?|secs?|s))/im, - value: 1000 + weeks: { + match: / (?:(?-?(?:\d+)?\.?\d+) *(?:weeks?|w))/im, + value: 1000 * 60 * 60 * 24 * 7 }, - milliseconds: { - match: / (?:(?-?(?:\d+)?\.?\d+) *(?:milliseconds?|msecs?|ms))/im, - value: 1 + months: { + match: / (?:(?-?(?:\d+)?\.?\d+) *(?:months?|mon|mo?))/im, + value: 1000 * 60 * 60 * 24 * 30.4375 // average of days in months including leap years + }, + years: { + match: / (?:(?-?(?:\d+)?\.?\d+) *(?:years?|y))/im, + value: 1000 * 60 * 60 * 24 * 365.25 //leap years } }; -- cgit