Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Making public pages responsive, removing reblogs/favs counts from them

Browse source
This commit is contained in:
Eugen Rochko 2016-10-03 00:26:00 +02:00
parent d74da1a89a
commit 188c6f326b
8 changed files with 31 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/accounts_controller.rb
View file

@ -8,15 +8,6 @@ class AccountsController < ApplicationController
respond_to do |format|
format.html do
@statuses = @account.statuses.order('id desc').with_includes.with_counters.paginate(page: params[:page], per_page: 10)
if user_signed_in?
status_ids = @statuses.collect { |s| [s.id, s.reblog_of_id] }.flatten.uniq
@favourited = Status.favourites_map(status_ids, current_user.account_id)
@reblogged = Status.reblogs_map(status_ids, current_user.account_id)
else
@favourited = {}
@reblogged = {}
end
end
format.atom do

9
app/controllers/stream_entries_controller.rb
View file

@ -11,15 +11,6 @@ class StreamEntriesController < ApplicationController
if @stream_entry.activity_type == 'Status'
@ancestors = @stream_entry.activity.ancestors
@descendants = @stream_entry.activity.descendants
if user_signed_in?
status_ids = [@stream_entry.activity_id] + @ancestors.map(&:id) + @descendants.map(&:id)
@favourited = Status.favourites_map(status_ids, current_user.account_id)
@reblogged = Status.reblogs_map(status_ids, current_user.account_id)
else
@favourited = {}
@reblogged = {}
end
end
respond_to do |format|