Refactor to use not_private scope to remove extra query

otwcode · Jan 10, 2025 · 43ee70a · 43ee70a
1 parent 5d4dc02
commit 43ee70a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
@@ -61,9 +61,8 @@ def search
   def index
     if @bookmarkable
       access_denied unless logged_in_as_admin? || @bookmarkable.visible?
-      @bookmarks = @bookmarkable.bookmarks.is_public
-      @bookmarks += @bookmarkable.bookmarks.where(hidden_by_admin: true) if logged_in_as_admin?
-      @bookmarks = @bookmarks.order_by_created_at.paginate(page: params[:page], per_page: ArchiveConfig.ITEMS_PER_PAGE)
+      @bookmarks = @bookmarkable.bookmarks.not_private.order_by_created_at.paginate(page: params[:page], per_page: ArchiveConfig.ITEMS_PER_PAGE)
+      @bookmarks = @bookmarks.filter { |bookmark| !bookmark.hidden_by_admin } unless logged_in_as_admin?
     else
       base_options = {
         show_private: (@user.present? && @user == current_user),