From fe57f6330f089d023f0fa4db7f7c8a51551d2ee9 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 7 Mar 2016 13:25:26 +0100 Subject: API methods for retrieving home and mentions timelines --- app/controllers/api/accounts_controller.rb | 2 +- app/controllers/api/statuses_controller.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'app/controllers/api') diff --git a/app/controllers/api/accounts_controller.rb b/app/controllers/api/accounts_controller.rb index 927fd86b7..fc4c9d681 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 + @statuses = @account.statuses.order('created_at desc') end def follow diff --git a/app/controllers/api/statuses_controller.rb b/app/controllers/api/statuses_controller.rb index b1633ab6c..82334a32f 100644 --- a/app/controllers/api/statuses_controller.rb +++ b/app/controllers/api/statuses_controller.rb @@ -20,4 +20,12 @@ class Api::StatusesController < ApiController @status = FavouriteService.new.(current_user.account, Status.find(params[:id])).status render action: :show end + + def home + @statuses = Status.where(account: [current_user.account] + current_user.account.following).order('created_at desc') + end + + def mentions + @statuses = Status.where(id: Mention.where(account: current_user.account).pluck(:status_id)).order('created_at desc') + end end -- cgit