mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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.
168 lines
5.0 KiB
JavaScript
168 lines
5.0 KiB
JavaScript
// @ts-check
|
|
|
|
import { connectStream } from '../stream';
|
|
import {
|
|
updateTimeline,
|
|
deleteFromTimelines,
|
|
expandHomeTimeline,
|
|
connectTimeline,
|
|
disconnectTimeline,
|
|
fillHomeTimelineGaps,
|
|
fillPublicTimelineGaps,
|
|
fillCommunityTimelineGaps,
|
|
fillListTimelineGaps,
|
|
} from './timelines';
|
|
import { updateNotifications, expandNotifications } from './notifications';
|
|
import { updateConversations } from './conversations';
|
|
import { updateStatus } from './statuses';
|
|
import {
|
|
fetchAnnouncements,
|
|
updateAnnouncements,
|
|
updateReaction as updateAnnouncementsReaction,
|
|
deleteAnnouncement,
|
|
} from './announcements';
|
|
import { getLocale } from '../locales';
|
|
|
|
const { messages } = getLocale();
|
|
|
|
/**
|
|
* @param {number} max
|
|
* @return {number}
|
|
*/
|
|
const randomUpTo = max =>
|
|
Math.floor(Math.random() * Math.floor(max));
|
|
|
|
/**
|
|
* @param {string} timelineId
|
|
* @param {string} channelName
|
|
* @param {Object.<string, string>} params
|
|
* @param {Object} options
|
|
* @param {function(Function, Function): void} [options.fallback]
|
|
* @param {function(): void} [options.fillGaps]
|
|
* @param {function(object): boolean} [options.accept]
|
|
* @return {function(): void}
|
|
*/
|
|
export const connectTimelineStream = (timelineId, channelName, params = {}, options = {}) =>
|
|
connectStream(channelName, params, (dispatch, getState) => {
|
|
const locale = getState().getIn(['meta', 'locale']);
|
|
|
|
let pollingId;
|
|
|
|
/**
|
|
* @param {function(Function, Function): void} fallback
|
|
*/
|
|
const useFallback = fallback => {
|
|
fallback(dispatch, () => {
|
|
pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000));
|
|
});
|
|
};
|
|
|
|
return {
|
|
onConnect() {
|
|
dispatch(connectTimeline(timelineId));
|
|
|
|
if (pollingId) {
|
|
clearTimeout(pollingId);
|
|
pollingId = null;
|
|
}
|
|
|
|
if (options.fillGaps) {
|
|
dispatch(options.fillGaps());
|
|
}
|
|
},
|
|
|
|
onDisconnect() {
|
|
dispatch(disconnectTimeline(timelineId));
|
|
|
|
if (options.fallback) {
|
|
pollingId = setTimeout(() => useFallback(options.fallback), randomUpTo(40000));
|
|
}
|
|
},
|
|
|
|
onReceive (data) {
|
|
switch(data.event) {
|
|
case 'update':
|
|
dispatch(updateTimeline(timelineId, JSON.parse(data.payload), options.accept));
|
|
break;
|
|
case 'status.update':
|
|
dispatch(updateStatus(JSON.parse(data.payload)));
|
|
break;
|
|
case 'delete':
|
|
dispatch(deleteFromTimelines(data.payload));
|
|
break;
|
|
case 'notification':
|
|
dispatch(updateNotifications(JSON.parse(data.payload), messages, locale));
|
|
break;
|
|
case 'conversation':
|
|
dispatch(updateConversations(JSON.parse(data.payload)));
|
|
break;
|
|
case 'announcement':
|
|
dispatch(updateAnnouncements(JSON.parse(data.payload)));
|
|
break;
|
|
case 'announcement.reaction':
|
|
dispatch(updateAnnouncementsReaction(JSON.parse(data.payload)));
|
|
break;
|
|
case 'announcement.delete':
|
|
dispatch(deleteAnnouncement(data.payload));
|
|
break;
|
|
}
|
|
},
|
|
};
|
|
});
|
|
|
|
/**
|
|
* @param {Function} dispatch
|
|
* @param {function(): void} done
|
|
*/
|
|
const refreshHomeTimelineAndNotification = (dispatch, done) => {
|
|
dispatch(expandHomeTimeline({}, () =>
|
|
dispatch(expandNotifications({}, () =>
|
|
dispatch(fetchAnnouncements(done))))));
|
|
};
|
|
|
|
/**
|
|
* @return {function(): void}
|
|
*/
|
|
export const connectUserStream = () =>
|
|
connectTimelineStream('home', 'user', {}, { fallback: refreshHomeTimelineAndNotification, fillGaps: fillHomeTimelineGaps });
|
|
|
|
/**
|
|
* @param {Object} options
|
|
* @param {boolean} [options.onlyMedia]
|
|
* @return {function(): void}
|
|
*/
|
|
export const connectCommunityStream = ({ onlyMedia } = {}) =>
|
|
connectTimelineStream(`community${onlyMedia ? ':media' : ''}`, `public:local${onlyMedia ? ':media' : ''}`, {}, { fillGaps: () => (fillCommunityTimelineGaps({ onlyMedia })) });
|
|
|
|
/**
|
|
* @param {Object} options
|
|
* @param {boolean} [options.onlyMedia]
|
|
* @param {boolean} [options.onlyRemote]
|
|
* @return {function(): void}
|
|
*/
|
|
export const connectPublicStream = ({ onlyMedia, onlyRemote } = {}) =>
|
|
connectTimelineStream(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, `public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, {}, { fillGaps: () => fillPublicTimelineGaps({ onlyMedia, onlyRemote }) });
|
|
|
|
/**
|
|
* @param {string} columnId
|
|
* @param {string} tagName
|
|
* @param {boolean} onlyLocal
|
|
* @param {function(object): boolean} accept
|
|
* @return {function(): void}
|
|
*/
|
|
export const connectHashtagStream = (columnId, tagName, onlyLocal, accept) =>
|
|
connectTimelineStream(`hashtag:${columnId}${onlyLocal ? ':local' : ''}`, `hashtag${onlyLocal ? ':local' : ''}`, { tag: tagName }, { accept });
|
|
|
|
/**
|
|
* @return {function(): void}
|
|
*/
|
|
export const connectDirectStream = () =>
|
|
connectTimelineStream('direct', 'direct');
|
|
|
|
/**
|
|
* @param {string} listId
|
|
* @return {function(): void}
|
|
*/
|
|
export const connectListStream = listId =>
|
|
connectTimelineStream(`list:${listId}`, 'list', { list: listId }, { fillGaps: () => fillListTimelineGaps(listId) });
|