diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-31 18:25:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 18:25:34 +0100 |
| commit | 968f34300681d8082cf2f824722a3945fc604b2d (patch) | |
| tree | 910675cc3b8d9022f65bcfa9bee1acee6af8d0e4 /app/controllers/directories_controller.rb | |
| parent | 371563b0e249b6369e04709fb974a8e57413529f (diff) | |
| parent | 1fe4e5e38c17a726e6aea5d6033139653e89a379 (diff) | |
Merge pull request #1876 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/directories_controller.rb')
| -rw-r--r-- | app/controllers/directories_controller.rb | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/app/controllers/directories_controller.rb b/app/controllers/directories_controller.rb deleted file mode 100644 index 2263f286b..000000000 --- a/app/controllers/directories_controller.rb +++ /dev/null @@ -1,37 +0,0 @@ -# frozen_string_literal: true - -class DirectoriesController < ApplicationController - layout 'public' - - before_action :authenticate_user!, if: :whitelist_mode? - before_action :require_enabled! - before_action :set_instance_presenter - before_action :set_accounts - before_action :set_pack - - skip_before_action :require_functional!, unless: :whitelist_mode? - - def index - render :index - end - - private - - def set_pack - use_pack 'share' - end - - def require_enabled! - return not_found unless Setting.profile_directory - end - - def set_accounts - @accounts = Account.local.discoverable.by_recent_status.page(params[:page]).per(20).tap do |query| - query.merge!(Account.not_excluded_by_account(current_account)) if current_account - end - end - - def set_instance_presenter - @instance_presenter = InstancePresenter.new - end -end |