diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-30 03:17:12 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-30 03:17:12 +0000 |
| commit | ad46bc9772dfc52c7ed522658eda1a3ef608a7b3 (patch) | |
| tree | 12be46cac80eadcddc3ab122f1bda36d9c67a07c /app/services/activitypub/process_account_service.rb | |
| parent | d020ed1e05278a4b3e5d1ed60ee03e511bb513e3 (diff) | |
| parent | 4c6b5dbe96b565d3db3cbf0912f3b9911bc3922a (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/services/activitypub/process_account_service.rb')
| -rw-r--r-- | app/services/activitypub/process_account_service.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 5ee7d89ee..06ca75563 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -107,12 +107,7 @@ class ActivityPub::ProcessAccountService < BaseService def url return if @json['url'].blank? - - value = first_of_value(@json['url']) - - return value if value.is_a?(String) - - value['href'] + url_to_href(@json['url'], 'text/html') end def outbox_total_items |