Skip to content

Fix event display: add per-category cap #3104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
internet-addict-xyz wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix event display: add per-category cap #3104

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
462d9f0
Fix event display: add per-category cap
internet-addict-xyz Feb 3, 2026
8f6d9c3
Fix events display: use const for remainingEvents
internet-addict-xyz Feb 3, 2026
087c756
Merge branch 'main' into fix/events-per-category-cap
internet-addict-xyz Feb 5, 2026
9b4c419
Merge branch 'openfrontio:main' into fix/events-per-category-cap
internet-addict-xyz Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions src/client/graphics/layers/EventsDisplay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export class EventsDisplay extends LitElement implements Layer {
}
}

let remainingEvents = this.events.filter((event) => {
const remainingEvents = this.events.filter((event) => {
const shouldKeep =
this.game.ticks() - event.createdAt < (event.duration ?? 600) &&
!event.shouldDelete?.(this.game);
Expand All @@ -245,10 +245,6 @@ export class EventsDisplay extends LitElement implements Layer {
return shouldKeep;
});

if (remainingEvents.length > 30) {
remainingEvents = remainingEvents.slice(-30);
}

if (this.events.length !== remainingEvents.length) {
this.events = remainingEvents;
this.requestUpdate();
Expand Down Expand Up @@ -343,10 +339,30 @@ export class EventsDisplay extends LitElement implements Layer {
}

private addEvent(event: GameEvent) {
this.events = [...this.events, event];
if (this._hidden === true) {
this.newEvents++;
const category = getMessageCategory(event.type);
const next = [...this.events, event];

// Count how many we have in this category
let count = 0;
for (const e of next) {
if (getMessageCategory(e.type) === category) {
count++;
}
}

// If cap is exeeded > Remove the oldest event of this category
if (count > 30) {
const idx = next.findIndex(
(e) => getMessageCategory(e.type) === category,
);
if (idx !== -1) {
next.splice(idx, 1);
}
}

this.events = next;

if (this._hidden) this.newEvents++;
this.requestUpdate();
}

Expand Down
Loading