From: abcang <abcang1015@gmail.com>
Date: Sun, 19 Nov 2017 14:33:15 +0000 (+0900)
Subject: Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2bcc81700c586a543e849e222c640df89da7fcb0;p=mastodon.git

Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)
---

diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index 8d7b7a17c..8de9283de 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -18,7 +18,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
     actor = ActivityPub::TagManager.instance.uri_to_resource(actor_id, Account)
     actor = ActivityPub::FetchRemoteAccountService.new.call(actor_id, id: true) if actor.nil? || needs_update(actor)
 
-    return if actor.suspended?
+    return if actor.nil? || actor.suspended?
 
     ActivityPub::Activity.factory(activity_json, actor).perform
   end