mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-08-25 01:44:52 +00:00
Less gross passing of notifications flag
This commit is contained in:
parent
eaaf2170fe
commit
0c547faf92
|
@ -33,7 +33,7 @@ class Api::V1::AccountsController < Api::BaseController
|
|||
end
|
||||
|
||||
def mute
|
||||
MuteService.new.call(current_user.account, @account, notifications: params[:notifications])
|
||||
MuteService.new.call(current_user.account, @account, **params.permit(:notifications).to_hash.symbolize_keys)
|
||||
render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
|
||||
end
|
||||
|
||||
|
|
|
@ -1,13 +1,9 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class MuteService < BaseService
|
||||
def call(account, target_account, notifications: nil)
|
||||
def call(account, target_account, **opts)
|
||||
return if account.id == target_account.id
|
||||
FeedManager.instance.clear_from_timeline(account, target_account)
|
||||
# This unwieldy approach avoids duplicating the default value here
|
||||
# and in mute!.
|
||||
opts = {}
|
||||
opts[:notifications] = notifications unless notifications.nil?
|
||||
account.mute!(target_account, **opts)
|
||||
account.mute!(target_account, **opts.slice(:notifications))
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue