diff options
author | ThibG <thib@sitedethib.com> | 2019-05-15 18:44:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-15 18:44:21 +0200 |
commit | c1cf8c1636e0a639cced585f0cb234547a64d417 (patch) | |
tree | 77b40e8bb0b1682bebaebebfa32d135ba406ac14 /app/models/domain_block.rb | |
parent | 4bab7d7640a72ffeb04c104a93ad6d3d5700c712 (diff) | |
parent | 6badf2d252a980d496b894c7258a778c57639953 (diff) |
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/domain_block.rb')
-rw-r--r-- | app/models/domain_block.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index 0b12617c6..84c08c158 100644 --- a/app/models/domain_block.rb +++ b/app/models/domain_block.rb @@ -17,8 +17,6 @@ class DomainBlock < ApplicationRecord enum severity: [:silence, :suspend, :noop] - attr_accessor :retroactive - validates :domain, presence: true, uniqueness: true has_many :accounts, foreign_key: :domain, primary_key: :domain @@ -36,4 +34,9 @@ class DomainBlock < ApplicationRecord return false if other_block.silence? && noop? (reject_media || !other_block.reject_media) && (reject_reports || !other_block.reject_reports) end + + def affected_accounts_count + scope = suspend? ? accounts.where(suspended_at: created_at) : accounts.where(silenced_at: created_at) + scope.count + end end |