diff --git a/app/jobs/onceoff/grant_emoji.rb b/app/jobs/onceoff/grant_emoji.rb index e99cdbb2e78..696fd1f9528 100644 --- a/app/jobs/onceoff/grant_emoji.rb +++ b/app/jobs/onceoff/grant_emoji.rb @@ -26,7 +26,7 @@ module Jobs end def badge - @badge ||= Badge.find(Badge::FirstEmoji) + Badge.find(Badge::FirstEmoji) end end diff --git a/app/jobs/onceoff/grant_first_reply_by_email.rb b/app/jobs/onceoff/grant_first_reply_by_email.rb index a7d98cdfdbb..ae769f681c3 100644 --- a/app/jobs/onceoff/grant_first_reply_by_email.rb +++ b/app/jobs/onceoff/grant_first_reply_by_email.rb @@ -25,7 +25,7 @@ module Jobs end def badge - @badge ||= Badge.find(Badge::FirstReplyByEmail) + Badge.find(Badge::FirstReplyByEmail) end end diff --git a/app/jobs/onceoff/grant_onebox.rb b/app/jobs/onceoff/grant_onebox.rb index 6e4a92d69f4..0c63e6b7b85 100644 --- a/app/jobs/onceoff/grant_onebox.rb +++ b/app/jobs/onceoff/grant_onebox.rb @@ -35,7 +35,7 @@ module Jobs end def badge - @badge ||= Badge.find(Badge::FirstOnebox) + Badge.find(Badge::FirstOnebox) end end diff --git a/app/jobs/scheduled/pending_queued_posts_reminder.rb b/app/jobs/scheduled/pending_queued_posts_reminder.rb index 7eb3e3b8e8e..37b9afe6f4e 100644 --- a/app/jobs/scheduled/pending_queued_posts_reminder.rb +++ b/app/jobs/scheduled/pending_queued_posts_reminder.rb @@ -6,17 +6,19 @@ module Jobs def execute(args) return true unless SiteSetting.notify_about_queued_posts_after > 0 && SiteSetting.contact_email - if should_notify_ids.size > 0 && last_notified_id.to_i < should_notify_ids.max - message = PendingQueuedPostsMailer.notify(count: should_notify_ids.size) + queued_post_ids = should_notify_ids + + if queued_post_ids.size > 0 && last_notified_id.to_i < queued_post_ids.max + message = PendingQueuedPostsMailer.notify(count: queued_post_ids.size) Email::Sender.new(message, :pending_queued_posts_reminder).send - self.last_notified_id = should_notify_ids.max + self.last_notified_id = queued_post_ids.max end true end def should_notify_ids - @_should_notify_ids ||= QueuedPost.new_posts.visible.where('created_at < ?', SiteSetting.notify_about_queued_posts_after.hours.ago).pluck(:id) + QueuedPost.new_posts.visible.where('created_at < ?', SiteSetting.notify_about_queued_posts_after.hours.ago).pluck(:id) end def last_notified_id @@ -28,7 +30,7 @@ module Jobs end def self.last_notified_key - "last_notified_queued_post_id" + "last_notified_queued_post_id".freeze end end end diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb index c30f68cd2d1..fcd0243aae2 100644 --- a/app/jobs/scheduled/poll_feed.rb +++ b/app/jobs/scheduled/poll_feed.rb @@ -19,7 +19,7 @@ module Jobs end def feed_key - @feed_key ||= "feed-modified:#{Digest::SHA1.hexdigest(SiteSetting.feed_polling_url)}" + "feed-modified:#{Digest::SHA1.hexdigest(SiteSetting.feed_polling_url)}" end def poll_feed