diff options
| author | ThibG <thib@sitedethib.com> | 2017-04-22 15:09:49 +0200 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-22 15:09:49 +0200 |
| commit | fe43991d02b67a650a8ad60ec48d156b6e4e963a (patch) | |
| tree | 122e1dbeda7fd96fa161a26133a494c7c55f2bd5 | |
| parent | 8565ba68f7a6e4342cd4a63833b4d0ff743f0235 (diff) | |
Add author/actor URI to the list of webfinger aliases (#2319)
This fixes outbound salmon requests to remote GNU Social instances
| -rw-r--r-- | app/views/well_known/webfinger/show.json.rabl | 2 | ||||
| -rw-r--r-- | app/views/well_known/webfinger/show.xml.ruby | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/well_known/webfinger/show.json.rabl b/app/views/well_known/webfinger/show.json.rabl index e637ed9d3..67874da78 100644 --- a/app/views/well_known/webfinger/show.json.rabl +++ b/app/views/well_known/webfinger/show.json.rabl @@ -3,7 +3,7 @@ object @account node(:subject) { @canonical_account_uri } node(:aliases) do - [TagManager.instance.url_for(@account)] + [TagManager.instance.url_for(@account), TagManager.instance.uri_for(@account)] end node(:links) do diff --git a/app/views/well_known/webfinger/show.xml.ruby b/app/views/well_known/webfinger/show.xml.ruby index 80ac71d27..fc0ab5b84 100644 --- a/app/views/well_known/webfinger/show.xml.ruby +++ b/app/views/well_known/webfinger/show.xml.ruby @@ -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.Subject @canonical_account_uri 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://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)) |