From 02998669c31e14e22c1d53dc32f848a304beeb37 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 21 Oct 2016 14:36:34 -0400 Subject: [PATCH] introducing option to disable chat message editing/deletion --- package.json | 4 ++-- src/controllers/api.js | 1 + src/messaging/edit.js | 4 +++- src/views/admin/settings/chat.tpl | 10 ++++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 86f00a3335..d9169ffe3d 100644 --- a/package.json +++ b/package.json @@ -62,8 +62,8 @@ "nodebb-plugin-spam-be-gone": "0.4.10", "nodebb-rewards-essentials": "0.0.9", "nodebb-theme-lavender": "3.0.15", - "nodebb-theme-persona": "4.1.67", - "nodebb-theme-vanilla": "5.1.45", + "nodebb-theme-persona": "4.1.68", + "nodebb-theme-vanilla": "5.1.46", "nodebb-widget-essentials": "2.0.12", "nodemailer": "2.6.4", "nodemailer-sendmail-transport": "1.0.0", diff --git a/src/controllers/api.js b/src/controllers/api.js index 36261a23c1..ee35aaa55d 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -42,6 +42,7 @@ apiController.getConfig = function (req, res, next) { config.allowTopicsThumbnail = parseInt(meta.config.allowTopicsThumbnail, 10) === 1; config.usePagination = parseInt(meta.config.usePagination, 10) === 1; config.disableChat = parseInt(meta.config.disableChat, 10) === 1; + config.disableChatMessageEditing = parseInt(meta.config.disableChatMessageEditing, 10) === 1; config.socketioTransports = nconf.get('socket.io:transports') || ['polling', 'websocket']; config.websocketAddress = nconf.get('socket.io:address') || ''; config.maxReconnectionAttempts = meta.config.maxReconnectionAttempts || 5; diff --git a/src/messaging/edit.js b/src/messaging/edit.js index c60e264cbf..b472aea261 100644 --- a/src/messaging/edit.js +++ b/src/messaging/edit.js @@ -45,7 +45,9 @@ module.exports = function (Messaging) { }; Messaging.canEdit = function (messageId, uid, callback) { - if (parseInt(meta.config.disableChat) === 1) { + if (parseInt(meta.config.disableChat, 10) === 1) { + return callback(null, false); + } else if (parseInt(meta.config.disableChatMessageEditing, 10) === 1) { return callback(null, false); } diff --git a/src/views/admin/settings/chat.tpl b/src/views/admin/settings/chat.tpl index 5f4d0b8315..c4023b8ad7 100644 --- a/src/views/admin/settings/chat.tpl +++ b/src/views/admin/settings/chat.tpl @@ -13,6 +13,16 @@ +
+
+ +
+

Administrators and global moderators are exempt from this restriction

+
+