diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-10-04 20:13:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 20:13:46 +0200 |
| commit | 02ba9cfa35c7b2285950955619ae3431391e9625 (patch) | |
| tree | 0e1ccc086ba1efde94851f998418d21ac4e278a6 /app/controllers | |
| parent | e2b561e3a521ff893943c0e9e32952e35934ca54 (diff) | |
Remove code for rendering public and hashtag timelines outside the web UI (#19257)
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/directories_controller.rb | 32 | ||||
| -rw-r--r-- | app/controllers/public_timelines_controller.rb | 26 | ||||
| -rw-r--r-- | app/controllers/tags_controller.rb | 2 |
3 files changed, 1 insertions, 59 deletions
diff --git a/app/controllers/directories_controller.rb b/app/controllers/directories_controller.rb deleted file mode 100644 index f28c5b2af..000000000 --- a/app/controllers/directories_controller.rb +++ /dev/null @@ -1,32 +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 - - skip_before_action :require_functional!, unless: :whitelist_mode? - - def index - render :index - end - - private - - 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 diff --git a/app/controllers/public_timelines_controller.rb b/app/controllers/public_timelines_controller.rb deleted file mode 100644 index 1332ba16c..000000000 --- a/app/controllers/public_timelines_controller.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -class PublicTimelinesController < ApplicationController - layout 'public' - - before_action :authenticate_user!, if: :whitelist_mode? - before_action :require_enabled! - before_action :set_body_classes - before_action :set_instance_presenter - - def show; end - - private - - def require_enabled! - not_found unless Setting.timeline_preview - end - - def set_body_classes - @body_classes = 'with-modals' - end - - def set_instance_presenter - @instance_presenter = InstancePresenter.new - end -end diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 6dbc2667a..2890c179d 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -21,7 +21,7 @@ class TagsController < ApplicationController def show respond_to do |format| format.html do - expires_in 0, public: true + redirect_to web_path("tags/#{@tag.name}") end format.rss do |