AO3-5512 Reviewdog

Author: Bilka2

app/controllers/tags_controller.rb

@@ -249,9 +249,7 @@ def update
 
     # Limiting the conditions under which you can update the tag type
     types = logged_in_as_admin? ? Tag::TYPES : Tag::USER_DEFINED
-    if @tag.can_change_type? && (types + %w(UnsortedTag)).include?(new_tag_type)
-      @tag = @tag.recategorize(new_tag_type)
-    end
+    @tag = @tag.recategorize(new_tag_type) if @tag.can_change_type? && (types + %w[UnsortedTag]).include?(new_tag_type)
 
     unless params[:tag].empty?
       @tag.attributes = tag_params

app/controllers/unsorted_tags_controller.rb

@@ -19,11 +19,8 @@ def mass_update
       tags = UnsortedTag.where(id: params[:tags].keys)
       tags.each do |tag|
         new_type = params[:tags][tag.id.to_s]
-        if Tag::USER_DEFINED.include?(new_type)
-          tag.update_attribute(:type, new_type)
-        else
-          raise ts("#{new_type} is not a valid tag type")
-        end
+        raise "#{new_type} is not a valid tag type" unless Tag::USER_DEFINED.include?(new_type)
+        tag.update_attribute(:type, new_type)
       end
       flash[:notice] = ts("Tags were successfully sorted.")
     end

app/views/tags/edit.html.erb

@@ -50,7 +50,7 @@
         <% types = logged_in_as_admin? ? Tag::TYPES : Tag::USER_DEFINED %>
         <% if @tag.can_change_type? %>
           <%= f.select :type,
-                options_for_select(types + %w(UnsortedTag),
+                options_for_select(types + %w[UnsortedTag],
                 @tag.type.to_s) %>
         <% else %>
           <strong><%= ts("%{tag_type}", tag_type: tag_type_label_name(@tag.type.tableize)) %></strong>