Node.js based forum software built for the modern web
fix: merge notifications that share a mergeId with no differentiator (#14871)
palmoni5bd0b2535fad7
diff --git a/src/notifications.js b/src/notifications.jsindex 7400ca8206..32c4e4672f 100644--- a/src/notifications.js+++ b/src/notifications.js@@ -542,12 +542,8 @@ Notifications.merge = async function (notifications) {}, []);differentiators.forEach((differentiator) => {- let set;- if (differentiator === 0 && differentiators.length === 1) {- set = isolated;- } else {- set = isolated.filter(n => n.mergeId === (`${mergeId}|${differentiator}`));- }+ const target = differentiator === 0 ? mergeId : `${mergeId}|${differentiator}`;+ const set = isolated.filter(n => n.mergeId === target);const modifyIndex = notifications.indexOf(set[0]);if (modifyIndex === -1 || set.length === 1) {@@ -607,7 +603,7 @@ Notifications.merge = async function (notifications) {return true;}- return !(notifObj.mergeId === (mergeId + (differentiator ? `|${differentiator}` : '')) && idx !== modifyIndex);+ return !(notifObj.mergeId === target && idx !== modifyIndex);});});diff --git a/test/notifications.js b/test/notifications.jsindex b758139974..e136fcf1a0 100644--- a/test/notifications.js+++ b/test/notifications.js@@ -432,5 +432,32 @@ describe('Notifications', () => {assert.strictEqual(survivor.bodyShort, 'one');assert.strictEqual(survivor.mergeCount, 2);});++ it('should merge undifferentiated notifications alongside differentiated ones', async () => {+ const method = async (data) => {+ data.mergeIds.push('plugin-merge');+ return data;+ };+ plugins.hooks.register('notifications-merge-test', { hook: 'filter:notifications.mergeIds', method });++ let merged;+ try {+ merged = await notifications.merge([+ { nid: 'b1', mergeId: 'plugin-merge', bodyShort: 'bare one' },+ { nid: 'b2', mergeId: 'plugin-merge', bodyShort: 'bare two' },+ { nid: 'd1', mergeId: 'plugin-merge|7', bodyShort: 'seven one' },+ { nid: 'd2', mergeId: 'plugin-merge|7', bodyShort: 'seven two' },+ ]);+ } finally {+ plugins.hooks.unregister('notifications-merge-test', 'filter:notifications.mergeIds', method);+ }++ assert.strictEqual(merged.length, 2);+ const bare = merged.find(n => n.mergeId === 'plugin-merge');+ assert.strictEqual(bare.bodyShort, 'bare one');+ assert.strictEqual(bare.mergeCount, 2);+ const differentiated = merged.find(n => n.mergeId === 'plugin-merge|7');+ assert.strictEqual(differentiated.mergeCount, 2);+ });});});