Add account based notifications

TheOneRing · TheOneRing · commit 50a6b628013f · 2025-03-04T18:18:25.000+01:00
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -42,6 +42,7 @@ target_sources(OpenCloudGui PRIVATE
     logbrowser.cpp
     networkinformation.cpp
     networksettings.cpp
+    notifications.cpp
     openfilemanager.cpp
     owncloudgui.cpp
     protocolwidget.cpp
@@ -100,6 +101,8 @@ ecm_add_qml_module(OpenCloudGui
             qml/FolderDelegate.qml
             qml/FolderError.qml
 
+            qml/Notifications.qml
+
             qml/credentials/Credentials.qml
             qml/credentials/OAuthCredentials.qml
 
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
@@ -157,7 +157,7 @@ void AccountManager::save()
         }
 
         // save the account state
-        this->account(account->uuid())->writeToSettings(settings);
+        accountState->writeToSettings(settings);
     }
     settings.endArray();
 
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
@@ -38,6 +38,7 @@
 #include "libsync/graphapi/spacesmanager.h"
 #include "libsync/syncresult.h"
 #include "libsync/theme.h"
+#include "networkjobs/jsonjob.h"
 #include "scheduling/syncscheduler.h"
 #include "settingsdialog.h"
 
@@ -46,6 +47,8 @@
 #include <QSortFilterProxyModel>
 #include <QtQuickWidgets/QtQuickWidgets>
 
+using namespace std::chrono_literals;
+
 namespace {
 constexpr auto modalWidgetStretchedMarginC = 50;
 }
@@ -91,6 +94,11 @@ AccountSettings::AccountSettings(const AccountStatePtr &accountState, QWidget *p
         }
     });
     ui->stackedWidget->setCurrentWidget(ui->quickWidget);
+
+    auto *notificationsPollTimer = new QTimer(this);
+    notificationsPollTimer->setInterval(1min);
+    notificationsPollTimer->start();
+    connect(notificationsPollTimer, &QTimer::timeout, this, &AccountSettings::updateNotifications);
 }
 
 void AccountSettings::slotToggleSignInState()
@@ -102,6 +110,20 @@ void AccountSettings::slotToggleSignInState()
     }
 }
 
+void AccountSettings::markNotificationsRead()
+{
+    if (!_notifications.isEmpty()) {
+        auto *job = Notification::dismissAllNotifications(_accountState->account(), _notifications, this);
+        connect(job, &JsonApiJob::finishedSignal, this, [job, this] {
+            if (job->httpStatusCode() == 200) {
+                _notifications.clear();
+                Q_EMIT notificationsChanged();
+            }
+        });
+        job->start();
+    }
+}
+
 void AccountSettings::showSelectiveSyncDialog(Folder *folder)
 {
     auto *selectiveSync = new SelectiveSyncWidget(_accountState->account(), this);
@@ -318,6 +340,17 @@ void AccountSettings::doForceSyncCurrentFolder(Folder *selectedFolder)
     // Restart scheduler
     FolderMan::instance()->scheduler()->start();
 }
+void AccountSettings::updateNotifications()
+{
+    if (_accountState->isConnected()) {
+        auto *job = Notification::createNotificationsJob(_accountState->account(), this);
+        connect(job, &JsonApiJob::finishedSignal, this, [job, this] {
+            _notifications = Notification::getNotifications(job);
+            Q_EMIT notificationsChanged();
+        });
+        job->start();
+    }
+}
 
 void AccountSettings::slotAccountStateChanged()
 {
@@ -342,6 +375,7 @@ void AccountSettings::slotAccountStateChanged()
         connect(
             accountsState()->account()->spacesManager(), &GraphApi::SpacesManager::updated, this, &AccountSettings::slotSpacesUpdated, Qt::UniqueConnection);
         slotSpacesUpdated();
+        updateNotifications();
         break;
     }
     case AccountState::ServiceUnavailable:
