Show news from the window the server serves

A host may serve fewer hours than the day. The hotspots answer may name its window
(`windowHours`, a whole number from 1 to 24); the layer keeps reports, the
feed, In view and the chosen event inside it, and the panel says
"Last 12 h" or "Last 24 h" accordingly. Without a window named, or with one
out of range, the layer keeps the full day as before.
This commit is contained in:
Denis Groshev committed 2026-11-06 00:45:27 +01:00
1 parent f3e206bf37
commit 60fad38c3f
18 files changed
+178 -73

No files matched your search

+18 -7
View File
@@ -29,6 +29,7 @@ import {
NEWS_RELEVANT,
NEWS_SETTLE_MS,
NEWS_SEVERITY,
NEWS_WINDOW_MS,
ageWords,
attestation,
beaconPixelSize,
@@ -44,6 +45,7 @@ import {
markerStyle,
mediaLabels,
mergeFeedPage,
newsWindowMs,
normalizeFilters,
passesFilters,
reportMarkerPosition,
@@ -139,6 +141,9 @@ export function createNewsLayer({
lastRunAt = null,
autoPages = 0;
let hotspots = [];
// The window the server serves (newsWindowMs): a host may serve
// fewer hours than the day.
let windowMs = NEWS_WINDOW_MS;
let mapReports = [];
let feed = emptyFeed();
let inView = emptyInView();
@@ -159,7 +164,7 @@ export function createNewsLayer({
inView.minor?.find((r) => r.id === id) ||
null;
const selected = () => (selectedId ? findReport(selectedId) : null);
const onMap = (report) => visibleOnMap(report, filters, now());
const onMap = (report) => visibleOnMap(report, filters, now(), windowMs);
function markerCartesian(report, pin = 0) {
const { lat, lon } = reportMarkerPosition(report, pin);
@@ -806,7 +811,7 @@ export function createNewsLayer({
}
const shownCount = () =>
feed.items.filter((r) => passesFilters(r, filters, now())).length;
feed.items.filter((r) => passesFilters(r, filters, now(), windowMs)).length;
async function loadFeed(mode) {
if (!enabled || unavailable) return;
@@ -828,7 +833,7 @@ export function createNewsLayer({
if (controller.signal.aborted || feedRequest !== controller || !enabled)
return;
feed = {
...mergeFeedPage(feed, page, mode, now()),
...mergeFeedPage(feed, page, mode, now(), undefined, windowMs),
loading: false,
error: null,
};
@@ -915,7 +920,7 @@ export function createNewsLayer({
if (controller.signal.aborted || inViewRequest !== controller) return;
inView = {
...inView,
minor: page.reports.filter((r) => withinNewsWindow(r, now())),
minor: page.reports.filter((r) => withinNewsWindow(r, now(), windowMs)),
loading: false,
error: null,
};
@@ -1015,7 +1020,7 @@ export function createNewsLayer({
color: level.color,
})),
items: feed.items
.filter((r) => passesFilters(r, filters, at))
.filter((r) => passesFilters(r, filters, at, windowMs))
.map((r) => feedCardView(r, at)),
inView: {
active: inView.active,
@@ -1026,10 +1031,12 @@ export function createNewsLayer({
inView.centre,
filters,
at,
undefined,
windowMs,
).map((r) => feedCardView(r, at)),
},
selected:
report && withinNewsWindow(report, at)
report && withinNewsWindow(report, at, windowMs)
? feedCardView(report, at)
: null,
hasMore: Boolean(feed.nextBefore),
@@ -1037,6 +1044,7 @@ export function createNewsLayer({
// Read failures are English data; the panel shows them translated.
error: error || feed.error ? t(error || feed.error) : null,
lastRunAt,
windowHours: windowMs / 3_600_000,
};
}
@@ -1149,7 +1157,10 @@ export function createNewsLayer({
hotspots = index.hotspots;
loadOutlines();
lastRunAt = index.lastRunAt;
mapReports = todays.reports.filter((r) => withinNewsWindow(r, now()));
windowMs = newsWindowMs(index.windowHours);
mapReports = todays.reports.filter((r) =>
withinNewsWindow(r, now(), windowMs),
);
filters = normalizeFilters({}, hotspots, filters);
error = null;
lastUpdate = now();
+42 -15
View File
@@ -11,6 +11,16 @@ export const NEWS_FEED_PAGE = 60;
export const NEWS_MAP_LIMIT = 500;
/** News is real time only: nothing older than a day is shown anywhere. */
export const NEWS_WINDOW_MS = 24 * 3_600_000;
/**
* The window a server serves, in ms: its `windowHours` (a whole number of
* hours up to 24; a host may serve fewer), else the full day.
*/
export function newsWindowMs(hours) {
return Number.isInteger(hours) && hours >= 1 && hours <= 24
? hours * 3_600_000
: NEWS_WINDOW_MS;
}
// A publish time this far ahead of the clock is skew, not a future story
// (as data/regionalNewsWindow.js).
const NEWS_CLOCK_SKEW_MS = 15 * 60_000;
@@ -210,21 +220,26 @@ const lastHeard = (report) =>
Date.parse(report?.event?.lastAt || report?.publishedAt || '');
/**
* Whether a time is inside the last 24 hours (the only news shown); one more
* than 15 minutes ahead of the clock is not.
* Whether a time is inside the window (the last 24 hours unless the server
* serves fewer; the only news shown); one more than 15 minutes ahead of the
* clock is not.
*/
function inWindow(value, now) {
function inWindow(value, now, windowMs = NEWS_WINDOW_MS) {
const at = Date.parse(value || '');
return (
Number.isFinite(at) &&
now - at <= NEWS_WINDOW_MS &&
now - at <= windowMs &&
at - now <= NEWS_CLOCK_SKEW_MS
);
}
/** Whether a report is from the last 24 hours (the only news shown). */
export function withinNewsWindow(report, now = Date.now()) {
return inWindow(report?.publishedAt, now);
/** Whether a report is inside the window (the only news shown). */
export function withinNewsWindow(
report,
now = Date.now(),
windowMs = NEWS_WINDOW_MS,
) {
return inWindow(report?.publishedAt, now, windowMs);
}
/** The event's one-report-per-side list, inside the last 24 hours only. */
@@ -548,7 +563,7 @@ export function reportMarkerPosition(report, pin = 0) {
/**
* Merge a page into the feed, newest first, one row per report id, keeping
* only the last 24 hours and at most `max` rows (a long session does not grow
* only the window and at most `max` rows (a long session does not grow
* the list). `mode` 'head' refreshes the top and keeps the older cursor;
* 'append' adds an older page and takes its cursor; 'replace' starts over.
*/
@@ -558,6 +573,7 @@ export function mergeFeedPage(
mode,
now = Date.now(),
max = NEWS_FEED_MAX,
windowMs = NEWS_WINDOW_MS,
) {
const byId = new Map();
const items =
@@ -567,7 +583,7 @@ export function mergeFeedPage(
? [...feed.items, ...page.reports]
: [...page.reports, ...feed.items];
for (const item of items)
if (!byId.has(item.id) && withinNewsWindow(item, now))
if (!byId.has(item.id) && withinNewsWindow(item, now, windowMs))
byId.set(item.id, item);
return {
items: [...byId.values()]
@@ -604,24 +620,34 @@ export function normalizeFilters(next = {}, hotspots = [], previous = {}) {
}
/** Whether a report passes the filters the server does not apply. */
export function passesFilters(report, filters, now = Date.now()) {
export function passesFilters(
report,
filters,
now = Date.now(),
windowMs = NEWS_WINDOW_MS,
) {
return (
withinNewsWindow(report, now) &&
withinNewsWindow(report, now, windowMs) &&
reportSeverity(report) >= filters.minSeverity
);
}
/** Whether a report belongs on the map under the current filters. */
export function visibleOnMap(report, filters, now = Date.now()) {
export function visibleOnMap(
report,
filters,
now = Date.now(),
windowMs = NEWS_WINDOW_MS,
) {
return (
(filters.hotspot === 'all' ||
(report.hotspotIds || [report.hotspotId]).includes(filters.hotspot)) &&
(filters.category === 'all' || report.category === filters.category) &&
passesFilters(report, filters, now)
passesFilters(report, filters, now, windowMs)
);
}
/** API query for the feed under the current filters: always the last 24 h. */
/** API query for the feed under the current filters: the window only. */
export function feedQueryFor(filters, extra = {}) {
return {
events: true,
@@ -660,12 +686,13 @@ export function reportsInView(
filters,
now = Date.now(),
limit = NEWS_IN_VIEW_LIMIT,
windowMs = NEWS_WINDOW_MS,
) {
if (!centre) return [];
return reports
.filter(
(r) =>
passesFilters(r, filters, now) &&
passesFilters(r, filters, now, windowMs) &&
(filters.category === 'all' || r.category === filters.category) &&
r.pins?.some(
(pin) => distanceKm(pin, centre) <= NEWS_IN_VIEW_RADIUS_KM,
+38
View File
@@ -20,6 +20,7 @@ import {
isPressing,
markerStyle,
mergeFeedPage,
newsWindowMs,
normalizeFilters,
passesFilters,
reportMarkerPosition,
@@ -562,3 +563,40 @@ test('in view: half-degree cells and reports within 500 km of the centre', () =>
assert.deepEqual(reportsInView([near], null, filters, NOW), []);
assert.deepEqual(reportsInView([], centre, filters, NOW), []);
});
test('a server may serve fewer hours than the day, never more', () => {
assert.equal(newsWindowMs(12), 12 * 3_600_000);
assert.equal(newsWindowMs(24), 24 * 3_600_000);
for (const bad of [0, 25, 12.5, '12', null, undefined])
assert.equal(newsWindowMs(bad), 24 * 3_600_000);
const page = {
reports: [
report('fresh', '2026-10-28T02:00:00Z'),
report('old', '2026-10-27T20:00:00Z'),
],
nextBefore: null,
};
const empty = { items: [], nextBefore: null };
const ids = (windowMs) =>
mergeFeedPage(empty, page, 'replace', NOW, undefined, windowMs).items.map(
(r) => r.id,
);
assert.deepEqual(ids(newsWindowMs(12)), ['fresh']);
assert.deepEqual(ids(newsWindowMs(24)), ['fresh', 'old']);
});
test('the hotspots answer carries the window it was counted over', () => {
const base = {
hotspots: [],
ingest: { lastRunAt: '2026-10-28T09:00:00Z' },
};
assert.equal(
normalizeHotspotsPayload({ ...base, windowHours: 12 }).windowHours,
12,
);
assert.equal(normalizeHotspotsPayload(base).windowHours, null);
assert.equal(
normalizeHotspotsPayload({ ...base, windowHours: 48 }).windowHours,
null,
);
});
+8 -1
View File
@@ -96,7 +96,8 @@ function normalizeDeveloping(items) {
}
/**
* `/api/news/hotspots` → `{hotspots, categories, lastRunAt}`, or null when the
* `/api/news/hotspots` → `{hotspots, categories, lastRunAt, windowHours}`
* (`windowHours` null when the server names none), or null when the
* payload has no hotspot list.
*/
export function normalizeHotspotsPayload(payload) {
@@ -135,6 +136,12 @@ export function normalizeHotspotsPayload(payload) {
)
: [],
lastRunAt: iso(payload.ingest?.lastRunAt),
windowHours:
Number.isInteger(payload.windowHours) &&
payload.windowHours >= 1 &&
payload.windowHours <= 24
? payload.windowHours
: null,
};
}