From 1b5d20713187465c13986eea0f3a487d254b6e63 Mon Sep 17 00:00:00 2001
From: David Vega <david-vega@users.noreply.github.com>
Date: Thu, 15 Dec 2022 08:11:58 -0800
Subject: [PATCH] Fix single name variables on controller folder (#20092)
Co-authored-by: petrokoriakin1 <116151189+petrokoriakin1@users.noreply.github.com>
Co-authored-by: petrokoriakin1 <116151189+petrokoriakin1@users.noreply.github.com>
Co-authored-by: Effy Elden <effy@effy.space>
---
app/controllers/auth/registrations_controller.rb | 4 ++--
app/controllers/concerns/rate_limit_headers.rb | 2 +-
app/controllers/concerns/signature_verification.rb | 4 ++--
app/controllers/follower_accounts_controller.rb | 2 +-
app/controllers/following_accounts_controller.rb | 2 +-
app/controllers/media_controller.rb | 4 ++--
app/controllers/statuses_controller.rb | 4 ++--
app/controllers/tags_controller.rb | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index cd1c546b80..71c0cd8271 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -56,8 +56,8 @@ class Auth::RegistrationsController < Devise::RegistrationsController
end
def configure_sign_up_params
- devise_parameter_sanitizer.permit(:sign_up) do |u|
- u.permit({ account_attributes: [:username, :display_name], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password)
+ devise_parameter_sanitizer.permit(:sign_up) do |user_params|
+ user_params.permit({ account_attributes: [:username, :display_name], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password)
end
end
diff --git a/app/controllers/concerns/rate_limit_headers.rb b/app/controllers/concerns/rate_limit_headers.rb
index 86fe58a71c..b8696df736 100644
--- a/app/controllers/concerns/rate_limit_headers.rb
+++ b/app/controllers/concerns/rate_limit_headers.rb
@@ -58,7 +58,7 @@ module RateLimitHeaders
end
def api_throttle_data
- most_limited_type, = request.env['rack.attack.throttle_data'].min_by { |_, v| v[:limit] - v[:count] }
+ most_limited_type, = request.env['rack.attack.throttle_data'].min_by { |_key, value| value[:limit] - value[:count] }
request.env['rack.attack.throttle_data'][most_limited_type]
end
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 2394574b3b..4502da698c 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -28,8 +28,8 @@ module SignatureVerification
end
class SignatureParamsTransformer < Parslet::Transform
- rule(params: subtree(:p)) do
- (p.is_a?(Array) ? p : [p]).each_with_object({}) { |(key, val), h| h[key] = val }
+ rule(params: subtree(:param)) do
+ (param.is_a?(Array) ? param : [param]).each_with_object({}) { |(key, value), hash| hash[key] = value }
end
rule(param: { key: simple(:key), value: simple(:val) }) do
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index e4d8cc4950..9ced184491 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -63,7 +63,7 @@ class FollowerAccountsController < ApplicationController
id: account_followers_url(@account, page: params.fetch(:page, 1)),
type: :ordered,
size: @account.followers_count,
- items: follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.account) },
+ items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.account) },
part_of: account_followers_url(@account),
next: next_page_url,
prev: prev_page_url
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index f84dca1e5a..febd13c975 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -66,7 +66,7 @@ class FollowingAccountsController < ApplicationController
id: account_following_index_url(@account, page: params.fetch(:page, 1)),
type: :ordered,
size: @account.following_count,
- items: follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.target_account) },
+ items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.target_account) },
part_of: account_following_index_url(@account),
next: next_page_url,
prev: prev_page_url
diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb
index ee82625a03..3cdd97f067 100644
--- a/app/controllers/media_controller.rb
+++ b/app/controllers/media_controller.rb
@@ -12,8 +12,8 @@ class MediaController < ApplicationController
before_action :check_playable, only: :player
before_action :allow_iframing, only: :player
- content_security_policy only: :player do |p|
- p.frame_ancestors(false)
+ content_security_policy only: :player do |policy|
+ policy.frame_ancestors(false)
end
def show
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index 9eb7ad691d..0e0783b4b2 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -17,8 +17,8 @@ class StatusesController < ApplicationController
skip_around_action :set_locale, if: -> { request.format == :json }
skip_before_action :require_functional!, only: [:show, :embed], unless: :whitelist_mode?
- content_security_policy only: :embed do |p|
- p.frame_ancestors(false)
+ content_security_policy only: :embed do |policy|
+ policy.frame_ancestors(false)
end
def show
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index f0a0993506..65017acba3 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -65,7 +65,7 @@ class TagsController < ApplicationController
id: tag_url(@tag),
type: :ordered,
size: @tag.statuses.count,
- items: @statuses.map { |s| ActivityPub::TagManager.instance.uri_for(s) }
+ items: @statuses.map { |status| ActivityPub::TagManager.instance.uri_for(status) }
)
end
end