diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-08-04 15:57:21 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-08-04 15:57:21 +0100 |
| commit | b3a4345e1359f77011bd312b1afeed8eb2b97c91 (patch) | |
| tree | e97c6654abbc946f59ab3aa230b1ac55a06bc140 | |
| parent | 02a177d8e744f7e084bc69d10a0b7f8fb7e3bd44 (diff) | |
Fixed a couple of bugs in the packaging and the pop3 server
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/mauvealert-server.install | 3 | ||||
| -rw-r--r-- | lib/mauve/pop3_server.rb | 10 | ||||
| -rw-r--r-- | lib/mauve/version.rb | 2 |
4 files changed, 18 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 44c479e..8cc7d77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mauvealert (3.3.1) stable; urgency=low + + * Fixed bug in Pop3 server + + -- Patrick J Cherry <patrick@bytemark.co.uk> Thu, 04 Aug 2011 15:18:27 +0100 + mauvealert (3.3.0) stable; urgency=low * Added pop3 server diff --git a/debian/mauvealert-server.install b/debian/mauvealert-server.install index 1449c30..8970850 100644 --- a/debian/mauvealert-server.install +++ b/debian/mauvealert-server.install @@ -4,7 +4,7 @@ lib/dm-sqlite-adapter-with-mutex.rb usr/lib/ruby/1.8/ lib/mauve/alert.rb usr/lib/ruby/1.8/mauve/ lib/mauve/alert_changed.rb usr/lib/ruby/1.8/mauve/ lib/mauve/alert_group.rb usr/lib/ruby/1.8/mauve/ -lib/mauve/auth_bytemark.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/authentication.rb usr/lib/ruby/1.8/mauve/ lib/mauve/calendar_interface.rb usr/lib/ruby/1.8/mauve/ lib/mauve/configuration.rb usr/lib/ruby/1.8/mauve/ lib/mauve/configuration_builder.rb usr/lib/ruby/1.8/mauve/ @@ -21,6 +21,7 @@ lib/mauve/notifiers usr/lib/ruby/1.8/mauve/ lib/mauve/notifiers.rb usr/lib/ruby/1.8/mauve/ lib/mauve/people_list.rb usr/lib/ruby/1.8/mauve/ lib/mauve/person.rb usr/lib/ruby/1.8/mauve/ +lib/mauve/pop3_server.rb usr/lib/ruby/1.8/mauve/ lib/mauve/processor.rb usr/lib/ruby/1.8/mauve/ lib/mauve/server.rb usr/lib/ruby/1.8/mauve/ lib/mauve/source_list.rb usr/lib/ruby/1.8/mauve/ 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]) diff --git a/lib/mauve/version.rb b/lib/mauve/version.rb index 9967f49..4b6e941 100644 --- a/lib/mauve/version.rb +++ b/lib/mauve/version.rb @@ -1,5 +1,5 @@ module Mauve - VERSION="3.3.0" + VERSION="3.3.1" end |