diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/statuses_controller.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/api/accounts_controller.rb b/app/controllers/api/accounts_controller.rb index 4a4431b2d..1a19ae43e 100644 --- a/app/controllers/api/accounts_controller.rb +++ b/app/controllers/api/accounts_controller.rb @@ -15,7 +15,7 @@ class Api::AccountsController < ApiController end def statuses - @statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id] || nil) + @statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id] || nil).to_a end def follow diff --git a/app/controllers/api/statuses_controller.rb b/app/controllers/api/statuses_controller.rb index 90e78a542..a4b183ef1 100644 --- a/app/controllers/api/statuses_controller.rb +++ b/app/controllers/api/statuses_controller.rb @@ -8,8 +8,8 @@ class Api::StatusesController < ApiController def context @status = Status.find(params[:id]) - @ancestors = @status.ancestors.with_includes.with_counters - @descendants = @status.descendants.with_includes.with_counters + @ancestors = @status.ancestors.with_includes.with_counters.to_a + @descendants = @status.descendants.with_includes.with_counters.to_a end def create @@ -28,10 +28,10 @@ class Api::StatusesController < ApiController end def home - @statuses = Feed.new(:home, current_user.account).get(20, params[:max_id]) + @statuses = Feed.new(:home, current_user.account).get(20, params[:max_id]).to_a end def mentions - @statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id]) + @statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id]).to_a end end |