From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 8 Oct 2017 20:03:34 +0000 (+0200)
Subject: Fix #5272 - Order of checks in ActivityPub handler (#5276)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3888a12c7922ffd9278f2b1a9f73fd92e51789c7;p=mastodon.git

Fix #5272 - Order of checks in ActivityPub handler (#5276)
---

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)