~cytrogen/masto-fe

434770f580016acff6bdb51dc6715bffefb44150 — Nick Schonning 3 years ago 35d0325
Autofix Rubocop Rails/FindById (#23762)

M .rubocop_todo.yml => .rubocop_todo.yml +0 -7
@@ 1645,13 1645,6 @@ Rails/FilePath:
    - 'spec/rails_helper.rb'
    - 'spec/spec_helper.rb'

# Offense count: 2
# This cop supports safe autocorrection (--autocorrect).
Rails/FindById:
  Exclude:
    - 'app/controllers/api/v1/notifications_controller.rb'
    - 'app/controllers/media_controller.rb'

# Offense count: 6
# Configuration parameters: Include.
# Include: app/models/**/*.rb

M app/controllers/api/v1/notifications_controller.rb => app/controllers/api/v1/notifications_controller.rb +1 -1
@@ 24,7 24,7 @@ class Api::V1::NotificationsController < Api::BaseController
  end

  def dismiss
    current_account.notifications.find_by!(id: params[:id]).destroy!
    current_account.notifications.find(params[:id]).destroy!
    render_empty
  end


M app/controllers/media_controller.rb => app/controllers/media_controller.rb +1 -1
@@ 32,7 32,7 @@ class MediaController < ApplicationController

    scope = MediaAttachment.local.attached
    # If id is 19 characters long, it's a shortcode, otherwise it's an identifier
    @media_attachment = id.size == 19 ? scope.find_by!(shortcode: id) : scope.find_by!(id: id)
    @media_attachment = id.size == 19 ? scope.find_by!(shortcode: id) : scope.find(id)
  end

  def verify_permitted_status!