Skip to content

Node.js based forum software built for the modern web

fix: moderation note privileges

Barış Soner Uşaklı2d06a07531de
diff --git a/install/package.json b/install/package.json
index 8d5524f481..712d64cab8 100644
--- a/install/package.json
+++ b/install/package.json
@@ -112,10 +112,10 @@
"nodebb-plugin-spam-be-gone": "2.3.4",
"nodebb-plugin-web-push": "0.8.1",
"nodebb-rewards-essentials": "1.0.3",
- "nodebb-theme-harmony": "3.1.14",
+ "nodebb-theme-harmony": "3.1.15",
"nodebb-theme-lavender": "8.0.6",
"nodebb-theme-peace": "3.0.6",
- "nodebb-theme-persona": "15.1.8",
+ "nodebb-theme-persona": "15.1.9",
"nodebb-widget-essentials": "8.0.9",
"nodemailer": "9.0.3",
"nprogress": "0.2.0",
diff --git a/public/src/client/account/info.js b/public/src/client/account/info.js
index 5dfc698769..86188fc08b 100644
--- a/public/src/client/account/info.js
+++ b/public/src/client/account/info.js
@@ -38,6 +38,15 @@ define('forum/account/info', ['forum/account/header', 'alerts', 'forum/account/s
});
});
+ noteList.on('click', '[component="account/moderation-note/delete"]', async function () {
+ const parent = $(this).parents('[data-id]');
+ socket.emit('user.deleteModerationNote', {
+ uid: ajaxify.data.uid,
+ id: parent.attr('data-id'),
+ }).then(() => {
+ parent.remove();
+ }).catch(alerts.error);
+ });
noteList.on('click', '[component="account/moderation-note/edit"]', function () {
const parent = $(this).parents('[data-id]');
diff --git a/src/privileges/users.js b/src/privileges/users.js
index e2f82dedcf..a042dbf8eb 100644
--- a/src/privileges/users.js
+++ b/src/privileges/users.js
@@ -73,10 +73,10 @@ async function filterIsModerator(cid, uid, isModerator) {
return data.isModerator;
}
-privsUsers.canEdit = async function (callerUid, uid) {
+privsUsers.canEdit = async function (callerUid, uid, allowSelfEdit = true) {
callerUid = String(callerUid);
uid = String(uid);
- if (callerUid === uid) {
+ if (allowSelfEdit && callerUid === uid) {
return true;
}
diff --git a/src/socket.io/user.js b/src/socket.io/user.js
index 671b3bd7bf..2bb7a23c80 100644
--- a/src/socket.io/user.js
+++ b/src/socket.io/user.js
@@ -142,7 +142,7 @@ SocketUser.setModerationNote = async function (socket, data) {
note: data.note,
timestamp: Date.now(),
};
- let canEdit = await privileges.users.canEdit(socket.uid, data.uid);
+ let canEdit = await privileges.users.canEdit(socket.uid, data.uid, false);
if (!canEdit) {
canEdit = await user.isModeratorOfAnyCategory(socket.uid);
}
@@ -158,15 +158,21 @@ SocketUser.editModerationNote = async function (socket, data) {
if (!socket.uid || !data || !data.uid || !data.note || !data.id) {
throw new Error('[[error:invalid-data]]');
}
+ const existingNote = await db.getObject(`uid:${data.uid}:moderation:note:${data.id}`);
+ if (!existingNote) {
+ throw new Error('[[error:invalid-data]]');
+ }
+ const editingSelfNote = String(existingNote.uid) === String(socket.uid);
const noteData = {
note: data.note,
timestamp: data.id,
};
- let canEdit = await privileges.users.canEdit(socket.uid, data.uid);
+ let canEdit = await privileges.users.canEdit(socket.uid, data.uid, false);
+ const isAdmin = await user.isAdministrator(socket.uid);
if (!canEdit) {
canEdit = await user.isModeratorOfAnyCategory(socket.uid);
}
- if (!canEdit) {
+ if (!canEdit || (!editingSelfNote && !isAdmin)) {
throw new Error('[[error:no-privileges]]');
}
@@ -174,6 +180,23 @@ SocketUser.editModerationNote = async function (socket, data) {
return await user.getModerationNotesByIds(data.uid, [data.id]);
};
+SocketUser.deleteModerationNote = async function (socket, data) {
+ if (!socket.uid || !data || !data.uid || !data.id) {
+ throw new Error('[[error:invalid-data]]');
+ }
+ const [existingNote, isAdmin] = await Promise.all([
+ db.getObject(`uid:${data.uid}:moderation:note:${data.id}`),
+ user.isAdministrator(socket.uid),
+ ]);
+ if (!existingNote) {
+ throw new Error('[[error:invalid-data]]');
+ }
+ if (!isAdmin) {
+ throw new Error('[[error:no-privileges]]');
+ }
+ await user.deleteModerationNote({ uid: data.uid, noteData: { timestamp: data.id } });
+};
+
SocketUser.getCustomReasons = async function (socket, { type }) {
const canBan = await privileges.users.hasBanPrivilege(socket.uid);
if (!canBan) {
diff --git a/src/user/info.js b/src/user/info.js
index 787bcfed1f..9e33195612 100644
--- a/src/user/info.js
+++ b/src/user/info.js
@@ -156,4 +156,9 @@ module.exports = function (User) {
User.setModerationNote = async ({ uid, noteData }) => {
await db.setObject(`uid:${uid}:moderation:note:${noteData.timestamp}`, noteData);
};
+
+ User.deleteModerationNote = async ({ uid, noteData }) => {
+ await db.delete(`uid:${uid}:moderation:note:${noteData.timestamp}`);
+ await db.sortedSetRemove(`uid:${uid}:moderation:notes`, noteData.timestamp);
+ };
};