Node.js based forum software built for the modern web
feat: add Messaging.isRoomMember() (#14779)
palmoni518925527adb3
diff --git a/src/messaging/rooms.js b/src/messaging/rooms.jsindex ad7b26eab4..7567414b28 100644--- a/src/messaging/rooms.js+++ b/src/messaging/rooms.js@@ -177,16 +177,25 @@ module.exports = function (Messaging) {]);};+ Messaging.isRoomMember = async (uid, roomIds) => {+ const single = !Array.isArray(roomIds);+ if (single) {+ roomIds = [roomIds];+ }+ const isMembers = await db.isMemberOfSortedSets(+ roomIds.map(id => `chat:room:${id}:uids`),+ uid+ );+ return single ? isMembers.pop() : isMembers;+ };+Messaging.isUserInRoom = async (uid, roomIds) => {let single = false;if (!Array.isArray(roomIds)) {roomIds = [roomIds];single = true;}- const inRooms = await db.isMemberOfSortedSets(- roomIds.map(id => `chat:room:${id}:uids`),- uid- );+ const inRooms = await Messaging.isRoomMember(uid, roomIds);const data = await Promise.all(roomIds.map(async (roomId, idx) => {const data = await plugins.hooks.fire('filter:messaging.isUserInRoom', {diff --git a/test/messaging.js b/test/messaging.jsindex b391d0f4a3..b271610e4a 100644--- a/test/messaging.js+++ b/test/messaging.js@@ -1074,4 +1074,45 @@ describe('Messaging Library', () => {assert(second.timestamp > second.prevTimestamp);});});++ describe('.isRoomMember()', () => {+ const plugins = require('../src/plugins');+ let memberRoomId;++ before(async () => {+ memberRoomId = await Messaging.newRoom(mocks.users.foo.uid, {+ uids: [mocks.users.bar.uid],+ });+ });++ it('should report actual membership', async () => {+ assert.strictEqual(await Messaging.isRoomMember(mocks.users.foo.uid, memberRoomId), true);+ assert.strictEqual(await Messaging.isRoomMember(mocks.users.herp.uid, memberRoomId), false);+ });++ it('should accept an array of roomIds', async () => {+ assert.deepStrictEqual(+ await Messaging.isRoomMember(mocks.users.bar.uid, [memberRoomId, 0]),+ [true, false]+ );+ });++ it('should not be overridable via filter:messaging.isUserInRoom', async () => {+ plugins.hooks.register('my-test-plugin', {+ hook: 'filter:messaging.isUserInRoom',+ method: async data => ({ ...data, inRoom: true }),+ });++ try {+ assert.strictEqual(+ await Messaging.isUserInRoom(mocks.users.herp.uid, memberRoomId), true+ );+ assert.strictEqual(+ await Messaging.isRoomMember(mocks.users.herp.uid, memberRoomId), false+ );+ } finally {+ plugins.hooks.unregister('my-test-plugin', 'filter:messaging.isUserInRoom');+ }+ });+ });});