Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge remote-tracking branch 'tootsuite/master'

Browse source 
Conflicts:
 	app/controllers/statuses_controller.rb
This commit is contained in:
David Yip 2018-04-12 03:30:57 -05:00
commit a817f084ea
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
14 changed files with 160 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/statuses_controller.rb
View file

@ -4,6 +4,8 @@ class StatusesController < ApplicationController
include SignatureAuthentication
include Authorization
ANCESTORS_LIMIT = 20
layout 'public'
before_action :set_account
@ -17,8 +19,9 @@ class StatusesController < ApplicationController
respond_to do |format|
format.html do
use_pack 'public'
@ancestors = @status.reply? ? cache_collection(@status.ancestors(current_account), Status) : []
@descendants = cache_collection(@status.descendants(current_account), Status)
@ancestors = @status.reply? ? cache_collection(@status.ancestors(ANCESTORS_LIMIT, current_account), Status) : []
@next_ancestor = @ancestors.size < ANCESTORS_LIMIT ? nil : @ancestors.shift
@descendants = cache_collection(@status.descendants(current_account), Status)
render 'stream_entries/show'
end