From 93db08b2170d39945b7819245182a93e132edefb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Wed, 20 May 2026 15:13:57 +0200
Subject: [PATCH] Fix notification focus and image cache races

---
 shell/plugins/notifications/Service.qml | 63 +++++++++++++++++--------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/shell/plugins/notifications/Service.qml b/shell/plugins/notifications/Service.qml
index 7b823299..908368ea 100644
--- a/shell/plugins/notifications/Service.qml
+++ b/shell/plugins/notifications/Service.qml
@@ -88,6 +88,7 @@ Item {
   ListModel { id: pastModel }
 
   readonly property int historyCap: 100
+  property var imageCacheQueue: []
 
   function durationFor(urgency) {
     switch (urgency) {
@@ -369,7 +370,7 @@ Item {
     var lower = String(entry.app).toLowerCase()
     focusAppProc.command = ["bash", "-lc",
       "hyprctl clients -j 2>/dev/null | " +
-      "jq -r --arg name \"" + lower + "\" " +
+      "jq -r --arg name " + Util.shellQuote(lower) + " " +
       "'[.[] | select((.class // \"\") | ascii_downcase | startswith($name))] | first.address // empty' | " +
       "xargs -r -I{} hyprctl dispatch focuswindow address:{}"]
     focusAppProc.running = true
@@ -407,15 +408,45 @@ Item {
     var srcPath = decodeURIComponent(image.substring(7))
     var ext = imageExtension(srcPath)
     var destPath = imageCacheDir + snapshot.timestamp + "-" + snapshot.originalId + "." + ext
-    var destUri = "file://" + destPath
+    var destUri = Util.fileUrl(destPath)
 
-    imageCacheProc.targetUri = destUri
-    imageCacheProc.matchOriginalId = snapshot.originalId
-    imageCacheProc.matchTimestamp = snapshot.timestamp
-    imageCacheProc.command = ["cp", "-f", srcPath, destPath]
+    imageCacheQueue = imageCacheQueue.concat([{
+      srcPath: srcPath,
+      destPath: destPath,
+      targetUri: destUri,
+      originalId: snapshot.originalId,
+      timestamp: snapshot.timestamp
+    }])
+    runNextImageCacheJob()
+  }
+
+  function runNextImageCacheJob() {
+    if (imageCacheProc.running || imageCacheQueue.length === 0) return
+
+    var job = imageCacheQueue[0]
+    imageCacheQueue = imageCacheQueue.slice(1)
+    imageCacheProc.targetUri = job.targetUri
+    imageCacheProc.matchOriginalId = job.originalId
+    imageCacheProc.matchTimestamp = job.timestamp
+    imageCacheProc.command = ["cp", "-f", job.srcPath, job.destPath]
     imageCacheProc.running = true
   }
 
+  function rewriteCachedImage(targetUri, originalId, timestamp) {
+    function rewrite(model) {
+      for (var i = 0; i < model.count; i++) {
+        var row = model.get(i)
+        if (row && row.originalId === originalId && row.timestamp === timestamp) {
+          model.setProperty(i, "image", targetUri)
+          return true
+        }
+      }
+      return false
+    }
+
+    return rewrite(pendingModel) || rewrite(pastModel)
+  }
+
   function maybeDeleteCachedImage(image) {
     var path = String(image || "")
     if (!path) return
@@ -438,20 +469,12 @@ Item {
     property int matchOriginalId: -1
     property double matchTimestamp: 0
     onExited: function(exitCode) {
-      if (exitCode !== 0 || !targetUri) return
-      // Search both models since a notification may have moved to past
-      // between when we kicked off the copy and when it finished.
-      function rewrite(model) {
-        for (var i = 0; i < model.count; i++) {
-          var row = model.get(i)
-          if (row && row.originalId === matchOriginalId && row.timestamp === matchTimestamp) {
-            model.setProperty(i, "image", targetUri)
-            return true
-          }
-        }
-        return false
-      }
-      if (rewrite(pendingModel) || rewrite(pastModel)) scheduleHistorySave()
+      if (exitCode === 0 && targetUri && rewriteCachedImage(targetUri, matchOriginalId, matchTimestamp))
+        scheduleHistorySave()
+      targetUri = ""
+      matchOriginalId = -1
+      matchTimestamp = 0
+      runNextImageCacheJob()
     }
   }