about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-09-03 14:33:06 +0200
committerThibaut Girka <thib@sitedethib.com>2018-09-03 14:33:06 +0200
commit6c233a04a04f674b1be75ce7c6c4547c7a006797 (patch)
tree24b32d52e098fac57e91fd26be1311b7b677c9c9 /app/services
parente915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (diff)
parentccc2f608c5c1caac2ea4796f4490f29d59d67068 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
Diffstat (limited to 'app/services')
-rw-r--r--app/services/report_service.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index c06488a6d..057d05ab9 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -26,7 +26,10 @@ class ReportService < BaseService
   end
 
   def notify_staff!
+    return if @report.unresolved_siblings?
+
     User.staff.includes(:account).each do |u|
+      next unless u.allows_report_emails?
       AdminMailer.new_report(u.account, @report).deliver_later
     end
   end