mirrors
/
glitch-social
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Releases Activity

Autofix Rubocop Rails/FindById (#23762)

This commit is contained in:
Nick Schonning 2023-02-20 20:21:48 -05:00 committed by GitHub
parent 35d032500b
commit 434770f580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.rubocop_todo.yml
View File

@ -1645,13 +1645,6 @@ Rails/FilePath:
- 'spec/rails_helper.rb' - 'spec/rails_helper.rb'
- 'spec/spec_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 # Offense count: 6
# Configuration parameters: Include. # Configuration parameters: Include.
# Include: app/models/**/*.rb # Include: app/models/**/*.rb

2
app/controllers/api/v1/notifications_controller.rb
View File

@ -24,7 +24,7 @@ class Api::V1::NotificationsController < Api::BaseController
end end
def dismiss def dismiss
current_account.notifications.find_by!(id: params[:id]).destroy! current_account.notifications.find(params[:id]).destroy!
render_empty render_empty
end end

2
app/controllers/media_controller.rb
View File

@ -32,7 +32,7 @@ class MediaController < ApplicationController
scope = MediaAttachment.local.attached scope = MediaAttachment.local.attached
# If id is 19 characters long, it's a shortcode, otherwise it's an identifier # 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 end
def verify_permitted_status! def verify_permitted_status!