]> cat aescling's git repositories - mastodon.git/commitdiff
Fix #5272 - Order of checks in ActivityPub handler (#5276)
authorEugen Rochko <eugen@zeonfederated.com>
Sun, 8 Oct 2017 20:03:34 +0000 (22:03 +0200)
committerGitHub <noreply@github.com>
Sun, 8 Oct 2017 20:03:34 +0000 (22:03 +0200)
app/services/activitypub/fetch_remote_status_service.rb

index c7414f1617dad06bea7e00b5d498dbf9e6846cdc..e2a89a87c8a89ca1b0052dfd66345b5867e01b71 100644 (file)
@@ -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)