From fe43991d02b67a650a8ad60ec48d156b6e4e963a Mon Sep 17 00:00:00 2001 From: ThibG Date: Sat, 22 Apr 2017 15:09:49 +0200 Subject: [PATCH] Add author/actor URI to the list of webfinger aliases (#2319) This fixes outbound salmon requests to remote GNU Social instances --- app/views/well_known/webfinger/show.json.rabl | 2 +- app/views/well_known/webfinger/show.xml.ruby | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/well_known/webfinger/show.json.rabl b/app/views/well_known/webfinger/show.json.rabl index e637ed9d329..67874da7819 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 80ac71d2708..fc0ab5b84d1 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))