From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 25 Jul 2017 14:01:03 +0000 (+0900)
Subject: Merge queries in Api::V1::FavouritesController (#4359)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a6ea7e282fc0cbb837cb1c1e344c31264600114c;p=mastodon.git

Merge queries in Api::V1::FavouritesController (#4359)
---

diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 92c0a62a9..9d73bb337 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -20,9 +20,7 @@ class Api::V1::FavouritesController < Api::BaseController
 
   def cached_favourites
     cache_collection(
-      Status.where(
-        id: results.map(&:status_id)
-      ),
+      Status.reorder(nil).joins(:favourites).merge(results),
       Status
     )
   end