Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-11-19 15:17:12 +00:00
parent e45cb0837b 2bcc81700c
commit a36a2c1796
3 changed files with 19 additions and 24 deletions
--- 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