about summary refs log tree commit diff
path: root/app/models
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/models
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/models')
-rw-r--r--app/models/report.rb4
-rw-r--r--app/models/user.rb4
2 files changed, 8 insertions, 0 deletions
diff --git a/app/models/report.rb b/app/models/report.rb
index efe385b2d..2804020f5 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -60,6 +60,10 @@ class Report < ApplicationRecord
     !action_taken?
   end
 
+  def unresolved_siblings?
+    Report.where.not(id: id).where(target_account_id: target_account_id).unresolved.exists?
+  end
+
   def history
     time_range = created_at..updated_at
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 9e529019c..6022a5eb0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -224,6 +224,10 @@ class User < ApplicationRecord
     settings.notification_emails['digest']
   end
 
+  def allows_report_emails?
+    settings.notification_emails['report']
+  end
+
   def hides_network?
     @hides_network ||= settings.hide_network
   end