5bb8563f6c
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
24 lines
700 B
Ruby
24 lines
700 B
Ruby
# frozen_string_literal: true
|
|
|
|
class Settings::FollowerDomainsController < Settings::BaseController
|
|
def show
|
|
@account = current_account
|
|
@domains = current_account.followers.reorder(Arel.sql('MIN(follows.id) DESC')).group('accounts.domain').select('accounts.domain, count(accounts.id) as accounts_from_domain').page(params[:page]).per(10)
|
|
end
|
|
|
|
def update
|
|
domains = bulk_params[:select] || []
|
|
|
|
AfterAccountDomainBlockWorker.push_bulk(domains) do |domain|
|
|
[current_account.id, domain]
|
|
end
|
|
|
|
redirect_to settings_follower_domains_path, notice: I18n.t('followers.success', count: domains.size)
|
|
end
|
|
|
|
private
|
|
|
|
def bulk_params
|
|
params.permit(select: [])
|
|
end
|
|
end
|