forked from treehouse/mastodon
* Send short account URL to remote instance (regression from #3844) Resolve #4347 * remove format: 'json'signup-info-prompt
parent
02744f29ef
commit
e5c0aa6493
|
@ -8,7 +8,7 @@ end
|
||||||
|
|
||||||
node(:links) do
|
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: '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: 'self', type: 'application/activity+json', href: account_url(@account) },
|
||||||
{ rel: 'salmon', href: api_salmon_url(@account.id) },
|
{ rel: 'salmon', href: api_salmon_url(@account.id) },
|
||||||
|
|
|
@ -3,7 +3,7 @@ Nokogiri::XML::Builder.new do |xml|
|
||||||
xml.Subject @canonical_account_uri
|
xml.Subject @canonical_account_uri
|
||||||
xml.Alias short_account_url(@account)
|
xml.Alias short_account_url(@account)
|
||||||
xml.Alias 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: '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: 'self', type: 'application/activity+json', href: account_url(@account))
|
||||||
xml.Link(rel: 'salmon', href: api_salmon_url(@account.id))
|
xml.Link(rel: 'salmon', href: api_salmon_url(@account.id))
|
||||||
|
|
Loading…
Reference in New Issue