From 547cb39dee12c097b779fd07bc543416125f50f8 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Mon, 9 Nov 2020 13:25:56 -0600
Subject: [PATCH] Removed unused api_salmon_url in haml meta pages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Removed:
- unused api_salmon_url in haml meta pages
---
 app/lib/ostatus/atom_serializer.rb      | 1 -
 app/serializers/webfinger_serializer.rb | 1 -
 app/views/accounts/_meta.html.haml      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/app/lib/ostatus/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb
index 17115444..962a6151 100644
--- a/app/lib/ostatus/atom_serializer.rb
+++ b/app/lib/ostatus/atom_serializer.rb
@@ -54,7 +54,6 @@ class OStatus::AtomSerializer
     append_element(feed, 'link', nil, rel: :self, type: 'application/atom+xml', href: account_url(account, format: 'atom'))
     append_element(feed, 'link', nil, rel: :next, type: 'application/atom+xml', href: account_url(account, format: 'atom', max_id: stream_entries.last.id)) if stream_entries.size == 20
     append_element(feed, 'link', nil, rel: :hub, href: api_push_url)
-    append_element(feed, 'link', nil, rel: :salmon, href: api_salmon_url(account.id))
 
     stream_entries.each do |stream_entry|
       feed << entry(stream_entry)
diff --git a/app/serializers/webfinger_serializer.rb b/app/serializers/webfinger_serializer.rb
index 8c0b0770..4220f697 100644
--- a/app/serializers/webfinger_serializer.rb
+++ b/app/serializers/webfinger_serializer.rb
@@ -18,7 +18,6 @@ class WebfingerSerializer < ActiveModel::Serializer
       { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(object) },
       { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(object, format: 'atom') },
       { rel: 'self', type: 'application/activity+json', href: account_url(object) },
-      { rel: 'salmon', href: api_salmon_url(object.id) },
       { rel: 'magic-public-key', href: "data:application/magic-public-key,#{object.magic_key}" },
       { rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_interaction_url}?uri={uri}" },
     ]
diff --git a/app/views/accounts/_meta.html.haml b/app/views/accounts/_meta.html.haml
index 87ff16f7..02d6dfa6 100644
--- a/app/views/accounts/_meta.html.haml
+++ b/app/views/accounts/_meta.html.haml
@@ -5,7 +5,6 @@
   - if account.user&.setting_noindex
     %meta{ name: 'robots', content: 'noindex' }/
 
-  %link{ rel: 'salmon', href: api_salmon_url(account.id) }/
   %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(account, format: 'atom') }/
   %link{ rel: 'alternate', type: 'application/rss+xml', href: account_url(account, format: 'rss') }/
   %link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(account) }/