From 892b9a8476ed1007ae5ae499059e958f10ee6ba8 Mon Sep 17 00:00:00 2001 From: Takeshi Umeda Date: Mon, 19 Aug 2019 03:54:36 +0900 Subject: 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 --- app/controllers/accounts_controller.rb | 2 +- app/views/accounts/show.html.haml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- cgit