tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add author/actor URI to the list of webfinger aliases (#2319)

Browse Source 
This fixes outbound salmon requests to remote GNU Social instances
This commit is contained in:
ThibG 2017-04-22 15:09:49 +02:00 committed by Eugen
parent 8565ba68f7
commit fe43991d02
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/well_known/webfinger/show.json.rabl
View File

@ -3,7 +3,7 @@ object @account
node(:subject) { @canonical_account_uri } node(:subject) { @canonical_account_uri }
node(:aliases) do node(:aliases) do
[TagManager.instance.url_for(@account)] [TagManager.instance.url_for(@account), TagManager.instance.uri_for(@account)]
end end
node(:links) do node(:links) do

1
app/views/well_known/webfinger/show.xml.ruby
View File

@ -2,6 +2,7 @@ Nokogiri::XML::Builder.new do |xml|
xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do
xml.Subject @canonical_account_uri xml.Subject @canonical_account_uri
xml.Alias TagManager.instance.url_for(@account) xml.Alias TagManager.instance.url_for(@account)
xml.Alias TagManager.instance.uri_for(@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: TagManager.instance.url_for(@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: 'salmon', href: api_salmon_url(@account.id)) xml.Link(rel: 'salmon', href: api_salmon_url(@account.id))