From e5c0aa6493427b7251da558897877f8aa6ad8e4e Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Tue, 25 Jul 2017 22:59:43 +0900 Subject: [PATCH] Send short account URL to remote instance (regression from #3844) (#4355) * Send short account URL to remote instance (regression from #3844) Resolve #4347 * remove format: 'json' --- app/views/well_known/webfinger/show.json.rabl | 2 +- app/views/well_known/webfinger/show.xml.ruby | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/well_known/webfinger/show.json.rabl b/app/views/well_known/webfinger/show.json.rabl index af11cd207..762d1860d 100644 --- a/app/views/well_known/webfinger/show.json.rabl +++ b/app/views/well_known/webfinger/show.json.rabl @@ -8,7 +8,7 @@ end node(:links) do [ - { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: account_url(@account) }, + { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(@account) }, { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }, { rel: 'self', type: 'application/activity+json', href: account_url(@account) }, { rel: 'salmon', href: api_salmon_url(@account.id) }, diff --git a/app/views/well_known/webfinger/show.xml.ruby b/app/views/well_known/webfinger/show.xml.ruby index 844742d68..b0158b8bd 100644 --- a/app/views/well_known/webfinger/show.xml.ruby +++ b/app/views/well_known/webfinger/show.xml.ruby @@ -3,7 +3,7 @@ Nokogiri::XML::Builder.new do |xml| xml.Subject @canonical_account_uri xml.Alias short_account_url(@account) xml.Alias account_url(@account) - xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account)) + xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(@account)) xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom')) xml.Link(rel: 'self', type: 'application/activity+json', href: account_url(@account)) xml.Link(rel: 'salmon', href: api_salmon_url(@account.id))