Check for settings allowing/forbidding editing/deleting messages

client/methods/deleteMessage.coffee

@@ -3,6 +3,9 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error 203, t('general.User_logged_out')
 
+		if not RocketChat.settings.get 'Message_AllowDeleting'
+			throw new Meteor.Error 'message-deleting-not-allowed', t('Message_deleting_not_allowed')
+
 		Tracker.nonreactive ->
 			ChatMessage.remove
 				_id: message._id

client/methods/updateMessage.coffee

@@ -3,6 +3,9 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error 203, t('User_logged_out')
 
+		if not RocketChat.settings.get 'Message_AllowEditing'
+			throw new Meteor.Error 'message-editing-not-allowed', t('Message_editing_not_allowed')
+
 		Tracker.nonreactive ->
 
 			message.ets = new Date(Date.now() + TimeSync.serverOffset())

i18n/en.i18n.json

@@ -117,6 +117,8 @@
   "Message" : "Message",
   "Message_AllowDeleting" : "Allow Message Deleting",
   "Message_AllowEditing" : "Allow Message Editing",
+  "Message_deleting_not_allowed": "Message deleting not allowed",
+  "Message_editing_not_allowed": "Message editing not allowed",
   "Message_KeepHistory" : "Keep Message History",
   "Message_removed" : "Message removed",
   "Message_ShowDeletedStatus" : "Show Deleted Status",

server/methods/deleteMessage.coffee

@@ -3,6 +3,10 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error('invalid-user', "[methods] deleteMessage -> Invalid user")
 
+		if not RocketChat.settings.get 'Message_AllowDeleting'
+			throw new Meteor.Error 'message-deleting-not-allowed', "[methods] updateMessage -> Message deleting not allowed"
+
+
 		console.log '[methods] deleteMessage -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
 
 		keepHistory = RocketChat.settings.get 'Message_KeepHistory'

server/methods/updateMessage.coffee

@@ -3,6 +3,9 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error('invalid-user', "[methods] updateMessage -> Invalid user")
 
+		if not RocketChat.settings.get 'Message_AllowEditing'
+			throw new Meteor.Error 'message-editing-not-allowed', "[methods] updateMessage -> Message editing not allowed"
+
 		console.log '[methods] updateMessage -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
 
 		# If we keep history of edits, insert a new message to store history information