From de2096030d5f24b8778e522d25d3e85cb130df7d Mon Sep 17 00:00:00 2001
From: JungEon Kim <38336615+jungeonkim@users.noreply.github.com>
Date: Wed, 15 May 2019 23:28:34 +0900
Subject: [PATCH] [IMPROVEMENT] Don't group messages with different alias
 (#14257)

---
 app/ui-message/client/message.html | 2 +-
 app/ui-message/client/message.js   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/ui-message/client/message.html b/app/ui-message/client/message.html
index 571b6e7bdce..a155f169704 100644
--- a/app/ui-message/client/message.html
+++ b/app/ui-message/client/message.html
@@ -1,5 +1,5 @@
 <template name="message">
-	<li id="{{templatePrefix}}{{msg._id}}" data-id="{{msg._id}}" data-context={{actionContext}} class="message {{ignoredClass}} {{sequentialClass}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{collapsed}} {{customClass}}" data-username="{{msg.u.username}}" data-tmid="{{msg.tmid}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
+	<li id="{{templatePrefix}}{{msg._id}}" data-id="{{msg._id}}" data-context={{actionContext}} class="message {{ignoredClass}} {{sequentialClass}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{collapsed}} {{customClass}}" data-username="{{msg.u.username}}" data-tmid="{{msg.tmid}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}" data-alias="{{msg.alias}}">
 		{{#if isThreadReply}}
 			{{> messageThread parentMessage=parentMessage threadMessage=threadMessage following=msg.following avatar=msg.u.username msg=msg body=body class=bodyClass}}
 		{{else}}
diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js
index 23c07058a82..5436075563c 100644
--- a/app/ui-message/client/message.js
+++ b/app/ui-message/client/message.js
@@ -556,6 +556,10 @@ const isSequential = (currentNode, previousNode, forceDate, period, showDateSepa
 		return false;
 	}
 
+	if (previousDataset.alias !== currentDataset.alias) {
+		return false;
+	}
+
 	if (parseInt(currentDataset.timestamp) - parseInt(previousDataset.timestamp) <= period) {
 		return true;
 	}