Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add an RSS feed tagged to a public profile page (#10502)

Browse source 
* Add featured tag support to rss feed on public account page

* fix codeing style
This commit is contained in:
Takeshi Umeda 2019-08-19 03:54:36 +09:00 • committed by Eugen Rochko
parent a8b0bb355d
commit 9e1d28f48e
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/accounts_controller.rb
View file

@ -28,6 +28,7 @@ class AccountsController < ApplicationController
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
@statuses = filtered_status_page(params)
@statuses = cache_collection(@statuses, Status)
@rss_url = rss_url
unless @statuses.empty?
@older_url = older_url if @statuses.last.id > filtered_statuses.last.id
@ -38,8 +39,9 @@ class AccountsController < ApplicationController
format.rss do
expires_in 0, public: true
@statuses = cache_collection(default_statuses.without_reblogs.without_replies.limit(PAGE_SIZE), Status)
render xml: RSS::AccountSerializer.render(@account, @statuses)
@statuses = filtered_statuses.without_reblogs.without_replies.limit(PAGE_SIZE)
@statuses = cache_collection(@statuses, Status)
render xml: RSS::AccountSerializer.render(@account, @statuses, params[:tag])
end
format.json do
@ -97,6 +99,14 @@ class AccountsController < ApplicationController
params[:username]
end
def rss_url
if tag_requested?
short_account_tag_url(@account, params[:tag], format: 'rss')
else
short_account_url(@account, format: 'rss')
end
end
def older_url
pagination_url(max_id: @statuses.last.id)
end
@ -126,7 +136,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)