From 188c6f326b991793239c47751ef45226c0cd8890 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 3 Oct 2016 00:26:00 +0200 Subject: Making public pages responsive, removing reblogs/favs counts from them --- app/controllers/accounts_controller.rb | 9 --------- app/controllers/stream_entries_controller.rb | 9 --------- 2 files changed, 18 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 55b1f3c45..9f4751771 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -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 diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb index fd8b97c9f..e1b664b08 100644 --- a/app/controllers/stream_entries_controller.rb +++ b/app/controllers/stream_entries_controller.rb @@ -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| -- cgit