From: William Morgan Date: Sun, 3 Feb 2008 04:19:25 +0000 (-0800) Subject: Merge branches 'dispatch-next-fix', 'handle-deletion-fix' and 'handle-spam-fix' into... X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=9a0188e4299b904e28a412e804e59a318835d7eb;p=sup Merge branches 'dispatch-next-fix', 'handle-deletion-fix' and 'handle-spam-fix' into next --- 9a0188e4299b904e28a412e804e59a318835d7eb diff --cc lib/sup/modes/thread-index-mode.rb index 629f8df,cdc0b73,5985cae,460de1f..23c76c3 --- a/lib/sup/modes/thread-index-mode.rb +++ b/lib/sup/modes/thread-index-mode.rb @@@@@ -172,13 -170,13 -166,12 -166,20 +176,19 @@@@@ EO end def handle_deleted_update sender, m -- - @ts_mutex.synchronize do -- - return unless @ts.contains? m -- - @ts.remove_thread_containing_id m.id -- - end ++ + t = @ts_mutex.synchronize { @ts.thread_for m } ++ + return unless t ++ + hide_thread t ++ update ++ end ++ +++ def handle_spammed_update sender, m +++ t = @ts_mutex.synchronize { @ts.thread_for m } +++ return unless t +++ hide_thread t + update + end + def handle_undeleted_update sender, m add_or_unhide m end