diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-25 21:36:22 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-25 21:36:22 +0200 |
| commit | 7e5691804d4f0019a89b8b8a3dad532bc9d940ea (patch) | |
| tree | 84c2f4e4ac07bea3915639a50df84eb62b6c5768 /app/views/well_known | |
| parent | 852acbd7385a640d9e00e462d58a847851744034 (diff) | |
| parent | 7232cdf7e8249f79078005931b1165e54e413fa9 (diff) | |
Merge git://github.com/tootsuite/mastodon into tootsuite-master
Diffstat (limited to 'app/views/well_known')
| -rw-r--r-- | app/views/well_known/webfinger/show.json.rabl | 2 | ||||
| -rw-r--r-- | 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)) |