diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-03 04:17:11 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-03 04:17:11 +0000 |
commit | 933840bebf4ce8f5282c88e8c3e8c1b3675fbf2d (patch) | |
tree | e1d156a830d9446218ad1f250111dfc32df76961 /app/services | |
parent | fa768abf5c10eb3469a26347a9fa5ff677b3d394 (diff) | |
parent | 99f962ba731f67050a914bb5b9a245869531ebd1 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/activitypub/process_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 06ca75563..0fbf18c00 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -74,7 +74,7 @@ class ActivityPub::ProcessAccountService < BaseService @account.statuses_count = outbox_total_items if outbox_total_items.present? @account.following_count = following_total_items if following_total_items.present? @account.followers_count = followers_total_items if followers_total_items.present? - @account.moved_to_account = moved_account if @json['movedTo'].present? + @account.moved_to_account = @json['movedTo'].present? ? moved_account : nil end def after_protocol_change! |