Node.js based forum software built for the modern web
fix: uid can be a groupname in groups.join/leave
Barış Soner Uşaklı857680ceb82b
diff --git a/src/groups/join.js b/src/groups/join.jsindex 9fb02ec0bb..2c037ade85 100644--- a/src/groups/join.js+++ b/src/groups/join.js@@ -6,6 +6,7 @@ const db = require('../database');const user = require('../user');const plugins = require('../plugins');const cache = require('../cache');+const utils = require('../utils');module.exports = function (Groups) {Groups.join = async function (groupNames, uid) {@@ -26,7 +27,7 @@ module.exports = function (Groups) {const [isMembers, exists, isAdmin] = await Promise.all([Groups.isMemberOfGroups(uid, groupNames),Groups.exists(groupNames),- user.isAdministrator(uid),+ utils.isNumber(uid) ? user.isAdministrator(uid) : false,]);const groupsToCreate = groupNames.filter((groupName, index) => groupName && !exists[index]);@@ -91,6 +92,9 @@ module.exports = function (Groups) {}async function setGroupTitleIfNotSet(groupNames, uid) {+ if (!utils.isNumber(uid)) {+ return;+ }const ignore = ['registered-users', 'verified-users', 'unverified-users', Groups.BANNED_USERS];groupNames = groupNames.filter(groupName => !ignore.includes(groupName) && !Groups.isPrivilegeGroup(groupName)diff --git a/src/groups/leave.js b/src/groups/leave.jsindex ca591a5957..35f1668a95 100644--- a/src/groups/leave.js+++ b/src/groups/leave.js@@ -7,6 +7,7 @@ const user = require('../user');const plugins = require('../plugins');const cache = require('../cache');const messaging = require('../messaging');+const utils = require('../utils');module.exports = function (Groups) {Groups.leave = async function (groupNames, uid) {@@ -82,6 +83,9 @@ module.exports = function (Groups) {}async function clearGroupTitleIfSet(groupNames, uid) {+ if (!utils.isNumber(uid)) {+ return;+ }groupNames = groupNames.filter(groupName => groupName !== 'registered-users' &&groupName !== 'unverified-users' &&