From 2f8c301abaf5b0c4c80785723dab5ddb4727cfb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 12 Jul 2023 20:43:53 -0400 Subject: [PATCH] fix groups reference --- src/socket.io/modules.js | 5 +++-- src/topics/sorted.js | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js index 809fe8fafa..559bbdd5be 100644 --- a/src/socket.io/modules.js +++ b/src/socket.io/modules.js @@ -7,6 +7,7 @@ const Messaging = require('../messaging'); const utils = require('../utils'); const user = require('../user'); const privileges = require('../privileges'); +const groups = require('../groups'); const SocketModules = module.exports; @@ -108,8 +109,8 @@ async function joinLeave(socket, roomIds, method, prefix = 'chat_room') { await Promise.all(roomIds.map(async (roomId, idx) => { const isPublic = roomData[idx] && roomData[idx].public; - const groups = roomData[idx] && roomData[idx].groups; - if (isAdmin || (inRooms[idx] && (!isPublic || await groups.isMemberOfAny(socket.uid, groups)))) { + const roomGroups = roomData[idx] && roomData[idx].groups; + if (isAdmin || (inRooms[idx] && (!isPublic || await groups.isMemberOfAny(socket.uid, roomGroups)))) { socket[method](`${prefix}_${roomId}`); } })); diff --git a/src/topics/sorted.js b/src/topics/sorted.js index 7899a2f8d0..a1d809fb48 100644 --- a/src/topics/sorted.js +++ b/src/topics/sorted.js @@ -112,7 +112,9 @@ module.exports = function (Topics) { if (params.term === 'alltime' && !params.cids && !params.tags.length && params.filter !== 'watched' && !params.floatPinned) { return tids; } - const topicData = await Topics.getTopicsFields(tids, ['tid', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned']); + const topicData = await Topics.getTopicsFields(tids, [ + 'tid', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned', + ]); const sortMap = { recent: sortRecent, old: sortOld,