mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-30 23:33:42 +01: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.
119 lines
4.6 KiB
JavaScript
119 lines
4.6 KiB
JavaScript
import escapeTextContentForBrowser from 'escape-html';
|
|
import emojify from '../../features/emoji/emoji';
|
|
import { unescapeHTML } from '../../utils/html';
|
|
import { expandSpoilers } from '../../initial_state';
|
|
|
|
const domParser = new DOMParser();
|
|
|
|
const makeEmojiMap = record => record.emojis.reduce((obj, emoji) => {
|
|
obj[`:${emoji.shortcode}:`] = emoji;
|
|
return obj;
|
|
}, {});
|
|
|
|
export function searchTextFromRawStatus (status) {
|
|
const spoilerText = status.spoiler_text || '';
|
|
const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
|
|
return domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
|
|
}
|
|
|
|
export function normalizeAccount(account) {
|
|
account = { ...account };
|
|
|
|
const emojiMap = makeEmojiMap(account);
|
|
const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
|
|
|
|
account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
|
|
account.note_emojified = emojify(account.note, emojiMap);
|
|
account.note_plain = unescapeHTML(account.note);
|
|
|
|
if (account.fields) {
|
|
account.fields = account.fields.map(pair => ({
|
|
...pair,
|
|
name_emojified: emojify(escapeTextContentForBrowser(pair.name), emojiMap),
|
|
value_emojified: emojify(pair.value, emojiMap),
|
|
value_plain: unescapeHTML(pair.value),
|
|
}));
|
|
}
|
|
|
|
if (account.moved) {
|
|
account.moved = account.moved.id;
|
|
}
|
|
|
|
return account;
|
|
}
|
|
|
|
export function normalizeFilterResult(result) {
|
|
const normalResult = { ...result };
|
|
|
|
normalResult.filter = normalResult.filter.id;
|
|
|
|
return normalResult;
|
|
}
|
|
|
|
export function normalizeStatus(status, normalOldStatus) {
|
|
const normalStatus = { ...status };
|
|
normalStatus.account = status.account.id;
|
|
|
|
if (status.reblog && status.reblog.id) {
|
|
normalStatus.reblog = status.reblog.id;
|
|
}
|
|
|
|
if (status.poll && status.poll.id) {
|
|
normalStatus.poll = status.poll.id;
|
|
}
|
|
|
|
if (status.filtered) {
|
|
normalStatus.filtered = status.filtered.map(normalizeFilterResult);
|
|
}
|
|
|
|
// Only calculate these values when status first encountered and
|
|
// when the underlying values change. Otherwise keep the ones
|
|
// already in the reducer
|
|
if (normalOldStatus && normalOldStatus.get('content') === normalStatus.content && normalOldStatus.get('spoiler_text') === normalStatus.spoiler_text) {
|
|
normalStatus.search_index = normalOldStatus.get('search_index');
|
|
normalStatus.contentHtml = normalOldStatus.get('contentHtml');
|
|
normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
|
|
normalStatus.spoiler_text = normalOldStatus.get('spoiler_text');
|
|
normalStatus.hidden = normalOldStatus.get('hidden');
|
|
} else {
|
|
// If the status has a CW but no contents, treat the CW as if it were the
|
|
// status' contents, to avoid having a CW toggle with seemingly no effect.
|
|
if (normalStatus.spoiler_text && !normalStatus.content) {
|
|
normalStatus.content = normalStatus.spoiler_text;
|
|
normalStatus.spoiler_text = '';
|
|
}
|
|
|
|
const spoilerText = normalStatus.spoiler_text || '';
|
|
const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
|
|
const emojiMap = makeEmojiMap(normalStatus);
|
|
|
|
normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
|
|
normalStatus.contentHtml = emojify(normalStatus.content, emojiMap);
|
|
normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
|
|
normalStatus.hidden = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
|
|
}
|
|
|
|
return normalStatus;
|
|
}
|
|
|
|
export function normalizePoll(poll) {
|
|
const normalPoll = { ...poll };
|
|
const emojiMap = makeEmojiMap(normalPoll);
|
|
|
|
normalPoll.options = poll.options.map((option, index) => ({
|
|
...option,
|
|
voted: poll.own_votes && poll.own_votes.includes(index),
|
|
title_emojified: emojify(escapeTextContentForBrowser(option.title), emojiMap),
|
|
}));
|
|
|
|
return normalPoll;
|
|
}
|
|
|
|
export function normalizeAnnouncement(announcement) {
|
|
const normalAnnouncement = { ...announcement };
|
|
const emojiMap = makeEmojiMap(normalAnnouncement);
|
|
|
|
normalAnnouncement.contentHtml = emojify(normalAnnouncement.content, emojiMap);
|
|
|
|
return normalAnnouncement;
|
|
}
|