Block message editing based on admin settings

client/lib/chatMessages.coffee

@@ -48,6 +48,14 @@ class @ChatMessages
 
 		return unless hasPermission or (editAllowed and editOwn)
 		return if element.classList.contains("system")
+
+		blockEditInMinutes = RocketChat.settings.get 'Message_AllowEditing_BlockEditInMinutes'
+		if blockEditInMinutes? and blockEditInMinutes isnt 0
+			msgTs = moment(message.ts) if message.ts?
+			currentTsDiff = moment().diff(msgTs, 'minutes') if msgTs?
+			if currentTsDiff > blockEditInMinutes
+				return
+
 		this.clearEditing()
 		this.input.value = message.msg
 		this.editing.element = element

client/methods/updateMessage.coffee

@@ -10,8 +10,17 @@ Meteor.methods
 		editOwn = originalMessage?.u?._id is Meteor.userId()
 
 		unless hasPermission or (editAllowed and editOwn)
+			toastr.error t('Message_editing_not_allowed')
 			throw new Meteor.Error 'message-editing-not-allowed', t('Message_editing_not_allowed')
 
+		blockEditInMinutes = RocketChat.settings.get 'Message_AllowEditing_BlockEditInMinutes'
+		if blockEditInMinutes? and blockEditInMinutes isnt 0
+			msgTs = moment(originalMessage.ts) if originalMessage.ts?
+			currentTsDiff = moment().diff(msgTs, 'minutes') if msgTs?
+			if currentTsDiff > blockEditInMinutes
+				toastr.error t('Message_editing_blocked')
+				throw new Meteor.Error 'message-editing-blocked'
+
 		Tracker.nonreactive ->
 
 			message.ets = new Date(Date.now() + TimeSync.serverOffset())

client/views/admin/admin.coffee

@@ -6,7 +6,7 @@ Template.admin.helpers
 	sections: ->
 		group = FlowRouter.getParam('group')
 		group ?= Settings.findOne({ type: 'group' })?._id
-		settings = Settings.find({ group: group }, {sort: {section: 1}}).fetch()
+		settings = Settings.find({ group: group }, {sort: {section: 1, i18nLabel: 1}}).fetch()
 		sections = {}
 		for setting in settings
 			sections[setting.section or ''] ?= []

client/views/app/message.coffee

@@ -42,10 +42,19 @@ Template.message.helpers
 	pinned: ->
 		return this.pinned
 	canEdit: ->
-		if RocketChat.authz.hasAtLeastOnePermission('edit-message', this.rid )
-			return true
+		hasPermission = RocketChat.authz.hasAtLeastOnePermission('edit-message', this.rid)
+		isEditAllowed = RocketChat.settings.get 'Message_AllowEditing'
+		editOwn = this.u?._id is Meteor.userId()
+
+		return unless hasPermission or (isEditAllowed and editOwn)
 
-		return RocketChat.settings.get('Message_AllowEditing') and this.u?._id is Meteor.userId()
+		blockEditInMinutes = RocketChat.settings.get 'Message_AllowEditing_BlockEditInMinutes'
+		if blockEditInMinutes? and blockEditInMinutes isnt 0
+			msgTs = moment(this.ts) if this.ts?
+			currentTsDiff = moment().diff(msgTs, 'minutes') if msgTs?
+			return currentTsDiff < blockEditInMinutes
+		else
+			return true
 
 	canDelete: ->
 		if RocketChat.authz.hasAtLeastOnePermission('delete-message', this.rid )

i18n/en.i18n.json

@@ -166,9 +166,11 @@
   "Message" : "Message",
   "Message_AllowDeleting" : "Allow Message Deleting",
   "Message_AllowEditing" : "Allow Message Editing",
+  "Message_AllowEditing_BlockEditInMinutes" : "Block message editing after (in minutes - 0 to disable)",
   "Message_AllowPinning" : "Allow Message Pinning",
   "Message_deleting_not_allowed" : "Message deleting not allowed",
   "Message_editing_not_allowed" : "Message editing not allowed",
