]> cat aescling's git repositories - mastodon.git/commitdiff
Merge queries in Api::V1::FavouritesController (#4359)
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Tue, 25 Jul 2017 14:01:03 +0000 (23:01 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 25 Jul 2017 14:01:03 +0000 (16:01 +0200)
app/controllers/api/v1/favourites_controller.rb

index 92c0a62a980cc032c33f816f7a87b46597591c8a..9d73bb3379b6f707b0fd507aa8db96eb4926c081 100644 (file)
@@ -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