* Change: #591 ホワイトリストのドメイン一覧の保存先・画面変更 * Update account_batch.rb * 表示まわりを改善 * Update dangerous.rake
This commit is contained in:
parent
8c399cefce
commit
ff2860d0df
18 changed files with 211 additions and 49 deletions
|
@ -98,10 +98,10 @@ class Form::AccountBatch
|
|||
|
||||
def approve_remote_domain!
|
||||
domains = accounts.group_by(&:domain).pluck(0)
|
||||
if (Setting.permit_new_account_domains || []).compact_blank.present?
|
||||
list = ((Setting.permit_new_account_domains || []) + domains).compact_blank.uniq.join("\n")
|
||||
Form::AdminSettings.new(permit_new_account_domains: list).save
|
||||
(domains - SpecifiedDomain.where(domain: domains, table: 0).pluck(:domain)).each do |domain|
|
||||
SpecifiedDomain.create!(domain: domain, table: 0)
|
||||
end
|
||||
|
||||
Account.where(domain: domains, remote_pending: true).find_each do |account|
|
||||
approve_remote_account(account)
|
||||
end
|
||||
|
|
|
@ -61,7 +61,6 @@ class Form::AdminSettings
|
|||
unlocked_friend
|
||||
enable_local_timeline
|
||||
emoji_reaction_disallow_domains
|
||||
permit_new_account_domains
|
||||
block_unfollow_account_mention
|
||||
hold_remote_new_accounts
|
||||
).freeze
|
||||
|
@ -121,7 +120,6 @@ class Form::AdminSettings
|
|||
|
||||
STRING_ARRAY_KEYS = %i(
|
||||
emoji_reaction_disallow_domains
|
||||
permit_new_account_domains
|
||||
).freeze
|
||||
|
||||
attr_accessor(*KEYS)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue