Show accurate number of accounts that would be affected by unsuspendi…

…ng an instance

app/models/domain_block.rb

@@ -36,4 +36,9 @@ def stricter_than?(other_block)
     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: true, suspended_at: [created_at, nil]) : accounts.where(silenced: true, silenced_at: [created_at, nil])
+    scope.count
+  end
 end

app/views/admin/domain_blocks/show.html.haml

@@ -14,7 +14,7 @@
       label: t(".retroactive.#{@domain_block.severity}"),
       hint: t(:affected_accounts,
         scope: [:admin, :domain_blocks, :show],
-        count: @domain_block.accounts_count)
+        count: @domain_block.affected_accounts_count)
 
   .actions
     = f.button :button, t('.undo'), type: :submit

config/locales/en.yml

@@ -293,8 +293,8 @@ en:
           one: One account in the database affected
           other: "%{count} accounts in the database affected"
         retroactive:
-          silence: Unsilence all existing accounts from this domain
-          suspend: Unsuspend all existing accounts from this domain
+          silence: Unsilence existing affected accounts from this domain
+          suspend: Unsuspend existing affected accounts from this domain
         title: Undo domain block for %{domain}
         undo: Undo
       undo: Undo domain block