From 8e73187bf131a718c4b58b567ee3da83a727f511 Mon Sep 17 00:00:00 2001
From: mrsimpson <github@beimir.net>
Date: Fri, 22 May 2020 01:38:46 +0200
Subject: [PATCH] Chatpal: Fix avatar display in results

---
 app/chatpal-search/client/template/result.html | 2 +-
 app/chatpal-search/client/template/result.js   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/chatpal-search/client/template/result.html b/app/chatpal-search/client/template/result.html
index 45877e108e57..c0c410f3e934 100644
--- a/app/chatpal-search/client/template/result.html
+++ b/app/chatpal-search/client/template/result.html
@@ -111,7 +111,7 @@ <h2>
 		</h2>
 		<div class="chatpal-avatar">
 			<div class="chatpal-avatar-image"
-				 style="background-image:url({{getAvatarUrl cleanUsername }});"></div>
+				 style="background-image:url({{getAvatarUrl username }});"></div>
 		</div>
 		<span class="chatpal-name">{{username}}</span>
 		<span class="chatpal-time">{{time}}</span>
diff --git a/app/chatpal-search/client/template/result.js b/app/chatpal-search/client/template/result.js
index 751e92897da9..4268444de28c 100644
--- a/app/chatpal-search/client/template/result.js
+++ b/app/chatpal-search/client/template/result.js
@@ -6,8 +6,8 @@ import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { DateFormat } from '../../../lib';
 import { roomTypes, getURL } from '../../../utils';
 import { Subscriptions } from '../../../models';
+import { getUserAvatarURL as getAvatarUrl } from '../../../utils/lib/getUserAvatarURL';
 
-const getAvatarUrl = (username) => getURL(`/avatar/${ username }?_dc=undefined`);
 const getDMUrl = (username) => getURL(`/direct/${ username }`);
 
 Template.ChatpalSearchResultTemplate.onCreated(function() {
@@ -138,7 +138,8 @@ Template.ChatpalSearchSingleRoom.helpers({
 
 Template.ChatpalSearchSingleUser.helpers({
 	cleanUsername() {
-		return this.user_username.replace(/<\/?em>/ig, '');
+		const username = this.user_username || this.username; // varies whether users or messages of users are displayed
+		return username.replace(/<\/?em>/ig, '');
 	},
 	getAvatarUrl,
 	getDMUrl,