From de0c719f53b865870ab549f0e7ef0628084d3301 Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Sun, 2 May 2021 19:35:13 +0100
Subject: [PATCH] properly mark messages as read when not in inbox

---
 core/src/main/groovy/com/muwire/core/messenger/Messenger.groovy | 2 +-
 .../groovy/com/muwire/core/messenger/UIMessageReadEvent.groovy  | 1 +
 .../controllers/com/muwire/gui/MessageFolderController.groovy   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/groovy/com/muwire/core/messenger/Messenger.groovy b/core/src/main/groovy/com/muwire/core/messenger/Messenger.groovy
index fc2a499d..ae62c69b 100644
--- a/core/src/main/groovy/com/muwire/core/messenger/Messenger.groovy
+++ b/core/src/main/groovy/com/muwire/core/messenger/Messenger.groovy
@@ -145,7 +145,7 @@ class Messenger {
     
     synchronized void onUIMessageReadEvent(UIMessageReadEvent e) {
         diskIO.execute({
-            File unread = new File(folders.get(INBOX), deriveUnread(e.message))
+            File unread = new File(folders.get(e.folder), deriveUnread(e.message))
             unread.delete()
         })
     }
diff --git a/core/src/main/groovy/com/muwire/core/messenger/UIMessageReadEvent.groovy b/core/src/main/groovy/com/muwire/core/messenger/UIMessageReadEvent.groovy
index 7242cbb8..33691f73 100644
--- a/core/src/main/groovy/com/muwire/core/messenger/UIMessageReadEvent.groovy
+++ b/core/src/main/groovy/com/muwire/core/messenger/UIMessageReadEvent.groovy
@@ -4,4 +4,5 @@ import com.muwire.core.Event
 
 class UIMessageReadEvent extends Event {
     MWMessage message
+    String folder
 }
diff --git a/gui/griffon-app/controllers/com/muwire/gui/MessageFolderController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MessageFolderController.groovy
index f866d46e..b881d4f3 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/MessageFolderController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/MessageFolderController.groovy
@@ -120,7 +120,7 @@ class MessageFolderController {
     void markMessageRead(MWMessageStatus status) {
         if (status.status) {
             status.status = false
-            model.core.eventBus.publish(new UIMessageReadEvent(message : status.message))
+            model.core.eventBus.publish(new UIMessageReadEvent(message : status.message, folder: model.name))
         }
     }
 }
\ No newline at end of file