Skip to content
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

Show up to 20 message notifications per chat or 50 in total #5310

Merged
merged 5 commits into from
Feb 2, 2024
Merged

Show up to 20 message notifications per chat or 50 in total #5310

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f9bf0e
Close oldest notifications if there are more than 50
hpeebles Feb 1, 2024
56ab3a2
Tidy up
hpeebles Feb 1, 2024
25b4574
End not included
hpeebles Feb 1, 2024
06fb692
Show up to 20 notifications per chat
hpeebles Feb 1, 2024
257faf7
Remove tag for messages
hpeebles Feb 1, 2024
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
33 changes: 26 additions & 7 deletions frontend/openchat-service-worker/src/service_worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ function toUint8Array(base64String: string): Uint8Array {
return Uint8Array.from(atob(base64String), (c) => c.charCodeAt(0));
}

const MAX_NOTIFICATIONS = 50;
const MAX_NOTIFICATIONS_PER_GROUP = 20;

async function showNotification(n: Notification, id: string): Promise<void> {
let icon = "/_/raw/icon.png";
let image = undefined;
Expand Down Expand Up @@ -240,25 +243,30 @@ async function showNotification(n: Notification, id: string): Promise<void> {
}

const path = notificationPath(n);
const tag = path;
let tag: string | undefined = undefined;

// If true, we close existing notifications where the `path` matches, this ensures this new notification will
// trigger an alert. If false, and there is already at least one notification with a matching path, then this new
// notification will be silent
if (isMessageNotification(n)) {
if (icon === undefined && n.messageType === "File") {
icon = FILE_ICON;
}
} else {
tag = path;
}

const existing = await self.registration.getNotifications();
const matching = existing.filter((n) => n.data.path === path);
const closed = closeExcessNotifications(matching, MAX_NOTIFICATIONS_PER_GROUP);

// We need to close any existing notifications for the same tag otherwise the new notification will not be shown
const existing = await self.registration.getNotifications({ tag });
existing.forEach((n) => n.close());
if (existing.length - closed >= MAX_NOTIFICATIONS) {
const existing = await self.registration.getNotifications();
closeExcessNotifications(existing, MAX_NOTIFICATIONS);
}

const toShow = {
body,
icon,
image,
renotify: tag !== undefined,
tag,
timestamp: Number(n.timestamp),
data: {
Expand All @@ -271,6 +279,17 @@ async function showNotification(n: Notification, id: string): Promise<void> {
await self.registration.showNotification(title, toShow);
}

function closeExcessNotifications(
notifications: globalThis.Notification[],
maxCount: number,
): number {
const toClose = Math.max(notifications.length + 1 - maxCount, 0);
if (toClose > 0) {
notifications.slice(0, toClose).forEach((n) => n.close());
}
return toClose;
}

function messageText(
messageText: string | undefined,
messageType: string,
Expand Down
Loading