dan/dots-hyprland
1
0
Fork 0
mirror of https://github.com/danbulant/dots-hyprland synced 2026-05-24 12:22:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

notifications: avoid id collisions across sessions

Browse source
This commit is contained in:
end-4 2025-04-20 08:44:06 +02:00
parent 3096107d6b
commit b5a9e01455
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/quickshell/modules/common/widgets/NotificationActionButton.qml
View file

@ -15,7 +15,7 @@ Button {
leftPadding: 10
rightPadding: 10
PointingHandInteraction {}
// PointingHandInteraction {}
background: Rectangle {
radius: Appearance.rounding.small

19
.config/quickshell/services/Notifications.qml
View file

@ -11,6 +11,9 @@ Singleton {
id: root
property var filePath: `${StandardPaths.standardLocations(StandardPaths.CacheLocation)[0]}/notifications/notifications.json`
property var list: []
// Quickshell's notification IDs starts at 1 on each run, while saved notifications
// can already contain higher IDs. This is a workaround to avoid id collisions
property int idOffset
signal initDone();
signal notify(notification: var);
@ -31,7 +34,7 @@ Singleton {
onNotification: (notification) => {
notification.tracked = true
const newNotifObject = {
"id": notification.id,
"id": notification.id + root.idOffset,
"actions": notification.actions.map((action) => {
return {
"identifier": action.identifier,
@ -54,7 +57,7 @@ Singleton {
function discardNotification(id) {
const index = root.list.findIndex((notif) => notif.id === id);
const notifServerIndex = notifServer.trackedNotifications.values.findIndex((notif) => notif.id === id);
const notifServerIndex = notifServer.trackedNotifications.values.findIndex((notif) => notif.id + root.idOffset === id);
if (index !== -1) {
root.list.splice(index, 1);
notifFileView.setText(JSON.stringify(root.list, null, 2))
@ -76,12 +79,13 @@ Singleton {
}
function attemptInvokeAction(id, notifIdentifier) {
const notifServerIndex = notifServer.trackedNotifications.values.findIndex((notif) => notif.id === id);
const notifServerIndex = notifServer.trackedNotifications.values.findIndex((notif) => notif.id + root.idOffset === id);
if (notifServerIndex !== -1) {
const notifServerNotif = notifServer.trackedNotifications.values[notifServerIndex];
const action = notifServerNotif.actions.find((action) => action.identifier === notifIdentifier);
action.invoke()
} else console.log("Notification not found in server: " + id)
}
// else console.log("Notification not found in server: " + id)
root.discard(id);
}
@ -103,7 +107,14 @@ Singleton {
onLoaded: {
const fileContents = notifFileView.text()
root.list = JSON.parse(fileContents)
// Find largest id
let maxId = 0
root.list.forEach((notif) => {
maxId = Math.max(maxId, notif.id)
})
console.log("[Notifications] File loaded")
root.idOffset = maxId
root.initDone()
}
onLoadFailed: (error) => {