Merge pull request #10061 from RocketChat/fix-read-receipt-error-on-e…

…diting-message [FIX] Message editing is crashing the server when read receipts are enabled
RocketChat · Mar 8, 2018 · bdad666 · bdad666
2 parents 37a8461 + f3f16de
commit bdad666
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/imports/message-read-receipt/server/hooks.js b/imports/message-read-receipt/server/hooks.js
@@ -2,6 +2,11 @@ import { ReadReceipt } from './lib/ReadReceipt';
 
 RocketChat.callbacks.add('afterSaveMessage', (message, room) => {
 
+	// skips this callback if the message was edited
+	if (message.editedAt) {
+		return message;
+	}
+
 	// set subscription as read right after message was sent
 	RocketChat.models.Subscriptions.setAsReadByRoomIdAndUserId(room._id, message.u._id);