+  "Message_editing_blocked" : "This message cannot be edited anymore",
   "Message_MaxAllowedSize" : "Message max allowed size",
   "Message_pinning_not_allowed" : "Message pinning not allowed",
   "Message_KeepHistory" : "Keep Message History",

i18n/pt.i18n.json

@@ -152,9 +152,11 @@
   "Message" : "Mensagem",
   "Message_AllowDeleting" : "Permitir Exclusão de Mensagem",
   "Message_AllowEditing" : "Permitir Edição de Mensagem",
+  "Message_AllowEditing_BlockEditInMinutes" : "Bloquear edição de mensagens após (em minutos - 0 para desabilitar)",
   "Message_AllowPinning" : "Permitir Fixar Mensagem",
   "Message_deleting_not_allowed" : "Exclusão de mensagem não permitido",
   "Message_editing_not_allowed" : "Edição de mensagem não permitido",
+  "Message_editing_blocked" : "Esta mensagem não pode mais ser editada",
   "Message_pinning_not_allowed" : "Não Permitir Fixar Mensagem",
   "Message_KeepHistory" : "Manter Histórico de Mensagens",
   "Message_removed" : "Mensagem removida",

packages/rocketchat-lib/client/MessageAction.coffee

@@ -68,7 +68,19 @@ Meteor.startup ->
 				input.focus()
 			, 200
 		validation: (message) ->
-			return RocketChat.authz.hasAtLeastOnePermission('edit-message', message.rid ) or RocketChat.settings.get('Message_AllowEditing') and message.u?._id is Meteor.userId()
+			hasPermission = RocketChat.authz.hasAtLeastOnePermission('edit-message', message.rid)
+			isEditAllowed = RocketChat.settings.get 'Message_AllowEditing'
+			editOwn = message.u?._id is Meteor.userId()
+
+			return unless hasPermission or (isEditAllowed and editOwn)
+
+			blockEditInMinutes = RocketChat.settings.get 'Message_AllowEditing_BlockEditInMinutes'
+			if blockEditInMinutes? and blockEditInMinutes isnt 0
+				msgTs = moment(message.ts) if message.ts?
+				currentTsDiff = moment().diff(msgTs, 'minutes') if msgTs?
+				return currentTsDiff < blockEditInMinutes
+			else
+				return true
 		order: 1
 
 	RocketChat.MessageAction.addButton

packages/rocketchat-lib/settings/server/startup.coffee

@@ -51,6 +51,7 @@ Meteor.startup ->
 
 	RocketChat.settings.addGroup 'Message'
 	RocketChat.settings.add 'Message_AllowEditing', true, { type: 'boolean', group: 'Message', public: true }
+	RocketChat.settings.add 'Message_AllowEditing_BlockEditInMinutes', 0, { type: 'int', group: 'Message', public: true }
 	RocketChat.settings.add 'Message_AllowDeleting', true, { type: 'boolean', group: 'Message', public: true }
 	RocketChat.settings.add 'Message_AllowPinning', true, { type: 'boolean', group: 'Message', public: true }
 	RocketChat.settings.add 'Message_ShowEditedStatus', true, { type: 'boolean', group: 'Message', public: true }

server/methods/updateMessage.coffee

@@ -12,6 +12,13 @@ Meteor.methods
 		unless hasPermission or (editAllowed and editOwn)
 			throw new Meteor.Error 'message-editing-not-allowed', "[methods] updateMessage -> Message editing not allowed"
 
+		blockEditInMinutes = RocketChat.settings.get 'Message_AllowEditing_BlockEditInMinutes'
+		if blockEditInMinutes? and blockEditInMinutes isnt 0
+			msgTs = moment(originalMessage.ts) if originalMessage.ts?
+			currentTsDiff = moment().diff(msgTs, 'minutes') if msgTs?
+			if currentTsDiff > blockEditInMinutes
+				throw new Meteor.Error 'message-editing-blocked'
+
 		console.log '[methods] updateMessage -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
 
 		# If we keep history of edits, insert a new message to store history information