From 83d8bcdc27fa82f1b6a8ac18f9805cbc8f39d596 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 27 Aug 2013 11:52:09 +1000
Subject: [PATCH] revert non queuing of emails

---
 app/models/user_email_observer.rb       |  8 +-------
 spec/models/user_email_observer_spec.rb | 14 +++++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/models/user_email_observer.rb b/app/models/user_email_observer.rb
index 45e1adbc5..f83c85226 100644
--- a/app/models/user_email_observer.rb
+++ b/app/models/user_email_observer.rb
@@ -55,13 +55,7 @@ class UserEmailObserver < ActiveRecord::Observer
     end
 
     def delay
-      mins = SiteSetting.email_time_window_mins.minutes
-      if  notification.user &&
-          (!notification.user.last_seen_at || notification.user.last_seen_at < mins.ago)
-        0
-      else
-        mins
-      end
+      SiteSetting.email_time_window_mins.minutes
     end
   end
 
diff --git a/spec/models/user_email_observer_spec.rb b/spec/models/user_email_observer_spec.rb
index b33af44a2..331d6eb63 100644
--- a/spec/models/user_email_observer_spec.rb
+++ b/spec/models/user_email_observer_spec.rb
@@ -8,7 +8,7 @@ describe UserEmailObserver do
     let!(:notification) { Fabricate(:notification, user: user) }
 
     it "enqueues a job for the email" do
-      Jobs.expects(:enqueue_in).with(0, :user_email, type: :user_mentioned, user_id: notification.user_id, notification_id: notification.id)
+      Jobs.expects(:enqueue_in).with(SiteSetting.email_time_window_mins.minutes, :user_email, type: :user_mentioned, user_id: notification.user_id, notification_id: notification.id)
       UserEmailObserver.send(:new).after_commit(notification)
     end
 
@@ -32,7 +32,7 @@ describe UserEmailObserver do
     let!(:notification) { Fabricate(:notification, user: user, notification_type: 9) }
 
     it "enqueues a job for the email" do
-      Jobs.expects(:enqueue_in).with(0, :user_email, type: :user_posted, user_id: notification.user_id, notification_id: notification.id)
+      Jobs.expects(:enqueue_in).with(SiteSetting.email_time_window_mins.minutes, :user_email, type: :user_posted, user_id: notification.user_id, notification_id: notification.id)
       UserEmailObserver.send(:new).after_commit(notification)
     end
 
@@ -50,7 +50,7 @@ describe UserEmailObserver do
     let!(:notification) { Fabricate(:notification, user: user, notification_type: 2) }
 
     it "enqueues a job for the email" do
-      Jobs.expects(:enqueue_in).with(0, :user_email, type: :user_replied, user_id: notification.user_id, notification_id: notification.id)
+      Jobs.expects(:enqueue_in).with(SiteSetting.email_time_window_mins.minutes, :user_email, type: :user_replied, user_id: notification.user_id, notification_id: notification.id)
       UserEmailObserver.send(:new).after_commit(notification)
     end
 
@@ -68,13 +68,13 @@ describe UserEmailObserver do
     let!(:notification) { Fabricate(:notification, user: user, notification_type: 3) }
 
     it "enqueues a job for the email" do
-      Jobs.expects(:enqueue_in).with(0, :user_email, type: :user_quoted, user_id: notification.user_id, notification_id: notification.id)
+      Jobs.expects(:enqueue_in).with(SiteSetting.email_time_window_mins.minutes, :user_email, type: :user_quoted, user_id: notification.user_id, notification_id: notification.id)
       UserEmailObserver.send(:new).after_commit(notification)
     end
 
     it "doesn't enqueue an email if the user has mention emails disabled" do
       user.expects(:email_direct?).returns(false)
-      Jobs.expects(:enqueue_in).with(0, :user_email, has_entry(type: :user_quoted)).never
+      Jobs.expects(:enqueue_in).with(SiteSetting.email_time_window_mins.minutes, :user_email, has_entry(type: :user_quoted)).never
       UserEmailObserver.send(:new).after_commit(notification)
     end
 
@@ -86,13 +86,13 @@ describe UserEmailObserver do
     let!(:notification) { Fabricate(:notification, user: user, notification_type: 7) }
 
     it "enqueues a job for the email" do
-      Jobs.expects(:enqueue_in).with(0, :user_email, type: :user_invited_to_private_message, user_id: notification.user_id, notification_id: notification.id)
+      Jobs.expects(:enqueue_in).with(SiteSetting.email_time_window_mins.minutes, :user_email, type: :user_invited_to_private_message, user_id: notification.user_id, notification_id: notification.id)
       UserEmailObserver.send(:new).after_commit(notification)
     end
 
     it "doesn't enqueue an email if the user has mention emails disabled" do
       user.expects(:email_direct?).returns(false)
-      Jobs.expects(:enqueue_in).with(0, :user_email, has_entry(type: :user_invited_to_private_message)).never
+      Jobs.expects(:enqueue_in).with(SiteSetting.email_time_window_mins.minutes, :user_email, has_entry(type: :user_invited_to_private_message)).never
       UserEmailObserver.send(:new).after_commit(notification)
     end