Give a reader their own events back
An event of theirs that had ended was on no surface at all. Every list and the board drop a row once its end has passed, and settings only counted the events a game held rather than naming them — so a one-off became unreachable the day it finished: impossible to edit, and impossible to delete out of a store nothing else can see. Repeating events escaped only because their occurrences roll forward. So settings names them now, under the game they were filed against, each row opening the same detail sheet a row on the front page does. Nothing about how they are managed changes; what was missing was the way back to them. Two things the index has to get right or it leaves the same hole it closes. The lists hold occurrences, never rules, so a repeating rule's own id opens nothing — nearestOccurrence bridges that, and answers for a finished series too by falling back to the first occurrence, since a rule whose `until` has passed would otherwise be exactly as stuck. And an event filed under a game we track has no row of theirs to nest under; the form allows that, so those get their own heading rather than trailing the list and reading as though they belonged to whichever game came last. Each row says why it is not on the front page — ended and when, or its cadence — because a list of bare titles leaves you guessing which of two entries is the dead one. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
This commit is contained in:
Lucas Winther
co-authored by
Claude Opus 5
Claude Opus 5
parent
8671a309b0
commit
3a3b7d9c2f
@@ -210,6 +210,11 @@ carry no source link because there is no page to send a sceptic to, and they
|
||||
travel in your export. Like everything else here, your browser holds the only
|
||||
copy.
|
||||
|
||||
Settings lists everything you have added, whatever state it is in, and opens
|
||||
the same panel a row does. Every other surface drops an event once it has
|
||||
ended, so that list is the only way back to a one-off of yours after its end
|
||||
date passes — to edit it, or to get rid of it.
|
||||
|
||||
### How often it comes round
|
||||
|
||||
An event you add states its **cadence** — asked before any date, because the
|
||||
|
||||
@@ -317,6 +317,11 @@ Four constraints, each protecting something that already exists:
|
||||
- **Their events never touch the ingest pipeline.** `sanitize.ts` and `merge.ts` exist for pages we
|
||||
do not control; a reader's own typing is neither untrusted markup nor a second opinion to
|
||||
reconcile. Nothing they enter is fetched, parsed, merged, scored or quarantined.
|
||||
- **They are always reachable.** Settings lists every event the reader has made, whatever state it
|
||||
is in, and opens the same detail sheet a row does. Every other surface drops an event once it has
|
||||
ended, so without this list a one-off of their own became unreachable the day it finished —
|
||||
impossible to edit, and impossible to delete out of a store nothing else can see. Events filed
|
||||
under a game we track are listed too; the form allows that, so the index has to.
|
||||
- **Their IDs live in their own key space.** Never `${game}:${slug}:${date}` — see
|
||||
`docs/DATA-MODEL.md` § Reader-authored key spaces.
|
||||
- **They are in the backup.** An export that omitted hand-entered events would be a lossy backup,
|
||||
|
||||
+11
-1
@@ -30,7 +30,7 @@ import {
|
||||
} from "./state/lens.ts";
|
||||
import { clockFor, formatRemaining } from "../shared/time.ts";
|
||||
import { dailySummary, isDaily, resolveDaily } from "../shared/daily.ts";
|
||||
import { occurrenceForId, strandedOccurrences } from "../shared/recurrence.ts";
|
||||
import { nearestOccurrence, occurrenceForId, strandedOccurrences } from "../shared/recurrence.ts";
|
||||
import { orderGames } from "./state/gameOrder.ts";
|
||||
import { GameMetaProvider, type MetaResolver } from "./state/gameMeta.tsx";
|
||||
import { metaOnTheme, useTheme } from "./state/theme.ts";
|
||||
@@ -650,6 +650,16 @@ export function App() {
|
||||
onEditGame: custom.editGame,
|
||||
onRemoveGame: custom.removeGame,
|
||||
onAddEvent: custom.addEvent,
|
||||
now,
|
||||
// The index lists rules; the sheet opens rows. A repeating rule's
|
||||
// own id is never a row — the lists hold its occurrences — so it is
|
||||
// resolved to whichever occurrence is nearest before opening.
|
||||
onOpen: (id) => {
|
||||
const record = custom.events[id];
|
||||
const occurrence =
|
||||
record === undefined ? null : nearestOccurrence(record, now);
|
||||
setOpenId(occurrence === null ? id : occurrence.id);
|
||||
},
|
||||
}}
|
||||
onExport={() =>
|
||||
exportProgress(prog.progress, daily.logs, ignored.marks, prefs, {
|
||||
|
||||
@@ -1,16 +1,47 @@
|
||||
import { useState } from "react";
|
||||
import type { CustomEvents, CustomGames, LaneId } from "../../shared/custom.ts";
|
||||
import type { CustomEvent, CustomEvents, CustomGames, LaneId } from "../../shared/custom.ts";
|
||||
import { formatAbsolute } from "../../shared/time.ts";
|
||||
import type { EventDraft } from "../state/useCustom.ts";
|
||||
import { EventForm, GameForm } from "./CustomForms.tsx";
|
||||
import { useGameMeta } from "../state/gameMeta.tsx";
|
||||
import { cadenceLabel, EventForm, GameForm } from "./CustomForms.tsx";
|
||||
|
||||
/**
|
||||
* The reader's own games and events — a group of the settings panel (PRD F13).
|
||||
*
|
||||
* Their events are managed from the event itself — open it and the detail sheet
|
||||
* offers edit and delete, exactly where you would look for them. What has no
|
||||
* other home is the list of games they invented, and the way in to adding the
|
||||
* first event, so both live here.
|
||||
* Their events are still *managed* from the event itself — open one and the
|
||||
* detail sheet offers edit and delete, exactly where you would look for them.
|
||||
* What lives here is the way back **to** it, which the rest of the app cannot
|
||||
* offer: every list and the board drop an event once it has ended, so a
|
||||
* one-off of the reader's own became unreachable the day it finished —
|
||||
* impossible to edit, and impossible to delete out of a store nothing else can
|
||||
* reach. This index is the only surface that shows an event whatever state it
|
||||
* is in.
|
||||
*/
|
||||
|
||||
/**
|
||||
* What a row says about itself, beyond its title.
|
||||
*
|
||||
* The job is to explain why an event is not on any other surface, because a
|
||||
* list of bare titles leaves the reader guessing which of two entries is the
|
||||
* dead one. A repeating event says how often instead of when: its dates roll
|
||||
* forward, so printing one would disagree with the row they would find if they
|
||||
* went looking.
|
||||
*/
|
||||
export function eventCaption(event: CustomEvent, nowMs: number): string {
|
||||
const cadence = cadenceLabel(event.repeat);
|
||||
if (cadence !== null) return cadence;
|
||||
|
||||
if (event.endsAt !== null && Date.parse(event.endsAt) < nowMs) {
|
||||
return `ended ${formatAbsolute(Date.parse(event.endsAt), false)}`;
|
||||
}
|
||||
if (Date.parse(event.startsAt) > nowMs) {
|
||||
return `starts ${formatAbsolute(Date.parse(event.startsAt), false)}`;
|
||||
}
|
||||
return event.endsAt === null
|
||||
? "no end date"
|
||||
: `until ${formatAbsolute(Date.parse(event.endsAt), false)}`;
|
||||
}
|
||||
|
||||
export function YourOwn({
|
||||
games,
|
||||
events,
|
||||
@@ -19,6 +50,8 @@ export function YourOwn({
|
||||
onEditGame,
|
||||
onRemoveGame,
|
||||
onAddEvent,
|
||||
now,
|
||||
onOpen,
|
||||
}: {
|
||||
games: CustomGames;
|
||||
events: CustomEvents;
|
||||
@@ -28,12 +61,27 @@ export function YourOwn({
|
||||
onEditGame: (id: string, name: string, hue: string) => void;
|
||||
onRemoveGame: (id: string) => { removed: boolean; blockedBy: number };
|
||||
onAddEvent: (draft: EventDraft) => void;
|
||||
now: number;
|
||||
/**
|
||||
* Open one of their events. Takes the stored id — a rule's, not an
|
||||
* occurrence's — and the caller resolves it to whichever row the sheet can
|
||||
* actually show.
|
||||
*/
|
||||
onOpen: (id: string) => void;
|
||||
}) {
|
||||
const gameMeta = useGameMeta();
|
||||
const [adding, setAdding] = useState<"game" | "event" | null>(null);
|
||||
const [editing, setEditing] = useState<string | null>(null);
|
||||
const [refusal, setRefusal] = useState<string | null>(null);
|
||||
|
||||
const list = Object.values(games);
|
||||
// An event may be filed under a game we track — a source can miss one — and
|
||||
// those have no row above to nest under. Listing them separately is what
|
||||
// keeps this index complete: an ended event under Genshin is on no other
|
||||
// surface either, and would be just as stuck.
|
||||
const underTracked = Object.values(events).filter(
|
||||
(e) => games[e.game] === undefined,
|
||||
);
|
||||
|
||||
return (
|
||||
// No heading or rule of its own: this is the body of a settings group that
|
||||
@@ -48,9 +96,8 @@ export function YourOwn({
|
||||
{list.length > 0 && (
|
||||
<ul className="mt-3 flex flex-col gap-1.5">
|
||||
{list.map((game) => {
|
||||
const held = Object.values(events).filter(
|
||||
(e) => e.game === game.id,
|
||||
).length;
|
||||
const mine = Object.values(events).filter((e) => e.game === game.id);
|
||||
const held = mine.length;
|
||||
return (
|
||||
<li key={game.id}>
|
||||
<div className="flex items-center gap-2">
|
||||
@@ -95,6 +142,31 @@ export function YourOwn({
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Indented under its game rather than in one flat list,
|
||||
because the games are already the structure here and a
|
||||
reader looking for an event of theirs knows which game they
|
||||
filed it under. */}
|
||||
{mine.length > 0 && (
|
||||
<ul className="mt-1 flex flex-col gap-1 border-l border-hairline pl-3">
|
||||
{mine.map((event) => (
|
||||
<li key={event.id}>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => onOpen(event.id)}
|
||||
className="flex w-full items-baseline gap-2 text-left transition-colors hover:text-ink"
|
||||
>
|
||||
<span className="min-w-0 flex-1 truncate text-sm text-muted">
|
||||
{event.title}
|
||||
</span>
|
||||
<span className="shrink-0 text-xs text-faint">
|
||||
{eventCaption(event, now)}
|
||||
</span>
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
|
||||
{editing === game.id && (
|
||||
<GameForm
|
||||
initial={{ name: game.name, hue: game.hue }}
|
||||
@@ -111,6 +183,35 @@ export function YourOwn({
|
||||
</ul>
|
||||
)}
|
||||
|
||||
{/* Its own heading rather than trailing the list above, which read as
|
||||
though these belonged to whichever game happened to be last. */}
|
||||
{underTracked.length > 0 && (
|
||||
<p className="mt-4 text-xs text-faint">Filed under a game we track</p>
|
||||
)}
|
||||
{underTracked.length > 0 && (
|
||||
<ul className="mt-1.5 flex flex-col gap-1">
|
||||
{underTracked.map((event) => (
|
||||
<li key={event.id}>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => onOpen(event.id)}
|
||||
className="flex w-full items-baseline gap-2 text-left transition-colors hover:text-ink"
|
||||
>
|
||||
<span className="shrink-0 text-xs text-faint">
|
||||
{gameMeta(event.game).short}
|
||||
</span>
|
||||
<span className="min-w-0 flex-1 truncate text-sm text-muted">
|
||||
{event.title}
|
||||
</span>
|
||||
<span className="shrink-0 text-xs text-faint">
|
||||
{eventCaption(event, now)}
|
||||
</span>
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
|
||||
{refusal !== null && (
|
||||
<p className="mt-2 text-xs leading-relaxed text-critical">{refusal}</p>
|
||||
)}
|
||||
|
||||
@@ -474,6 +474,38 @@ export function nextOccurrences(
|
||||
return occurrencesOf(event, nowMs, horizon, count);
|
||||
}
|
||||
|
||||
/**
|
||||
* The occurrence to open when the reader asks for the rule itself.
|
||||
*
|
||||
* The settings index lists rules, but the detail sheet opens rows, and a
|
||||
* rule's own id is never a row — the lists hold its occurrences, keyed
|
||||
* `myevent:<token>#<date>`. This is the bridge between the two.
|
||||
*
|
||||
* Running or next where there is one. Where there is not — a series whose
|
||||
* `until` has passed — it falls back to the first occurrence rather than
|
||||
* giving up, and that fallback is the point rather than a nicety: a finished
|
||||
* rule with no future occurrence would otherwise be exactly as unreachable as
|
||||
* the ended one-off this index exists to rescue, and just as impossible to
|
||||
* delete. Which time round it lands on does not matter, because the reader
|
||||
* has come to edit or delete the rule, not to inspect an occurrence.
|
||||
*
|
||||
* Null only when nothing repeats, and the caller has a row already: a
|
||||
* non-repeating event's own id is in the lists unchanged.
|
||||
*/
|
||||
export function nearestOccurrence(
|
||||
event: RepeatingEvent,
|
||||
nowMs: number,
|
||||
): Occurrence | null {
|
||||
if (event.repeat === null) return null;
|
||||
|
||||
const upcoming = nextOccurrences(event, nowMs, 1);
|
||||
if (upcoming.length > 0) return upcoming[0]!;
|
||||
|
||||
const anchor = Date.parse(event.startsAt);
|
||||
if (Number.isNaN(anchor)) return null;
|
||||
return occurrencesOf(event, anchor, anchor, 1)[0] ?? null;
|
||||
}
|
||||
|
||||
/**
|
||||
* How many of a rule's ids the reader has actually recorded something
|
||||
* against — what a schedule edit that re-keys ids would strand.
|
||||
|
||||
@@ -52,6 +52,8 @@ function render(prefs: Prefs, ignoredCount = 0): string {
|
||||
games: {},
|
||||
events: {},
|
||||
lanes: ["genshin", "hsr"],
|
||||
now: 0,
|
||||
onOpen: () => {},
|
||||
onAddGame: () => {},
|
||||
onEditGame: () => {},
|
||||
onRemoveGame: () => ({ removed: true, blockedBy: 0 }),
|
||||
|
||||
+126
-1
@@ -9,7 +9,7 @@ import {
|
||||
repeatFrom,
|
||||
strandedNotice,
|
||||
} from "../src/client/components/CustomForms.tsx";
|
||||
import { YourOwn } from "../src/client/components/YourOwn.tsx";
|
||||
import { eventCaption, YourOwn } from "../src/client/components/YourOwn.tsx";
|
||||
import { EventRow } from "../src/client/components/EventRow.tsx";
|
||||
import { EventDetail } from "../src/client/components/EventDetail.tsx";
|
||||
import { AUTHOR, Colophon, REPO_URL } from "../src/client/components/Colophon.tsx";
|
||||
@@ -75,6 +75,8 @@ describe("YourOwn", () => {
|
||||
onEditGame: noop,
|
||||
onRemoveGame: () => ({ removed: true, blockedBy: 0 }),
|
||||
onAddEvent: noop,
|
||||
now: Date.parse("2026-10-01T12:00:00.000Z"),
|
||||
onOpen: noop,
|
||||
};
|
||||
|
||||
test("lists a reader's game with the events it holds", () => {
|
||||
@@ -883,3 +885,126 @@ describe("repeatOf", () => {
|
||||
).toBe(null);
|
||||
});
|
||||
});
|
||||
|
||||
describe("eventCaption", () => {
|
||||
// What each row in the settings index says about itself. The point is to
|
||||
// explain why an event is not on the front page — a list of bare titles
|
||||
// leaves the reader guessing which of two entries is the dead one.
|
||||
const NOW = Date.parse("2026-10-01T12:00:00.000Z");
|
||||
const at = (over: Record<string, unknown>) =>
|
||||
CustomEvent.parse({
|
||||
id: "myevent:k3f9qa2m01",
|
||||
game: "mygame:limbus-company",
|
||||
title: "Season 7",
|
||||
type: "story",
|
||||
summary: null,
|
||||
startsAt: "2026-09-01T00:00:00.000Z",
|
||||
startPrecision: "day",
|
||||
endsAt: "2026-09-08T00:00:00.000Z",
|
||||
endPrecision: "day",
|
||||
repeat: null,
|
||||
at: AT,
|
||||
updatedAt: AT,
|
||||
...over,
|
||||
});
|
||||
|
||||
test("a repeating event says how often, not when", () => {
|
||||
// Its dates roll forward, so a date would be out of step with the row the
|
||||
// reader would find if they went looking on the front page.
|
||||
expect(
|
||||
eventCaption(at({ repeat: { unit: "weeks", interval: 1, until: null } }), NOW),
|
||||
).toBe("on a weekly cycle");
|
||||
});
|
||||
|
||||
test("an event whose end has passed says so", () => {
|
||||
// The whole reason this index exists: this one is on no other surface.
|
||||
expect(eventCaption(at({}), NOW)).toContain("ended");
|
||||
});
|
||||
|
||||
test("an event still to come is not reported as ended", () => {
|
||||
const caption = eventCaption(
|
||||
at({ startsAt: "2026-11-01T00:00:00.000Z", endsAt: "2026-11-08T00:00:00.000Z" }),
|
||||
NOW,
|
||||
);
|
||||
expect(caption).not.toContain("ended");
|
||||
});
|
||||
|
||||
test("an unannounced end is not mistaken for a passed one", () => {
|
||||
const caption = eventCaption(
|
||||
at({ endsAt: null, endPrecision: "unknown" }),
|
||||
NOW,
|
||||
);
|
||||
expect(caption).not.toContain("ended");
|
||||
});
|
||||
});
|
||||
|
||||
describe("the settings index of your own events", () => {
|
||||
test("lists an ended event that no other surface shows", () => {
|
||||
const ended = CustomEvent.parse({
|
||||
id: "myevent:seasonseven",
|
||||
game: "mygame:limbus-company",
|
||||
title: "Season 7",
|
||||
type: "story",
|
||||
summary: null,
|
||||
startsAt: "2026-09-01T00:00:00.000Z",
|
||||
startPrecision: "day",
|
||||
endsAt: "2026-09-08T00:00:00.000Z",
|
||||
endPrecision: "day",
|
||||
repeat: null,
|
||||
at: AT,
|
||||
updatedAt: AT,
|
||||
});
|
||||
const html = render(
|
||||
<YourOwn
|
||||
games={GAMES}
|
||||
events={{ [ended.id]: ended }}
|
||||
lanes={["mygame:limbus-company"]}
|
||||
now={Date.parse("2026-10-01T12:00:00.000Z")}
|
||||
onAddGame={() => {}}
|
||||
onEditGame={() => {}}
|
||||
onRemoveGame={() => ({ removed: true, blockedBy: 0 })}
|
||||
onAddEvent={() => {}}
|
||||
onOpen={() => {}}
|
||||
/>,
|
||||
);
|
||||
expect(html).toContain("Season 7");
|
||||
expect(html).toContain("ended");
|
||||
});
|
||||
});
|
||||
|
||||
describe("the index covers events filed under a tracked game", () => {
|
||||
test("an event under Genshin is listed too", () => {
|
||||
// The form deliberately allows this — a source can miss an event — so an
|
||||
// index that only walked the reader's own games would leave exactly the
|
||||
// same hole it exists to close.
|
||||
const own = CustomEvent.parse({
|
||||
id: "myevent:undergenshin",
|
||||
game: "genshin",
|
||||
title: "Something the wiki missed",
|
||||
type: "other",
|
||||
summary: null,
|
||||
startsAt: "2026-09-01T00:00:00.000Z",
|
||||
startPrecision: "day",
|
||||
endsAt: "2026-09-08T00:00:00.000Z",
|
||||
endPrecision: "day",
|
||||
repeat: null,
|
||||
at: AT,
|
||||
updatedAt: AT,
|
||||
});
|
||||
const html = render(
|
||||
<YourOwn
|
||||
games={GAMES}
|
||||
events={{ [own.id]: own }}
|
||||
lanes={["genshin", "mygame:limbus-company"]}
|
||||
now={Date.parse("2026-10-01T12:00:00.000Z")}
|
||||
onAddGame={() => {}}
|
||||
onEditGame={() => {}}
|
||||
onRemoveGame={() => ({ removed: true, blockedBy: 0 })}
|
||||
onAddEvent={() => {}}
|
||||
onOpen={() => {}}
|
||||
/>,
|
||||
);
|
||||
expect(html).toContain("Something the wiki missed");
|
||||
expect(html).toContain("ended");
|
||||
});
|
||||
});
|
||||
|
||||
+44
-1
@@ -1,5 +1,5 @@
|
||||
import { describe, expect, test } from "bun:test";
|
||||
import { addUnits, comesRoundEarly, Repeat, repeatSpanning, repeatModeOf, cadenceOf, isOccurrenceId, occurrenceId, occurrenceForId, ruleIdOf, movesOccurrences, nextOccurrences, occurrencesOf, strandedOccurrences, type RepeatingEvent } from "../src/shared/recurrence.ts";
|
||||
import { addUnits, comesRoundEarly, Repeat, repeatSpanning, repeatModeOf, cadenceOf, nearestOccurrence, isOccurrenceId, occurrenceId, occurrenceForId, ruleIdOf, movesOccurrences, nextOccurrences, occurrencesOf, strandedOccurrences, type RepeatingEvent } from "../src/shared/recurrence.ts";
|
||||
import { CustomEventId, isCustomEventId } from "../src/shared/custom.ts";
|
||||
|
||||
// Pinned so the DST cases mean something. Copenhagen is UTC+1 in winter and
|
||||
@@ -590,3 +590,46 @@ describe("cadenceOf", () => {
|
||||
).toBe("custom");
|
||||
});
|
||||
});
|
||||
|
||||
describe("nearestOccurrence", () => {
|
||||
// The settings index lists rules, but the detail sheet opens rows, and a
|
||||
// rule's own id is never a row — `allRows` holds its occurrences. This is
|
||||
// the bridge, and it has to answer for a dead series too: a rule whose
|
||||
// `until` has passed has no future occurrence at all, and without an answer
|
||||
// it would be exactly as unreachable as the ended one-off this fixes.
|
||||
const rule = (over: Partial<RepeatingEvent> = {}): RepeatingEvent => ({
|
||||
id: "myevent:k3f9qa2m01",
|
||||
startsAt: new Date("2026-09-01T09:00:00").toISOString(),
|
||||
startPrecision: "exact",
|
||||
endsAt: new Date("2026-09-08T09:00:00").toISOString(),
|
||||
endPrecision: "exact",
|
||||
repeat: { unit: "weeks", interval: 2, until: null },
|
||||
...over,
|
||||
});
|
||||
|
||||
test("a running occurrence is the nearest one", () => {
|
||||
const got = nearestOccurrence(rule(), new Date("2026-09-03T12:00:00").getTime());
|
||||
expect(got?.id).toBe("myevent:k3f9qa2m01#2026-09-01");
|
||||
});
|
||||
|
||||
test("between cycles it is the one about to open", () => {
|
||||
const got = nearestOccurrence(rule(), new Date("2026-09-10T12:00:00").getTime());
|
||||
expect(got?.id).toBe("myevent:k3f9qa2m01#2026-09-15");
|
||||
});
|
||||
|
||||
test("a finished series still resolves, so it can still be reached", () => {
|
||||
// Any occurrence will do here: the reader has come to edit or delete the
|
||||
// rule, not to inspect a particular time round. The first always exists,
|
||||
// which is what makes this total.
|
||||
const dead = rule({
|
||||
repeat: { unit: "weeks", interval: 2, until: new Date("2026-09-02T00:00:00").toISOString() },
|
||||
});
|
||||
const got = nearestOccurrence(dead, new Date("2027-06-01T12:00:00").getTime());
|
||||
expect(got?.id).toBe("myevent:k3f9qa2m01#2026-09-01");
|
||||
});
|
||||
|
||||
test("an event that does not repeat has no occurrence to find", () => {
|
||||
// Its own id is already a row, so the caller opens it directly.
|
||||
expect(nearestOccurrence(rule({ repeat: null }), Date.now())).toBe(null);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user