AO3-5513 Reviewdog

Author: Bilka2

app/controllers/fandoms_controller.rb

@@ -9,21 +9,18 @@ def index
       @counts = SearchCounts.fandom_ids_for_collection(@collection)
       @fandoms = (@medium ? @medium.fandoms : Fandom.all).where(id: @counts.keys).by_name
     elsif params[:media_id]
-      if @medium = Media.find_by_name(params[:media_id])
-         @page_subtitle = @medium.name
-        if @medium == Media.uncategorized
-          @fandoms = @medium.fandoms.in_use.by_name
-        else
-          @fandoms = @medium.fandoms.canonical.by_name.with_count
-        end
-      else
-        raise ActiveRecord::RecordNotFound, "Couldn't find media category named '#{params[:media_id]}'"
-      end
+      @medium = Media.find_by_name!(params[:media_id]) # rubocop:disable Rails/DynamicFindBy
+      @page_subtitle = @medium.name
+      @fandoms = if @medium == Media.uncategorized
+                   @medium.fandoms.in_use.by_name
+                 else
+                   @medium.fandoms.canonical.by_name.with_count
+                 end
     else
-      redirect_to media_index_path(notice: "Please choose a media category to start browsing fandoms.")
-      return
+      flash[:notice] = t(".choose_media")
+      redirect_to media_index_path and return
     end
-    @fandoms_by_letter = @fandoms.group_by {|f| f.sortable_name[0].upcase}
+    @fandoms_by_letter = @fandoms.group_by { |f| f.sortable_name[0].upcase }
   end
 
   def show

app/models/tag.rb

@@ -582,15 +582,25 @@ def self.autocomplete_fandom_lookup(options = {})
   # Substitute characters that are particularly prone to cause trouble in urls
   def self.find_by_name(string)
     return unless string.is_a? String
