Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Show pinned statuses only in the top of the profile page (#4803)

Browse source 
* Show pinned statuses only in the top of the profile page

* Refactor AccountsController#show_pinned_statuses?
This commit is contained in:
nullkal 2017-09-04 19:53:18 +09:00 • committed by Eugen Rochko
parent b6f3869f8d
commit 2293466edd
2 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/accounts_controller.rb
View file

@ -14,7 +14,7 @@ class AccountsController < ApplicationController
return
end
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) unless media_requested?
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
@statuses = filtered_statuses.paginate_by_max_id(20, params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses, Status)
@next_url = next_url unless @statuses.empty?
@ -33,6 +33,10 @@ class AccountsController < ApplicationController
private
def show_pinned_statuses?
[replies_requested?, media_requested?, params[:max_id].present?, params[:since_id].present?].none?
end
def filtered_statuses
default_statuses.tap do |statuses|
statuses.merge!(only_media_scope) if media_requested?