mirror of
https://github.com/mastodon/mastodon.git
synced 2024-05-04 03:08:46 +00:00
02851848e9
* Add model for custom filter keywords * Use CustomFilterKeyword internally Does not change the API * Fix /filters/edit and /filters/new * Add migration tests * Remove whole_word column from custom_filters (covered by custom_filter_keywords) * Redesign /filters Instead of a list, present a card that displays more information and handles multiple keywords per filter. * Redesign /filters/new and /filters/edit to add and remove keywords This adds a new gem dependency: cocoon, as well as a npm dependency: cocoon-js-vanilla. Those are used to easily populate and remove form fields from the user interface when manipulating multiple keyword filters at once. * Add /api/v2/filters to edit filter with multiple keywords Entities: - `Filter`: `id`, `title`, `filter_action` (either `hide` or `warn`), `context` `keywords` - `FilterKeyword`: `id`, `keyword`, `whole_word` API endpoits: - `GET /api/v2/filters` to list filters (including keywords) - `POST /api/v2/filters` to create a new filter `keywords_attributes` can also be passed to create keywords in one request - `GET /api/v2/filters/:id` to read a particular filter - `PUT /api/v2/filters/:id` to update a new filter `keywords_attributes` can also be passed to edit, delete or add keywords in one request - `DELETE /api/v2/filters/:id` to delete a particular filter - `GET /api/v2/filters/:id/keywords` to list keywords for a filter - `POST /api/v2/filters/:filter_id/keywords/:id` to add a new keyword to a filter - `GET /api/v2/filter_keywords/:id` to read a particular keyword - `PUT /api/v2/filter_keywords/:id` to edit a particular keyword - `DELETE /api/v2/filter_keywords/:id` to delete a particular keyword * Change from `irreversible` boolean to `action` enum * Remove irrelevent `irreversible_must_be_within_context` check * Fix /filters/new and /filters/edit with update for filter_action * Fix Rubocop/Codeclimate complaining about task names * Refactor FeedManager#phrase_filtered? This moves regexp building and filter caching to the `CustomFilter` class. This does not change the functional behavior yet, but this changes how the cache is built, doing per-custom_filter regexps so that filters can be matched independently, while still offering caching. * Perform server-side filtering and output result in REST API * Fix numerous filters_changed events being sent when editing multiple keywords at once * Add some tests * Use the new API in the WebUI - use client-side logic for filters we have fetched rules for. This is so that filter changes can be retroactively applied without reloading the UI. - use server-side logic for filters we haven't fetched rules for yet (e.g. network error, or initial timeline loading) * Minor optimizations and refactoring * Perform server-side filtering on the streaming server * Change the wording of filter action labels * Fix issues pointed out by linter * Change design of “Show anyway” link in accordence to review comments * Drop “irreversible” filtering behavior * Move /api/v2/filter_keywords to /api/v1/filters/keywords * Rename `filter_results` attribute to `filtered` * Rename REST::LegacyFilterSerializer to REST::V1::FilterSerializer * Fix systemChannelId value in streaming server * Simplify code by removing client-side filtering code The simplifcation comes at a cost though: filters aren't retroactively applied anymore.
66 lines
1.9 KiB
Ruby
66 lines
1.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Api::V1::FiltersController < Api::BaseController
|
|
before_action -> { doorkeeper_authorize! :read, :'read:filters' }, only: [:index, :show]
|
|
before_action -> { doorkeeper_authorize! :write, :'write:filters' }, except: [:index, :show]
|
|
before_action :require_user!
|
|
before_action :set_filters, only: :index
|
|
before_action :set_filter, only: [:show, :update, :destroy]
|
|
|
|
def index
|
|
render json: @filters, each_serializer: REST::V1::FilterSerializer
|
|
end
|
|
|
|
def create
|
|
ApplicationRecord.transaction do
|
|
filter_category = current_account.custom_filters.create!(resource_params)
|
|
@filter = filter_category.keywords.create!(keyword_params)
|
|
end
|
|
|
|
render json: @filter, serializer: REST::V1::FilterSerializer
|
|
end
|
|
|
|
def show
|
|
render json: @filter, serializer: REST::V1::FilterSerializer
|
|
end
|
|
|
|
def update
|
|
ApplicationRecord.transaction do
|
|
@filter.update!(keyword_params)
|
|
@filter.custom_filter.assign_attributes(filter_params)
|
|
raise Mastodon::ValidationError, I18n.t('filters.errors.deprecated_api_multiple_keywords') if @filter.custom_filter.changed? && @filter.custom_filter.keywords.count > 1
|
|
|
|
@filter.custom_filter.save!
|
|
end
|
|
|
|
render json: @filter, serializer: REST::V1::FilterSerializer
|
|
end
|
|
|
|
def destroy
|
|
@filter.destroy!
|
|
render_empty
|
|
end
|
|
|
|
private
|
|
|
|
def set_filters
|
|
@filters = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account: current_account })
|
|
end
|
|
|
|
def set_filter
|
|
@filter = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account: current_account }).find(params[:id])
|
|
end
|
|
|
|
def resource_params
|
|
params.permit(:phrase, :expires_in, :irreversible, :whole_word, context: [])
|
|
end
|
|
|
|
def filter_params
|
|
resource_params.slice(:expires_in, :irreversible, :context)
|
|
end
|
|
|
|
def keyword_params
|
|
resource_params.slice(:phrase, :whole_word)
|
|
end
|
|
end
|