@@ -487,6 +521,11 @@ QString AccountSettings::accountStateIconName()
     return _accountStateIconName;
 }
 
+const QList<Notification> &AccountSettings::notifications() const
+{
+    return _notifications;
+}
+
 void AccountSettings::slotDeleteAccount()
 {
     // Deleting the account potentially deletes 'this', so
diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h
@@ -17,6 +17,7 @@
 #include "gui/opencloudguilib.h"
 
 #include "folder.h"
+#include "gui/notifications.h"
 #include "gui/qmlutils.h"
 #include "owncloudgui.h"
 #include "progressdispatcher.h"
@@ -55,6 +56,7 @@ class OPENCLOUD_GUI_EXPORT AccountSettings : public QWidget
     Q_PROPERTY(uint syncedSpaces READ syncedSpaces NOTIFY syncedSpacesChanged)
     Q_PROPERTY(QString connectionLabel READ connectionLabel NOTIFY connectionLabelChanged)
     Q_PROPERTY(QString accountStateIconName READ accountStateIconName NOTIFY connectionLabelChanged)
+    Q_PROPERTY(QList<Notification> notifications READ notifications NOTIFY notificationsChanged)
     OC_DECLARE_WIDGET_FOCUS
     QML_ELEMENT
     QML_UNCREATABLE("C++ only")
@@ -79,11 +81,14 @@ class OPENCLOUD_GUI_EXPORT AccountSettings : public QWidget
     QString connectionLabel();
     QString accountStateIconName();
 
+    const QList<Notification> &notifications() const;
+
 Q_SIGNALS:
     void showIssuesList();
     void unsyncedSpacesChanged();
     void syncedSpacesChanged();
     void connectionLabelChanged();
+    void notificationsChanged();
 
 public Q_SLOTS:
     void slotAccountStateChanged();
@@ -100,12 +105,15 @@ protected Q_SLOTS:
     void slotFolderWizardAccepted();
     void slotDeleteAccount();
     void slotToggleSignInState();
+    void markNotificationsRead();
 
 private:
     void showConnectionLabel(const QString &message, SyncResult::Status status, QStringList errors = {});
 
     void doForceSyncCurrentFolder(Folder *selectedFolder);
 
+    void updateNotifications();
+
     Ui::AccountSettings *ui;
 
     FolderStatusModel *_model;
@@ -118,6 +126,8 @@ protected Q_SLOTS:
     uint _unsyncedSpaces = 0;
     QString _connectionLabel;
     QString _accountStateIconName;
+
+    QList<Notification> _notifications;
 };
 
 } // namespace OCC
