From a514ca39b8f3d0f664a86a9fa91b3fcbd94593c5 Mon Sep 17 00:00:00 2001 From: Jeremy Friesen Date: Mon, 25 Apr 2022 10:43:21 -0400 Subject: [PATCH] Removing unused instance variable (#17414) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As I was looking into the implementation details of the `/t/:tag_name` relevancy feed I noticed an instance variable that we do not need. Below are the results of looking for the instance_variable `@article_index` or a potential `article_index` local variable or method name. ```shell ❯ rg "@?article_index" app/controllers/stories_controller.rb 28: @article_index = true 131: @article_index = true 162: @organization_article_index = true app/controllers/stories/tagged_articles_controller.rb 18: @article_index = true app/controllers/stories/articles_search_controller.rb 7: @article_index = true app/views/articles/_single_story.html.erb 26: <% if story.cached_organization && !@organization_article_index %> 32: 79: <% if story.cached_organization && !@organization_article_index %> ``` --- app/controllers/stories/articles_search_controller.rb | 2 +- app/controllers/stories/tagged_articles_controller.rb | 2 +- app/controllers/stories_controller.rb | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/stories/articles_search_controller.rb b/app/controllers/stories/articles_search_controller.rb index b40b193fc..45fc15bec 100644 --- a/app/controllers/stories/articles_search_controller.rb +++ b/app/controllers/stories/articles_search_controller.rb @@ -4,7 +4,7 @@ module Stories def index @query = I18n.t("stories_controller.searching") - @article_index = true + @current_ordering = current_search_results_ordering set_surrogate_key_header "articles-page-with-query" end diff --git a/app/controllers/stories/tagged_articles_controller.rb b/app/controllers/stories/tagged_articles_controller.rb index d0c6bcc42..8b7cef9d3 100644 --- a/app/controllers/stories/tagged_articles_controller.rb +++ b/app/controllers/stories/tagged_articles_controller.rb @@ -15,7 +15,7 @@ module Stories end @page = (params[:page] || 1).to_i - @article_index = true + @moderators = User.with_role(:tag_moderator, @tag).select(:username, :profile_image, :id) set_number_of_articles(tag: @tag) diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb index d823fb867..d973d0ca3 100644 --- a/app/controllers/stories_controller.rb +++ b/app/controllers/stories_controller.rb @@ -25,7 +25,6 @@ class StoriesController < ApplicationController def index @page = (params[:page] || 1).to_i - @article_index = true return handle_user_or_organization_or_podcast_or_page_index if params[:username] @@ -128,7 +127,7 @@ class StoriesController < ApplicationController assign_hero_html assign_podcasts get_latest_campaign_articles if Campaign.current.show_in_sidebar? - @article_index = true + set_surrogate_key_header "main_app_home_page" set_cache_control_headers(600, stale_while_revalidate: 30,