diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-08-30 00:14:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 00:14:36 +0200 |
| commit | cb447b28c403c7db32e3e3d7c2510004287edfda (patch) | |
| tree | 5bf7b38a977107857407ba7e9d03044eb0c1534a /app/controllers/directories_controller.rb | |
| parent | 7802ebd5f3de1ef4b7384f24fe5067977aff8da3 (diff) | |
Add profile directory to web UI (#11688)
* Add profile directory to web UI * Add a line of bio to the directory
Diffstat (limited to 'app/controllers/directories_controller.rb')
| -rw-r--r-- | app/controllers/directories_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/directories_controller.rb b/app/controllers/directories_controller.rb index a5c47b515..7244f02f0 100644 --- a/app/controllers/directories_controller.rb +++ b/app/controllers/directories_controller.rb @@ -7,7 +7,6 @@ class DirectoriesController < ApplicationController before_action :require_enabled! before_action :set_instance_presenter before_action :set_tag, only: :show - before_action :set_tags before_action :set_accounts def index @@ -28,13 +27,10 @@ class DirectoriesController < ApplicationController @tag = Tag.discoverable.find_normalized!(params[:id]) end - def set_tags - @tags = Tag.discoverable.limit(30).reject { |tag| tag.cached_sample_accounts.empty? } - end - def set_accounts - @accounts = Account.discoverable.by_recent_status.page(params[:page]).per(40).tap do |query| + @accounts = Account.local.discoverable.by_recent_status.page(params[:page]).per(15).tap do |query| query.merge!(Account.tagged_with(@tag.id)) if @tag + query.merge!(Account.not_excluded_by_account(current_account)) if current_account end end |