mastofe

commit: b9d241c6f554570e0677d9354b27dad21322e341
parent: 56af04dbb4663031c3c654b3f16d323cb64f8c7d
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Wed, 13 Sep 2017 11:05:02 +0200

Fix #4917 - Add missing suspend checks (#4921)


Diffstat:
M
app/services/activitypub/fetch_remote_status_service.rb
2
++
M
app/services/activitypub/process_collection_service.rb
4
++--

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
@@ -17,6 +17,8 @@ class ActivityPub::FetchRemoteStatusService < BaseService
     actor = ActivityPub::TagManager.instance.uri_to_resource(actor_id, Account)
     actor = ActivityPub::FetchRemoteAccountService.new.call(actor_id) if actor.nil?
 
+    return if actor.suspended?
+
     ActivityPub::Activity.factory(activity, actor).perform
   end
 
diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb
@@ -7,9 +7,9 @@ class ActivityPub::ProcessCollectionService < BaseService
     @account = account
     @json    = Oj.load(body, mode: :strict)
 
-    return if @account.suspended? || !supported_context?
-
+    return unless supported_context?
     return if different_actor? && verify_account!.nil?
+    return if @account.suspended?
 
     case @json['type']
     when 'Collection', 'CollectionPage'