Browse Source

Using double splat operator (#5859)

custom
Yamagishi Kazutoshi 5 years ago
committed by Eugen Rochko
parent
commit
b21db9bbde
  1. 2
      app/controllers/api/v1/accounts_controller.rb
  2. 2
      app/helpers/admin/filter_helper.rb
  3. 2
      app/helpers/application_helper.rb
  4. 2
      app/helpers/routing_helper.rb
  5. 4
      app/lib/activitypub/activity.rb
  6. 2
      app/lib/extractor.rb
  7. 2
      app/lib/formatter.rb
  8. 2
      app/lib/ostatus/activity/base.rb
  9. 2
      app/lib/ostatus/atom_serializer.rb
  10. 2
      app/lib/provider_discovery.rb
  11. 2
      app/lib/request.rb
  12. 2
      app/mailers/notification_mailer.rb
  13. 6
      app/mailers/user_mailer.rb
  14. 4
      app/models/remote_follow.rb
  15. 2
      app/models/session_activation.rb
  16. 2
      app/presenters/account_relationships_presenter.rb
  17. 2
      app/presenters/status_relationships_presenter.rb
  18. 2
      app/services/activitypub/process_collection_service.rb
  19. 2
      app/services/authorize_follow_service.rb
  20. 2
      app/services/post_status_service.rb
  21. 2
      app/services/process_feed_service.rb
  22. 2
      app/services/remove_status_service.rb
  23. 2
      app/services/suspend_account_service.rb
  24. 8
      lib/mastodon/migration_helpers.rb
  25. 2
      spec/services/post_status_service_spec.rb

2
app/controllers/api/v1/accounts_controller.rb

@ -51,7 +51,7 @@ class Api::V1::AccountsController < Api::BaseController
@account = Account.find(params[:id])
end
def relationships(options = {})
def relationships(**options)
AccountRelationshipsPresenter.new([@account.id], current_user.account_id, options)
end
end

2
app/helpers/admin/filter_helper.rb

@ -13,7 +13,7 @@ module Admin::FilterHelper
link_to text, new_url, class: filter_link_class(new_class)
end
def table_link_to(icon, text, path, options = {})
def table_link_to(icon, text, path, **options)
link_to safe_join([fa_icon(icon), text]), path, options.merge(class: 'table-action-link')
end

2
app/helpers/application_helper.rb

@ -5,7 +5,7 @@ module ApplicationHelper
current_page?(path) ? 'active' : ''
end
def active_link_to(label, path, options = {})
def active_link_to(label, path, **options)
link_to label, path, options.merge(class: active_nav_class(path))
end

2
app/helpers/routing_helper.rb

@ -11,7 +11,7 @@ module RoutingHelper
end
end
def full_asset_url(source, options = {})
def full_asset_url(source, **options)
source = ActionController::Base.helpers.asset_url(source, options) unless use_storage?
URI.join(root_url, source).to_s

4
app/lib/activitypub/activity.rb

@ -3,7 +3,7 @@
class ActivityPub::Activity
include JsonLdHelper
def initialize(json, account, options = {})
def initialize(json, account, **options)
@json = json
@account = account
@object = @json['object']
@ -15,7 +15,7 @@ class ActivityPub::Activity
end
class << self
def factory(json, account, options = {})
def factory(json, account, **options)
@json = json
klass&.new(json, account, options)
end

2
app/lib/extractor.rb

@ -32,7 +32,7 @@ module Extractor
possible_entries
end
def extract_hashtags_with_indices(text, _options = {})
def extract_hashtags_with_indices(text, **)
return [] unless text =~ /#/
tags = []

2
app/lib/formatter.rb

@ -9,7 +9,7 @@ class Formatter
include ActionView::Helpers::TextHelper
def format(status, options = {})
def format(status, **options)
if status.reblog?
prepend_reblog = status.reblog.account.acct
status = status.proper

2
app/lib/ostatus/activity/base.rb

@ -1,7 +1,7 @@
# frozen_string_literal: true
class OStatus::Activity::Base
def initialize(xml, account = nil, options = {})
def initialize(xml, account = nil, **options)
@xml = xml
@account = account
@options = options

2
app/lib/ostatus/atom_serializer.rb

@ -319,7 +319,7 @@ class OStatus::AtomSerializer
private
def append_element(parent, name, content = nil, attributes = {})
def append_element(parent, name, content = nil, **attributes)
element = Ox::Element.new(name)
attributes.each { |k, v| element[k] = sanitize_str(v) }
element << sanitize_str(content) unless content.nil?

2
app/lib/provider_discovery.rb

@ -2,7 +2,7 @@
class ProviderDiscovery < OEmbed::ProviderDiscovery
class << self
def discover_provider(url, options = {})
def discover_provider(url, **options)
res = Request.new(:get, url).perform
format = options[:format]

2
app/lib/request.rb

@ -5,7 +5,7 @@ class Request
include RoutingHelper
def initialize(verb, url, options = {})
def initialize(verb, url, **options)
@verb = verb
@url = Addressable::URI.parse(url).normalize
@options = options

2
app/mailers/notification_mailer.rb

@ -63,7 +63,7 @@ class NotificationMailer < ApplicationMailer
end
end
def digest(recipient, opts = {})
def digest(recipient, **opts)
@me = recipient
@since = opts[:since] || @me.user.last_emailed_at || @me.user.current_sign_in_at
@notifications = Notification.where(account: @me, activity_type: 'Mention').where('created_at > ?', @since)

6
app/mailers/user_mailer.rb

@ -5,7 +5,7 @@ class UserMailer < Devise::Mailer
helper :instance
def confirmation_instructions(user, token, _opts = {})
def confirmation_instructions(user, token, **)
@resource = user
@token = token
@instance = Rails.configuration.x.local_domain
@ -17,7 +17,7 @@ class UserMailer < Devise::Mailer
end
end
def reset_password_instructions(user, token, _opts = {})
def reset_password_instructions(user, token, **)
@resource = user
@token = token
@instance = Rails.configuration.x.local_domain
@ -29,7 +29,7 @@ class UserMailer < Devise::Mailer
end
end
def password_change(user, _opts = {})
def password_change(user, **)
@resource = user
@instance = Rails.configuration.x.local_domain

4
app/models/remote_follow.rb

@ -7,8 +7,8 @@ class RemoteFollow
validates :acct, presence: true
def initialize(attrs = {})
@acct = attrs[:acct].gsub(/\A@/, '').strip unless attrs[:acct].nil?
def initialize(attrs = nil)
@acct = attrs[:acct].gsub(/\A@/, '').strip if !attrs.nil? && !attrs[:acct].nil?
end
def valid?

2
app/models/session_activation.rb

@ -53,7 +53,7 @@ class SessionActivation < ApplicationRecord
id && where(session_id: id).exists?
end
def activate(options = {})
def activate(**options)
activation = create!(options)
purge_old
activation

2
app/presenters/account_relationships_presenter.rb

@ -4,7 +4,7 @@ class AccountRelationshipsPresenter
attr_reader :following, :followed_by, :blocking,
:muting, :requested, :domain_blocking
def initialize(account_ids, current_account_id, options = {})
def initialize(account_ids, current_account_id, **options)
@following = Account.following_map(account_ids, current_account_id).merge(options[:following_map] || {})
@followed_by = Account.followed_by_map(account_ids, current_account_id).merge(options[:followed_by_map] || {})
@blocking = Account.blocking_map(account_ids, current_account_id).merge(options[:blocking_map] || {})

2
app/presenters/status_relationships_presenter.rb

@ -3,7 +3,7 @@
class StatusRelationshipsPresenter
attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map
def initialize(statuses, current_account_id = nil, options = {})
def initialize(statuses, current_account_id = nil, **options)
if current_account_id.nil?
@reblogs_map = {}
@favourites_map = {}

2
app/services/activitypub/process_collection_service.rb

@ -3,7 +3,7 @@
class ActivityPub::ProcessCollectionService < BaseService
include JsonLdHelper
def call(body, account, options = {})
def call(body, account, **options)
@account = account
@json = Oj.load(body, mode: :strict)
@options = options

2
app/services/authorize_follow_service.rb

@ -1,7 +1,7 @@
# frozen_string_literal: true
class AuthorizeFollowService < BaseService
def call(source_account, target_account, options = {})
def call(source_account, target_account, **options)
if options[:skip_follow_request]
follow_request = FollowRequest.new(account: source_account, target_account: target_account)
else

2
app/services/post_status_service.rb

@ -13,7 +13,7 @@ class PostStatusService < BaseService
# @option [Doorkeeper::Application] :application
# @option [String] :idempotency Optional idempotency key
# @return [Status]
def call(account, text, in_reply_to = nil, options = {})
def call(account, text, in_reply_to = nil, **options)
if options[:idempotency].present?
existing_id = redis.get("idempotency:status:#{account.id}:#{options[:idempotency]}")
return Status.find(existing_id) if existing_id

2
app/services/process_feed_service.rb

@ -1,7 +1,7 @@
# frozen_string_literal: true
class ProcessFeedService < BaseService
def call(body, account, options = {})
def call(body, account, **options)
@options = options
xml = Nokogiri::XML(body)

2
app/services/remove_status_service.rb

@ -3,7 +3,7 @@
class RemoveStatusService < BaseService
include StreamEntryRenderer
def call(status, options = {})
def call(status, **options)
@payload = Oj.dump(event: :delete, payload: status.id.to_s)
@status = status
@account = status.account

2
app/services/suspend_account_service.rb

@ -1,7 +1,7 @@
# frozen_string_literal: true
class SuspendAccountService < BaseService
def call(account, options = {})
def call(account, **options)
@account = account
@options = options

8
lib/mastodon/migration_helpers.rb

@ -99,7 +99,7 @@ module Mastodon
# default - The default value for the column.
# null - When set to `true` the column will allow NULL values.
# The default is to not allow NULL values.
def add_timestamps_with_timezone(table_name, options = {})
def add_timestamps_with_timezone(table_name, **options)
options[:null] = false if options[:null].nil?
[:created_at, :updated_at].each do |column_name|
@ -134,7 +134,7 @@ module Mastodon
# add_concurrent_index :users, :some_column
#
# See Rails' `add_index` for more info on the available arguments.
def add_concurrent_index(table_name, column_name, options = {})
def add_concurrent_index(table_name, column_name, **options)
if transaction_open?
raise 'add_concurrent_index can not be run inside a transaction, ' \
'you can disable transactions by calling disable_ddl_transaction! ' \
@ -158,7 +158,7 @@ module Mastodon
# remove_concurrent_index :users, :some_column
#
# See Rails' `remove_index` for more info on the available arguments.
def remove_concurrent_index(table_name, column_name, options = {})
def remove_concurrent_index(table_name, column_name, **options)
if transaction_open?
raise 'remove_concurrent_index can not be run inside a transaction, ' \
'you can disable transactions by calling disable_ddl_transaction! ' \
@ -182,7 +182,7 @@ module Mastodon
# remove_concurrent_index :users, "index_X_by_Y"
#
# See Rails' `remove_index` for more info on the available arguments.
def remove_concurrent_index_by_name(table_name, index_name, options = {})
def remove_concurrent_index_by_name(table_name, index_name, **options)
if transaction_open?
raise 'remove_concurrent_index_by_name can not be run inside a transaction, ' \
'you can disable transactions by calling disable_ddl_transaction! ' \

2
spec/services/post_status_service_spec.rb

@ -182,7 +182,7 @@ RSpec.describe PostStatusService do
expect(status2.id).to eq status1.id
end
def create_status_with_options(options = {})
def create_status_with_options(**options)
subject.call(Fabricate(:account), 'test', nil, options)
end
end

Loading…
Cancel
Save