From 6417c87afe2746bab4b1a1cb861b25a172f228a7 Mon Sep 17 00:00:00 2001
From: Felipe Orellana <forellana@digithinkit.com>
Date: Wed, 25 Mar 2020 22:12:48 +0000
Subject: [PATCH 1/3] feat: Adds small improvements to chat notifications

---
 frappe/public/js/frappe/chat.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/chat.js b/frappe/public/js/frappe/chat.js
index 810de89874..9d82b4d593 100644
--- a/frappe/public/js/frappe/chat.js
+++ b/frappe/public/js/frappe/chat.js
@@ -1566,7 +1566,11 @@ class extends Component {
 				const  alert   = // TODO: ellipses content
 				`
 				<span data-action="show-message" class="cursor-pointer">
-					<span class="indicator yellow"/> <b>${frappe.user.first_name(r.user)}</b>: ${r.content}
+					<span class="indicator yellow"/>
+						<span class="avatar avatar-small">
+							<span class="avatar-frame" style="background-image: url(&quot;${frappe.user.image(r.user)}&quot;)"></span>
+						</span>
+						<b>${frappe.user.first_name(r.user)}</b>: ${r.content}
 				</span>
 				`
 				frappe.show_alert(alert, 15, {
@@ -1575,6 +1579,11 @@ class extends Component {
 						this.base.firstChild._component.toggle()
 					}.bind(this, r)
 				})
+				frappe.notify(`${frappe.user.first_name(r.user)}`, {
+					body: r.content,
+					icon: frappe.user.image(r.user),
+					requireInteraction: true
+				})
 			}
 
 			if ( r.room === state.room.name ) {

From 945ee717920432614bbceced721642f9ea09d509 Mon Sep 17 00:00:00 2001
From: Felipe Orellana <forellana@digithinkit.com>
Date: Wed, 25 Mar 2020 22:38:14 +0000
Subject: [PATCH 2/3] feat: adds notification tag to avoid spamming recipient

---
 frappe/public/js/frappe/chat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/chat.js b/frappe/public/js/frappe/chat.js
index 9d82b4d593..04633bd920 100644
--- a/frappe/public/js/frappe/chat.js
+++ b/frappe/public/js/frappe/chat.js
@@ -1582,7 +1582,7 @@ class extends Component {
 				frappe.notify(`${frappe.user.first_name(r.user)}`, {
 					body: r.content,
 					icon: frappe.user.image(r.user),
-					requireInteraction: true
+					tag: r.user
 				})
 			}
 

From 29d01a1e699df22f6d3d9410f5abb639941512a8 Mon Sep 17 00:00:00 2001
From: Rohan <Alchez@users.noreply.github.com>
Date: Fri, 10 Apr 2020 11:42:18 +0530
Subject: [PATCH 3/3] fix: remove old quote structure

Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/public/js/frappe/chat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/chat.js b/frappe/public/js/frappe/chat.js
index 04633bd920..8b1c09ac93 100644
--- a/frappe/public/js/frappe/chat.js
+++ b/frappe/public/js/frappe/chat.js
@@ -1568,7 +1568,7 @@ class extends Component {
 				<span data-action="show-message" class="cursor-pointer">
 					<span class="indicator yellow"/>
 						<span class="avatar avatar-small">
-							<span class="avatar-frame" style="background-image: url(&quot;${frappe.user.image(r.user)}&quot;)"></span>
+							<span class="avatar-frame" style="background-image: url(${frappe.user.image(r.user)})"></span>
 						</span>
 						<b>${frappe.user.first_name(r.user)}</b>: ${r.content}
 				</span>