-    string = string.gsub(
+
+    self.find_by(name: from_param(string))
+  end
+
+  def self.find_by_name!(string)
+    return unless string.is_a? String
+
+    self.find_by!(name: from_param(string))
+  end
+
+  def self.from_param(string)
+    string.gsub(
       /\*[sadqh]\*/,
       '*s*' => '/',
       '*a*' => '&',
       '*d*' => '.',
       '*q*' => '?',
       '*h*' => '#'
     )
-    self.where('tags.name = ?', string).first
   end
 
   # If a tag by this name exists in another class, add a suffix to disambiguate them

app/views/bookmarks/index.html.erb

@@ -46,7 +46,7 @@
 <% end %>
 
 <% unless @owner.present? || @bookmarkable.present? %>
-  <p><%= ts("These are some of the latest bookmarks created on the Archive. To find more bookmarks, #{link_to 'choose a fandom', media_index_path} or #{link_to 'try our advanced search', search_bookmarks_path}.").html_safe %>
+  <p><%= t(".recent_bookmarks_html", choose_fandom_link: link_to(t(".choose_fandom"), media_index_path), advanced_search_link: link_to(t(".advanced_search"), search_bookmarks_path)) %>
 <% end %>
 
 <%== pagy_nav @pagy %>

app/views/fandoms/index.html.erb

@@ -1,11 +1,11 @@
 <!--SEARCHBROWSE Descriptive page name, messages and instructions-->
 <h2 class="heading">
   <% if @collection %>
-    <%= link_to(@collection.title, @collection) %> > <%= ts("Fandoms") %>
+    <%= link_to(@collection.title, @collection) %> > <%= t(".page_heading") %>
   <% elsif @medium %>
-    <%= link_to ts("Fandoms"), media_index_path %> > <%= @medium.name %>
+    <%= link_to t(".page_heading"), media_index_path %> > <%= @medium.name %>
   <% else %>
-    <%= link_to ts("Fandoms"), media_index_path %>
+    <%= link_to t(".page_heading"), media_index_path %>
   <% end %>
 </h2>
 <p>You can search this page by pressing <kbd>ctrl F</kbd> / <kbd>cmd F</kbd> and typing in what you are looking for.</p>
@@ -14,7 +14,7 @@
   <%= form_tag "", method: :get, class: "filter", id: "media-filter" do %>
     <fieldset>
       <p title="<%=ts("Choose media type") %>">
-        <%= select_tag :media_id, options_for_select(["All Media Types"] + @media.map{|m| m.name}, params[:media_id]) %>
+        <%= select_tag :media_id, options_for_select(["All Media Types"] + @media.map(&:name), params[:media_id]) %>
         <%= submit_tag ts("Show") %>
       </p>
     </fieldset>

app/views/home/_fandoms.html.erb

@@ -4,7 +4,7 @@
   <% cache "homepage-fandoms-version1", skip_digest: true do %>
     <% Media.for_menu.each do |medium| %>
       <% unless medium.id.nil? %>
-        <li><%= link_to ts("#{medium.name}"), media_fandoms_path(medium) %></li>
+        <li><%= link_to medium.name, media_fandoms_path(medium) %></li>
       <% end %>
     <% end %>
   <% end %>

app/views/media/index.html.erb

@@ -1,5 +1,5 @@
 <!--SEARCHBROWSE descriptive page name and system messages, descriptions, and instructions.-->
-<h2 class="heading"><%= ts('Fandoms') %></h2>
+<h2 class="heading"><%= t(".page_heading") %></h2>
 <!--/descriptions-->
 
 <!--main content-->
@@ -20,7 +20,7 @@
     </ol>
 
     <% unless @fandom_listing[medium].size < 5 %>
-    <p class="actions" role="navigation"><%= link_to ts("All %{media_type}...", :media_type => medium.name), media_fandoms_path(medium) %></p>
+    <p class="actions" role="navigation"><%= link_to t(".all", media_type: medium.name), media_fandoms_path(medium) %></p>
     <% end %>
   </li>
 <% end %>

config/locales/controllers/en.yml

@@ -93,6 +93,9 @@ en:
   external_works:
     update:
       successfully_updated: External work was successfully updated.
+  fandoms:
+    index:
+      choose_media: Please choose a media category to start browsing fandoms.
   home:
     content:
       page_title: Content Policy

config/locales/views/en.yml

@@ -462,6 +462,11 @@ en:
           comments_on_works: delete or hide comments they previously left on your works; you can delete these individually
           hide_works: hide their works or bookmarks from you
           intro: 'Blocking a user will not:'
+  bookmarks:
+    index:
+      advanced_search: try our advanced search
+      choose_fandom: choose a fandom
+      recent_bookmarks_html: These are some of the latest bookmarks created on the Archive. To find more bookmarks, %{choose_fandom_link} or %{advanced_search_link}.
   challenge_signups:
     signup_form:
       notice:
@@ -611,6 +616,9 @@ en:
         restricted_html: A translation of [Restricted Work] by %{creator_link}
         revealed_html: A translation of %{work_link} by %{creator_link}
         unrevealed: A translation of a work in an unrevealed collection
+  fandoms:
+    index:
+      page_heading: Fandoms
   feedbacks:
     new:
       abuse:
@@ -1515,6 +1523,10 @@ en:
       read_and_understood: I have read & understood the 2024 Terms of Service, including the Content Policy and Privacy Policy.
       summary_html: On the Archive of Our Own (AO3), users can create works, bookmarks, comments, tags, and other %{content_link}. Any information you publish on AO3 may be accessible by the public, AO3 users, and/or AO3 personnel. Be mindful when sharing personal information, including but not limited to your name, email, age, location, personal relationships, gender or sexual identity, racial or ethnic background, religious or political views, and/or account usernames for other sites.
       tos: Terms of Service
+  media:
+    index:
+      all: All %{media_type}...
+      page_heading: Fandoms
   menu:
     menu_about:
       about_us: About Us