* Allow import/export of instance-level domain blocks/allows (#1754) * Allow import/export of instance-level domain blocks/allows. Fixes #15095 * Pacify circleci * Address simple code review feedback * Add headers to exported CSV * Extract common import/export functionality to AdminExportControllerConcern * Add additional fields to instance-blocked domain export * Address review feedback * Split instance domain block/allow import/export into separate pages/controllers * Address code review feedback * Pacify DeepSource * Work around Paperclip::HasAttachmentFile for Rails 6 * Fix deprecated API warning in export tests * Remove after_commit workaround (cherry picked from commit94e98864e3) * Add confirmation page when importing blocked domains (#1773) * Move glitch-soc-specific strings to glitch-soc-specific locale files * Add confirmation page when importing blocked domains (cherry picked from commitb91196f4b7) * Fix authorization check in domain blocks controller (cherry picked from commit7527937758) * Fix error strings for domain blocks and email-domain blocks Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's" * Ran i18n-tasks normalize to address test failure * Removed unused admin.export_domain_blocks.not_permitted string Removing unused string as indicated by Check i18n * Fix tests (cherry picked from commit9094c2f52c) * Fix domain block export not exporting blocks with only media rejection (cherry picked from commit26ff48ee48) * Fix various issues with domain block import - stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded (cherry picked from commit cad824d8f501b95377e4f0a957e5a00d517a1902) Co-authored-by: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>
		
			
				
	
	
		
			102 lines
		
	
	
	
		
			3.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			102 lines
		
	
	
	
		
			3.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| module Admin
 | |
|   class DomainBlocksController < BaseController
 | |
|     before_action :set_domain_block, only: [:show, :destroy, :edit, :update]
 | |
| 
 | |
|     def batch
 | |
|       authorize :domain_block, :create?
 | |
|       @form = Form::DomainBlockBatch.new(form_domain_block_batch_params.merge(current_account: current_account, action: action_from_button))
 | |
|       @form.save
 | |
|     rescue ActionController::ParameterMissing
 | |
|       flash[:alert] = I18n.t('admin.domain_blocks.no_domain_block_selected')
 | |
|     rescue Mastodon::NotPermittedError
 | |
|       flash[:alert] = I18n.t('admin.domain_blocks.not_permitted')
 | |
|     else
 | |
|       redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
 | |
|     end
 | |
| 
 | |
|     def new
 | |
|       authorize :domain_block, :create?
 | |
|       @domain_block = DomainBlock.new(domain: params[:_domain])
 | |
|     end
 | |
| 
 | |
|     def edit
 | |
|       authorize :domain_block, :create?
 | |
|     end
 | |
| 
 | |
|     def create
 | |
|       authorize :domain_block, :create?
 | |
| 
 | |
|       @domain_block = DomainBlock.new(resource_params)
 | |
|       existing_domain_block = resource_params[:domain].present? ? DomainBlock.rule_for(resource_params[:domain]) : nil
 | |
| 
 | |
|       if existing_domain_block.present? && !@domain_block.stricter_than?(existing_domain_block)
 | |
|         @domain_block.save
 | |
|         flash.now[:alert] = I18n.t('admin.domain_blocks.existing_domain_block_html', name: existing_domain_block.domain, unblock_url: admin_domain_block_path(existing_domain_block)).html_safe # rubocop:disable Rails/OutputSafety
 | |
|         @domain_block.errors.delete(:domain)
 | |
|         render :new
 | |
|       else
 | |
|         if existing_domain_block.present?
 | |
|           @domain_block = existing_domain_block
 | |
|           @domain_block.update(resource_params)
 | |
|         end
 | |
| 
 | |
|         if @domain_block.save
 | |
|           DomainBlockWorker.perform_async(@domain_block.id)
 | |
|           log_action :create, @domain_block
 | |
|           redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
 | |
|         else
 | |
|           render :new
 | |
|         end
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     def update
 | |
|       authorize :domain_block, :update?
 | |
| 
 | |
|       @domain_block.update(update_params)
 | |
| 
 | |
|       severity_changed = @domain_block.severity_changed?
 | |
| 
 | |
|       if @domain_block.save
 | |
|         DomainBlockWorker.perform_async(@domain_block.id, severity_changed)
 | |
|         log_action :update, @domain_block
 | |
|         redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
 | |
|       else
 | |
|         render :edit
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     def destroy
 | |
|       authorize @domain_block, :destroy?
 | |
|       UnblockDomainService.new.call(@domain_block)
 | |
|       log_action :destroy, @domain_block
 | |
|       redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.destroyed_msg')
 | |
|     end
 | |
| 
 | |
|     private
 | |
| 
 | |
|     def set_domain_block
 | |
|       @domain_block = DomainBlock.find(params[:id])
 | |
|     end
 | |
| 
 | |
|     def update_params
 | |
|       params.require(:domain_block).permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
 | |
|     end
 | |
| 
 | |
|     def resource_params
 | |
|       params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
 | |
|     end
 | |
| 
 | |
|     def form_domain_block_batch_params
 | |
|       params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate])
 | |
|     end
 | |
| 
 | |
|     def action_from_button
 | |
|       if params[:save]
 | |
|         'save'
 | |
|       end
 | |
|     end
 | |
|   end
 | |
| end
 |