From 2a7411a3e0ea6645858dd94ef3193af896d1a4f3 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 28 Oct 2015 18:05:50 +0100
Subject: [PATCH] Fix problems with data load
---
client/lib/RoomHistoryManager.coffee | 2 +-
server/methods/loadHistory.coffee | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/client/lib/RoomHistoryManager.coffee b/client/lib/RoomHistoryManager.coffee
index 4ec46f52de3..44807d2d76c 100644
--- a/client/lib/RoomHistoryManager.coffee
+++ b/client/lib/RoomHistoryManager.coffee
@@ -27,7 +27,7 @@
if lastMessage?
ts = lastMessage.ts
else
- ts = new Date
+ ts = undefined
ls = undefined
typeName = undefined
diff --git a/server/methods/loadHistory.coffee b/server/methods/loadHistory.coffee
index 94b0a3a9db1..f7058298f32 100644
--- a/server/methods/loadHistory.coffee
+++ b/server/methods/loadHistory.coffee
@@ -14,7 +14,12 @@ Meteor.methods
if not RocketChat.settings.get 'Message_ShowEditedStatus'
options.fields = { ets: 0 }
- messages = _.map RocketChat.models.Messages.findVisibleByRoomIdBeforeTimestamp(rid, end, options).fetch(), (message) ->
+ if end?
+ records = RocketChat.models.Messages.findVisibleByRoomIdBeforeTimestamp(rid, end, options).fetch()
+ else
+ records = RocketChat.models.Messages.findVisibleByRoomId(rid, options).fetch()
+
+ messages = _.map records, (message) ->
message.starred = _.findWhere message.starred, { _id: fromId }
return message
--
GitLab