follow shouldNotify flag to hide notifications when needed

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/gui/tray/activitydata.h b/src/gui/tray/activitydata.h
index 947cea5fb7c265de80c207412e33d51548ef3394..c4e8947240a706e7bde5c3fcea06a8da3ab3c288 100644 (file)
--- a/src/gui/tray/activitydata.h
+++ b/src/gui/tray/activitydata.h
@@ -157,6 +157,7 @@ public:
      * @return
      */
 
+    bool _shouldNotify = true;
 
     [[nodiscard]] Identifier ident() const;
 };

diff --git a/src/gui/tray/notificationhandler.cpp b/src/gui/tray/notificationhandler.cpp
index d0fc7b4c88291400b6119d2b0ac3d4b97b76abd8..f87a717b77d5b7e043f2af241487f937b1d6a881 100644 (file)
--- a/src/gui/tray/notificationhandler.cpp
+++ b/src/gui/tray/notificationhandler.cpp
@@ -105,6 +105,10 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
             }
         }
 
+        if (json.contains("shouldNotify")) {
+            a._shouldNotify = json.value("shouldNotify").toBool(true);
+        }
+
         // 2 cases to consider:
         // 1. server == 24 & has Talk: object_type is chat/call/room & object_id contains conversationToken/messageId
         // 2. server < 24 & has Talk: object_type is chat/call/room & object_id contains _only_ conversationToken

diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
index 5c6f24e5f3ae0491fd0b3ffd4d48c60bb3b36f17..deae25c513d332c096b65a61e5fa1dc13a5f6c9b 100644 (file)
--- a/src/gui/tray/usermodel.cpp
+++ b/src/gui/tray/usermodel.cpp
@@ -193,6 +193,10 @@ void User::slotBuildNotificationDisplay(const ActivityList &list)
             qCInfo(lcActivity) << "Activity already notified, skip";
             return false;
         }
+        if (!activity._shouldNotify) {
+            qCDebug(lcActivity) << "Activity should not be notified";
+            return false;
+        }
 
         return true;
     });
@@ -226,6 +230,11 @@ void User::slotBuildIncomingCallDialogs(const ActivityList &list)
 
     if(systray) {
         for(const auto &activity : list) {
+            if (!activity._shouldNotify) {
+                qCDebug(lcActivity) << "Activity should not be notified";
+                continue;
+            }
+
             systray->createCallDialog(activity, _account);
         }
     }