Fixed RocketChat#13302

knrt10 · Mar 21, 2019 · 713fcae · 713fcae
1 parent 805a7eb
commit 713fcae
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git 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.name}}
+                                        {{/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
@@ -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
@@ -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,
 		}));
 	},
 };