diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-19 15:17:12 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-19 15:17:12 +0000 |
| commit | a36a2c17964ee4cb3b1d6471769e765db0d9f90d (patch) | |
| tree | 8766f192e2ce8c3eac4312490bad7b33f5a2623b /app/services | |
| parent | e45cb0837bcefecfecf3ef39bbdee721a47a79fd (diff) | |
| parent | 2bcc81700c586a543e849e222c640df89da7fcb0 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/activitypub/fetch_remote_status_service.rb | 2 |
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 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 |