Skip to content

Commit 11e5c4e

Browse files
ClearlyClairehiyuki2578
authored andcommitted
Drop magic-public-key from webfinger replies as it's only used for OStatus (mastodon#11280)
1 parent 98624e4 commit 11e5c4e

2 files changed

Lines changed: 0 additions & 6 deletions

File tree

app/serializers/webfinger_serializer.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def links
1818
{ rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(object) },
1919
{ rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(object, format: 'atom') },
2020
{ rel: 'self', type: 'application/activity+json', href: account_url(object) },
21-
{ rel: 'magic-public-key', href: "data:application/magic-public-key,#{object.magic_key}" },
2221
{ rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_interaction_url}?uri={uri}" },
2322
]
2423
end

app/views/well_known/webfinger/show.xml.ruby

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ doc << Ox::Element.new('XRD').tap do |xrd|
2525
link['href'] = account_url(@account)
2626
end
2727

28-
xrd << Ox::Element.new('Link').tap do |link|
29-
link['rel'] = 'magic-public-key'
30-
link['href'] = "data:application/magic-public-key,#{@account.magic_key}"
31-
end
32-
3328
xrd << Ox::Element.new('Link').tap do |link|
3429
link['rel'] = 'http://ostatus.org/schema/1.0/subscribe'
3530
link['template'] = "#{authorize_interaction_url}?acct={uri}"

0 commit comments

Comments
 (0)