diff options
| author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-03 11:51:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 11:51:35 -0700 |
| commit | de154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch) | |
| tree | 88a1715021c33add55501351dbf74950deeac481 /app/views/xrd | |
| parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) | |
| parent | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff) | |
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'app/views/xrd')
| -rw-r--r-- | app/views/xrd/webfinger.json.rabl | 3 | ||||
| -rw-r--r-- | app/views/xrd/webfinger.xml.ruby | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/xrd/webfinger.json.rabl b/app/views/xrd/webfinger.json.rabl index 0de17ac19..e637ed9d3 100644 --- a/app/views/xrd/webfinger.json.rabl +++ b/app/views/xrd/webfinger.json.rabl @@ -11,6 +11,7 @@ node(:links) do { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account) }, { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }, { rel: 'salmon', href: api_salmon_url(@account.id) }, - { rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}" } + { rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}" }, + { rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}" }, ] end diff --git a/app/views/xrd/webfinger.xml.ruby b/app/views/xrd/webfinger.xml.ruby index ee5b5fc9d..80ac71d27 100644 --- a/app/views/xrd/webfinger.xml.ruby +++ b/app/views/xrd/webfinger.xml.ruby @@ -6,5 +6,6 @@ Nokogiri::XML::Builder.new do |xml| 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: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}") + xml.Link(rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}") end end.to_xml |