mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-10 09:29:18 +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.
226 lines
6.7 KiB
Ruby
226 lines
6.7 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe Api::V1::StatusesController, type: :controller do
|
|
render_views
|
|
|
|
let(:user) { Fabricate(:user) }
|
|
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
|
|
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: scopes) }
|
|
|
|
context 'with an oauth token' do
|
|
before do
|
|
allow(controller).to receive(:doorkeeper_token) { token }
|
|
end
|
|
|
|
describe 'GET #show' do
|
|
let(:scopes) { 'read:statuses' }
|
|
let(:status) { Fabricate(:status, account: user.account) }
|
|
|
|
it 'returns http success' do
|
|
get :show, params: { id: status.id }
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
|
|
context 'when post includes filtered terms' do
|
|
let(:status) { Fabricate(:status, text: 'this toot is about that banned word') }
|
|
|
|
before do
|
|
user.account.custom_filters.create!(phrase: 'filter1', context: %w(home), action: :hide, keywords_attributes: [{ keyword: 'banned' }, { keyword: 'irrelevant' }])
|
|
end
|
|
|
|
it 'returns http success' do
|
|
get :show, params: { id: status.id }
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
|
|
it 'returns filter information' do
|
|
get :show, params: { id: status.id }
|
|
json = body_as_json
|
|
expect(json[:filtered][0]).to include({
|
|
filter: a_hash_including({
|
|
id: user.account.custom_filters.first.id.to_s,
|
|
title: 'filter1',
|
|
filter_action: 'hide',
|
|
}),
|
|
keyword_matches: ['banned'],
|
|
})
|
|
end
|
|
end
|
|
|
|
context 'when reblog includes filtered terms' do
|
|
let(:status) { Fabricate(:status, reblog: Fabricate(:status, text: 'this toot is about that banned word')) }
|
|
|
|
before do
|
|
user.account.custom_filters.create!(phrase: 'filter1', context: %w(home), action: :hide, keywords_attributes: [{ keyword: 'banned' }, { keyword: 'irrelevant' }])
|
|
end
|
|
|
|
it 'returns http success' do
|
|
get :show, params: { id: status.id }
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
|
|
it 'returns filter information' do
|
|
get :show, params: { id: status.id }
|
|
json = body_as_json
|
|
expect(json[:reblog][:filtered][0]).to include({
|
|
filter: a_hash_including({
|
|
id: user.account.custom_filters.first.id.to_s,
|
|
title: 'filter1',
|
|
filter_action: 'hide',
|
|
}),
|
|
keyword_matches: ['banned'],
|
|
})
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET #context' do
|
|
let(:scopes) { 'read:statuses' }
|
|
let(:status) { Fabricate(:status, account: user.account) }
|
|
|
|
before do
|
|
Fabricate(:status, account: user.account, thread: status)
|
|
end
|
|
|
|
it 'returns http success' do
|
|
get :context, params: { id: status.id }
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
end
|
|
|
|
describe 'POST #create' do
|
|
let(:scopes) { 'write:statuses' }
|
|
|
|
context do
|
|
before do
|
|
post :create, params: { status: 'Hello world' }
|
|
end
|
|
|
|
it 'returns http success' do
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
|
|
it 'returns rate limit headers' do
|
|
expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
|
|
expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
|
|
end
|
|
end
|
|
|
|
context 'with missing parameters' do
|
|
before do
|
|
post :create, params: {}
|
|
end
|
|
|
|
it 'returns http unprocessable entity' do
|
|
expect(response).to have_http_status(422)
|
|
end
|
|
|
|
it 'returns rate limit headers' do
|
|
expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
|
|
end
|
|
end
|
|
|
|
context 'when exceeding rate limit' do
|
|
before do
|
|
rate_limiter = RateLimiter.new(user.account, family: :statuses)
|
|
300.times { rate_limiter.record! }
|
|
post :create, params: { status: 'Hello world' }
|
|
end
|
|
|
|
it 'returns http too many requests' do
|
|
expect(response).to have_http_status(429)
|
|
end
|
|
|
|
it 'returns rate limit headers' do
|
|
expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
|
|
expect(response.headers['X-RateLimit-Remaining']).to eq '0'
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'DELETE #destroy' do
|
|
let(:scopes) { 'write:statuses' }
|
|
let(:status) { Fabricate(:status, account: user.account) }
|
|
|
|
before do
|
|
post :destroy, params: { id: status.id }
|
|
end
|
|
|
|
it 'returns http success' do
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
|
|
it 'removes the status' do
|
|
expect(Status.find_by(id: status.id)).to be nil
|
|
end
|
|
end
|
|
|
|
describe 'PUT #update' do
|
|
let(:scopes) { 'write:statuses' }
|
|
let(:status) { Fabricate(:status, account: user.account) }
|
|
|
|
before do
|
|
put :update, params: { id: status.id, status: 'I am updated' }
|
|
end
|
|
|
|
it 'returns http success' do
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
|
|
it 'updates the status' do
|
|
expect(status.reload.text).to eq 'I am updated'
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'without an oauth token' do
|
|
before do
|
|
allow(controller).to receive(:doorkeeper_token) { nil }
|
|
end
|
|
|
|
context 'with a private status' do
|
|
let(:status) { Fabricate(:status, account: user.account, visibility: :private) }
|
|
|
|
describe 'GET #show' do
|
|
it 'returns http unauthorized' do
|
|
get :show, params: { id: status.id }
|
|
expect(response).to have_http_status(404)
|
|
end
|
|
end
|
|
|
|
describe 'GET #context' do
|
|
before do
|
|
Fabricate(:status, account: user.account, thread: status)
|
|
end
|
|
|
|
it 'returns http unauthorized' do
|
|
get :context, params: { id: status.id }
|
|
expect(response).to have_http_status(404)
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'with a public status' do
|
|
let(:status) { Fabricate(:status, account: user.account, visibility: :public) }
|
|
|
|
describe 'GET #show' do
|
|
it 'returns http success' do
|
|
get :show, params: { id: status.id }
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
end
|
|
|
|
describe 'GET #context' do
|
|
before do
|
|
Fabricate(:status, account: user.account, thread: status)
|
|
end
|
|
|
|
it 'returns http success' do
|
|
get :context, params: { id: status.id }
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|