rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-10 17:10:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: timestampToMoment, parseTimestamp

Browse Source 
parseTimestamp now returns an ISO 8601 string instead of a moment (currently, only timestampToMoment uses parseTimestamp)
timestampToMoment now does the parsed timestamp conversion itself
This commit is contained in:
Succubyss 2024-07-26 11:29:41 -05:00
parent e59fb85db8
commit af227a0191
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
public/scripts/utils.js
View File

@ -704,6 +704,22 @@ export function isOdd(number) {
return number % 2 !== 0; 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(); const dateCache = new Map();
/** /**
@ -717,26 +733,27 @@ export function timestampToMoment(timestamp) {
return dateCache.get(timestamp); return dateCache.get(timestamp);
} }
const moment = parseTimestamp(timestamp); const iso8601 = 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. * 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. * @param {string|number} timestamp - The timestamp to parse. It can be a string or a number.
* @returns {moment.Moment} - A moment object representing the parsed date and time. If the timestamp is invalid, an invalid moment object is returned. * @returns {string} - If the timestamp is valid, returns an ISO 8601 string.
*/ */
function parseTimestamp(timestamp) { function parseTimestamp(timestamp) {
if (!timestamp) return moment.invalid(); if (!timestamp) return;
// Unix time (legacy TAI / tags) // Unix time (legacy TAI / tags)
if (typeof timestamp === 'number' || /^\d+$/.test(timestamp)) { if (typeof timestamp === 'number' || /^\d+$/.test(timestamp)) {
const number = Number(timestamp); const unixTime = Number(timestamp);
if (isNaN(number)) return moment.invalid(); const isValid = Number.isFinite(unixTime) && !Number.isNaN(unixTime) && unixTime >= 0;
if (!isFinite(number)) return moment.invalid(); if (!isValid) return;
if (number < 0) return moment.invalid(); return new Date(unixTime).toISOString();
return moment(number);
} }
let dtFmt = []; let dtFmt = [];
@ -760,32 +777,12 @@ function parseTimestamp(timestamp) {
// 2024-6-5 @14h 56m 50s 682ms // 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/ }); 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) { for (const x of dtFmt) {
let rgxMatch = timestamp.match(x.pattern); let rgxMatch = timestamp.match(x.pattern);
if (!rgxMatch) continue; if (!rgxMatch) continue;
iso8601 = x.callback(...rgxMatch); 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. /** Split string to parts no more than length in size.