about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTakeshi Umeda <noel.yoshiba@gmail.com>2019-08-19 03:54:36 +0900
committermultiple creatures <dev@multiple-creature.party>2020-02-20 23:32:58 -0600
commit892b9a8476ed1007ae5ae499059e958f10ee6ba8 (patch)
treeadb7f8baf0ece07b9d47b51a9d61ad7c945c32ac
parent4363c65753e20c03b1aac22de432ed5dcae9182e (diff)
port tootsuite#10502 to monsterfork: Add an RSS feed tagged to a public profile page
* Add featured tag support to rss feed on public account page

* fix codeing style
-rw-r--r--app/controllers/accounts_controller.rb2
-rw-r--r--app/views/accounts/show.html.haml1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 8bff3ab18..3dca0a1af 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -164,7 +164,7 @@ class AccountsController < ApplicationController
   end
 
   def tag_requested?
-    request.path.ends_with?(Addressable::URI.parse("/tagged/#{params[:tag]}").normalize)
+    request.path.split('.').first.ends_with?(Addressable::URI.parse("/tagged/#{params[:tag]}").normalize)
   end
 
   def filtered_status_page(params)
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 428f4d259..bcfd3ff79 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -7,6 +7,7 @@
   - if @account.user&.setting_noindex
     %meta{ name: 'robots', content: 'noindex' }/
 
+  %link{ rel: 'alternate', type: 'application/rss+xml', href: @rss_url }/
   %link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/
 
   - if @older_url