mirror of
https://github.com/whippyshou/mastodon
synced 2024-12-05 10:18:39 +09: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.
102 lines
2.5 KiB
JavaScript
102 lines
2.5 KiB
JavaScript
import { normalizeAccount, normalizeStatus, normalizePoll } from './normalizer';
|
|
|
|
export const ACCOUNT_IMPORT = 'ACCOUNT_IMPORT';
|
|
export const ACCOUNTS_IMPORT = 'ACCOUNTS_IMPORT';
|
|
export const STATUS_IMPORT = 'STATUS_IMPORT';
|
|
export const STATUSES_IMPORT = 'STATUSES_IMPORT';
|
|
export const POLLS_IMPORT = 'POLLS_IMPORT';
|
|
export const FILTERS_IMPORT = 'FILTERS_IMPORT';
|
|
|
|
function pushUnique(array, object) {
|
|
if (array.every(element => element.id !== object.id)) {
|
|
array.push(object);
|
|
}
|
|
}
|
|
|
|
export function importAccount(account) {
|
|
return { type: ACCOUNT_IMPORT, account };
|
|
}
|
|
|
|
export function importAccounts(accounts) {
|
|
return { type: ACCOUNTS_IMPORT, accounts };
|
|
}
|
|
|
|
export function importStatus(status) {
|
|
return { type: STATUS_IMPORT, status };
|
|
}
|
|
|
|
export function importStatuses(statuses) {
|
|
return { type: STATUSES_IMPORT, statuses };
|
|
}
|
|
|
|
export function importFilters(filters) {
|
|
return { type: FILTERS_IMPORT, filters };
|
|
}
|
|
|
|
export function importPolls(polls) {
|
|
return { type: POLLS_IMPORT, polls };
|
|
}
|
|
|
|
export function importFetchedAccount(account) {
|
|
return importFetchedAccounts([account]);
|
|
}
|
|
|
|
export function importFetchedAccounts(accounts) {
|
|
const normalAccounts = [];
|
|
|
|
function processAccount(account) {
|
|
pushUnique(normalAccounts, normalizeAccount(account));
|
|
|
|
if (account.moved) {
|
|
processAccount(account.moved);
|
|
}
|
|
}
|
|
|
|
accounts.forEach(processAccount);
|
|
|
|
return importAccounts(normalAccounts);
|
|
}
|
|
|
|
export function importFetchedStatus(status) {
|
|
return importFetchedStatuses([status]);
|
|
}
|
|
|
|
export function importFetchedStatuses(statuses) {
|
|
return (dispatch, getState) => {
|
|
const accounts = [];
|
|
const normalStatuses = [];
|
|
const polls = [];
|
|
const filters = [];
|
|
|
|
function processStatus(status) {
|
|
pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id])));
|
|
pushUnique(accounts, status.account);
|
|
|
|
if (status.filtered) {
|
|
status.filtered.forEach(result => pushUnique(filters, result.filter));
|
|
}
|
|
|
|
if (status.reblog && status.reblog.id) {
|
|
processStatus(status.reblog);
|
|
}
|
|
|
|
if (status.poll && status.poll.id) {
|
|
pushUnique(polls, normalizePoll(status.poll));
|
|
}
|
|
}
|
|
|
|
statuses.forEach(processStatus);
|
|
|
|
dispatch(importPolls(polls));
|
|
dispatch(importFetchedAccounts(accounts));
|
|
dispatch(importStatuses(normalStatuses));
|
|
dispatch(importFilters(filters));
|
|
};
|
|
}
|
|
|
|
export function importFetchedPoll(poll) {
|
|
return dispatch => {
|
|
dispatch(importPolls([normalizePoll(poll)]));
|
|
};
|
|
}
|