Clarify keyword arguments with ** (#12769)
This change is to suppress the warning below on on ruby-2.7.0: - warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/gh/stable
parent
7583679ecf
commit
206dfd7dad
|
@ -3,7 +3,7 @@
|
||||||
module AccountsHelper
|
module AccountsHelper
|
||||||
def display_name(account, **options)
|
def display_name(account, **options)
|
||||||
if options[:custom_emojify]
|
if options[:custom_emojify]
|
||||||
Formatter.instance.format_display_name(account, options)
|
Formatter.instance.format_display_name(account, **options)
|
||||||
else
|
else
|
||||||
account.display_name.presence || account.username
|
account.display_name.presence || account.username
|
||||||
end
|
end
|
||||||
|
|
|
@ -21,7 +21,7 @@ class ActivityPub::Activity
|
||||||
class << self
|
class << self
|
||||||
def factory(json, account, **options)
|
def factory(json, account, **options)
|
||||||
@json = json
|
@json = json
|
||||||
klass&.new(json, account, options)
|
klass&.new(json, account, **options)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -37,7 +37,7 @@ class ActivityPub::ProcessCollectionService < BaseService
|
||||||
end
|
end
|
||||||
|
|
||||||
def process_item(item)
|
def process_item(item)
|
||||||
activity = ActivityPub::Activity.factory(item, @account, @options)
|
activity = ActivityPub::Activity.factory(item, @account, **@options)
|
||||||
activity&.perform
|
activity&.perform
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Reference in New Issue