rubocop: fix various style issues.

Rakefile

@@ -1,7 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 require 'rake'
 
 Rails.application.load_tasks

app/controllers/application_controller.rb

@@ -16,14 +16,14 @@ class ApplicationController < ActionController::Base
 
   rescue_from Exception, :with => :rescue_exception
 
-  protected
-
   def self.rescue_with(*klasses, status: 500)
-    rescue_from *klasses do |exception|
+    rescue_from(*klasses) do |exception|
       render_error_page(status, exception)
     end
   end
 
+  protected
+
   def enable_cors
     response.headers["Access-Control-Allow-Origin"] = "*"
   end
@@ -61,7 +61,7 @@ class ApplicationController < ActionController::Base
     when ActionController::RoutingError
       render_error_page(405, exception)
     when ActionController::UnknownFormat, ActionView::MissingTemplate
-      render_error_page(406, exception, message: "#{request.format.to_s} is not a supported format for this page")
+      render_error_page(406, exception, message: "#{request.format} is not a supported format for this page")
     when PaginationExtension::PaginationError
       render_error_page(410, exception, template: "static/pagination_error", message: "You cannot go beyond page #{Danbooru.config.max_numbered_pages}.")
     when Post::SearchError
@@ -80,7 +80,7 @@ class ApplicationController < ActionController::Base
   def render_error_page(status, exception, message: exception.message, template: "static/error", format: request.format.symbol)
     @exception = exception
     @expected = status < 500
-    @message = message.encode("utf-8", { invalid: :replace, undef: :replace })
+    @message = message.encode("utf-8", invalid: :replace, undef: :replace)
     @backtrace = Rails.backtrace_cleaner.clean(@exception.backtrace)
     format = :html unless format.in?(%i[html json xml js atom])
 

app/controllers/artist_commentaries_controller.rb

@@ -34,7 +34,7 @@ class ArtistCommentariesController < ApplicationController
     @artist_commentary.revert_to!(@version)
   end
 
