Merge branch 'main' into glitch-soc/merge-upstream

2022-03-14 16:44:35 +01:00
parent 988f5bf026 91616004fe
commit a945182b56
71 changed files with 165 additions and 68 deletions
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -32,8 +32,12 @@ class Instance < ApplicationRecord
    @delivery_failure_tracker ||= DeliveryFailureTracker.new(domain)
  end

+  def purgeable?
+    unavailable? || domain_block&.suspend?
+  end
+
  def unavailable?
-    unavailable_domain.present? || domain_block&.suspend?
+    unavailable_domain.present?
  end

  def failing?