diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 10:30:45 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 10:46:26 +0100 |
commit | c6df6686af01e774b2b4618e96194bf80db6ecf2 (patch) | |
tree | d05719cda14674586cf82190d8bc0e0c59cff647 /app/models | |
parent | 4eed5019a23084816931cf9a0f426003aa160256 (diff) |
Disable notifications for trending links and trending statuses by default
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/trends.rb | 9 | ||||
-rw-r--r-- | app/models/user.rb | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/app/models/trends.rb b/app/models/trends.rb index f8864e55f..0be900b04 100644 --- a/app/models/trends.rb +++ b/app/models/trends.rb @@ -32,10 +32,13 @@ module Trends tags_requiring_review = tags.request_review statuses_requiring_review = statuses.request_review - return if links_requiring_review.empty? && tags_requiring_review.empty? && statuses_requiring_review.empty? - User.staff.includes(:account).find_each do |user| - AdminMailer.new_trends(user.account, links_requiring_review, tags_requiring_review, statuses_requiring_review).deliver_later! if user.allows_trends_review_emails? + links = user.allows_trending_tags_review_emails? ? links_requiring_review : [] + tags = user.allows_trending_links_review_emails? ? tags_requiring_review : [] + statuses = user.allows_trending_statuses_review_emails? ? statuses_requiring_review : [] + next if links.empty? && tags.empty? && statuses.empty? + + AdminMailer.new_trends(user.account, links, tags, statuses).deliver_later! end end diff --git a/app/models/user.rb b/app/models/user.rb index cb03e99a0..77685ad02 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -269,10 +269,18 @@ class User < ApplicationRecord settings.notification_emails['appeal'] end - def allows_trends_review_emails? + def allows_trending_tags_review_emails? settings.notification_emails['trending_tag'] end + def allows_trending_links_review_emails? + settings.notification_emails['trending_link'] + end + + def allows_trending_statuses_review_emails? + settings.notification_emails['trending_status'] + end + def hides_network? @hides_network ||= settings.hide_network end |