Fixed a couple of bugs in the packaging and the pop3 server

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/mauve/pop3_server.rb b/lib/mauve/pop3_server.rb
index b83e839..36a6cd2 100644
--- a/lib/mauve/pop3_server.rb
+++ b/lib/mauve/pop3_server.rb
@@ -276,13 +276,21 @@ module Mauve
         smtp = Mauve::Notifiers::Email::Default.new("TODO: why do I need to put this argument here?")
         alerts_seen = []
 
-        AlertChanged.all(:person => self.user).each do |a|
+        #
+        # A maximum of the 100 most recent alerts.
+        #
+        AlertChanged.first(100, :person => self.user).each do |a|
           #
           # Not interested in alerts 
           #
           next unless @level.nil? or a.level.to_s == @level
 
           #
+          # Only interested in alerts
+          #
+          next unless a.alert.is_a?(Mauve::Alert)
+
+          #
           # Only one message per alert.
           #
           next if alerts_seen.include?([a.alert_id, a.update_type])