diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-27 18:54:26 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-27 18:54:26 +0200 |
| commit | c13cfeac0952b112140d48a076d685730ff39b06 (patch) | |
| tree | 304e82845e241ed35840e5e578dd496efb3f74a4 /app/services | |
| parent | 5bb8563f6c0ec9021d6e70d85544147e6c2d0f44 (diff) | |
| parent | eef8d9a5f7d07bf785c6a7184e01374e211c6d7f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/activitypub/fetch_remote_account_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb index 1ec9ee5dd..8430d12d5 100644 --- a/app/services/activitypub/fetch_remote_account_service.rb +++ b/app/services/activitypub/fetch_remote_account_service.rb @@ -5,9 +5,10 @@ class ActivityPub::FetchRemoteAccountService < BaseService SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze - # Should be called when uri has already been checked for locality # Does a WebFinger roundtrip on each call def call(uri, id: true, prefetched_body: nil, break_on_redirect: false) + return ActivityPub::TagManager.instance.uri_to_resource(uri, Account) if ActivityPub::TagManager.instance.local_uri?(uri) + @json = if prefetched_body.nil? fetch_resource(uri, id) else |