-private
+  private
 
   def commentary_params
     params.fetch(:artist_commentary, {}).except(:post_id).permit(%i[

app/controllers/artist_urls_controller.rb

@@ -5,7 +5,7 @@ class ArtistUrlsController < ApplicationController
   def index
     @artist_urls = ArtistUrl.includes(:artist).paginated_search(params)
     respond_with(@artist_urls) do |format|
-      format.json { render json: @artist_urls.to_json(include: "artist",) }
+      format.json { render json: @artist_urls.to_json(include: "artist") }
       format.xml { render xml: @artist_urls.to_xml(include: "artist", root: "artist-urls") }
     end
   end
@@ -16,7 +16,7 @@ class ArtistUrlsController < ApplicationController
     respond_with(@artist_url)
   end
 
-private
+  private
 
   def artist_url_params
     permitted_params = %i[is_active]

app/controllers/artists_controller.rb

@@ -85,7 +85,7 @@ class ArtistsController < ApplicationController
     end
   end
 
-private
+  private
 
   def load_artist
     @artist = Artist.find(params[:id])

app/controllers/comments_controller.rb

@@ -72,7 +72,8 @@ class CommentsController < ApplicationController
     respond_with(@comment)
   end
 
-private
+  private
+
   def index_for_post
     @post = Post.find(params[:post_id])
     @comments = @post.comments

app/controllers/dmails_controller.rb

@@ -60,7 +60,7 @@ class DmailsController < ApplicationController
     @dmail.update_column(:is_spam, false)
   end
 
-private
+  private
 
   def check_privilege(dmail)
     if !dmail.visible_to?(CurrentUser.user, params[:key])

app/controllers/explore/posts_controller.rb

@@ -29,6 +29,7 @@ module Explore
     end
 
     private
+
     def set_date
       @date = params[:date] ? Date.parse(params[:date]) : Date.today
     end

app/controllers/forum_post_votes_controller.rb

@@ -19,7 +19,7 @@ class ForumPostVotesController < ApplicationController
     respond_with(@forum_post_vote)
   end
 
-private
+  private
 
   def forum_post_vote_params
     params.fetch(:forum_post_vote, {}).permit(:score)

app/controllers/forum_posts_controller.rb

@@ -66,7 +66,8 @@ class ForumPostsController < ApplicationController
     respond_with(@forum_post)
   end
 
-private
+  private
+
   def load_post
     @forum_post = ForumPost.find(params[:id])
     @forum_topic = @forum_post.topic

app/controllers/forum_topics_controller.rb

@@ -93,13 +93,12 @@ class ForumTopicsController < ApplicationController
 
   def unsubscribe
     subscription = ForumSubscription.where(:forum_topic_id => @forum_topic.id, :user_id => CurrentUser.user.id).first
-    if subscription
+    subscription&.destroy
-      subscription.destroy
-    end
     respond_with(@forum_topic)
   end
 
-private
+  private
+
   def normalize_search
     if params[:title_matches]
       params[:search] ||= {}

app/controllers/ip_addresses_controller.rb

@@ -5,13 +5,12 @@ class IpAddressesController < ApplicationController
   def index
     if search_params[:group_by] == "ip_addr"
       @ip_addresses = IpAddress.search(search_params).group_by_ip_addr(search_params[:ipv4_masklen], search_params[:ipv6_masklen]).paginate(params[:page], limit: params[:limit] || 1000)
-      respond_with(@ip_addresses)
     elsif search_params[:group_by] == "user"
       @ip_addresses = IpAddress.includes(:user).search(search_params).group_by_user.paginate(params[:page], limit: params[:limit] || 1000)
-      respond_with(@ip_addresses)
     else
       @ip_addresses = IpAddress.includes(:user, :model).paginated_search(params)
+    end
+
     respond_with(@ip_addresses)
   end
-  end
 end

app/controllers/legacy_controller.rb

@@ -33,7 +33,8 @@ class LegacyController < ApplicationController
     render :plain => "this resource is no longer available", :status => 410
   end
 
-private
+  private
+
   def tag_query
     params[:tags] || (params[:post] && params[:post][:tags])
   end

app/controllers/maintenance/user/email_notifications_controller.rb

@@ -1,7 +1,7 @@
 module Maintenance
   module User
     class EmailNotificationsController < ApplicationController
-      class VerificationError < Exception ; end
+      class VerificationError < Exception; end
 
       before_action :validate_sig, :only => [:destroy]
       rescue_from VerificationError, :with => :render_403

app/controllers/pool_elements_controller.rb

@@ -27,7 +27,8 @@ class PoolElementsController < ApplicationController
     @pools
   end
 
-private
+  private
+
   def append_pool_to_session(pool)
     recent_pool_ids = session[:recent_pool_ids].to_s.scan(/\d+/)
     recent_pool_ids << pool.id.to_s

app/controllers/pool_versions_controller.rb

@@ -22,7 +22,7 @@ class PoolVersionsController < ApplicationController
     end
   end
 
-private
+  private
 
   def set_timeout
     PoolArchive.connection.execute("SET statement_timeout = #{CurrentUser.user.statement_timeout}")

app/controllers/post_replacements_controller.rb

@@ -23,13 +23,14 @@ class PostReplacementsController < ApplicationController
   end
 
   def index
-    params[:search][:post_id] = params.delete(:post_id) if params.has_key?(:post_id)
+    params[:search][:post_id] = params.delete(:post_id) if params.key?(:post_id)
     @post_replacements = PostReplacement.paginated_search(params)
 
     respond_with(@post_replacements)
   end
 
-private
+  private
+
   def create_params
     params.require(:post_replacement).permit(:replacement_url, :replacement_file, :final_source, :tags)
   end

app/controllers/posts_controller.rb

@@ -91,7 +91,7 @@ class PostsController < ApplicationController
     respond_with_post_after_update(@post)
   end
 
-private
+  private
 
   def tag_query
     params[:tags] || (params[:post] && params[:post][:tags])
@@ -109,7 +109,7 @@ private
           render :template => "static/error", :status => 500
         else
           response_params = {:q => params[:tags_query], :pool_id => params[:pool_id], :favgroup_id => params[:favgroup_id]}
-          response_params.reject!{|key, value| value.blank?}
+          response_params.reject! {|key, value| value.blank?}
           redirect_to post_path(post, response_params)
         end
       end

app/controllers/sessions_controller.rb

@@ -28,6 +28,6 @@ class SessionsController < ApplicationController
   end
 
   def sign_out
-    destroy()
+    destroy
   end
 end

app/controllers/tag_aliases_controller.rb

@@ -40,7 +40,7 @@ class TagAliasesController < ApplicationController
     respond_with(@tag_alias, :location => tag_alias_path(@tag_alias))
   end
 
-private
+  private
 
   def tag_alias_params
     params.require(:tag_alias).permit(%i[antecedent_name consequent_name forum_topic_id skip_secondary_validations])

app/controllers/tag_implications_controller.rb

@@ -40,7 +40,7 @@ class TagImplicationsController < ApplicationController
     respond_with(@tag_implication, :location => tag_implication_path(@tag_implication))
   end
 
-private
+  private
 
   def tag_implication_params
     params.require(:tag_implication).permit(%i[antecedent_name consequent_name forum_topic_id skip_secondary_validations])

app/controllers/tags_controller.rb

@@ -37,7 +37,8 @@ class TagsController < ApplicationController
     respond_with(@tag)
   end
 
-private
+  private
+
   def check_privilege(tag)
     raise User::PrivilegeError unless tag.editable_by?(CurrentUser.user)
   end

app/controllers/users_controller.rb

@@ -99,7 +99,7 @@ class UsersController < ApplicationController
   private
 
   def check_privilege(user)
-    raise User::PrivilegeError unless (user.id == CurrentUser.id || CurrentUser.is_admin?)
+    raise User::PrivilegeError unless user.id == CurrentUser.id || CurrentUser.is_admin?
   end
 
   def user_params(context)

app/controllers/wiki_pages_controller.rb

@@ -10,7 +10,7 @@ class WikiPagesController < ApplicationController
   end
 
   def edit
-    @wiki_page, _ = WikiPage.find_by_id_or_title(params[:id])
+    @wiki_page, _found_by = WikiPage.find_by_id_or_title(params[:id])
     respond_with(@wiki_page)
   end
 
@@ -49,7 +49,7 @@ class WikiPagesController < ApplicationController
   end
 
   def update
-    @wiki_page, _ = WikiPage.find_by_id_or_title(params[:id])
+    @wiki_page, _found_by = WikiPage.find_by_id_or_title(params[:id])
     @wiki_page.update(wiki_page_params(:update))
     flash[:notice] = @wiki_page.warnings.full_messages.join(".\n \n") if @wiki_page.warnings.any?
 
@@ -57,13 +57,13 @@ class WikiPagesController < ApplicationController
   end
 
   def destroy
-    @wiki_page, _ = WikiPage.find_by_id_or_title(params[:id])
+    @wiki_page, _found_by = WikiPage.find_by_id_or_title(params[:id])
     @wiki_page.update(is_deleted: true)
     respond_with(@wiki_page)
   end
 
   def revert
-    @wiki_page, _ = WikiPage.find_by_id_or_title(params[:id])
+    @wiki_page, _found_by = WikiPage.find_by_id_or_title(params[:id])
     @version = @wiki_page.versions.find(params[:version_id])
     @wiki_page.revert_to!(@version)
     flash[:notice] = "Page was reverted"

app/helpers/application_helper.rb

@@ -8,7 +8,7 @@ module ApplicationHelper
 
   def wordbreakify(string)
     lines = string.scan(/.{1,10}/)
-    wordbreaked_string = lines.map{|str| h(str)}.join("<wbr>")
+    wordbreaked_string = lines.map {|str| h(str)}.join("<wbr>")
     raw(wordbreaked_string)
   end
 
@@ -43,7 +43,7 @@ module ApplicationHelper
   def error_messages_for(instance_name)
     instance = instance_variable_get("@#{instance_name}")
 
-    if instance && instance.errors.any?
+    if instance&.errors&.any?
       %{<div class="error-messages ui-state-error ui-corner-all"><strong>Error</strong>: #{instance.__send__(:errors).full_messages.join(", ")}</div>}.html_safe
     else
       ""
@@ -133,11 +133,11 @@ module ApplicationHelper
     return "anonymous" if user.blank?
 
     user_class = "user-#{user.level_string.downcase}"
-    user_class = user_class + " user-post-approver" if user.can_approve_posts?
+    user_class += " user-post-approver" if user.can_approve_posts?
-    user_class = user_class + " user-post-uploader" if user.can_upload_free?
+    user_class += " user-post-uploader" if user.can_upload_free?
-    user_class = user_class + " user-super-voter" if user.is_super_voter?
+    user_class += " user-super-voter" if user.is_super_voter?
-    user_class = user_class + " user-banned" if user.is_banned?
+    user_class += " user-banned" if user.is_banned?
-    user_class = user_class + " with-style" if CurrentUser.user.style_usernames?
+    user_class += " with-style" if CurrentUser.user.style_usernames?
     if options[:raw_name]
       name = user.name
     else
@@ -252,15 +252,13 @@ module ApplicationHelper
     CurrentUser.can_approve_posts? && (cookies[:moderated].blank? || Time.at(cookies[:moderated].to_i) < 72.hours.ago)
   end
 
-protected
+  protected
+
   def nav_link_match(controller, url)
     url =~ case controller
     when "sessions", "users", "maintenance/user/password_resets", "admin/users"
       /^\/(session|users)/
 
-    when "forum_posts"
-      /^\/forum_topics/
-
     when "comments"
       /^\/comments/
 

app/helpers/artist_versions_helper.rb

@@ -1,6 +1,6 @@
 module ArtistVersionsHelper
   def artist_versions_listing_type
-    params.dig(:search, :artist_id).present? && CurrentUser.is_member? ? :revert : :standard
+    (params.dig(:search, :artist_id).present? && CurrentUser.is_member?) ? :revert : :standard
   end
 
   def artist_version_other_names_diff(artist_version)

app/helpers/bulk_update_requests_helper.rb

@@ -94,7 +94,7 @@ module BulkUpdateRequestsHelper
         "#{btag}remove implication " + link_to(arg1, posts_path(:tags => arg1)) + " (#{arg1_count}) -> " + link_to(arg2, posts_path(:tags => arg2)) + " (#{arg2_count})#{etag}"
 
       when :mass_update
-        "#{btag}mass update " + link_to(arg1, posts_path(:tags => arg1)) + " -> " + link_to(arg2, posts_path(:tags => arg2)) + "#{etag}"
+        "#{btag}mass update " + link_to(arg1, posts_path(:tags => arg1)) + " -> " + link_to(arg2, posts_path(:tags => arg2)) + etag.to_s
 
       when :change_category
         arg1_count = Tag.find_by_name(arg1).try(:post_count).to_i

app/helpers/pagination_helper.rb

@@ -54,7 +54,7 @@ module PaginationHelper
     else
       html << numbered_paginator_item(1, records.current_page)
       html << numbered_paginator_item("...", records.current_page)
-      if records.size > 0
+      if records.present?
         right_window = records.current_page + window
       else
         right_window = records.current_page
@@ -62,13 +62,13 @@ module PaginationHelper
       (records.current_page - window).upto(right_window) do |page|
         html << numbered_paginator_item(page, records.current_page)
       end
-      if records.size > 0
+      if records.present?
         html << numbered_paginator_item("...", records.current_page)
         html << numbered_paginator_final_item(records.total_pages, records.current_page)
       end
     end
 
-    if records.current_page < records.total_pages && records.size > 0
+    if records.current_page < records.total_pages && records.present?
       html << "<li class='arrow'>" + link_to(content_tag(:i, nil, class: "fas fa-chevron-right"), nav_params_for(records.current_page + 1), rel: "next", id: "paginator-next", "data-shortcut": "d right") + "</li>"
     else
       html << "<li class='arrow'><span>" + content_tag(:i, nil, class: "fas fa-chevron-right") + "</span></li>"

app/helpers/posts_helper.rb

@@ -68,7 +68,7 @@ module PostsHelper
   end
 
   def post_favlist(post)
-    post.favorited_users.reverse_each.map{|user| link_to_user(user)}.join(", ").html_safe
+    post.favorited_users.reverse_each.map {|user| link_to_user(user)}.join(", ").html_safe
   end
 
   def has_parent_message(post, parent_post_set)
@@ -81,7 +81,7 @@ module PostsHelper
     sibling_count = parent_post_set.children.count - 1
     if sibling_count > 0
       html << " and has "
-      text = sibling_count == 1 ? "a sibling" : "#{sibling_count} siblings"
+      text = (sibling_count == 1) ? "a sibling" : "#{sibling_count} siblings"
       html << link_to(text, posts_path(:tags => "parent:#{post.parent_id}"))
     end
 
@@ -96,7 +96,7 @@ module PostsHelper
     html = ""
 
     html << "This post has "
-    text = children_post_set.children.count == 1 ? "a child" : "#{children_post_set.children.count} children"
+    text = (children_post_set.children.count == 1) ? "a child" : "#{children_post_set.children.count} children"
     html << link_to(text, posts_path(:tags => "parent:#{post.id}"))
 
     html << " (#{link_to_wiki "learn more", "help:post_relationships"}) "
@@ -111,9 +111,9 @@ module PostsHelper
   end
 
   def is_pool_selected?(pool)
-    return false if params.has_key?(:q)
+    return false if params.key?(:q)
-    return false if params.has_key?(:favgroup_id)
+    return false if params.key?(:favgroup_id)
-    return false if !params.has_key?(:pool_id)
+    return false if !params.key?(:pool_id)
     return params[:pool_id].to_i == pool.id
   end
 

app/helpers/uploads_helper.rb

@@ -7,11 +7,11 @@ module UploadsHelper
 
     when /\Aerror: /
       search_params = params[:search].permit!
-      link_to(upload.sanitized_status, uploads_path(search: search_params.merge({ status: upload.sanitized_status })))
+      link_to(upload.sanitized_status, uploads_path(search: search_params.merge(status: upload.sanitized_status)))
 
     else
       search_params = params[:search].permit!
-      link_to(upload.status, uploads_path(search: search_params.merge({ status: upload.status })))
+      link_to(upload.status, uploads_path(search: search_params.merge(status: upload.status)))
     end
   end
 end

app/helpers/users_helper.rb

@@ -1,6 +1,6 @@
 module UsersHelper
   def email_sig(user)
     verifier = ActiveSupport::MessageVerifier.new(Danbooru.config.email_key, serializer: JSON, digest: "SHA256")
-    verifier.generate("#{user.id}")
+    verifier.generate(user.id.to_s)
   end
 end

app/helpers/wiki_page_versions_helper.rb

@@ -27,15 +27,15 @@ module WikiPageVersionsHelper
     cbo = Diff::LCS::ContextDiffCallbacks.new
     diffs = thisarr.diff(otharr, cbo)
 
-    escape_html = ->(str) {str.gsub(/&/,'&amp;').gsub(/</,'&lt;').gsub(/>/,'&gt;')}
+    escape_html = ->(str) {str.gsub(/&/, '&amp;').gsub(/</, '&lt;').gsub(/>/, '&gt;')}
 
     output = thisarr
     output.each { |q| q.replace(escape_html[q]) }
 
     diffs.reverse_each do |hunk|
-      newchange = hunk.max{|a,b| a.old_position <=> b.old_position}
+      newchange = hunk.max {|a, b| a.old_position <=> b.old_position}
       newstart = newchange.old_position
-      oldstart = hunk.min{|a,b| a.old_position <=> b.old_position}.old_position
+      oldstart = hunk.min {|a, b| a.old_position <=> b.old_position}.old_position
 
       if newchange.action == '+'
         output.insert(newstart, '</ins>')
@@ -50,7 +50,7 @@ module WikiPageVersionsHelper
           if chg.new_element.match(/^\r?\n$/)
             output.insert(chg.old_position, '<br>')
           else
-            output.insert(chg.old_position, "#{escape_html[chg.new_element]}")
+            output.insert(chg.old_position, (escape_html[chg.new_element]).to_s)
           end
         end
       end
@@ -60,7 +60,7 @@ module WikiPageVersionsHelper
       end
 
       if hunk[0].action == '-'
-        output.insert((newstart == oldstart || newchange.action != '+') ? newstart+1 : newstart, '</del>')
+        output.insert((newstart == oldstart || newchange.action != '+') ? newstart + 1 : newstart, '</del>')
         output.insert(oldstart, '<del>')
       end
     end

app/helpers/wiki_pages_helper.rb

@@ -18,7 +18,7 @@ module WikiPagesHelper
   end
 
   def wiki_page_other_names_list(wiki_page)
-    names_html = wiki_page.other_names.map{|name| link_to(name, "http://www.pixiv.net/search.php?s_mode=s_tag_full&word=#{u(name)}", :class => "wiki-other-name")}
+    names_html = wiki_page.other_names.map {|name| link_to(name, "http://www.pixiv.net/search.php?s_mode=s_tag_full&word=#{u(name)}", :class => "wiki-other-name")}
     names_html.join(" ").html_safe
   end
 end

app/jobs/tag_batch_change_job.rb

@@ -1,5 +1,5 @@
 class TagBatchChangeJob < ApplicationJob
-  class Error < Exception ; end
+  class Error < Exception; end
 
   queue_as :default
 

app/jobs/upload_preprocessor_delayed_start_job.rb

@@ -1,6 +1,6 @@
 class UploadPreprocessorDelayedStartJob < ApplicationJob
   queue_as :default
-  queue_with_priority -1
+  queue_with_priority(-1)
 
   def perform(source, referer_url, uploader)
     UploadService::Preprocessor.new(source: source, referer_url: referer_url).delayed_start(uploader.id)

app/jobs/upload_service_delayed_start_job.rb

@@ -1,6 +1,6 @@
 class UploadServiceDelayedStartJob < ApplicationJob
   queue_as :default
-  queue_with_priority -1
+  queue_with_priority(-1)
 
   def perform(uploader)
     UploadService.delayed_start(uploader.id)

app/logical/alias_and_implication_importer.rb

@@ -120,7 +120,7 @@ class AliasAndImplicationImporter
     end
   end
 
-private
+  private
 
   def parse(tokens, approver)
     ActiveRecord::Base.transaction do

app/logical/apng_inspector.rb

@@ -9,36 +9,35 @@ class APNGInspector
     @animated = false
   end
 
-  #PNG file consists of 8-byte magic number, followed by arbitrary number of chunks
+  # PNG file consists of 8-byte magic number, followed by arbitrary number of chunks
-  #Each chunk has the following structure:
+  # Each chunk has the following structure:
-  #4-byte length (unsigned int, can be zero)
+  # 4-byte length (unsigned int, can be zero)
-  #4-byte name (ASCII string consisting of letters A-z)
+  # 4-byte name (ASCII string consisting of letters A-z)
-  #(length)-byte data
+  # (length)-byte data
-  #4-byte CRC
+  # 4-byte CRC
   #
-  #Any data after chunk named IEND is irrelevant
+  # Any data after chunk named IEND is irrelevant
-  #APNG frame count is inside a chunk named acTL, in first 4 bytes of data.
+  # APNG frame count is inside a chunk named acTL, in first 4 bytes of data.
 
-
+  # This function calls associated block for each PNG chunk
-  #This function calls associated block for each PNG chunk
+  # parameters passed are |chunk_name, chunk_length, file_descriptor|
-  #parameters passed are |chunk_name, chunk_length, file_descriptor|
+  # returns true if file is read succesfully from start to IEND,
-  #returns true if file is read succesfully from start to IEND,
+  # or if 100 000 chunks are read; returns false otherwise.
-  #or if 100 000 chunks are read; returns false otherwise.
   def each_chunk
     iend_reached = false
     File.open(@file_path, 'rb') do |file|
-      #check if file is not PNG at all
+      # check if file is not PNG at all
       return false if file.read(8) != PNG_MAGIC_NUMBER
 
       chunks = 0
 
-      #We could be dealing with large number of chunks,
+      # We could be dealing with large number of chunks,
-      #so the code should be optimized to create as few objects as possible.
+      # so the code should be optimized to create as few objects as possible.
-      #All literal strings are frozen and read() function uses string buffer.
+      # All literal strings are frozen and read() function uses string buffer.
       chunkheader = ''
       while file.read(8, chunkheader)
-        #ensure that first 8 bytes from chunk were read properly
+        # ensure that first 8 bytes from chunk were read properly
-        if chunkheader == nil || chunkheader.length < 8
+        if chunkheader.nil? || chunkheader.length < 8
           return false
         end
 
@@ -48,23 +47,23 @@ class APNGInspector
         return false if chunk_name =~ /[^A-Za-z]/
         yield chunk_name, chunk_len, file
 
-        #no need to read further if IEND is reached
+        # no need to read further if IEND is reached
         if chunk_name == "IEND".freeze
           iend_reached = true
           break
         end
 
-        #check if we processed too many chunks already
+        # check if we processed too many chunks already
-        #if we did, file is probably maliciously formed
+        # if we did, file is probably maliciously formed
-        #fail gracefully without marking the file as corrupt
+        # fail gracefully without marking the file as corrupt
         chunks += 1
         if chunks > 100000
           iend_reached = true
           break
         end
 
-        #jump to the next chunk - go forward by chunk length + 4 bytes CRC
+        # jump to the next chunk - go forward by chunk length + 4 bytes CRC
-        file.seek(current_pos+chunk_len+4, IO::SEEK_SET)
+        file.seek(current_pos + chunk_len + 4, IO::SEEK_SET)
       end
     end
     return iend_reached
@@ -99,14 +98,13 @@ class APNGInspector
 
   private
 
-    #return number of frames in acTL or -1 on failure
+  # return number of frames in acTL or -1 on failure
   def parse_actl(len, file)
     return -1 if len != 8
     framedata = file.read(4)
-      if framedata == nil || framedata.length != 4
+    if framedata.nil? || framedata.length != 4
       return -1
     end
-      return framedata.unpack("N".freeze)[0]
+    return framedata.unpack1("N".freeze)
   end
-
 end

app/logical/approver_pruner.rb

@@ -1,5 +1,5 @@
 module ApproverPruner
-  extend self
+  module_function
 
   def inactive_approvers
     User.where("bit_prefs & ? > 0", User.flag_value_for("can_approve_posts")).select do |user|

app/logical/d_text.rb

@@ -64,15 +64,12 @@ class DText
   def self.parse_embedded_tag_request_text(text)
     [TagAlias, TagImplication, BulkUpdateRequest].each do |tag_request|
       text = text.gsub(tag_request.embedded_pattern) do |match|
-        begin
         obj = tag_request.find($~[:id])
         tag_request_message(obj) || match
-
       rescue ActiveRecord::RecordNotFound
         match
       end
     end
-    end
 
     text
   end

app/logical/danbooru_image_resizer.rb

@@ -1,5 +1,5 @@
 module DanbooruImageResizer
-  extend self
+  module_function
 
   # Taken from ArgyllCMS 2.0.0 (see also: https://ninedegreesbelow.com/photography/srgb-profile-comparison.html)
   SRGB_PROFILE = "#{Rails.root}/config/sRGB.icm"
@@ -46,7 +46,6 @@ module DanbooruImageResizer
     end
 
     return true
-
   ensure
     temp.close
     temp.unlink

app/logical/danbooru_logger.rb

@@ -39,14 +39,14 @@ class DanbooruLogger
     ::NewRelic::Agent.add_custom_attributes(attributes)
   end
 
-  private
+  private_class_method
 
   # flatten_hash({ foo: { bar: { baz: 42 } } })
   # => { "foo.bar.baz" => 42 }
   def self.flatten_hash(hash)
     hash.each_with_object({}) do |(k, v), h|
       if v.is_a?(Hash)
-        flatten_hash(v).map do|h_k, h_v|
+        flatten_hash(v).map do |h_k, h_v|
           h["#{k}.#{h_k}"] = h_v
         end
       else

app/logical/danbooru_math.rb

@@ -4,8 +4,8 @@ class DanbooruMath
       return 0
     end
 
-    z = Statistics2.pnormaldist(1-(1-confidence)/2)
+    z = Statistics2.pnormaldist(1 - (1 - confidence) / 2)
-    phat = 1.0*pos/n
+    phat = 1.0 * pos / n
-    100 * (phat + z*z/(2*n) - z * Math.sqrt((phat*(1-phat)+z*z/(4*n))/n))/(1+z*z/n)
+    100 * (phat + z * z / (2 * n) - z * Math.sqrt((phat * (1 - phat) + z * z / (4 * n)) / n)) / (1 + z * z / n)
   end
 end

app/logical/deviant_art_api_client.rb

@@ -3,7 +3,7 @@
 # API requests must send a user agent and must use gzip compression, otherwise
 # 403 errors will be returned.
 
-class DeviantArtApiClient < Struct.new(:deviation_id)
+DeviantArtApiClient = Struct.new(:deviation_id) do
   extend Memoist
 
   def extended_fetch

app/logical/downloads/file.rb

@@ -3,7 +3,7 @@ require 'resolv'
 module Downloads
   class File
     include ActiveModel::Validations
-    class Error < Exception ; end
+    class Error < Exception; end
 
     RETRIABLE_ERRORS = [Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EIO, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Timeout::Error, IOError]
 
@@ -12,7 +12,7 @@ module Downloads
 
     validate :validate_url
 
-    def initialize(url, referer=nil)
+    def initialize(url, referer = nil)
       @url = Addressable::URI.parse(url) rescue nil
       @referer = referer
       validate!
@@ -59,7 +59,7 @@ module Downloads
       else
         raise Error.new("HTTP error code: #{res.code} #{res.message}")
       end
-    end # def
+    end
 
     # Prevent Cloudflare from potentially mangling the image. See issue #3528.
     def uncached_url
@@ -87,7 +87,7 @@ module Downloads
         timeout: 10,
         stream_body: true,
         headers: strategy.headers,
-        connection_adapter: ValidatingConnectionAdapter,
+        connection_adapter: ValidatingConnectionAdapter
       }.deep_merge(Danbooru.config.httparty_options)
     end
 

app/logical/moderator/ip_addr_search.rb

@@ -19,6 +19,7 @@ module Moderator
     end
 
     private
+
     def search_by_ip_addr(ip_addrs)
       sums = Hash.new {|h, k| h[k] = 0}
 

app/logical/nico_seiga_api_client.rb

@@ -21,7 +21,7 @@ class NicoSeigaApiClient
           form["password"] = Danbooru.config.nico_seiga_password
         end.click_button
       end
-      session = mech.cookie_jar.cookies.select{|c| c.name == "user_session"}.first
+      session = mech.cookie_jar.cookies.select {|c| c.name == "user_session"}.first
       if session
         Cache.put("nico-seiga-session", session.value, 1.week)
       else
@@ -74,7 +74,7 @@ class NicoSeigaApiClient
 
   def get(url)
     response = Danbooru::Http.cache(1.minute).get(url)
-    raise "nico seiga api call failed (code=#{response.code}, body=#{response.body.to_s})" if response.code != 200
+    raise "nico seiga api call failed (code=#{response.code}, body=#{response.body})" if response.code != 200
 
     Hash.from_xml(response.to_s)
   end

app/logical/nico_seiga_manga_api_client.rb

@@ -51,7 +51,7 @@ class NicoSeigaMangaApiClient
 
   def get(url)
     response = Danbooru::Http.cache(1.minute).get(url)
-    raise "nico seiga api call failed (code=#{response.code}, body=#{response.body.to_s})" if response.code != 200
+    raise "nico seiga api call failed (code=#{response.code}, body=#{response.body})" if response.code != 200
 
     Hash.from_xml(response.to_s)
   end

app/logical/note_sanitizer.rb

@@ -10,7 +10,7 @@ module NoteSanitizer
     "span" => %w(class),
     "div" => %w(class align),
     "p" => %w(class align),
-    "font" => %w(color size),
+    "font" => %w(color size)
   }
 
   ALLOWED_PROPERTIES = %w(
@@ -61,7 +61,7 @@ module NoteSanitizer
       :elements => ALLOWED_ELEMENTS,
       :attributes => ALLOWED_ATTRIBUTES,
       :add_attributes => {
-        "a" => { "rel" => "external noreferrer nofollow" },
+        "a" => { "rel" => "external noreferrer nofollow" }
       },
       :protocols => {
         "a" => {
@@ -73,9 +73,9 @@ module NoteSanitizer
         allow_hacks: false,
         at_rules: [],
         protocols: [],
-        properties: ALLOWED_PROPERTIES,
+        properties: ALLOWED_PROPERTIES
       },
-      :transformers => method(:relativize_links),
+      :transformers => method(:relativize_links)
     )
   end
 

app/logical/pagination_extension.rb

@@ -1,5 +1,5 @@
 module PaginationExtension
-  class PaginationError < Exception ; end
+  class PaginationError < Exception; end
 
   attr_accessor :current_page, :records_per_page, :paginator_count, :paginator_mode
 

app/logical/pawoo_api_client.rb

@@ -6,7 +6,7 @@ class PawooApiClient
   STATUS1 = %r!\Ahttps?://pawoo\.net/web/statuses/(\d+)!
   STATUS2 = %r!\Ahttps?://pawoo\.net/@.+?/([^/]+)!
 
-  class MissingConfigurationError < Exception ; end
+  class MissingConfigurationError < Exception; end
 
   class Account
     attr_reader :json

app/logical/pixiv_api_client.rb

@@ -23,8 +23,8 @@ class PixivApiClient
     VistaPro Sculptris Comi\ Po! modo DAZ\ Studio 3D-Coat
   ]
 
-  class Error < Exception ; end
+  class Error < Exception; end
-  class BadIDError < Error ; end
+  class BadIDError < Error; end
 
   class WorkResponse
     attr_reader :json, :pages, :name, :moniker, :user_id, :page_count, :tags
@@ -102,6 +102,7 @@ class PixivApiClient
     memoize :pages
 
     public
+
     PXIMG = %r!\Ahttps?://i\.pximg\.net/c/\d+x\d+_\d+/novel-cover-master/img/(?<timestamp>\d+/\d+/\d+/\d+/\d+/\d+)/(?<filename>\d+_[a-f0-9]+)_master\d+\.(?<ext>jpg|jpeg|png|gif)!i
 
     def find_original(x)
@@ -177,11 +178,10 @@ class PixivApiClient
     elsif json["status"] == "failure" && json.dig("errors", "system", "message") =~ /対象のイラストは見つかりませんでした。/
       raise BadIDError.new("Pixiv ##{illust_id} not found: work was deleted, made private, or ID is invalid.")
     else
-      raise Error.new("Pixiv API call failed (status=#{response.code} body=#{response.body.to_s})")
+      raise Error.new("Pixiv API call failed (status=#{response.code} body=#{response.body})")
     end
-
   rescue JSON::ParserError
-    raise Error.new("Pixiv API call failed (status=#{response.code} body=#{response.body.to_s})")
+    raise Error.new("Pixiv API call failed (status=#{response.code} body=#{response.body})")
   end
 
   def fanbox(fanbox_id)
@@ -228,14 +228,14 @@ class PixivApiClient
       headers = {
         "Referer": "http://www.pixiv.net",
         "X-Client-Time": client_time,
-        "X-Client-Hash": client_hash,
+        "X-Client-Hash": client_hash
       }
       params = {
         username: Danbooru.config.pixiv_login,
         password: Danbooru.config.pixiv_password,
         grant_type: "password",
         client_id: CLIENT_ID,
-        client_secret: CLIENT_SECRET,
+        client_secret: CLIENT_SECRET
       }
       url = "https://oauth.secure.pixiv.net/auth/token"
 

app/logical/pixiv_ugoira_converter.rb

@@ -50,7 +50,6 @@ class PixivUgoiraConverter
           Rails.logger.error "[write_webm][ffmpeg] #{line}"
         end
         Rails.logger.error "[write_webm] ******************************"
-        return
       end
 
       mkvmerge_out, status = Open3.capture2e("mkvmerge -o #{write_path} --webm --timecodes 0:#{tmpdir}/timecodes.tc #{tmpdir}/tmp.webm")
@@ -63,7 +62,6 @@ class PixivUgoiraConverter
           Rails.logger.error "[write_webm][mkvmerge] #{line}"
         end
         Rails.logger.error "[write_webm] ******************************"
-        return
       end
     end
 

app/logical/pixiv_web_agent.rb

@@ -5,7 +5,7 @@ class PixivWebAgent
   COMIC_SESSION_COOKIE_KEY = "_pixiv-comic_session"
 
   def self.phpsessid(agent)
-    agent.cookies.select do |cookie| cookie.name == SESSION_COOKIE_KEY end.first.try(:value)
+    agent.cookies.select { |cookie| cookie.name == SESSION_COOKIE_KEY }.first.try(:value)
   end
 
   def self.build

app/logical/popular_search_service.rb

@@ -22,7 +22,7 @@ class PopularSearchService
     JSON.parse(fetch_data.to_s).map {|x| x[0]}
   end
 
-  def fetch_data()
+  def fetch_data
     return [] unless self.class.enabled?
 
     dates = date.strftime("%Y-%m-%d")
@@ -54,8 +54,7 @@ class PopularSearchService
     end
 
     data
-
+  rescue StandardError => e
-  rescue => e
     DanbooruLogger.log(e)
     return []
   end

app/logical/post_pruner.rb

@@ -5,19 +5,17 @@ class PostPruner
     prune_mod_actions!
   end
 
-protected
+  protected
 
   def prune_pending!
     CurrentUser.scoped(User.system, "127.0.0.1") do
       Post.where("is_deleted = ? and is_pending = ? and created_at < ?", false, true, 3.days.ago).each do |post|
-        begin
         post.delete!("Unapproved in three days")
       rescue PostFlag::Error
         # swallow
       end
     end
   end
-  end
 
   def prune_flagged!
     CurrentUser.scoped(User.system, "127.0.0.1") do

app/logical/post_query_builder.rb

@@ -299,7 +299,7 @@ class PostQueryBuilder
     if q[:flagger_ids_neg]
       q[:flagger_ids_neg].each do |flagger_id|
         if CurrentUser.can_view_flagger?(flagger_id)
-          post_ids = PostFlag.unscoped.search({:creator_id => flagger_id, :category => "normal"}).reorder("").select {|flag| flag.not_uploaded_by?(CurrentUser.id)}.map {|flag| flag.post_id}.uniq
+          post_ids = PostFlag.unscoped.search(:creator_id => flagger_id, :category => "normal").reorder("").select {|flag| flag.not_uploaded_by?(CurrentUser.id)}.map {|flag| flag.post_id}.uniq
           if post_ids.any?
             relation = relation.where.not("posts.id": post_ids)
           end
@@ -310,11 +310,11 @@ class PostQueryBuilder
     if q[:flagger_ids]
       q[:flagger_ids].each do |flagger_id|
         if flagger_id == "any"
-          relation = relation.where('EXISTS (' + PostFlag.unscoped.search({:category => "normal"}).where('post_id = posts.id').reorder('').select('1').to_sql + ')')
+          relation = relation.where('EXISTS (' + PostFlag.unscoped.search(:category => "normal").where('post_id = posts.id').reorder('').select('1').to_sql + ')')
         elsif flagger_id == "none"
-          relation = relation.where('NOT EXISTS (' + PostFlag.unscoped.search({:category => "normal"}).where('post_id = posts.id').reorder('').select('1').to_sql + ')')
+          relation = relation.where('NOT EXISTS (' + PostFlag.unscoped.search(:category => "normal").where('post_id = posts.id').reorder('').select('1').to_sql + ')')
         elsif CurrentUser.can_view_flagger?(flagger_id)
-          post_ids = PostFlag.unscoped.search({:creator_id => flagger_id, :category => "normal"}).reorder("").select {|flag| flag.not_uploaded_by?(CurrentUser.id)}.map {|flag| flag.post_id}.uniq
+          post_ids = PostFlag.unscoped.search(:creator_id => flagger_id, :category => "normal").reorder("").select {|flag| flag.not_uploaded_by?(CurrentUser.id)}.map {|flag| flag.post_id}.uniq
           relation = relation.where("posts.id": post_ids)
         end
       end

app/logical/post_sets/post.rb

@@ -78,7 +78,7 @@ module PostSets
     end
 
     def hidden_posts
-      posts.select { |p| !p.visible? }
+      posts.reject { |p| p.visible? }
     end
 
     def banned_posts
@@ -122,17 +122,17 @@ module PostSets
 
     def posts
       @posts ||= begin
-        @post_count = get_post_count()
+        @post_count = get_post_count
 
         if is_random?
-          temp = get_random_posts()
+          temp = get_random_posts
         elsif raw
           temp = ::Post.raw_tag_match(tag_string).order("posts.id DESC").where("true /* PostSets::Post#posts:1 */").paginate(page, :count => post_count, :limit => per_page)
         else
           temp = ::Post.tag_match(tag_string).where("true /* PostSets::Post#posts:2 */").paginate(page, :count => post_count, :limit => per_page)
         end
 
-        # XXX HACK: uploader_name is needed in api responses and in data-uploader attribs (visible to mods only).
+        # HACK: uploader_name is needed in api responses and in data-uploader attribs (visible to mods only).
         temp = temp.includes(:uploader) if !is_random? && (format.to_sym != :html || CurrentUser.is_moderator?)
 
         temp.each # hack to force rails to eager load
@@ -159,11 +159,11 @@ module PostSets
     end
 
     def is_empty_tag?
-      tag_array.size == 0
+      tag_array.empty?
     end
 
     def is_pattern_search?
-      is_single_tag? && tag_string =~ /\*/ && !tag_array.any? {|x| x =~ /^-?source:.+/}
+      is_single_tag? && tag_string =~ /\*/ && tag_array.none? {|x| x =~ /^-?source:.+/}
     end
 
     def current_page

app/logical/related_tag_calculator.rb

@@ -9,7 +9,7 @@ module RelatedTagCalculator
     tags = frequent_tags_for_search(tag_query, search_sample_size: search_sample_size, category: category).limit(tag_sample_size)
     tags = tags.sort_by do |tag|
       # cosine distance(tag1, tag2) = 1 - {{tag1 tag2}} / sqrt({{tag1}} * {{tag2}})
-      1 - tag.overlap_count / (Math.sqrt(tag.post_count * search_count.to_f))
+      1 - tag.overlap_count / Math.sqrt(tag.post_count * search_count.to_f)
     end
 
     tags

app/logical/related_tag_query.rb

@@ -68,7 +68,7 @@ class RelatedTagQuery
     }
   end
 
