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.
67 lines
1.2 KiB
Ruby
67 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class FiltersController < ApplicationController
|
|
include Authorization
|
|
|
|
layout 'admin'
|
|
|
|
before_action :set_filters, only: :index
|
|
before_action :set_filter, only: [:edit, :update, :destroy]
|
|
before_action :set_pack
|
|
before_action :set_body_classes
|
|
|
|
def index
|
|
@filters = current_account.custom_filters
|
|
end
|
|
|
|
def new
|
|
@filter = current_account.custom_filters.build
|
|
end
|
|
|
|
def create
|
|
@filter = current_account.custom_filters.build(resource_params)
|
|
|
|
if @filter.save
|
|
redirect_to filters_path
|
|
else
|
|
render action: :new
|
|
end
|
|
end
|
|
|
|
def edit; end
|
|
|
|
def update
|
|
if @filter.update(resource_params)
|
|
redirect_to filters_path
|
|
else
|
|
render action: :edit
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
@filter.destroy
|
|
redirect_to filters_path
|
|
end
|
|
|
|
private
|
|
|
|
def set_pack
|
|
use_pack 'settings'
|
|
end
|
|
|
|
def set_filters
|
|
@filters = current_account.custom_filters
|
|
end
|
|
|
|
def set_filter
|
|
@filter = current_account.custom_filters.find(params[:id])
|
|
end
|
|
|
|
def resource_params
|
|
params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, :whole_word, context: [])
|
|
end
|
|
|
|
def set_body_classes
|
|
@body_classes = 'admin'
|
|
end
|
|
end
|