Merge pull request #1468 from thelounge/xpaw/combine-notifications

Combine unread notifications into a single one

client/service-worker.js

@@ -9,16 +9,30 @@ self.addEventListener("push", function(event) {
 
 	const payload = event.data.json();
 
-	if (payload.type === "notification") {
+	if (payload.type !== "notification") {
-		event.waitUntil(
+		return;
-			self.registration.showNotification(payload.title, {
-				badge: "img/logo-64.png",
-				icon: "img/touch-icon-192x192.png",
-				body: payload.body,
-				timestamp: payload.timestamp,
-			})
-		);
 	}
+
+	// get current notification, close it, and draw new
+	event.waitUntil(
+		self.registration
+			.getNotifications({
+				tag: `chan-${payload.chanId}`
+			})
+			.then((notifications) => {
+				for (const notification of notifications) {
+					notification.close();
+				}
+
+				return self.registration.showNotification(payload.title, {
+					tag: `chan-${payload.chanId}`,
+					badge: "img/logo-64.png",
+					icon: "img/touch-icon-192x192.png",
+					body: payload.body,
+					timestamp: payload.timestamp,
+				});
+			})
+	);
 });
 
 self.addEventListener("notificationclick", function(event) {

src/client.js

@@ -430,7 +430,7 @@ Client.prototype.open = function(socketId, target) {
 
 	target.chan.firstUnread = 0;
 	target.chan.unread = 0;
-	target.chan.highlight = false;
+	target.chan.highlight = 0;
 
 	this.attachedClients[socketId].openChannel = target.chan.id;
 	this.lastActiveChannel = target.chan.id;

src/models/chan.js

@@ -26,7 +26,7 @@ function Chan(attr) {
 		type: Chan.Type.CHANNEL,
 		firstUnread: 0,
 		unread: 0,
-		highlight: false,
+		highlight: 0,
 		users: []
 	});
 }
@@ -78,7 +78,7 @@ Chan.prototype.pushMessage = function(client, msg, increasesUnread) {
 		}
 
 		if (msg.highlight) {
-			this.highlight = true;
+			this.highlight++;
 		}
 	}
 };

src/plugins/irc-events/message.js

@@ -106,20 +106,29 @@ module.exports = function(irc, network) {
 
 		// Do not send notifications for messages older than 15 minutes (znc buffer for example)
 		if (highlight && (!data.time || data.time > Date.now() - 900000)) {
-			let title = data.nick;
+			let title = chan.name;
+			let body = Helper.cleanIrcMessage(data.message);
 
+			// In channels, prepend sender nickname to the message
 			if (chan.type !== Chan.Type.QUERY) {
-				title += ` (${chan.name}) mentioned you`;
+				body = `${data.nick}: ${body}`;
-			} else {
+			}
-				title += " sent you a message";
+
+			// If a channel is active on any client, highlight won't increment and notification will say (0 mention)
+			if (chan.highlight > 0) {
+				title += ` (${chan.highlight} ${chan.type === Chan.Type.QUERY ? "new message" : "mention"}${chan.highlight > 1 ? "s" : ""})`;
+			}
+
+			if (chan.highlight > 1) {
+				body += `\n\n… and ${chan.highlight - 1} other message${chan.highlight > 2 ? "s" : ""}`;
 			}
 
 			client.manager.webPush.push(client, {
 				type: "notification",
 				chanId: chan.id,
 				timestamp: data.time || Date.now(),
-				title: `The Lounge: ${title}`,
+				title: title,
-				body: Helper.cleanIrcMessage(data.message)
+				body: body
 			}, true);
 		}
 	}