From 53081f52fb35c97944de91535409474ee536d76c Mon Sep 17 00:00:00 2001
From: Germain <germains@element.io>
Date: Wed, 15 Dec 2021 08:34:52 +0000
Subject: [PATCH] Pass MatrixEvent to displayNotification method (#7355)

---
 src/BasePlatform.ts | 31 ++++++++++++++++++++++++++++++-
 src/Notifier.ts     |  4 ++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index a4f91fc71b..d9062f8ce4 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -170,7 +170,36 @@ export default abstract class BasePlatform {
      */
     abstract requestNotificationPermission(): Promise<string>;
 
-    abstract displayNotification(title: string, msg: string, avatarUrl: string, room: Room);
+    public displayNotification(
+        title: string,
+        msg: string,
+        avatarUrl: string,
+        room: Room,
+        ev?: MatrixEvent,
+    ): Notification {
+        const notifBody = {
+            body: msg,
+            silent: true, // we play our own sounds
+        };
+        if (avatarUrl) notifBody['icon'] = avatarUrl;
+        const notification = new window.Notification(title, notifBody);
+
+        notification.onclick = () => {
+            const payload: ActionPayload = {
+                action: Action.ViewRoom,
+                room_id: room.roomId,
+            };
+
+            if (ev.getThread()) {
+                payload.event_id = ev.getId();
+            }
+
+            dis.dispatch(payload);
+            window.focus();
+        };
+
+        return notification;
+    }
 
     loudNotification(ev: MatrixEvent, room: Room) {
     }
diff --git a/src/Notifier.ts b/src/Notifier.ts
index 2fc2ee3643..35b3aee165 100644
--- a/src/Notifier.ts
+++ b/src/Notifier.ts
@@ -122,7 +122,7 @@ export const Notifier = {
             avatarUrl = Avatar.avatarUrlForMember(ev.sender, 40, 40, 'crop');
         }
 
-        const notif = plaf.displayNotification(title, msg, avatarUrl, room);
+        const notif = plaf.displayNotification(title, msg, avatarUrl, room, ev);
 
         // if displayNotification returns non-null,  the platform supports
         // clearing notifications later, so keep track of this.
@@ -381,7 +381,7 @@ export const Notifier = {
     _evaluateEvent: function(ev: MatrixEvent) {
         const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
         const actions = MatrixClientPeg.get().getPushActionsForEvent(ev);
-        if (actions && actions.notify) {
+        if (actions?.notify) {
             if (RoomViewStore.getRoomId() === room.roomId &&
                 UserActivity.sharedInstance().userActiveRecently() &&
                 !Modal.hasDialogs()