diff options
author | David Yip <yipdw@member.fsf.org> | 2017-12-12 02:54:13 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-12-12 02:54:13 -0600 |
commit | a057ed5cfea2c1c4fb21984cadae993740fb25e0 (patch) | |
tree | c965f135b8c46f679eb22e80a37550c8b985b9ea /app/services/resolve_remote_account_service.rb | |
parent | 04eaa1943f002865f8a0234e19c6ea4cc1d3bb6a (diff) | |
parent | 14c4a33cd9bfc1212cb362897272e5ea7d1529e5 (diff) |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Diffstat (limited to 'app/services/resolve_remote_account_service.rb')
-rw-r--r-- | app/services/resolve_remote_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/resolve_remote_account_service.rb b/app/services/resolve_remote_account_service.rb index 3293fe40f..d7d0be210 100644 --- a/app/services/resolve_remote_account_service.rb +++ b/app/services/resolve_remote_account_service.rb @@ -44,7 +44,7 @@ class ResolveRemoteAccountService < BaseService if lock.acquired? @account = Account.find_remote(@username, @domain) - if activitypub_ready? + if activitypub_ready? || @account&.activitypub? handle_activitypub else handle_ostatus |