Skip to content

Node.js based forum software built for the modern web

refactor: more roomIds checks

Barış Soner Uşaklı68edde626b3f
diff --git a/src/messaging/edit.js b/src/messaging/edit.js
index 6c366ea471..ca60447e74 100644
--- a/src/messaging/edit.js
+++ b/src/messaging/edit.js
@@ -102,6 +102,9 @@ module.exports = function (Messaging) {
Messaging.canDelete = async (messageId, uid) => await canEditDelete(messageId, uid, 'delete');
Messaging.canPin = async (roomId, uid) => {
+ if (utils.isNumber(roomId)) {
+ throw new Error('[[error:invalid-data]]');
+ }
const [isAdmin, isGlobalMod, inRoom, isRoomOwner] = await Promise.all([
user.isAdministrator(uid),
user.isGlobalModerator(uid),
diff --git a/src/messaging/rooms.js b/src/messaging/rooms.js
index 0fdfd018a1..8ca4d6e1f1 100644
--- a/src/messaging/rooms.js
+++ b/src/messaging/rooms.js
@@ -336,9 +336,10 @@ module.exports = function (Messaging) {
}
Messaging.leaveRoom = async (uids, roomId) => {
- const isInRoom = await Promise.all(
- uids.map(uid => Messaging.isUserInRoom(uid, roomId))
- );
+ if (!utils.isNumber(roomId) || !Array.isArray(uids)) {
+ throw new Error('[[error:invalid-data]]');
+ }
+ const isInRoom = await Messaging.isUsersInRoom(uids, roomId);
uids = uids.filter((uid, index) => isInRoom[index]);
const keys = uids
@@ -363,6 +364,9 @@ module.exports = function (Messaging) {
};
Messaging.leaveRooms = async (uid, roomIds) => {
+ if (!Array.isArray(roomIds)) {
+ throw new Error('[[error:invalid-data]]');
+ }
const isInRoom = await Messaging.isUserInRoom(uid, roomIds);
roomIds = roomIds.filter((roomId, index) => isInRoom[index]);
if (!roomIds.length) {