-protected
+  protected
 
   def tags_with_categories(list_of_tag_names)
     Tag.categories_for(list_of_tag_names).to_a

app/logical/reports/upload_tags.rb

@@ -47,6 +47,5 @@ module Reports
     def removed_tags
       removed_tags_array.join(' ')
     end
-
   end
 end

app/logical/reports/user_promotions.rb

@@ -56,9 +56,9 @@ module Reports
         return 0
       end
 
-      z = Statistics2.pnormaldist(1-(1-confidence)/2)
+      z = Statistics2.pnormaldist(1 - (1 - confidence) / 2)
-      phat = 1.0*pos/n
+      phat = 1.0 * pos / n
-      100 * (phat + z*z/(2*n) - z * Math.sqrt((phat*(1-phat)+z*z/(4*n))/n))/(1+z*z/n)
+      100 * (phat + z * z / (2 * n) - z * Math.sqrt((phat * (1 - phat) + z * z / (4 * n)) / n)) / (1 + z * z / n)
     end
 
     def self.min_time

app/logical/session_loader.rb

@@ -1,5 +1,5 @@
 class SessionLoader
-  class AuthenticationFailure < Exception ; end
+  class AuthenticationFailure < Exception; end
 
   attr_reader :session, :cookies, :request, :params
 
@@ -37,7 +37,7 @@ class SessionLoader
     request.authorization.present? || params[:login].present? || params[:api_key].present? || params[:password_hash].present?
   end
 
-private
+  private
 
   def set_statement_timeout
     timeout = CurrentUser.user.statement_timeout

app/logical/set_diff.rb

@@ -30,6 +30,6 @@ class SetDiff
     distance = ->(other) { ::DidYouMean::Levenshtein.distance(string, other) }
     max_distance = string.size * max_dissimilarity
 
-    candidates.select { |candidate| distance[candidate] <= max_distance }.sort_by(&distance).first
+    candidates.select { |candidate| distance[candidate] <= max_distance }.min_by(&distance)
   end
 end

app/logical/sources/strategies.rb

@@ -10,11 +10,11 @@ module Sources
         Strategies::ArtStation,
         Strategies::Nijie,
         Strategies::Pawoo,
-        Strategies::Moebooru,
+        Strategies::Moebooru
       ]
     end
 
-    def self.find(url, referer=nil, default: Strategies::Null)
+    def self.find(url, referer = nil, default: Strategies::Null)
       strategy = all.map { |strategy| strategy.new(url, referer) }.detect(&:match?)
       strategy || default&.new(url, referer)
     end

app/logical/sources/strategies/art_station.rb

@@ -27,7 +27,7 @@ module Sources::Strategies
 
     ASSET = %r!\Ahttps?://cdn\w*\.artstation\.com/p/assets/images/images/\d+/\d+/\d+/(?:medium|small|large)/!i
 
-    attr_reader :json, :image_urls
+    attr_reader :json
 
     def domains
       ["artstation.com"]
@@ -38,13 +38,11 @@ module Sources::Strategies
     end
 
     def image_urls
-      image_urls_sub
+      @image_urls ||= image_urls_sub.map { |asset| original_asset_url(asset) }
-        .map { |asset| original_asset_url(asset) }
     end
-    memoize :image_urls
 
     def page_url
-      return nil unless project_id.present?
+      return nil if project_id.blank?
 
       if artist_name.present?
         "https://#{artist_name}.artstation.com/projects/#{project_id}"
@@ -54,7 +52,7 @@ module Sources::Strategies
     end
 
     def profile_url
-      return nil unless artist_name.present?
+      return nil if artist_name.blank?
       "https://www.artstation.com/#{artist_name}"
     end
 
@@ -84,14 +82,13 @@ module Sources::Strategies
       profile_url.present? && url == profile_url
     end
 
-  public
-
     def image_urls_sub
       if url.match?(ASSET)
         return [url]
       end
 
-      api_response[:assets].to_a
+      api_response[:assets]
+        .to_a
         .select { |asset| asset[:asset_type] == "image" }
         .map { |asset| asset[:image_url] }
     end
@@ -108,7 +105,7 @@ module Sources::Strategies
     end
 
     def api_response
-      return {} unless project_id.present?
+      return {} if project_id.blank?
 
       resp = Danbooru::Http.cache(1.minute).get("https://www.artstation.com/projects/#{project_id}.json")
       return {} if resp.code != 200

app/logical/sources/strategies/base.rb

@@ -269,7 +269,7 @@ module Sources
             :tag_name => tag_name,
             :other_names => other_names,
             :profile_url => profile_url,
-            :profile_urls => profile_urls,
+            :profile_urls => profile_urls
           },
           :artists => artists.as_json(include: :sorted_urls),
           :image_url => image_url,
@@ -284,18 +284,16 @@ module Sources
             :title => artist_commentary_title,
             :description => artist_commentary_desc,
             :dtext_title => dtext_artist_commentary_title,
-            :dtext_description => dtext_artist_commentary_desc,
+            :dtext_description => dtext_artist_commentary_desc
           },
-          :api_response => api_response.to_h,
+          :api_response => api_response.to_h
         }
       end
 
-      def to_json
+      def to_json(*_args)
         to_h.to_json
       end
 
-    protected
-
       def http_exists?(url, headers)
         res = HTTParty.head(url, Danbooru.config.httparty_options.deep_merge(headers: headers))
         res.success?
@@ -306,7 +304,7 @@ module Sources
       def self.to_dtext(text)
         text = text.to_s
         text = Rails::Html::FullSanitizer.new.sanitize(text, encode_special_chars: false)
-        text = CGI::unescapeHTML(text)
+        text = CGI.unescapeHTML(text)
         text
       end
     end

app/logical/sources/strategies/deviant_art.rb

