WIPfeature-unify-uis

1 files changed, 3 insertions, 25 deletions

diff --git a/app/controllers/directories_controller.rb b/app/controllers/directories_controller.rb
index f198ad5ba..cfd0fa656 100644
--- a/app/controllers/directories_controller.rb
+++ b/app/controllers/directories_controller.rb
@@ -1,42 +1,20 @@
 # frozen_string_literal: true
 
 class DirectoriesController < ApplicationController
-  layout 'public'
+  include WebAppControllerConcern
 
   before_action :authenticate_user!, if: :whitelist_mode?
   before_action :require_enabled!
-  before_action :set_instance_presenter
-  before_action :set_tag, only: :show
-  before_action :set_accounts
 
   skip_before_action :require_functional!, unless: :whitelist_mode?
 
   def index
-    render :index
-  end
-
-  def show
-    render :index
+    expires_in 0, public: true if current_account.nil?
   end
 
   private
 
   def require_enabled!
-    return not_found unless Setting.profile_directory
-  end
-
-  def set_tag
-    @tag = Tag.discoverable.find_normalized!(params[:id])
-  end
-
-  def set_accounts
-    @accounts = Account.local.discoverable.by_recent_status.page(params[:page]).per(20).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
-
-  def set_instance_presenter
-    @instance_presenter = InstancePresenter.new
+    not_found unless Setting.profile_directory
   end
 end