AO3-6565 Appease dog somewhat

app/models/indexing/scheduled_reindex_job.rb

@@ -1,5 +1,5 @@
 class ScheduledReindexJob
-  MAIN_CLASSES = %w(Pseud Tag Work Bookmark Series ExternalWork User).freeze
+  MAIN_CLASSES = %w[Pseud Tag Work Bookmark Series ExternalWork User].freeze
 
   def self.perform(reindex_type)
     classes = case reindex_type
@@ -16,4 +16,3 @@ def self.run_queue(klass, reindex_type)
   end
 
 end
-

app/models/pseud.rb

@@ -81,9 +81,12 @@
   validates_length_of :icon_comment_text, allow_blank: true, maximum: ArchiveConfig.ICON_COMMENT_MAX,
     too_long: ts("must be less than %{max} characters long.", max: ArchiveConfig.ICON_COMMENT_MAX)
 
+  after_create :reindex_user
   after_update :check_default_pseud
   after_update :expire_caches
+  after_update :reindex_user, if: :name_changed?
   after_commit :reindex_creations, :touch_comments
+  after_destroy :reindex_user
 
   scope :alphabetical, -> { order(:name) }
   scope :default_alphabetical, -> { order(is_default: :desc).alphabetical }
@@ -419,7 +422,7 @@
 
   def clear_icon
     return unless delete_icon?
-    
+
     self.icon = nil unless icon.dirty?
     self.icon_alt_text = nil
   end
@@ -450,10 +453,6 @@
     IndexQueue.enqueue_ids(Series, series.pluck(:id), :main)
   end
 
-  after_create :reindex_user
-  after_update :reindex_user, if: :name_changed?
-  after_destroy :reindex_user
-
   def reindex_user
     user.enqueue_to_index
   end

app/models/roles_user.rb

@@ -2,7 +2,14 @@ class RolesUser < ApplicationRecord
   belongs_to :user
   belongs_to :role
 
+  delegate :enqueue_to_index, to: :user
+
   after_create :log_role_addition
+  after_create :enqueue_to_index
+  after_destroy :log_role_removal
+  after_destroy :destroy_last_wrangling_activity
+  after_destroy :enqueue_to_index
+
   def log_role_addition
     admin = User.current_user
     note = "Change made by #{admin&.login}"
@@ -12,7 +19,6 @@ def log_role_addition
                            role_id: role_id })
   end
 
-  after_destroy :log_role_removal
   def log_role_removal
     admin = User.current_user
     note = "Change made by #{admin&.login}"
@@ -24,14 +30,9 @@ def log_role_removal
 
   # After removing the tag_wrangler role, remove the
   # user's last wrangling activity as well.
-  after_destroy :destroy_last_wrangling_activity
   def destroy_last_wrangling_activity
     return unless role.name == "tag_wrangler"
 
     user.last_wrangling_activity&.destroy
   end
-
-  delegate :enqueue_to_index, to: :user
-  after_create :enqueue_to_index
-  after_destroy :enqueue_to_index
 end

app/models/search/user_query.rb

@@ -1,6 +1,6 @@
 class UserQuery < Query
   def klass
-    'User'
+    "User"
   end
 
   def index_name
@@ -38,15 +38,15 @@ def role_filter
   end
 
   def name_filter
-    return unless options[:name].present?
+    return if options[:name].blank?
 
     field = options[:search_past].present? ? :all_names : :names
 
     { wildcard: { field => options[:name] } }
   end
 
   def email_filter
-    return unless options[:email].present?
+    return if options[:email].blank?
 
     field = options[:search_past].present? ? :all_emails : :email