Merge pull request #84 from RocketChat/features/prevent-messages-removal

Features/prevent messages removal
RocketChat · Jun 1, 2015 · 32c5efc · 32c5efc
2 parents 6f7c002 + a2135f6
commit 32c5efc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/client/lib/RoomHistoryManager.coffee b/client/lib/RoomHistoryManager.coffee
@@ -1,5 +1,5 @@
 @RoomHistoryManager = new class
-	defaultLimit = 30
+	defaultLimit = 20
 
 	histories = {}
 
@@ -27,7 +27,15 @@
 
 		$('.messages-box .wrapper').data('previous-height', $('.messages-box .wrapper').get(0)?.scrollHeight - $('.messages-box .wrapper').get(0)?.scrollTop)
 
-		Meteor.call 'loadHistory', roomId, room.from, limit, room.loaded, (err, result) ->
+		lastMessage = ChatMessageHistory.findOne({rid: roomId}, {sort: {ts: 1}})
+		lastMessage ?= ChatMessage.findOne({rid: roomId}, {sort: {ts: 1}})
+
+		if lastMessage?
+			ts = lastMessage.ts
+		else
+			ts = new Date
+
+		Meteor.call 'loadHistory', roomId, ts, limit, 0, (err, result) ->
 			ChatMessageHistory.insert item for item in result
 
 			room.isLoading.set false

diff --git a/client/lib/collections.coffee b/client/lib/collections.coffee
@@ -1,2 +1,7 @@
 @UserAndRoom = new Meteor.Collection null
 @ChatMessageHistory = new Meteor.Collection null
+
+Meteor.startup ->
+	ChatMessage.find().observe
+		removed: (record) ->
+			ChatMessageHistory.insert record
diff --git a/server/methods/loadHistory.coffee b/server/methods/loadHistory.coffee
@@ -6,7 +6,7 @@ Meteor.methods
 		query =
 			rid: rid
 			ts:
-				$lte: end
+				$lt: end
 
 		options =
 			sort: