Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.
This commit is contained in:
		@@ -36,7 +36,6 @@ module Admin
 | 
			
		||||
      @profile_directory     = Setting.profile_directory
 | 
			
		||||
      @timeline_preview      = Setting.timeline_preview
 | 
			
		||||
      @keybase_integration   = Setting.enable_keybase
 | 
			
		||||
      @spam_check_enabled    = Setting.spam_check_enabled
 | 
			
		||||
      @trends_enabled        = Setting.trends
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										53
									
								
								app/controllers/admin/follow_recommendations_controller.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										53
									
								
								app/controllers/admin/follow_recommendations_controller.rb
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,53 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
module Admin
 | 
			
		||||
  class FollowRecommendationsController < BaseController
 | 
			
		||||
    before_action :set_language
 | 
			
		||||
 | 
			
		||||
    def show
 | 
			
		||||
      authorize :follow_recommendation, :show?
 | 
			
		||||
 | 
			
		||||
      @form     = Form::AccountBatch.new
 | 
			
		||||
      @accounts = filtered_follow_recommendations
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def update
 | 
			
		||||
      @form = Form::AccountBatch.new(form_account_batch_params.merge(current_account: current_account, action: action_from_button))
 | 
			
		||||
      @form.save
 | 
			
		||||
    rescue ActionController::ParameterMissing
 | 
			
		||||
      # Do nothing
 | 
			
		||||
    ensure
 | 
			
		||||
      redirect_to admin_follow_recommendations_path(filter_params)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    private
 | 
			
		||||
 | 
			
		||||
    def set_language
 | 
			
		||||
      @language = follow_recommendation_filter.language
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def filtered_follow_recommendations
 | 
			
		||||
      follow_recommendation_filter.results
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def follow_recommendation_filter
 | 
			
		||||
      @follow_recommendation_filter ||= FollowRecommendationFilter.new(filter_params)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def form_account_batch_params
 | 
			
		||||
      params.require(:form_account_batch).permit(:action, account_ids: [])
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def filter_params
 | 
			
		||||
      params.slice(*FollowRecommendationFilter::KEYS).permit(*FollowRecommendationFilter::KEYS)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def action_from_button
 | 
			
		||||
      if params[:suppress]
 | 
			
		||||
        'suppress_follow_recommendation'
 | 
			
		||||
      elsif params[:unsuppress]
 | 
			
		||||
        'unsuppress_follow_recommendation'
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
		Reference in New Issue
	
	Block a user