2018-03-24 12:06:27 +00:00
|
|
|
import escapeTextContentForBrowser from 'escape-html';
|
2023-05-23 15:15:17 +00:00
|
|
|
|
2018-03-24 12:06:27 +00:00
|
|
|
import emojify from '../../features/emoji/emoji';
|
2018-09-24 03:44:01 +00:00
|
|
|
import { expandSpoilers } from '../../initial_state';
|
2023-05-23 15:15:17 +00:00
|
|
|
import { unescapeHTML } from '../../utils/html';
|
2018-03-24 12:06:27 +00:00
|
|
|
|
|
|
|
const domParser = new DOMParser();
|
|
|
|
|
2023-05-31 22:10:21 +00:00
|
|
|
const makeEmojiMap = emojis => emojis.reduce((obj, emoji) => {
|
2018-05-06 09:48:51 +00:00
|
|
|
obj[`:${emoji.shortcode}:`] = emoji;
|
|
|
|
return obj;
|
|
|
|
}, {});
|
|
|
|
|
2019-11-04 12:01:50 +00:00
|
|
|
export function searchTextFromRawStatus (status) {
|
|
|
|
const spoilerText = status.spoiler_text || '';
|
2020-06-08 22:11:42 +00:00
|
|
|
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');
|
2019-11-04 12:01:50 +00:00
|
|
|
return domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
|
|
|
|
}
|
|
|
|
|
2018-03-24 12:06:27 +00:00
|
|
|
export function normalizeAccount(account) {
|
|
|
|
account = { ...account };
|
|
|
|
|
2023-05-31 22:10:21 +00:00
|
|
|
const emojiMap = makeEmojiMap(account.emojis);
|
2018-10-30 16:06:12 +00:00
|
|
|
const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
|
2018-05-06 09:48:51 +00:00
|
|
|
|
|
|
|
account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
|
|
|
|
account.note_emojified = emojify(account.note, emojiMap);
|
2021-04-19 12:45:15 +00:00
|
|
|
account.note_plain = unescapeHTML(account.note);
|
2018-03-24 12:06:27 +00:00
|
|
|
|
2018-04-14 10:41:08 +00:00
|
|
|
if (account.fields) {
|
|
|
|
account.fields = account.fields.map(pair => ({
|
|
|
|
...pair,
|
2019-07-21 01:40:27 +00:00
|
|
|
name_emojified: emojify(escapeTextContentForBrowser(pair.name), emojiMap),
|
2018-05-06 09:48:51 +00:00
|
|
|
value_emojified: emojify(pair.value, emojiMap),
|
2018-05-07 07:30:38 +00:00
|
|
|
value_plain: unescapeHTML(pair.value),
|
2018-04-14 10:41:08 +00:00
|
|
|
}));
|
|
|
|
}
|
|
|
|
|
2018-03-26 10:48:01 +00:00
|
|
|
if (account.moved) {
|
|
|
|
account.moved = account.moved.id;
|
|
|
|
}
|
|
|
|
|
2018-03-24 12:06:27 +00:00
|
|
|
return account;
|
|
|
|
}
|
|
|
|
|
Revamp post filtering system (#18058)
* 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.
2022-06-28 07:42:13 +00:00
|
|
|
export function normalizeFilterResult(result) {
|
|
|
|
const normalResult = { ...result };
|
|
|
|
|
|
|
|
normalResult.filter = normalResult.filter.id;
|
|
|
|
|
|
|
|
return normalResult;
|
|
|
|
}
|
|
|
|
|
2018-03-24 12:06:27 +00:00
|
|
|
export function normalizeStatus(status, normalOldStatus) {
|
|
|
|
const normalStatus = { ...status };
|
|
|
|
normalStatus.account = status.account.id;
|
|
|
|
|
|
|
|
if (status.reblog && status.reblog.id) {
|
|
|
|
normalStatus.reblog = status.reblog.id;
|
|
|
|
}
|
|
|
|
|
2019-03-03 21:18:23 +00:00
|
|
|
if (status.poll && status.poll.id) {
|
|
|
|
normalStatus.poll = status.poll.id;
|
|
|
|
}
|
|
|
|
|
Revamp post filtering system (#18058)
* 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.
2022-06-28 07:42:13 +00:00
|
|
|
if (status.filtered) {
|
|
|
|
normalStatus.filtered = status.filtered.map(normalizeFilterResult);
|
|
|
|
}
|
|
|
|
|
2022-01-19 21:37:27 +00:00
|
|
|
// 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) {
|
2018-03-24 12:06:27 +00:00
|
|
|
normalStatus.search_index = normalOldStatus.get('search_index');
|
|
|
|
normalStatus.contentHtml = normalOldStatus.get('contentHtml');
|
|
|
|
normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
|
2021-05-11 20:21:47 +00:00
|
|
|
normalStatus.spoiler_text = normalOldStatus.get('spoiler_text');
|
2018-03-24 12:06:27 +00:00
|
|
|
normalStatus.hidden = normalOldStatus.get('hidden');
|
2023-08-11 22:06:37 +00:00
|
|
|
|
|
|
|
if (normalOldStatus.get('translation')) {
|
|
|
|
normalStatus.translation = normalOldStatus.get('translation');
|
|
|
|
}
|
2018-03-24 12:06:27 +00:00
|
|
|
} else {
|
2021-05-05 21:41:02 +00:00
|
|
|
// 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 = '';
|
|
|
|
}
|
|
|
|
|
2018-06-14 06:03:51 +00:00
|
|
|
const spoilerText = normalStatus.spoiler_text || '';
|
2021-12-28 22:25:50 +00:00
|
|
|
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');
|
2023-05-31 22:10:21 +00:00
|
|
|
const emojiMap = makeEmojiMap(normalStatus.emojis);
|
2018-03-24 12:06:27 +00:00
|
|
|
|
|
|
|
normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
|
|
|
|
normalStatus.contentHtml = emojify(normalStatus.content, emojiMap);
|
2018-06-14 06:03:51 +00:00
|
|
|
normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
|
2018-09-24 03:44:01 +00:00
|
|
|
normalStatus.hidden = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
|
2018-03-24 12:06:27 +00:00
|
|
|
}
|
|
|
|
|
2023-07-25 18:29:31 +00:00
|
|
|
if (normalOldStatus) {
|
|
|
|
const list = normalOldStatus.get('media_attachments');
|
|
|
|
if (normalStatus.media_attachments && list) {
|
|
|
|
normalStatus.media_attachments.forEach(item => {
|
|
|
|
const oldItem = list.find(i => i.get('id') === item.id);
|
|
|
|
if (oldItem && oldItem.get('description') === item.description) {
|
2023-10-09 11:38:29 +00:00
|
|
|
item.translation = oldItem.get('translation');
|
2023-07-25 18:29:31 +00:00
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-24 12:06:27 +00:00
|
|
|
return normalStatus;
|
|
|
|
}
|
2019-03-06 02:57:46 +00:00
|
|
|
|
2023-05-31 22:10:21 +00:00
|
|
|
export function normalizeStatusTranslation(translation, status) {
|
|
|
|
const emojiMap = makeEmojiMap(status.get('emojis').toJS());
|
|
|
|
|
|
|
|
const normalTranslation = {
|
|
|
|
detected_source_language: translation.detected_source_language,
|
|
|
|
language: translation.language,
|
|
|
|
provider: translation.provider,
|
|
|
|
contentHtml: emojify(translation.content, emojiMap),
|
|
|
|
spoilerHtml: emojify(escapeTextContentForBrowser(translation.spoiler_text), emojiMap),
|
|
|
|
spoiler_text: translation.spoiler_text,
|
|
|
|
};
|
|
|
|
|
|
|
|
return normalTranslation;
|
|
|
|
}
|
|
|
|
|
2023-07-25 18:29:31 +00:00
|
|
|
export function normalizePoll(poll, normalOldPoll) {
|
2019-03-06 02:57:46 +00:00
|
|
|
const normalPoll = { ...poll };
|
2023-05-31 22:10:21 +00:00
|
|
|
const emojiMap = makeEmojiMap(poll.emojis);
|
2019-03-20 16:29:12 +00:00
|
|
|
|
2023-07-25 18:29:31 +00:00
|
|
|
normalPoll.options = poll.options.map((option, index) => {
|
|
|
|
const normalOption = {
|
|
|
|
...option,
|
|
|
|
voted: poll.own_votes && poll.own_votes.includes(index),
|
|
|
|
titleHtml: emojify(escapeTextContentForBrowser(option.title), emojiMap),
|
2023-10-09 11:38:29 +00:00
|
|
|
};
|
2023-07-25 18:29:31 +00:00
|
|
|
|
|
|
|
if (normalOldPoll && normalOldPoll.getIn(['options', index, 'title']) === option.title) {
|
|
|
|
normalOption.translation = normalOldPoll.getIn(['options', index, 'translation']);
|
|
|
|
}
|
|
|
|
|
2023-10-09 11:38:29 +00:00
|
|
|
return normalOption;
|
2023-07-25 18:29:31 +00:00
|
|
|
});
|
2019-03-06 02:57:46 +00:00
|
|
|
|
|
|
|
return normalPoll;
|
|
|
|
}
|
2020-01-23 21:00:13 +00:00
|
|
|
|
2023-05-31 22:10:21 +00:00
|
|
|
export function normalizePollOptionTranslation(translation, poll) {
|
|
|
|
const emojiMap = makeEmojiMap(poll.get('emojis').toJS());
|
|
|
|
|
|
|
|
const normalTranslation = {
|
|
|
|
...translation,
|
|
|
|
titleHtml: emojify(escapeTextContentForBrowser(translation.title), emojiMap),
|
|
|
|
};
|
|
|
|
|
|
|
|
return normalTranslation;
|
|
|
|
}
|
|
|
|
|
2020-01-23 21:00:13 +00:00
|
|
|
export function normalizeAnnouncement(announcement) {
|
|
|
|
const normalAnnouncement = { ...announcement };
|
2023-06-05 12:49:51 +00:00
|
|
|
const emojiMap = makeEmojiMap(normalAnnouncement.emojis);
|
2020-01-23 21:00:13 +00:00
|
|
|
|
|
|
|
normalAnnouncement.contentHtml = emojify(normalAnnouncement.content, emojiMap);
|
|
|
|
|
|
|
|
return normalAnnouncement;
|
|
|
|
}
|