@@ -57,8 +57,6 @@ module Sources
       PATH_PROFILE = %r{\Ahttps?://(www\.)?deviantart\.com/#{ARTIST}/?\z}i
       SUBDOMAIN_PROFILE = %r{\Ahttps?://#{ARTIST}\.deviantart\.com/?\z}i
 
-      attr_accessor :api_client
-
       def domains
         ["deviantart.net", "deviantart.com"]
       end
@@ -211,8 +209,6 @@ module Sources
         end.gsub(/\A[[:space:]]+|[[:space:]]+\z/, "")
       end
 
-    public
-
       def self.deviation_id_from_url(url)
         if url =~ ASSET
           $~[:base36_deviation_id].try(:to_i, 36)

app/logical/sources/strategies/nico_seiga.rb

@@ -130,8 +130,6 @@ module Sources
       end
       memoize :tags
 
-    public
-
       def api_client
         if illust_id
           NicoSeigaApiClient.new(illust_id: illust_id)

app/logical/sources/strategies/nijie.rb

@@ -120,9 +120,11 @@ module Sources
       def tags
         links = page&.search("div#view-tag a") || []
 
-        links.select do |node|
+        search_links = links.select do |node|
           node["href"] =~ /search\.php/
-        end.map do |node|
+        end
+
+        search_links.map do |node|
           [node.inner_text, "https://nijie.info" + node.attr("href")]
         end
       end
@@ -131,8 +133,6 @@ module Sources
         "nijie" + artist_id.to_s
       end
 
-    public
-
       def self.to_dtext(text)
         text = text.to_s.gsub(/\r\n|\r/, "<br>")
         DText.from_html(text).strip
@@ -196,7 +196,7 @@ module Sources
               form['password'] = Danbooru.config.nijie_password
             end.click_button
           end
-          session = mech.cookie_jar.cookies.select{|c| c.name == "NIJIEIJIEID"}.first
+          session = mech.cookie_jar.cookies.select {|c| c.name == "NIJIEIJIEID"}.first
           Cache.put("nijie-session", session.value, 1.day) if session
         end
 
@@ -207,7 +207,6 @@ module Sources
         mech.cookie_jar.add(cookie)
 
         mech
-
       rescue Mechanize::ResponseCodeError => x
         if x.response_code.to_i == 429
           sleep(5)

app/logical/sources/strategies/pawoo.rb

@@ -85,8 +85,6 @@ module Sources::Strategies
       end.strip
     end
 
-  public
-
     def api_response
       [url, referer_url].each do |x|
         if client = PawooApiClient.new.get(x)

app/logical/sources/strategies/pixiv.rb

@@ -132,7 +132,6 @@ module Sources
         end
 
         return url
-
       rescue PixivApiClient::BadIDError
         nil
       end
@@ -236,8 +235,6 @@ module Sources
         illust_id.present? ? "pixiv:#{illust_id}" : "source:#{canonical_url}"
       end
 
-    public
-
       def image_urls_sub
         if url =~ FANBOX_IMAGE
           return [url]

app/logical/sources/strategies/tumblr.rb

@@ -131,8 +131,6 @@ module Sources::Strategies
       DText.from_html(artist_commentary_desc).strip
     end
 
-  public
-
     # Look for the biggest available version on media.tumblr.com. A bigger
     # version may or may not exist.
     #
@@ -181,7 +179,7 @@ module Sources::Strategies
 
       response = Danbooru::Http.cache(1.minute).get(
         "https://api.tumblr.com/v2/blog/#{blog_name}/posts",
-        params: { id: post_id, api_key: Danbooru.config.tumblr_consumer_key },
+        params: { id: post_id, api_key: Danbooru.config.tumblr_consumer_key }
       )
 
       return {} if response.code != 200

app/logical/sources/strategies/twitter.rb

@@ -134,15 +134,13 @@ module Sources::Strategies
       url_replacements = url_replacements.to_h
 
       desc = artist_commentary_desc.unicode_normalize(:nfkc)
-      desc = CGI::unescapeHTML(desc)
+      desc = CGI.unescapeHTML(desc)
       desc = desc.gsub(%r!https?://t\.co/[a-zA-Z0-9]+!i, url_replacements)
       desc = desc.gsub(%r!#([^[:space:]]+)!, '"#\\1":[https://twitter.com/hashtag/\\1]')
       desc = desc.gsub(%r!@([a-zA-Z0-9_]+)!, '"@\\1":[https://twitter.com/\\1]')
       desc.strip
     end
 
-  public
-
     def api_client
       TwitterApiClient.new(Danbooru.config.twitter_api_key, Danbooru.config.twitter_api_secret)
     end

app/logical/spam_detector.rb

@@ -20,7 +20,7 @@ class SpamDetector
   # rakismet raises an exception if the api key or url aren't configured
   def self.working?
     Rakismet.validate_key
-  rescue
+  rescue StandardError
     false
   end
 
@@ -61,7 +61,7 @@ class SpamDetector
     end
 
     is_spam
-  rescue => exception
+  rescue StandardError => exception
     DanbooruLogger.log(exception)
     false
   end

app/logical/sqs_service.rb

@@ -20,7 +20,8 @@ class SqsService
     )
   end
 
-private
+  private
+
   def sqs
     @sqs ||= Aws::SQS::Client.new(
       credentials: Danbooru.config.aws_credentials,

app/logical/storage_manager.rb

@@ -45,7 +45,7 @@ class StorageManager
   end
 
   def open_file(post, type)
-    open(file_path(post.md5, post.file_ext, type))
+    self.open(file_path(post.md5, post.file_ext, type))
   end
 
   def file_url(post, type, tagged_filenames: false)

app/logical/storage_manager/local.rb

@@ -1,5 +1,5 @@
 class StorageManager::Local < StorageManager
-  DEFAULT_PERMISSIONS = 0644
+  DEFAULT_PERMISSIONS = 0o644
 
   def store(io, dest_path)
     temp_path = dest_path + "-" + SecureRandom.uuid + ".tmp"

app/logical/storage_manager/match.rb

@@ -1,35 +1,33 @@
-=begin
+#
-
+# Generalizes the hybrid storage manager to be more declarative in
-Generalizes the hybrid storage manager to be more declarative in 
+# syntax. Matches are executed in order of appearance so the first
-syntax. Matches are executed in order of appearance so the first
+# matching manager is returned. You should always add at least one
-matching manager is returned. You should always add at least one
+# manager with no constraints as a default case.
-manager with no constraints as a default case.
+#
-
 ### Example
-
+#
-  StorageManager::Match.new do |matcher|
+#   StorageManager::Match.new do |matcher|
-    matcher.add_manager(type: :crop) do
+#     matcher.add_manager(type: :crop) do
-      StorageManager::SFTP.new("raikou3.donmai.us", base_url: "https://raikou3.donmai.us", hierarchical: true, base_dir: "/var/www/raikou3")
+#       StorageManager::SFTP.new("raikou3.donmai.us", base_url: "https://raikou3.donmai.us", hierarchical: true, base_dir: "/var/www/raikou3")
-    end
+#     end
-
+#
-    matcher.add_manager(id: 1..850_000) do
+#     matcher.add_manager(id: 1..850_000) do
-      StorageManager::SFTP.new("raikou1.donmai.us", base_url: "https://raikou1.donmai.us", hierarchical: true, base_dir: "/var/www/raikou1")
+#       StorageManager::SFTP.new("raikou1.donmai.us", base_url: "https://raikou1.donmai.us", hierarchical: true, base_dir: "/var/www/raikou1")
-    end
+#     end
-
+#
-    matcher.add_manager(id: 850_001..2_000_000) do
+#     matcher.add_manager(id: 850_001..2_000_000) do
-      StorageManager::SFTP.new("raikou2.donmai.us", base_url: "https://raikou2.donmai.us", hierarchical: true, base_dir: "/var/www/raikou2")
+#       StorageManager::SFTP.new("raikou2.donmai.us", base_url: "https://raikou2.donmai.us", hierarchical: true, base_dir: "/var/www/raikou2")
-    end
+#     end
-
+#
-    matcher.add_manager(id: 1..3_000_000, type: [:large, :original]) do
+#     matcher.add_manager(id: 1..3_000_000, type: [:large, :original]) do
-      StorageManager::SFTP.new(*Danbooru.config.all_server_hosts, base_url: "https://hijiribe.donmai.us/data")
+#       StorageManager::SFTP.new(*Danbooru.config.all_server_hosts, base_url: "https://hijiribe.donmai.us/data")
-    end
+#     end
-
+#
-    matcher.add_manager({}) do
+#     matcher.add_manager({}) do
-      StorageManager::SFTP.new(*Danbooru.config.all_server_hosts, base_url: "#{CurrentUser.root_url}/data")
+#       StorageManager::SFTP.new(*Danbooru.config.all_server_hosts, base_url: "#{CurrentUser.root_url}/data")
-    end
+#     end
-  end
+#   end
-
+#
-=end
 
 class StorageManager::Match < StorageManager
   def initialize
@@ -109,4 +107,3 @@ class StorageManager::Match < StorageManager
     end
   end
 end
-

app/logical/storage_manager/sftp.rb

@@ -1,12 +1,12 @@
 class StorageManager::SFTP < StorageManager
-  DEFAULT_PERMISSIONS = 0644
+  DEFAULT_PERMISSIONS = 0o644
 
   # http://net-ssh.github.io/net-ssh/Net/SSH.html#method-c-start
   DEFAULT_SSH_OPTIONS = {
     timeout: 10,
     logger: Rails.logger,
     verbose: :fatal,
-    non_interactive: true,
+    non_interactive: true
   }
 
   attr_reader :hosts, :ssh_options
@@ -22,7 +22,6 @@ class StorageManager::SFTP < StorageManager
     dest_backup_path = dest_path + "-" + SecureRandom.uuid + ".bak"
 
     each_host do |host, sftp|
-      begin
       sftp.upload!(file.path, temp_upload_path)
       sftp.setstat!(temp_upload_path, permissions: DEFAULT_PERMISSIONS)
 
@@ -39,7 +38,6 @@ class StorageManager::SFTP < StorageManager
       force { sftp.remove!(dest_backup_path) }
     end
   end
-  end
 
   def delete(dest_path)
     each_host do |host, sftp|

app/logical/tag_alias_request.rb

@@ -1,5 +1,5 @@
 class TagAliasRequest
-  def self.command_string(antecedent_name, consequent_name, id=nil)
+  def self.command_string(antecedent_name, consequent_name, id = nil)
     if id
       return "[ta:#{id}]"
     end

app/logical/tag_autocomplete.rb

@@ -1,10 +1,10 @@
 module TagAutocomplete
-  extend self
+  module_function
 
   PREFIX_BOUNDARIES = "(_/:;-"
   LIMIT = 10
 
-  class Result < Struct.new(:name, :post_count, :category, :antecedent_name, :source)
+  Result = Struct.new(:name, :post_count, :category, :antecedent_name, :source) do
     include ActiveModel::Serializers::JSON
     include ActiveModel::Serializers::Xml
 
@@ -40,7 +40,7 @@ module TagAutocomplete
     end.reverse.slice(0, LIMIT)
   end
 
-  def search_exact(query, n=4)
+  def search_exact(query, n = 4)
     Tag
       .where("name like ? escape e'\\\\'", query.to_escaped_for_sql_like + "%")
       .where("post_count > 0")
@@ -50,7 +50,7 @@ module TagAutocomplete
       .map {|row| Result.new(*row, nil, :exact)}
   end
 
-  def search_correct(query, n=2)
+  def search_correct(query, n = 2)
     if query.size <= 3
       return []
     end
@@ -66,7 +66,7 @@ module TagAutocomplete
       .map {|row| Result.new(*row, nil, :correct)}
   end
 
-  def search_prefix(query, n=3)
+  def search_prefix(query, n = 3)
     if query.size >= 5
       return []
     end
@@ -97,7 +97,7 @@ module TagAutocomplete
       .map {|row| Result.new(*row, nil, :prefix)}
   end
 
-  def search_aliases(query, n=10)
+  def search_aliases(query, n = 10)
     wildcard_name = query + "*"
     TagAlias
       .select("tags.name, tags.post_count, tags.category, tag_aliases.antecedent_name")
@@ -112,4 +112,3 @@ module TagAutocomplete
       .map {|row| Result.new(*row, :alias)}
   end
 end
-

app/logical/tag_change_notice_service.rb

@@ -1,5 +1,5 @@
 module TagChangeNoticeService
-  extend self
+  module_function
 
   def get_forum_topic_id(tag)
     Cache.get("tcn:#{tag}")

app/logical/tag_implication_request.rb

@@ -1,5 +1,5 @@
 class TagImplicationRequest
-  def self.command_string(antecedent_name, consequent_name, id=nil)
+  def self.command_string(antecedent_name, consequent_name, id = nil)
     if id
       return "[ti:#{id}]"
     end

app/logical/tag_relationship_retirement_service.rb

@@ -1,7 +1,6 @@
 module TagRelationshipRetirementService
-  THRESHOLD = 2.year
+  module_function
-
+  THRESHOLD = 2.years
-  extend self
 
   def forum_topic_title
     return "Retired tag aliases & implications"

app/logical/upload_error_checker.rb

@@ -19,4 +19,3 @@ class UploadErrorChecker
     end
   end
 end
-

app/logical/upload_service.rb

@@ -54,7 +54,6 @@ class UploadService
       @upload.save!
       @post = create_post_from_upload(@upload)
       return @upload
-
     rescue Exception => x
       @upload.update(status: "error: #{x.class} - #{x.message}", backtrace: x.backtrace.join("\n"))
       @upload

app/logical/upload_service/preprocessor.rb

@@ -62,7 +62,6 @@ class UploadService
       CurrentUser.as(uploader_id) do
         start!
       end
-
     rescue ActiveRecord::RecordNotUnique
       return
     end
@@ -106,7 +105,7 @@ class UploadService
     end
 
     def finish!(upload = nil)
-      pred = upload || self.predecessor()
+      pred = upload || self.predecessor
 
       # regardless of who initialized the upload, credit should
       # goto whoever submitted the form
@@ -124,5 +123,4 @@ class UploadService
       return pred
     end
   end
-
 end

app/logical/upload_service/utils.rb

@@ -1,6 +1,6 @@
 class UploadService
   module Utils
-    extend self
+    module_function
     class CorruptFileError < RuntimeError; end
 
     def file_header_to_file_ext(file)
@@ -93,7 +93,7 @@ class UploadService
 
     def generate_video_crop_for(video, width)
       vp = Tempfile.new(["video-preview", ".jpg"], binmode: true)
-      video.screenshot(vp.path, {:seek_time => 0, :resolution => "#{video.width}x#{video.height}"})
+      video.screenshot(vp.path, :seek_time => 0, :resolution => "#{video.width}x#{video.height}")
       crop = DanbooruImageResizer.crop(vp, width, width, 85)
       vp.close
       return crop
@@ -108,7 +108,7 @@ class UploadService
       end
 
       output_file = Tempfile.new(["video-preview", ".jpg"], binmode: true)
-      video.screenshot(output_file.path, {:seek_time => 0, :resolution => "#{width}x#{height}"})
+      video.screenshot(output_file.path, :seek_time => 0, :resolution => "#{width}x#{height}")
       output_file
     end
 
@@ -179,7 +179,7 @@ class UploadService
 
     def get_file_for_upload(upload, file: nil)
       return file if file.present?
-      raise RuntimeError, "No file or source URL provided" if upload.source_url.blank?
+      raise "No file or source URL provided" if upload.source_url.blank?
 
       attempts = 0
 
@@ -190,8 +190,7 @@ class UploadService
         if !DanbooruImageResizer.validate_shell(file)
           raise CorruptFileError.new("File is corrupted")
         end
-
+      rescue StandardError
-      rescue
         if attempts == 3
           raise
         end

app/logical/user_deletion.rb

@@ -1,5 +1,5 @@
 class UserDeletion
-  class ValidationError < Exception ; end
+  class ValidationError < Exception; end
 
   attr_reader :user, :password
 
@@ -18,10 +18,10 @@ class UserDeletion
     create_mod_action
   end
 
-private
+  private
 
   def create_mod_action
-    ModAction.log("user ##{user.id} deleted",:user_delete)
+    ModAction.log("user ##{user.id} deleted", :user_delete)
   end
 
   def clear_saved_searches
@@ -55,9 +55,7 @@ private
   def rename
     name = "user_#{user.id}"
     n = 0
-    while User.where(:name => name).exists? && (n < 10)
+    name += "~" while User.where(:name => name).exists? && (n < 10)
-      name += "~"
-    end
 
     if n == 10
       raise ValidationError.new("New name could not be found")

app/logical/user_promotion.rb

@@ -18,19 +18,19 @@ class UserPromotion
 
     user.level = new_level
 
-    if options.has_key?(:can_approve_posts)
+    if options.key?(:can_approve_posts)
       user.can_approve_posts = options[:can_approve_posts]
     end
 
-    if options.has_key?(:can_upload_free)
+    if options.key?(:can_upload_free)
       user.can_upload_free = options[:can_upload_free]
     end
 
-    if options.has_key?(:no_feedback)
+    if options.key?(:no_feedback)
       user.no_feedback = options[:no_feedback]
     end
 
-    if options.has_key?(:no_flagging)
+    if options.key?(:no_flagging)
       user.no_flagging = options[:no_flagging]
     end
 
@@ -43,23 +43,23 @@ class UserPromotion
     user.save
   end
 
-private
+  private
 
   def create_mod_actions
     if old_can_approve_posts != user.can_approve_posts?
-      ModAction.log("\"#{promoter.name}\":/users/#{promoter.id} changed approval privileges for \"#{user.name}\":/users/#{user.id} from #{old_can_approve_posts} to [b]#{user.can_approve_posts?}[/b]",:user_approval_privilege)
+      ModAction.log("\"#{promoter.name}\":/users/#{promoter.id} changed approval privileges for \"#{user.name}\":/users/#{user.id} from #{old_can_approve_posts} to [b]#{user.can_approve_posts?}[/b]", :user_approval_privilege)
     end
 
     if old_can_upload_free != user.can_upload_free?
-      ModAction.log("\"#{promoter.name}\":/users/#{promoter.id} changed unlimited upload privileges for \"#{user.name}\":/users/#{user.id} from #{old_can_upload_free} to [b]#{user.can_upload_free?}[/b]",:user_upload_privilege)
+      ModAction.log("\"#{promoter.name}\":/users/#{promoter.id} changed unlimited upload privileges for \"#{user.name}\":/users/#{user.id} from #{old_can_upload_free} to [b]#{user.can_upload_free?}[/b]", :user_upload_privilege)
     end
 
     if old_no_flagging != user.no_flagging?
-      ModAction.log("\"#{promoter.name}\":/users/#{promoter.id} changed banned from flagging for \"#{user.name}\":/users/#{user.id} from #{old_no_flagging} to [b]#{user.no_flagging?}[/b]",:user_approval_privilege)
+      ModAction.log("\"#{promoter.name}\":/users/#{promoter.id} changed banned from flagging for \"#{user.name}\":/users/#{user.id} from #{old_no_flagging} to [b]#{user.no_flagging?}[/b]", :user_approval_privilege)
     end
 
     if old_no_feedback != user.no_feedback?
-      ModAction.log("\"#{promoter.name}\":/users/#{promoter.id} changed banned from feedback for \"#{user.name}\":/users/#{user.id} from #{old_no_feedback} to [b]#{user.no_feedback?}[/b]",:user_approval_privilege)
+      ModAction.log("\"#{promoter.name}\":/users/#{promoter.id} changed banned from feedback for \"#{user.name}\":/users/#{user.id} from #{old_no_feedback} to [b]#{user.no_feedback?}[/b]", :user_approval_privilege)
     end
 
     if user.level_changed?

app/models/artist.rb

@@ -1,6 +1,6 @@
 class Artist < ApplicationRecord
   extend Memoist
-  class RevertError < Exception ; end
+  class RevertError < Exception; end
 
   attr_accessor :url_string_changed
   array_attribute :other_names
@@ -140,7 +140,7 @@ class Artist < ApplicationRecord
         "youtube.com/c", # https://www.youtube.com/c/serafleurArt
         "youtube.com/channel", # https://www.youtube.com/channel/UCfrCa2Y6VulwHD3eNd3HBRA
         "youtube.com/user", # https://www.youtube.com/user/148nasuka
-        "youtu.be", # http://youtu.be/gibeLKKRT-0
+        "youtu.be" # http://youtu.be/gibeLKKRT-0
       ]
 
       SITE_BLACKLIST_REGEXP = Regexp.union(SITE_BLACKLIST.map do |domain|
@@ -213,13 +213,13 @@ class Artist < ApplicationRecord
 
     def domains
       Cache.get("artist-domains-#{id}", 1.day) do
-        Post.raw_tag_match(name).pluck(:source).map do |x| 
+        domains = Post.raw_tag_match(name).pluck(:source).map do |x|
-          begin
           map_domain(Addressable::URI.parse(x).domain)
         rescue Addressable::URI::InvalidURIError
           nil
         end
-        end.compact.inject(Hash.new(0)) {|h, x| h[x] += 1; h}.sort {|a, b| b[1] <=> a[1]}
+
+        domains.compact.inject(Hash.new(0)) {|h, x| h[x] += 1; h}.sort {|a, b| b[1] <=> a[1]}
       end
     end
   end
@@ -248,7 +248,7 @@ class Artist < ApplicationRecord
   end
 
   module VersionMethods
-    def create_version(force=false)
+    def create_version(force = false)
       if saved_change_to_name? || url_string_changed || saved_change_to_is_active? || saved_change_to_is_banned? || saved_change_to_other_names? || saved_change_to_group_name? || saved_change_to_notes? || force
         if merge_version?
           merge_version
@@ -401,7 +401,7 @@ class Artist < ApplicationRecord
       Post.transaction do
         CurrentUser.without_safe_mode do
           ti = TagImplication.where(:antecedent_name => name, :consequent_name => "banned_artist").first
-          ti.destroy if ti
+          ti&.destroy
 
           Post.tag_match(name).where("true /* Artist.unban */").each do |post|
             post.unban!
@@ -410,7 +410,7 @@ class Artist < ApplicationRecord
           end
 
           update_column(:is_banned, false)
-          ModAction.log("unbanned artist ##{id}",:artist_unban)
+          ModAction.log("unbanned artist ##{id}", :artist_unban)
         end
       end
     end
@@ -429,7 +429,7 @@ class Artist < ApplicationRecord
           end
 
           update_column(:is_banned, true)
-          ModAction.log("banned artist ##{id}",:artist_ban)
+          ModAction.log("banned artist ##{id}", :artist_ban)
         end
       end
     end

app/models/artist_commentary.rb

@@ -1,5 +1,5 @@
 class ArtistCommentary < ApplicationRecord
-  class RevertError < Exception ; end
+  class RevertError < Exception; end
 
   attr_accessor :remove_commentary_tag, :remove_commentary_request_tag, :remove_commentary_check_tag, :remove_partial_commentary_tag
   attr_accessor :add_commentary_tag, :add_commentary_request_tag, :add_commentary_check_tag, :add_partial_commentary_tag
@@ -109,7 +109,7 @@ class ArtistCommentary < ApplicationRecord
         original_title: original_title,
         original_description: original_description,
         translated_title: translated_title,
-        translated_description: translated_description,
+        translated_description: translated_description
       )
     end
 

app/models/ban.rb

@@ -94,9 +94,7 @@ class Ban < ApplicationRecord
     @duration = dur
   end
 
-  def duration
+  attr_reader :duration
-    @duration
-  end
 
   def humanized_duration
     ApplicationController.helpers.distance_of_time_in_words(created_at, expires_at)

app/models/bulk_update_request.rb

@@ -1,5 +1,6 @@
 class BulkUpdateRequest < ApplicationRecord
-  attr_accessor :reason, :skip_secondary_validations
+  attr_accessor :reason
+  attr_reader :skip_secondary_validations
 
   belongs_to :user
   belongs_to :forum_topic, optional: true
@@ -81,11 +82,10 @@ class BulkUpdateRequest < ApplicationRecord
           forum_updater.update("The #{bulk_update_request_link} (forum ##{forum_post.id}) has been approved by @#{approver.name}.", "APPROVED")
         end
       end
-
     rescue AliasAndImplicationImporter::Error => x
       self.approver = approver
       CurrentUser.scoped(approver) do
-        forum_updater.update("The #{bulk_update_request_link} (forum ##{forum_post.id}) has failed: #{x.to_s}", "FAILED")
+        forum_updater.update("The #{bulk_update_request_link} (forum ##{forum_post.id}) has failed: #{x}", "FAILED")
       end
     end
 
@@ -129,13 +129,11 @@ class BulkUpdateRequest < ApplicationRecord
     end
 
     def validate_script
-      begin
       AliasAndImplicationImporter.new(script, forum_topic_id, "1", skip_secondary_validations).validate!
     rescue RuntimeError => e
       errors[:base] << e.message
     end
   end
-  end
 
   extend SearchMethods
   include ApprovalMethods

app/models/comment.rb

@@ -10,16 +10,16 @@ class Comment < ApplicationRecord
   has_many :votes, :class_name => "CommentVote", :dependent => :destroy
   after_create :update_last_commented_at_on_create
   after_update(:if => ->(rec) {(!rec.is_deleted? || !rec.saved_change_to_is_deleted?) && CurrentUser.id != rec.creator_id}) do |rec|
-    ModAction.log("comment ##{rec.id} updated by #{CurrentUser.name}",:comment_update)
+    ModAction.log("comment ##{rec.id} updated by #{CurrentUser.name}", :comment_update)
   end
   after_save :update_last_commented_at_on_destroy, :if => ->(rec) {rec.is_deleted? && rec.saved_change_to_is_deleted?}
   after_save(:if => ->(rec) {rec.is_deleted? && rec.saved_change_to_is_deleted? && CurrentUser.id != rec.creator_id}) do |rec|
-    ModAction.log("comment ##{rec.id} deleted by #{CurrentUser.name}",:comment_delete)
+    ModAction.log("comment ##{rec.id} deleted by #{CurrentUser.name}", :comment_delete)
   end
   mentionable(
     :message_field => :body,
     :title => ->(user_name) {"#{creator.name} mentioned you in a comment on post ##{post_id}"},
-    :body => ->(user_name) {"@#{creator.name} mentioned you in a \"comment\":/posts/#{post_id}#comment-#{id} on post ##{post_id}:\n\n[quote]\n#{DText.excerpt(body, "@"+user_name)}\n[/quote]\n"},
+    :body => ->(user_name) {"@#{creator.name} mentioned you in a \"comment\":/posts/#{post_id}#comment-#{id} on post ##{post_id}:\n\n[quote]\n#{DText.excerpt(body, "@" + user_name)}\n[/quote]\n"}
   )
 
   api_attributes including: [:creator_name, :updater_name]
@@ -56,7 +56,7 @@ class Comment < ApplicationRecord
 
   module VoteMethods
     def vote!(val)
-      numerical_score = val == "up" ? 1 : -1
+      numerical_score = (val == "up") ? 1 : -1
       vote = votes.create!(:score => numerical_score)
 
       if vote.is_positive?

app/models/comment_vote.rb

@@ -1,5 +1,5 @@
 class CommentVote < ApplicationRecord
-  class Error < Exception ; end
+  class Error < Exception; end
 
   belongs_to :comment
   belongs_to :user

app/models/dmail_filter.rb

@@ -11,7 +11,7 @@ class DmailFilter < ApplicationRecord
   end
 
   def filtered?(dmail)
-    dmail.from.level < User::Levels::MODERATOR && has_filter? && (dmail.body =~ regexp || dmail.title =~ regexp || dmail.from.name =~ regexp)
+    dmail.from.level < User::Levels::MODERATOR && has_filter? && (dmail.body.match?(regexp) || dmail.title.match?(regexp) || dmail.from.name.match?(regexp))
   end
 
   def has_filter?

app/models/favorite.rb

@@ -1,5 +1,5 @@
 class Favorite < ApplicationRecord
-  class Error < Exception ; end
+  class Error < Exception; end
 
   belongs_to :post
   belongs_to :user
@@ -34,7 +34,7 @@ class Favorite < ApplicationRecord
       return unless Favorite.for_user(user.id).where(:user_id => user.id, :post_id => post_id).exists?
       Favorite.for_user(user.id).where(post_id: post_id).delete_all
       Post.where(:id => post_id).update_all("fav_count = fav_count - 1")
-      post.delete_user_from_fav_string(user.id) if post
+      post&.delete_user_from_fav_string(user.id)
       User.where(:id => user.id).update_all("favorite_count = favorite_count - 1")
       user.favorite_count -= 1
       post.fav_count -= 1 if post

app/models/favorite_group.rb

@@ -31,7 +31,7 @@ class FavoriteGroup < ApplicationRecord
       where("name ilike ? escape E'\\\\'", name.to_escaped_for_sql_like)
     end
 
-    def hide_private(user,params)
+    def hide_private(user, params)
       if user.hide_favorites?
         where("is_public = true")
       elsif params[:is_public].present?
@@ -51,14 +51,14 @@ class FavoriteGroup < ApplicationRecord
 
       if params[:creator_id].present?
         user = User.find(params[:creator_id])
-        q = q.hide_private(user,params)
+        q = q.hide_private(user, params)
         q = q.where("creator_id = ?", user.id)
       elsif params[:creator_name].present?
         user = User.find_by_name(params[:creator_name])
-        q = q.hide_private(user,params)
+        q = q.hide_private(user, params)
         q = q.where("creator_id = ?", user.id)
       else
-        q = q.hide_private(CurrentUser.user,params)
+        q = q.hide_private(CurrentUser.user, params)
         q = q.where("creator_id = ?", CurrentUser.user.id)
       end
 
@@ -130,13 +130,11 @@ class FavoriteGroup < ApplicationRecord
     offset = options[:offset] || 0
     limit = options[:limit] || Danbooru.config.posts_per_page
     slice = post_id_array.slice(offset, limit)
-    if slice && slice.any?
+    if slice&.any?
       slice.map do |id|
-        begin
         Post.find(id)
       rescue ActiveRecord::RecordNotFound
         # swallow
-        end
       end.compact
     else
       []