fix(chats): mark notifications with matching roomId read when opening a room (#14450)

Messaging.markRoomNotificationsRead only matched notifications whose nid
starts with chat_<roomId>_, so chat-related notifications created by
plugins (e.g. message reactions) stayed unread even after the user opened
the room. Topics already handle this by matching unread notifications on
the tid field, and chatsAPI.mark did the same with the roomId field.

Match unread notifications by their roomId field as well, and reuse
markRoomNotificationsRead in chatsAPI.mark instead of duplicating the
logic there.

Author: palmoni5

src/api/chats.js

@@ -6,7 +6,6 @@ const db = require('../database');
 const user = require('../user');
 const meta = require('../meta');
 const messaging = require('../messaging');
-const notifications = require('../notifications');
 const privileges = require('../privileges');
 const plugins = require('../plugins');
 const utils = require('../utils');
@@ -210,9 +209,7 @@ chatsAPI.mark = async (caller, data) => {
 	} else {
 		await messaging.markRead(caller.uid, roomId);
 		socketHelpers.emitToUids('event:chats.markedAsRead', { roomId: roomId }, [caller.uid]);
-		const nids = await user.notifications.getUnreadByField(caller.uid, 'roomId', [roomId]);
-		await notifications.markReadMultiple(nids, caller.uid);
-		user.notifications.pushCount(caller.uid);
+		await messaging.markRoomNotificationsRead(caller.uid, roomId);
 	}
 
 	socketHelpers.emitToUids('event:chats.mark', { roomId, state }, [caller.uid]);

src/messaging/notifications.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const winston = require('winston');
+const _ = require('lodash');
 
 const batch = require('../batch');
 const db = require('../database');
@@ -30,10 +31,16 @@ module.exports = function (Messaging) {
 	};
 
 	Messaging.markRoomNotificationsRead = async (uid, roomId) => {
-		const chatNids = await db.getSortedSetScan({
-			key: `uid:${uid}:notifications:unread`,
-			match: `chat_${roomId}_*`,
-		});
+		const [scannedNids, fieldNids] = await Promise.all([
+			db.getSortedSetScan({
+				key: `uid:${uid}:notifications:unread`,
+				match: `chat_${roomId}_*`,
+			}),
+			// covers notifications that reference the room but use a different
+			// nid format (e.g. those created by plugins)
+			user.notifications.getUnreadByField(uid, 'roomId', [roomId]),
+		]);
+		const chatNids = _.uniq(scannedNids.concat(fieldNids));
 		if (chatNids.length) {
 			await notifications.markReadMultiple(chatNids, uid);
 			await user.notifications.pushCount(uid);