refactor: timestampToMoment, parseTimestamp parseTimestamp now returns an ISO 8601 string instead of a moment (currently, only timestampToMoment uses parseTimestamp) timestampToMoment now does the parsed timestamp conversion itself

af227a0191bf4649295ca23399047d2da750fbbd

Succubyss <87207237+Succubyss@users.noreply.github.com>

public/scripts/utils.js+29 -32 Viewed

     return number % 2 !== 0;
+}
 +/**
 + * Compare two moment objects for sorting.
 + * @param {moment.Moment} a The first moment object.
 + * @param {moment.Moment} b The second moment object.
 + * @returns {number} A negative number if a is before b, a positive number if a is after b, or 0 if they are equal.
 + */
 +export function sortMoments(a, b) {
 +    if (a.isBefore(b)) {
 +        return 1;
 +    } else if (a.isAfter(b)) {
 +        return -1;
 +    } else {
 +        return 0;
 +    }
 +}
++
 const dateCache = new Map();
 /**

         return dateCache.get(timestamp);
+    }
     const momentiso8601 = parseTimestamp(timestamp);
 -    dateCache.set(timestamp, moment);
 +    const objMoment = iso8601 ? moment(iso8601) : moment.invalid();
 -    return moment;
++
 +    dateCache.set(timestamp, objMoment);
 +    return objMoment;
+}
 /**
  * Parses a timestamp and returns a moment object representing the parsed date and time.
  * @param {string|number} timestamp - The timestamp to parse. It can be a string or a number.
  * @returns {moment.Momentstring} - A moment object representing the parsed date and time. If the timestamp is invalidvalid, an invalidreturns momentan objectISO is8601 returnedstring.
  */
 function parseTimestamp(timestamp) {
     if (!timestamp) return moment.invalid();
     // Unix time (legacy TAI / tags)
     if (typeof timestamp === 'number' || /^\d+$/.test(timestamp)) {
         const numberunixTime = Number(timestamp);
 -        if (isNaN(number)) return moment.invalid();
 +        const isValid = Number.isFinite(unixTime) && !Number.isNaN(unixTime) && unixTime >= 0;
         if (!isFinite(number)isValid) return moment.invalid();
 -        if (number < 0) return moment.invalid();
 +        return new Date(unixTime).toISOString();
 -        return moment(number);
+    }
     let dtFmt = [];

     // 2024-6-5 @14h 56m 50s 682ms
     dtFmt.push({ callback: convertFromHumanized, pattern: /(\d{4})-(\d{1,2})-(\d{1,2}) @(\d{1,2})h (\d{1,2})m (\d{1,2})s (\d{1,3})ms/ });
 -    let iso8601;
     for (const x of dtFmt) {
         let rgxMatch = timestamp.match(x.pattern);
         if (!rgxMatch) continue;
         iso8601 =return x.callback(...rgxMatch);
 -        break;
 -    }
+-
 -    // If one of the patterns matched, return a valid moment object, otherwise return an invalid moment object
 -    return iso8601 ? moment(iso8601) : moment.invalid();
 -}
+-
 -/**
 - * Compare two moment objects for sorting.
 - * @param {moment.Moment} a The first moment object.
 - * @param {moment.Moment} b The second moment object.
 - * @returns {number} A negative number if a is before b, a positive number if a is after b, or 0 if they are equal.
 - */
 -export function sortMoments(a, b) {
 -    if (a.isBefore(b)) {
 -        return 1;
 -    } else if (a.isAfter(b)) {
 -        return -1;
 -    } else {
 -        return 0;
+    }
 +    return;
+}
 /** Split string to parts no more than length in size.