better sorted

This commit is contained in:
zmeyer44 2023-11-01 17:17:04 -04:00
parent d79ddf374e
commit 5e3bad1855

View File

@ -46,7 +46,7 @@ export function groupEventsByDay(events: NDKEvent[]) {
const eventDays: Record<string, NDKEvent[]> = {}; const eventDays: Record<string, NDKEvent[]> = {};
for (const event of events) { for (const event of events) {
const eventStartTime = getTagValues("start", event.tags); const eventStartTime = getTagValues("start", event.tags);
console.log("start", eventStartTime);
if (!eventStartTime) continue; if (!eventStartTime) continue;
const startDate = fromUnix(parseInt(eventStartTime)); const startDate = fromUnix(parseInt(eventStartTime));
const daysAway = daysOffset(startDate); const daysAway = daysOffset(startDate);
@ -65,7 +65,6 @@ export function groupEventsByDay(events: NDKEvent[]) {
const groupedArray = Object.entries(eventDays) const groupedArray = Object.entries(eventDays)
.sort(([aKey], [bKey]) => { .sort(([aKey], [bKey]) => {
const aDay = parseInt(aKey); const aDay = parseInt(aKey);
const bDay = parseInt(bKey); const bDay = parseInt(bKey);
if (aDay > bDay) { if (aDay > bDay) {
return 1; return 1;
@ -74,6 +73,17 @@ export function groupEventsByDay(events: NDKEvent[]) {
} }
return 0; return 0;
}) })
.map(([_, events]) => events); .map(([_, events]) =>
events.sort((a, b) => {
const aStart = parseInt(getTagValues("start", a.tags) ?? "0");
const bStart = parseInt(getTagValues("start", b.tags) ?? "0");
if (aStart > bStart) {
return 1;
} else if (aStart < bStart) {
return -1;
}
return 0;
}),
);
return groupedArray; return groupedArray;
} }