don't automatically save with dispatch-and-kill

[sup] / lib / sup / modes / inbox-mode.rb

diff --git a/lib/sup/modes/inbox-mode.rb b/lib/sup/modes/inbox-mode.rb
index 780ae4c72a5b8e1c9ec906413fc7ddf512674a0a..a2de13fc5b6717d36052741bba7341d7d8153525 100644 (file)
--- a/lib/sup/modes/inbox-mode.rb
+++ b/lib/sup/modes/inbox-mode.rb
@@ -9,46 +9,48 @@ class InboxMode < ThreadIndexMode
   end
 
   def initialize
-    super [:inbox], [:inbox]
+    super [:inbox, :sent], { :label => :inbox, :skip_killed => true }
+    raise "can't have more than one!" if defined? @@instance
+    @@instance = self
   end
 
+  def is_relevant? m
+    m.has_label?(:inbox) && ([:spam, :deleted, :killed] & m.labels).empty?
+  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
+  def self.instance; @@instance; end
   def killable?; false; end
 
   def archive
+    return unless cursor_thread
     cursor_thread.remove_label :inbox
     hide_thread cursor_thread
     regen_text
   end
 
   def multi_archive threads
-    threads.each { |t| remove_label_and_hide_thread t, :inbox }
+    threads.each do |t|
+      t.remove_label :inbox
+      hide_thread t
+    end
     regen_text
   end
 
-  def handle_archived_update sender, t
-    hide_thread t if contains_thread? t
+  def handle_unarchived_update sender, m
+    add_or_unhide m
   end
 
-# not quite working, and not sure if i like it anyways
-#   def handle_unarchived_update sender, t
-#     Redwood::log "unarchived #{t.subj}"
-#     show_thread t
-#   end
+  def handle_archived_update sender, m
+    t = thread_containing(m) or return
+    hide_thread t
+    regen_text
+  end
 
   def status
     super + "    #{Index.size} messages in index"
   end
-
-  def is_relevant? m; m.has_label? :inbox; end
-
-  def load_threads opts={}
-    n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM
-    load_n_threads_background n, :label => :inbox,
-                                 :when_done => (lambda do |num|
-      opts[:when_done].call if opts[:when_done]
-      BufferManager.flash "Added #{num} threads."
-    end)
-  end
 end
 
 end