Fix more rubocop errors (#258)

Author: toyhammered

.pryrc

@@ -6,6 +6,6 @@ if defined?(PryByebug)
 end
 
 # Hit Enter to repeat last command
-Pry::Commands.command /^$/, 'repeat last command' do
+Pry::Commands.command(/^$/, 'repeat last command') do
   _pry_.run_command Pry.history.to_a.last
 end

app/chewy/characters_index.rb

@@ -24,7 +24,7 @@ def self.query_for(query)
                 max_expansions: 15,
                 prefix_length: 2,
                 boost: 2
-              },
+              }
             },
             {
               multi_match: {

app/chewy/users_index.rb

@@ -5,7 +5,7 @@ def self.blocking(*user_ids)
     end
 
     def self.active
-      filter { deleted_at == nil }
+      filter { deleted_at.nil? }
     end
 
     field :name

app/controllers/concerns/custom_controller_helpers.rb

@@ -39,8 +39,6 @@ def user
   end
 
   def authenticate_user!
-    unless user
-      render_jsonapi serialize_error(403, 'Must be logged in'), status: 403
-    end
+    render_jsonapi serialize_error(403, 'Must be logged in'), status: 403 unless user
   end
 end

app/controllers/concerns/doorkeeper_helpers.rb

@@ -16,7 +16,7 @@ def validate_token!
     if doorkeeper_token && !doorkeeper_token.accessible?
       render json: {
         errors: [
-          { title: 'Invalid token', status: "403"}
+          { title: 'Invalid token', status: '403' }
         ]
       }, status: 403
     end

app/controllers/group_invites_controller.rb

@@ -22,19 +22,14 @@ def revoke
   private
 
   def authenticate!
-    unless invite
-      return render_jsonapi serialize_error(404, 'Not Found'), status: 404
-    end
+    return render_jsonapi serialize_error(404, 'Not Found'), status: 404 unless invite
+
     user = current_user&.resource_owner
-    unless user == invite.user
-      render_jsonapi serialize_error(403, 'Not Authorized'), status: 403
-    end
+    render_jsonapi serialize_error(403, 'Not Authorized'), status: 403 unless user == invite.user
   end
 
   def acceptable?
-    if invite.unacceptable?
-      render_jsonapi serialize_error(403, 'Already Responded'), status: 403
-    end
+    render_jsonapi serialize_error(403, 'Already Responded'), status: 403 if invite.unacceptable?
   end
 
   def invite

app/controllers/sessions_controller.rb

@@ -6,7 +6,7 @@ def new
   def create
     return render status: 403, text: 'Token missing' if params[:token].blank?
     token = Doorkeeper::AccessToken.by_token(params[:token])
-    is_admin = token.resource_owner.roles.where(name: 'admin').count > 0
+    is_admin = token.resource_owner.roles.where(name: 'admin').exists?
     return render status: 403, text: 'Not allowed' unless is_admin
     session[:token] = params[:token]
     render status: 200, text: 'Success'

app/controllers/sso_controller.rb

@@ -11,8 +11,6 @@ def canny
   private
 
   def authenticate!
-    unless signed_in?
-      render status: 403, json: serialize_error(403, 'Not authenticated')
-    end
+    render status: 403, json: serialize_error(403, 'Not authenticated') unless signed_in?
   end
 end

app/mailers/user_mailer.rb

@@ -23,5 +23,6 @@ def client_url_for(path)
     # TODO: stop hardcoding this and fix root_url
     # Also, this gsub collapses runs of more than one forward-slash (except in
     # the protocol)
-    "https://kitsu.io/#{path}".gsub(%r{([^:])/+}, '\1/')  end
+    "https://kitsu.io/#{path}".gsub(%r{([^:])/+}, '\1/')
+  end
 end

app/models/block.rb

@@ -29,15 +29,15 @@ class Block < ApplicationRecord
 
   validate :not_blocking_admin
   def not_blocking_admin
-    errors.add(:blocked, "cannot be an admin") if blocked.has_role?(:admin)
-    errors.add(:blocked, "cannot be a moderator") if blocked.title == 'Mod'
+    errors.add(:blocked, 'cannot be an admin') if blocked.has_role?(:admin)
+    errors.add(:blocked, 'cannot be a moderator') if blocked.title == 'Mod'
   end
 
   def self.hidden_for(user)
     return [] if user.nil?
     user = user.id if user.respond_to?(:id)
-    Block.where('user_id = ? or blocked_id = ?', *[user]*2).
-          pluck(:blocked_id, :user_id).flatten.uniq - [user]
+    Block.where('user_id = ? or blocked_id = ?', user, user)
+         .pluck(:blocked_id, :user_id).flatten.uniq - [user]
   end
 
   after_create do

app/models/group_invite.rb

@@ -107,15 +107,11 @@ def not_inviting_self
   end
 
   def not_banned
-    if GroupBan.where(group: group, user: user).exists?
-      errors.add(:user, 'is banned')
-    end
+    errors.add(:user, 'is banned') if GroupBan.where(group: group, user: user).exists?
   end
 
   def not_already_member
-    if GroupMember.where(group: group, user: user).exists?
-      errors.add(:user, 'is already a member')
-    end
+    errors.add(:user, 'is already a member') if GroupMember.where(group: group, user: user).exists?
   end
 
   def invitee_following_sender

app/models/linked_account.rb

@@ -43,9 +43,7 @@ def type_is_subclass
 
     in_namespace = type.start_with?('LinkedAccount')
     is_descendant = type.safe_constantize <= LinkedAccount
-    unless in_namespace && is_descendant
-      errors.add(:type, 'must be a LinkedAccount class')
-    end
+    errors.add(:type, 'must be a LinkedAccount class') unless in_namespace && is_descendant
   end
 
   def self.without_syncing(reason = nil)

app/models/list_import.rb

@@ -43,9 +43,7 @@ class ListImport < ApplicationRecord
   def type_is_subclass
     in_namespace = type.start_with?('ListImport')
     is_descendant = type.safe_constantize <= ListImport
-    unless in_namespace && is_descendant
-      errors.add(:type, 'must be a ListImport class')
-    end
+    errors.add(:type, 'must be a ListImport class') unless in_namespace && is_descendant
   end
 
   # Apply the ListImport

app/models/media_attribute_vote.rb

@@ -36,21 +36,15 @@ class MediaAttributeVote < ApplicationRecord
 
   counter_culture :anime_media_attributes,
     column_name: proc { |mav|
-      if mav.vote != 'unvoted' && mav.anime_media_attributes
-        "#{mav.vote}_vote_count"
-      end
+      "#{mav.vote}_vote_count" if mav.vote != 'unvoted' && mav.anime_media_attributes
     }
   counter_culture :manga_media_attributes,
     column_name: proc { |mav|
-      if mav.vote != 'unvoted' && mav.manga_media_attributes
-        "#{mav.vote}_vote_count"
-      end
+      "#{mav.vote}_vote_count" if mav.vote != 'unvoted' && mav.manga_media_attributes
     }
   counter_culture :dramas_media_attributes,
     column_name: proc { |mav|
-      if mav.vote != 'unvoted' && mav.dramas_media_attributes
-        "#{mav.vote}_vote_count"
-      end
+      "#{mav.vote}_vote_count" if mav.vote != 'unvoted' && mav.dramas_media_attributes
     }
 
   before_validation do

app/models/streaming_link.rb

@@ -31,6 +31,6 @@ class StreamingLink < ApplicationRecord
   validates :media, :streamer, :url, :subs, :dubs, presence: true
   validates :media, polymorphism: { type: Media }
 
-  scope :dubbed, -> (langs) { where('dubs @> ARRAY[?]::varchar[]', langs) }
-  scope :subbed, -> (langs) { where('subs @> ARRAY[?]::varchar[]', langs) }
+  scope :dubbed, ->(langs) { where('dubs @> ARRAY[?]::varchar[]', langs) }
+  scope :subbed, ->(langs) { where('subs @> ARRAY[?]::varchar[]', langs) }
 end