Alert#all_unacknowledged created, reflecting reality of what all_raised was being used for

XMPP alerts now sorted sanely

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/mauve/alert.rb b/lib/mauve/alert.rb
index 752a132..76e79cd 100644
--- a/lib/mauve/alert.rb
+++ b/lib/mauve/alert.rb
@@ -412,7 +412,11 @@ module Mauve
       #
       #
       def all_raised
-        all(:raised_at.not => nil, :acknowledged_at => nil, :cleared_at => nil)
+        all(:raised_at.not => nil, :order => [:raised_at.asc]) & (all(:cleared_at => nil) | all(:raised_at.gte => :cleared_at))
+      end
+      
+      def all_unacknowledged
+        all_raised - all_acknowledged
       end
 
       def all_acknowledged
@@ -420,7 +424,7 @@ module Mauve
       end
 
       def all_cleared
-        all(:cleared_at.not => nil, :acknowledged_at => nil)
+        all - all_raised - all_acknowledged
       end
 
       # Returns a hash of all the :urgent, :normal and :low alerts.