From 0b5008491465c60ea770bd48354739c9e8e963f9 Mon Sep 17 00:00:00 2001
From: knrt10 <tripathi.kautilya@gmail.com>
Date: Thu, 21 Mar 2019 22:47:03 +0530
Subject: [PATCH] Fixed #13302

---
 imports/message-read-receipt/client/readReceipts.html  | 6 +++++-
 imports/message-read-receipt/client/readReceipts.js    | 5 ++++-
 imports/message-read-receipt/server/lib/ReadReceipt.js | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/imports/message-read-receipt/client/readReceipts.html b/imports/message-read-receipt/client/readReceipts.html
index 3a81ee9cdcdfd..a4e3e43bace6d 100644
--- a/imports/message-read-receipt/client/readReceipts.html
+++ b/imports/message-read-receipt/client/readReceipts.html
@@ -6,7 +6,11 @@
 		<ul class="read-receipts">
 			{{#each receipts}}
 				<li class="read-receipts__user background-transparent-dark-hover">
-					{{> avatar username=user.username}}
+                                       {{#if user}}
+                                            {{> avatar username=user.username}}
+                                       {{else}}
+                                            {{> avatar username=guest.username}}
+                                       {{/if}}
 					<div class="read-receipts__name color-primary-font-color">{{displayName}}</div>
 					<span class="read-receipts__time color-info-font-color" title="{{dateTime}}">{{time}}</span>
 				</li>
diff --git a/imports/message-read-receipt/client/readReceipts.js b/imports/message-read-receipt/client/readReceipts.js
index bc59874f85a4f..9a1fb6c07a158 100644
--- a/imports/message-read-receipt/client/readReceipts.js
+++ b/imports/message-read-receipt/client/readReceipts.js
@@ -12,7 +12,10 @@ Template.readReceipts.helpers({
 		return Template.instance().readReceipts.get();
 	},
 	displayName() {
-		return (settings.get('UI_Use_Real_Name') && this.user.name) || this.user.username;
+		if (this.user) {
+			return (settings.get('UI_Use_Real_Name') && this.user.name) || this.user.username;
+		}
+		return this.guest.name;
 	},
 	time() {
 		return moment(this.ts).format('L LTS');
diff --git a/imports/message-read-receipt/server/lib/ReadReceipt.js b/imports/message-read-receipt/server/lib/ReadReceipt.js
index aa278884e0cda..abaf8aa02d579 100644
--- a/imports/message-read-receipt/server/lib/ReadReceipt.js
+++ b/imports/message-read-receipt/server/lib/ReadReceipt.js
@@ -81,6 +81,7 @@ export const ReadReceipt = {
 		return ReadReceipts.findByMessageId(message._id).map((receipt) => ({
 			...receipt,
 			user: Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),
+			guest: message.u,
 		}));
 	},
 };