Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix for single status pages

Browse source
This commit is contained in:
Eugen Rochko 2016-09-08 21:23:29 +02:00
parent 85d89b472d
commit 762157ee4e
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/accounts_controller.rb
View file

@ -11,8 +11,8 @@ class AccountsController < ApplicationController
if user_signed_in?
status_ids = @statuses.collect { |s| [s.id, s.reblog_of_id] }.flatten.uniq
@favourited = Favourite.where(status_id: status_ids).where(account_id: current_user.account_id).map { |f| [f.status_id, true] }.to_h
@reblogged = Status.where(reblog_of_id: status_ids).where(account_id: current_user.account_id).map { |s| [s.reblog_of_id, true] }.to_h
@favourited = Status.favourites_map(status_ids, current_user.account_id)
@reblogged = Status.reblogs_map(status_ids, current_user.account_id)
else
@favourited = {}
@reblogged = {}

14
app/controllers/stream_entries_controller.rb
View file

@ -7,6 +7,20 @@ class StreamEntriesController < ApplicationController
def show
@type = @stream_entry.activity_type.downcase
if @stream_entry.activity_type == 'Status'
@ancestors = @stream_entry.activity.ancestors.with_includes.with_counters
@descendants = @stream_entry.activity.descendants.with_includes.with_counters
if user_signed_in?
status_ids = [@stream_entry.activity_id] + @ancestors.map { |s| s.id } + @descendants.map { |s| s.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|
format.html
format.atom