diff --git a/src/gui/notifications.cpp b/src/gui/notifications.cpp
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: 2025 Hannah von Reth <h.vonreth@opencloud.eu>
+
+#include "notifications.h"
+
+#include "libsync/account.h"
+#include "networkjobs/jsonjob.h"
+
+using namespace OCC;
+
+Notification::Notification() { }
+
+Notification::Notification(const QString &title, const QString &message, const QString &id)
+    : title(title)
+    , message(message)
+    , id(id)
+{
+}
+
+JsonApiJob *Notification::dismissAllNotifications(const AccountPtr &account, const QList<Notification> &notifications, QObject *parent)
+{
+    QStringList ids;
+    for (const Notification &n : notifications) {
+        ids.append(n.id);
+    }
+
+    return new JsonApiJob(account, account->url(), QStringLiteral("ocs/v2.php/apps/notifications/api/v1/notifications"), "DELETE",
+        QJsonObject{{QStringLiteral("ids"), QJsonArray::fromStringList(ids)}}, {}, parent);
+}
+
+JsonApiJob *Notification::createNotificationsJob(const AccountPtr &account, QObject *parent)
+{
+    return new JsonApiJob(account, QStringLiteral("ocs/v2.php/apps/notifications/api/v1/notifications"), {}, {}, parent);
+}
+
+QList<Notification> Notification::getNotifications(JsonApiJob *job)
+{
+    if (job->ocsSuccess()) {
+        const auto data = job->data().value(QLatin1String("ocs")).toObject().value(QLatin1String("data")).toArray();
+        QList<Notification> notifications;
+        notifications.reserve(data.size());
+        for (const auto &notification : data) {
+            const auto n = notification.toObject();
+            notifications.emplace_back(n.value(QLatin1String("subject")).toString(), n.value(QLatin1String("message")).toString(),
+                n.value(QLatin1String("notification_id")).toString());
+        }
+        return notifications;
+    }
+    return {};
+}
diff --git a/src/gui/notifications.h b/src/gui/notifications.h
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: 2025 Hannah von Reth <h.vonreth@opencloud.eu>
+
+#pragma once
+
+#include "libsync/accountfwd.h"
+
+#include <QQmlEngine>
+
+namespace OCC {
+class JsonApiJob;
+
+class Notification
+{
+    Q_GADGET
+    Q_PROPERTY(QString title MEMBER title CONSTANT)
+    Q_PROPERTY(QString message MEMBER message CONSTANT)
+    Q_PROPERTY(QString id MEMBER id CONSTANT)
+    QML_VALUE_TYPE(notification)
+
+public:
+    Notification();
+    Notification(const QString &title, const QString &message, const QString &id);
+
+    QString title;
+    QString message;
+    QString id;
+
+    static JsonApiJob *createNotificationsJob(const AccountPtr &account, QObject *parent);
+
+    static QList<Notification> getNotifications(JsonApiJob *job);
+
+    static JsonApiJob *dismissAllNotifications(const AccountPtr &account, const QList<Notification> &notifications, QObject *parent);
+};
+
+}
diff --git a/src/gui/qml/FolderDelegate.qml b/src/gui/qml/FolderDelegate.qml
@@ -35,7 +35,7 @@ Pane {
         target: widget
 
         function onFocusFirst() {
-            manageAccountButton.forceActiveFocus(Qt.TabFocusReason);
+            notificationButton.forceActiveFocus(Qt.TabFocusReason);
         }
 
         function onFocusLast() {
@@ -66,6 +66,43 @@ Pane {
             }
             // spacer
             Item {}
+            Button {
+                id: notificationButton
+                spacing: folderSyncPanel.spacing
+
+                Popup {
+                    id: notificationPopup
+                    width: 300
+                    height: 200
+                    // kepp some distance to the window corner
+                    rightMargin: 10
+
+                    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
+
+                    contentItem: Frame {
+                        anchors.fill: parent
+                        Notifications {
+                            anchors.fill: parent
+                            notifications: accountSettings.notifications
+
+                            onMarkReadClicked: accountSettings.markNotificationsRead()
+                        }
+                    }
+                }
+
+                text: accountSettings.notifications.length
+                icon.source: QMLResources.resourcePath("core", "bell", enabled)
+                icon.color: "transparent"
+                icon.height: 16
+                icon.width: 16
+
+                onClicked: notificationPopup.open()
+
+                Keys.onBacktabPressed: {
+                    widget.parentFocusWidget.focusPrevious();
+                }
+            }
+
             Button {
                 id: manageAccountButton
                 text: qsTr("Manage Account")
@@ -97,10 +134,6 @@ Pane {
                     accountMenu.open();
                     Accessible.announce(qsTr("Account options Menu"));
                 }
-
-                Keys.onBacktabPressed: {
-                    widget.parentFocusWidget.focusPrevious();
-                }
             }
         }
 
diff --git a/src/gui/qml/Notifications.qml b/src/gui/qml/Notifications.qml
diff --git a/src/libsync/networkjobs/jsonjob.cpp b/src/libsync/networkjobs/jsonjob.cpp

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ void AccountManager::save()`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`// save the account state`
`160`		`- this->account(account->uuid())->writeToSettings(settings);`
	`160`	`+ accountState->writeToSettings(settings);`
`161`	`161`	`}`
`162`	`162`	`settings.endArray();`
`163`	`163`