summaryrefslogtreecommitdiffstats
path: root/app/views/well_known/webfinger/show.xml.ruby
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-07-19 01:44:42 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-07-19 01:44:42 +0200
commit730c4053d642024b9949d72c8a9f1873532c6212 (patch)
treef6bee482d07ccf0e51cd024bc759d3b48f6894f2 /app/views/well_known/webfinger/show.xml.ruby
parent15c7478c5560a1f654d0d00d8ee2a624acb34089 (diff)
Add ActivityPub actor representing the entire server (#11321)
* Add support for an instance actor * Skip username validation for local Application accounts * Add migration script to create instance actor * Make Codeclimate happy * Switch to id -99 for instance actor * Remove unused `icon` and `image` attributes from instance actor * Use if/elsif/else instead of return + ternary operator * Add instance actor to fresh installs * Use instance actor as instance representative Use instance actor for forwarding reports, relay operations, and spam auto-reporting. * Seed database in test environment * Fix single-user mode * Fix tests * Fix specs to accomodate for an extra `Account` * Auto-reject follows on instance actor Following an instance actor might make sense, but we are not handling that right now, so auto-reject. * Fix webfinger lookup and serialization for instance actor * Rename instance actor * Make it clear in the HTML view that the instance actor should not be blocked * Raise cache time for instance actor as there's no dynamic content * Re-use /about/more with a flash message for instance actor profile
Diffstat (limited to 'app/views/well_known/webfinger/show.xml.ruby')
-rw-r--r--app/views/well_known/webfinger/show.xml.ruby57
1 files changed, 37 insertions, 20 deletions
diff --git a/app/views/well_known/webfinger/show.xml.ruby b/app/views/well_known/webfinger/show.xml.ruby
index ae80df9d2f8..f5a54052a6c 100644
--- a/app/views/well_known/webfinger/show.xml.ruby
+++ b/app/views/well_known/webfinger/show.xml.ruby
@@ -4,30 +4,47 @@ doc << Ox::Element.new('XRD').tap do |xrd|
xrd['xmlns'] = 'http://docs.oasis-open.org/ns/xri/xrd-1.0'
xrd << (Ox::Element.new('Subject') << @account.to_webfinger_s)
- xrd << (Ox::Element.new('Alias') << short_account_url(@account))
- xrd << (Ox::Element.new('Alias') << account_url(@account))
- xrd << Ox::Element.new('Link').tap do |link|
- link['rel'] = 'http://webfinger.net/rel/profile-page'
- link['type'] = 'text/html'
- link['href'] = short_account_url(@account)
- end
+ if @account.instance_actor?
+ xrd << (Ox::Element.new('Alias') << instance_actor_url)
- xrd << Ox::Element.new('Link').tap do |link|
- link['rel'] = 'http://schemas.google.com/g/2010#updates-from'
- link['type'] = 'application/atom+xml'
- link['href'] = account_url(@account, format: 'atom')
- end
+ xrd << Ox::Element.new('Link').tap do |link|
+ link['rel'] = 'http://webfinger.net/rel/profile-page'
+ link['type'] = 'text/html'
+ link['href'] = about_more_url(instance_actor: true)
+ end
- xrd << Ox::Element.new('Link').tap do |link|
- link['rel'] = 'self'
- link['type'] = 'application/activity+json'
- link['href'] = account_url(@account)
- end
+ xrd << Ox::Element.new('Link').tap do |link|
+ link['rel'] = 'self'
+ link['type'] = 'application/activity+json'
+ link['href'] = instance_actor_url
+ end
+ else
+ xrd << (Ox::Element.new('Alias') << short_account_url(@account))
+ xrd << (Ox::Element.new('Alias') << account_url(@account))
+
+ xrd << Ox::Element.new('Link').tap do |link|
+ link['rel'] = 'http://webfinger.net/rel/profile-page'
+ link['type'] = 'text/html'
+ link['href'] = short_account_url(@account)
+ end
+
+ xrd << Ox::Element.new('Link').tap do |link|
+ link['rel'] = 'http://schemas.google.com/g/2010#updates-from'
+ link['type'] = 'application/atom+xml'
+ link['href'] = account_url(@account, format: 'atom')
+ end
+
+ xrd << Ox::Element.new('Link').tap do |link|
+ link['rel'] = 'self'
+ link['type'] = 'application/activity+json'
+ link['href'] = account_url(@account)
+ end
- xrd << Ox::Element.new('Link').tap do |link|
- link['rel'] = 'http://ostatus.org/schema/1.0/subscribe'
- link['template'] = "#{authorize_interaction_url}?acct={uri}"
+ xrd << Ox::Element.new('Link').tap do |link|
+ link['rel'] = 'http://ostatus.org/schema/1.0/subscribe'
+ link['template'] = "#{authorize_interaction_url}?acct={uri}"
+ end
end
end