X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lib%2Fsup%2Fmodes%2Finbox-mode.rb;h=ba095dab7c09696f60efb7e68c993d614da9e7b8;hb=c43664cff32bab46175f956f180f7f0a954a7b83;hp=21eb9ac43bff5cbd01fb0e10807b61381aabf1bd;hpb=9b6c0c66f3e4f6b61a2a9128065e72c9f0829cd4;p=sup

diff --git a/lib/sup/modes/inbox-mode.rb b/lib/sup/modes/inbox-mode.rb
index 21eb9ac..ba095da 100644
--- a/lib/sup/modes/inbox-mode.rb
+++ b/lib/sup/modes/inbox-mode.rb
@@ -1,4 +1,4 @@
-require 'thread'
+require 'sup'
 
 module Redwood
 
@@ -15,9 +15,7 @@ class InboxMode < ThreadIndexMode
     @@instance = self
   end
 
-  def is_relevant? m
-    m.has_label?(:inbox) && ([:spam, :deleted, :killed] & m.labels).empty?
-  end
+  def is_relevant? m; (m.labels & [:spam, :deleted, :killed, :inbox]) == Set.new([:inbox]) end
 
   ## label-list-mode wants to be able to raise us if the user selects
   ## the "inbox" label, so we need to keep our singletonness around
@@ -28,11 +26,10 @@ class InboxMode < ThreadIndexMode
     return unless cursor_thread
     thread = cursor_thread # to make sure lambda only knows about 'old' cursor_thread
 
-    undo = lambda {
+    UndoManager.register "archiving thread" do
       thread.apply_label :inbox
       add_or_unhide thread.first
-    }
-    UndoManager.register("archiving thread #{thread.first.id}", undo)
+    end
 
     cursor_thread.remove_label :inbox
     hide_thread cursor_thread
@@ -40,13 +37,13 @@ class InboxMode < ThreadIndexMode
   end
 
   def multi_archive threads
-    undo = threads.map {|t|
-             lambda{
-               t.apply_label :inbox
-               add_or_unhide t.first
-             }}
-    UndoManager.register("archiving #{threads.size} #{threads.size.pluralize 'thread'}",
-                         undo << lambda {regen_text} )
+    UndoManager.register "archiving #{threads.size.pluralize 'thread'}" do
+      threads.map do |t|
+        t.apply_label :inbox
+        add_or_unhide t.first
+      end
+      regen_text
+    end
 
     threads.each do |t|
       t.remove_label :inbox
@@ -59,12 +56,11 @@ class InboxMode < ThreadIndexMode
     return unless cursor_thread
     thread = cursor_thread # to make sure lambda only knows about 'old' cursor_thread
 
-    undo = lambda {
+    UndoManager.register "reading and archiving thread" do
       thread.apply_label :inbox
       thread.apply_label :unread
       add_or_unhide thread.first
-    }
-    UndoManager.register("reading and archiving thread ", undo)
+    end
 
     cursor_thread.remove_label :unread
     cursor_thread.remove_label :inbox
@@ -73,15 +69,7 @@ class InboxMode < ThreadIndexMode
   end
 
   def multi_read_and_archive threads
-    undo = threads.map {|t|
-      lambda {
-        t.apply_label :inbox
-        t.apply_label :unread
-        add_or_unhide t.first
-      }
-    }
-    UndoManager.register("reading and archiving #{threads.size} #{threads.size.pluralize 'thread'}",
-                         undo << lambda {regen_text})
+    old_labels = threads.map { |t| t.labels.dup }
 
     threads.each do |t|
       t.remove_label :unread
@@ -89,6 +77,15 @@ class InboxMode < ThreadIndexMode
       hide_thread t
     end
     regen_text
+
+    UndoManager.register "reading and archiving #{threads.size.pluralize 'thread'}" do
+      threads.zip(old_labels).each do |t, l|
+        t.labels = l
+        add_or_unhide t.first
+      end
+      regen_text
+    end
+
   end
 
   def handle_unarchived_update sender, m