notifs: persistent notifs + better sidebar notifs

1 files changed, 71 insertions, 15 deletions

diff --git a/services/Notifs.qml b/services/Notifs.qml
index 823840c..b651442 100644
--- a/services/Notifs.qml
+++ b/services/Notifs.qml
@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 
 import qs.components.misc
 import qs.config
+import qs.utils
 import Quickshell
 import Quickshell.Io
 import Quickshell.Services.Notifications
@@ -15,6 +16,24 @@ Singleton {
     readonly property list<Notif> popups: list.filter(n => n.popup)
     property alias dnd: props.dnd
 
+    property bool loaded
+
+    onListChanged: {
+        if (!loaded)
+            return;
+
+        storage.setText(JSON.stringify(list.filter(n => !n.closed).map(n => ({
+                    id: n.id,
+                    summary: n.summary,
+                    body: n.body,
+                    appIcon: n.appIcon,
+                    appName: n.appName,
+                    image: n.image,
+                    expireTimeout: n.expireTimeout,
+                    urgency: n.urgency
+                }))));
+    }
+
     PersistentProperties {
         id: props
 
@@ -32,6 +51,7 @@ Singleton {
         bodyImagesSupported: true
         bodyMarkupSupported: true
         imageSupported: true
+        persistenceSupported: true
 
         onNotification: notif => {
             notif.tracked = true;
@@ -43,6 +63,18 @@ Singleton {
         }
     }
 
+    FileView {
+        id: storage
+
+        path: `${Paths.state}/notifs.json`
+        onLoaded: {
+            const data = JSON.parse(text());
+            for (const notif of data)
+                root.list.push(notifComp.createObject(root, notif));
+            root.loaded = true;
+        }
+    }
+
     CustomShortcut {
         name: "clearNotifs"
         description: "Clear all notifications"
@@ -81,7 +113,10 @@ Singleton {
         id: notif
 
         property bool popup
-        readonly property date time: new Date()
+        property bool closed
+        property var locks: new Set()
+
+        property date time: new Date()
         readonly property string timeStr: {
             const diff = Time.date.getTime() - time.getTime();
             const m = Math.floor(diff / 60000);
@@ -94,18 +129,20 @@ Singleton {
             return `${h}h`;
         }
 
-        required property Notification notification
-        readonly property string summary: notification.summary
-        readonly property string body: notification.body
-        readonly property string appIcon: notification.appIcon
-        readonly property string appName: notification.appName
-        readonly property string image: notification.image
-        readonly property int urgency: notification.urgency
-        readonly property list<NotificationAction> actions: notification.actions
+        property Notification notification
+        property string id: notification?.id ?? ""
+        property string summary: notification?.summary ?? ""
+        property string body: notification?.body ?? ""
+        property string appIcon: notification?.appIcon ?? ""
+        property string appName: notification?.appName ?? ""
+        property string image: notification?.image ?? ""
+        property real expireTimeout: notification?.expireTimeout ?? Config.notifs.defaultExpireTimeout
+        property int urgency: notification?.urgency ?? NotificationUrgency.Normal
+        readonly property list<NotificationAction> actions: notification?.actions ?? []
 
         readonly property Timer timer: Timer {
             running: true
-            interval: notif.notification.expireTimeout > 0 ? notif.notification.expireTimeout : Config.notifs.defaultExpireTimeout
+            interval: notif.expireTimeout > 0 ? notif.expireTimeout : Config.notifs.defaultExpireTimeout
             onTriggered: {
                 if (Config.notifs.expire)
                     notif.popup = false;
@@ -113,14 +150,33 @@ Singleton {
         }
 
         readonly property Connections conn: Connections {
-            target: notif.notification.Retainable
+            target: notif.notification
+
+            function onClosed(): void {
+                notif.close();
+            }
+        }
 
-            function onDropped(): void {
-                root.list.splice(root.list.indexOf(notif), 1);
+        function lock(item: Item): void {
+            locks.add(item);
+        }
+
+        function unlock(item: Item): void {
+            locks.delete(item);
+
+            if (closed && locks.size === 0 && root.list.includes(this)) {
+                root.list.splice(root.list.indexOf(this), 1);
+                notification?.dismiss();
+                destroy();
             }
+        }
 
-            function onAboutToDestroy(): void {
-                notif.destroy();
+        function close(): void {
+            closed = true;
+            if (locks.size === 0 && root.list.includes(this)) {
+                root.list.splice(root.list.indexOf(this), 1);
+                notification?.dismiss();
+                destroy();
             }
         }
     }