From 173cca4eba24508de90e50a7ba7bb4023ec7835e Mon Sep 17 00:00:00 2001
From: Anton Kazarinov <askazarinov@gmail.com>
Date: Thu, 20 Feb 2020 14:32:48 +0500
Subject: [PATCH] fix: layout of starred messages

---
 app/message-star/client/views/starredMessages.html | 2 +-
 app/message-star/client/views/starredMessages.js   | 3 +++
 app/ui-message/client/message.js                   | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/message-star/client/views/starredMessages.html b/app/message-star/client/views/starredMessages.html
index 0b49c3e2d6f37..235bc54178e36 100644
--- a/app/message-star/client/views/starredMessages.html
+++ b/app/message-star/client/views/starredMessages.html
@@ -10,7 +10,7 @@ <h2>{{_ "No_starred_messages"}}</h2>
 		<ul class="list clearfix">
 			{{# with messageContext}}
 				{{#each msg in messages}}
-					{{>message msg=msg room=room groupable=false subscription=subscription settings=settings u=u}}
+					{{>message msg=(populateMessage msg) room=room groupable=false subscription=subscription settings=settings u=u}}
 				{{/each}}
 			{{/with}}
 		</ul>
diff --git a/app/message-star/client/views/starredMessages.js b/app/message-star/client/views/starredMessages.js
index 7b97d7f63bc74..4fa65b9c0ce6e 100644
--- a/app/message-star/client/views/starredMessages.js
+++ b/app/message-star/client/views/starredMessages.js
@@ -19,6 +19,9 @@ Template.starredMessages.helpers({
 		const instance = Template.instance();
 		return instance.messages.find({}, { limit: instance.limit.get(), sort: { ts: -1 } });
 	},
+	populateMessage(msg) {
+		return { ...msg, actionContext: 'starred' };
+	},
 	hasMore() {
 		return Template.instance().hasMore.get();
 	},
diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js
index b375bf62a7952..56bfc7c5b39c7 100644
--- a/app/ui-message/client/message.js
+++ b/app/ui-message/client/message.js
@@ -203,6 +203,9 @@ Template.message.helpers({
 	},
 	timestamp() {
 		const { msg } = this;
+		if (typeof msg.ts === 'string') {
+			return +new Date(msg.ts);
+		}
 		return +msg.ts;
 	},
 	chatops() {