diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:28:08 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:28:08 -0500 |
| commit | 514fc908a373306b32b2b6b9fc0d849161d88271 (patch) | |
| tree | 0f0028e424b43dcf4a59b21ccc7170dfe883746b /app/controllers/activitypub/inboxes_controller.rb | |
| parent | b9f7bc149b2a6abfbdaee83e6992b617b8bdb18e (diff) | |
| parent | 11bddd31ce33b654ef72b00221715e6026486e7c (diff) | |
Merge tag 'v1.6.0rc3' into sync/upstream
Diffstat (limited to 'app/controllers/activitypub/inboxes_controller.rb')
| -rw-r--r-- | app/controllers/activitypub/inboxes_controller.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb index 5fce505fd..b37910b36 100644 --- a/app/controllers/activitypub/inboxes_controller.rb +++ b/app/controllers/activitypub/inboxes_controller.rb @@ -26,8 +26,12 @@ class ActivityPub::InboxesController < Api::BaseController end def upgrade_account - return unless signed_request_account.subscribed? - Pubsubhubbub::UnsubscribeWorker.perform_async(signed_request_account.id) + if signed_request_account.ostatus? + signed_request_account.update(last_webfingered_at: nil) + ResolveRemoteAccountWorker.perform_async(signed_request_account.acct) + end + + Pubsubhubbub::UnsubscribeWorker.perform_async(signed_request_account.id) if signed_request_account.subscribed? end def process_payload |