about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-10-08 22:03:34 +0200
committerGitHub <noreply@github.com>2017-10-08 22:03:34 +0200
commit3888a12c7922ffd9278f2b1a9f73fd92e51789c7 (patch)
treea0b5e26d0dc63d7ad74535e01b2023eaac828d6a
parentcfa68907aeefca6bb36ae642f409c7856c14563f (diff)
Fix #5272 - Order of checks in ActivityPub handler (#5276)
-rw-r--r--app/services/activitypub/fetch_remote_status_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index c7414f161..e2a89a87c 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -11,7 +11,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
               body_to_json(prefetched_body)
             end
 
-    return unless expected_type? && supported_context?
+    return unless supported_context? && expected_type?
 
     return if actor_id.nil? || !trustworthy_attribution?(@json['id'], actor_id)