about summary refs log tree commit diff
path: root/app/controllers/directories_controller.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-12-17 03:14:28 +0100
committerGitHub <noreply@github.com>2018-12-17 03:14:28 +0100
commit087e11897137dc1f2811c21c3ccc6cec3ccdedb3 (patch)
treec690ef737c21b6c2f910c0363ec22eef8192bc70 /app/controllers/directories_controller.rb
parent628da11e38b0580a074268f32d09791ed6278def (diff)
Remove "most popular" tab from profile directory, add responsive design (#9539)
* Remove "most popular" tab from profile directory, add responsive design

* Remove unused translations
Diffstat (limited to 'app/controllers/directories_controller.rb')
-rw-r--r--app/controllers/directories_controller.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/app/controllers/directories_controller.rb b/app/controllers/directories_controller.rb
index b8565af4b..df012657a 100644
--- a/app/controllers/directories_controller.rb
+++ b/app/controllers/directories_controller.rb
@@ -32,22 +32,12 @@ class DirectoriesController < ApplicationController
   end
 
   def set_accounts
-    @accounts = Account.searchable.discoverable.page(params[:page]).per(50).tap do |query|
+    @accounts = Account.discoverable.page(params[:page]).per(30).tap do |query|
       query.merge!(Account.tagged_with(@tag.id)) if @tag
-
-      if popular_requested?
-        query.merge!(Account.popular)
-      else
-        query.merge!(Account.by_recent_status)
-      end
     end
   end
 
   def set_instance_presenter
     @instance_presenter = InstancePresenter.new
   end
-
-  def popular_requested?
-    request.path.ends_with?('/popular')
-  end
 end