mirror of
https://github.com/mastodon/mastodon.git
synced 2024-05-04 11:18:45 +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.
158 lines
4 KiB
Ruby
158 lines
4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
source 'https://rubygems.org'
|
|
ruby '>= 2.6.0', '< 3.1.0'
|
|
|
|
gem 'pkg-config', '~> 1.4'
|
|
gem 'rexml', '~> 3.2'
|
|
|
|
gem 'puma', '~> 5.6'
|
|
gem 'rails', '~> 6.1.6'
|
|
gem 'sprockets', '~> 3.7.2'
|
|
gem 'thor', '~> 1.2'
|
|
gem 'rack', '~> 2.2.3'
|
|
|
|
gem 'hamlit-rails', '~> 0.2'
|
|
gem 'pg', '~> 1.4'
|
|
gem 'makara', '~> 0.5'
|
|
gem 'pghero', '~> 2.8'
|
|
gem 'dotenv-rails', '~> 2.7'
|
|
|
|
gem 'aws-sdk-s3', '~> 1.114', require: false
|
|
gem 'fog-core', '<= 2.1.0'
|
|
gem 'fog-openstack', '~> 0.3', require: false
|
|
gem 'kt-paperclip', '~> 7.1'
|
|
gem 'blurhash', '~> 0.1'
|
|
|
|
gem 'active_model_serializers', '~> 0.10'
|
|
gem 'addressable', '~> 2.8'
|
|
gem 'bootsnap', '~> 1.12.0', require: false
|
|
gem 'browser'
|
|
gem 'charlock_holmes', '~> 0.7.7'
|
|
gem 'chewy', '~> 7.2'
|
|
gem 'devise', '~> 4.8'
|
|
gem 'devise-two-factor', '~> 4.0'
|
|
|
|
group :pam_authentication, optional: true do
|
|
gem 'devise_pam_authenticatable2', '~> 9.2'
|
|
end
|
|
|
|
gem 'net-ldap', '~> 0.17'
|
|
gem 'omniauth-cas', '~> 2.0'
|
|
gem 'omniauth-saml', '~> 1.10'
|
|
gem 'gitlab-omniauth-openid-connect', '~>0.9.1', require: 'omniauth_openid_connect'
|
|
gem 'omniauth', '~> 1.9'
|
|
gem 'omniauth-rails_csrf_protection', '~> 0.1'
|
|
|
|
gem 'color_diff', '~> 0.1'
|
|
gem 'discard', '~> 1.2'
|
|
gem 'doorkeeper', '~> 5.5'
|
|
gem 'ed25519', '~> 1.3'
|
|
gem 'fast_blank', '~> 1.0'
|
|
gem 'fastimage'
|
|
gem 'hiredis', '~> 0.6'
|
|
gem 'redis-namespace', '~> 1.8'
|
|
gem 'htmlentities', '~> 4.3'
|
|
gem 'http', '~> 5.1'
|
|
gem 'http_accept_language', '~> 2.1'
|
|
gem 'httplog', '~> 1.5.0'
|
|
gem 'idn-ruby', require: 'idn'
|
|
gem 'kaminari', '~> 1.2'
|
|
gem 'link_header', '~> 0.0'
|
|
gem 'mime-types', '~> 3.4.1', require: 'mime/types/columnar'
|
|
gem 'nokogiri', '~> 1.13'
|
|
gem 'nsa', '~> 0.2'
|
|
gem 'oj', '~> 3.13'
|
|
gem 'ox', '~> 2.14'
|
|
gem 'parslet'
|
|
gem 'posix-spawn'
|
|
gem 'pundit', '~> 2.2'
|
|
gem 'premailer-rails'
|
|
gem 'rack-attack', '~> 6.6'
|
|
gem 'rack-cors', '~> 1.1', require: 'rack/cors'
|
|
gem 'rails-i18n', '~> 6.0'
|
|
gem 'rails-settings-cached', '~> 0.6'
|
|
gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
|
|
gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
|
|
gem 'rqrcode', '~> 2.1'
|
|
gem 'ruby-progressbar', '~> 1.11'
|
|
gem 'sanitize', '~> 6.0'
|
|
gem 'scenic', '~> 1.6'
|
|
gem 'sidekiq', '~> 6.4'
|
|
gem 'sidekiq-scheduler', '~> 4.0'
|
|
gem 'sidekiq-unique-jobs', '~> 7.1'
|
|
gem 'sidekiq-bulk', '~> 0.2.0'
|
|
gem 'simple-navigation', '~> 4.4'
|
|
gem 'simple_form', '~> 5.1'
|
|
gem 'sprockets-rails', '~> 3.4', require: 'sprockets/railtie'
|
|
gem 'stoplight', '~> 3.0.0'
|
|
gem 'strong_migrations', '~> 0.7'
|
|
gem 'tty-prompt', '~> 0.23', require: false
|
|
gem 'twitter-text', '~> 3.1.0'
|
|
gem 'tzinfo-data', '~> 1.2022'
|
|
gem 'webpacker', '~> 5.4'
|
|
gem 'webpush', '~> 0.3'
|
|
gem 'webauthn', '~> 3.0.0.alpha1'
|
|
|
|
gem 'json-ld'
|
|
gem 'json-ld-preloaded', '~> 3.2'
|
|
gem 'rdf-normalize', '~> 0.5'
|
|
|
|
group :development, :test do
|
|
gem 'fabrication', '~> 2.28'
|
|
gem 'fuubar', '~> 2.5'
|
|
gem 'i18n-tasks', '~> 1.0', require: false
|
|
gem 'pry-byebug', '~> 3.9'
|
|
gem 'pry-rails', '~> 0.3'
|
|
gem 'rspec-rails', '~> 5.1'
|
|
end
|
|
|
|
group :production, :test do
|
|
gem 'private_address_check', '~> 0.5'
|
|
end
|
|
|
|
group :test do
|
|
gem 'capybara', '~> 3.37'
|
|
gem 'climate_control', '~> 0.2'
|
|
gem 'faker', '~> 2.21'
|
|
gem 'microformats', '~> 4.4'
|
|
gem 'rails-controller-testing', '~> 1.0'
|
|
gem 'rspec-sidekiq', '~> 3.1'
|
|
gem 'simplecov', '~> 0.21', require: false
|
|
gem 'webmock', '~> 3.14'
|
|
gem 'rspec_junit_formatter', '~> 0.5'
|
|
end
|
|
|
|
group :development do
|
|
gem 'active_record_query_trace', '~> 1.8'
|
|
gem 'annotate', '~> 3.2'
|
|
gem 'better_errors', '~> 2.9'
|
|
gem 'binding_of_caller', '~> 1.0'
|
|
gem 'bullet', '~> 7.0'
|
|
gem 'letter_opener', '~> 1.8'
|
|
gem 'letter_opener_web', '~> 2.0'
|
|
gem 'memory_profiler'
|
|
gem 'rubocop', '~> 1.30', require: false
|
|
gem 'rubocop-rails', '~> 2.15', require: false
|
|
gem 'brakeman', '~> 5.2', require: false
|
|
gem 'bundler-audit', '~> 0.9', require: false
|
|
|
|
gem 'capistrano', '~> 3.17'
|
|
gem 'capistrano-rails', '~> 1.6'
|
|
gem 'capistrano-rbenv', '~> 2.2'
|
|
gem 'capistrano-yarn', '~> 2.0'
|
|
|
|
gem 'stackprof'
|
|
end
|
|
|
|
group :production do
|
|
gem 'lograge', '~> 0.12'
|
|
end
|
|
|
|
gem 'concurrent-ruby', require: false
|
|
gem 'connection_pool', require: false
|
|
|
|
gem 'xorcist', '~> 1.1'
|
|
|
|
gem 'cocoon', '~> 1.2'
|