Merge tag 'v3.3.0' into instance_only_statuses

app/policies/account_policy.rb

@@ -14,10 +14,22 @@ class AccountPolicy < ApplicationPolicy
   end
 
   def suspend?
-    staff? && !record.user&.staff?
+    staff? && !record.user&.staff? && !record.instance_actor?
+  end
+
+  def destroy?
+    record.suspended_temporarily? && admin?
   end
 
   def unsuspend?
+    staff? && record.suspension_origin_local?
+  end
+
+  def sensitive?
+    staff? && !record.user&.staff?
+  end
+
+  def unsensitive?
     staff?
   end
 
@@ -50,6 +62,6 @@ class AccountPolicy < ApplicationPolicy
   end
 
   def memorialize?
-    admin? && !record.user&.admin?
+    admin? && !record.user&.admin? && !record.instance_actor?
   end
 end

app/policies/domain_block_policy.rb

@@ -13,6 +13,10 @@ class DomainBlockPolicy < ApplicationPolicy
     admin?
   end
 
+  def update?
+    admin?
+  end
+
   def destroy?
     admin?
   end

app/policies/ip_block_policy.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class IpBlockPolicy < ApplicationPolicy
+  def index?
+    admin?
+  end
+
+  def create?
+    admin?
+  end
+
+  def destroy?
+    admin?
+  end
+end

app/policies/status_policy.rb

@@ -13,6 +13,7 @@ class StatusPolicy < ApplicationPolicy
 
   def show?
     return false if local_only? && (current_account.nil? || !current_account.local?)
+    return false if author.suspended?
 
     if requires_mention?
       owned? || mention_exists?