Refactor domain block checks (#11268)

2019-07-09 03:27:35 +02:00
parent 1e7187f2a8
commit 4e92183227
11 changed files with 108 additions and 51 deletions
--- a/app/services/activitypub/process_collection_service.rb
+++ b/app/services/activitypub/process_collection_service.rb
@ -8,9 +8,7 @@ class ActivityPub::ProcessCollectionService < BaseService
    @json    = Oj.load(body, mode: :strict)
    @options = options

-    return unless supported_context?
-    return if different_actor? && verify_account!.nil?
-    return if @account.suspended? || @account.local?
+    return if !supported_context? || (different_actor? && verify_account!.nil?) || @account.suspended? || @account.local?

    case @json['type']
    when 'Collection', 'CollectionPage'