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.
373 lines
14 KiB
JavaScript
373 lines
14 KiB
JavaScript
import React from 'react';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
import { connect } from 'react-redux';
|
|
import PropTypes from 'prop-types';
|
|
import IconButton from './icon_button';
|
|
import DropdownMenuContainer from '../containers/dropdown_menu_container';
|
|
import { defineMessages, injectIntl } from 'react-intl';
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
import { me, isStaff } from '../initial_state';
|
|
import classNames from 'classnames';
|
|
|
|
const messages = defineMessages({
|
|
delete: { id: 'status.delete', defaultMessage: 'Delete' },
|
|
redraft: { id: 'status.redraft', defaultMessage: 'Delete & re-draft' },
|
|
edit: { id: 'status.edit', defaultMessage: 'Edit' },
|
|
direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' },
|
|
mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
|
|
mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
|
|
block: { id: 'account.block', defaultMessage: 'Block @{name}' },
|
|
reply: { id: 'status.reply', defaultMessage: 'Reply' },
|
|
share: { id: 'status.share', defaultMessage: 'Share' },
|
|
more: { id: 'status.more', defaultMessage: 'More' },
|
|
replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' },
|
|
reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
|
|
reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
|
|
cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
|
|
cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
|
|
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
|
|
bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
|
|
removeBookmark: { id: 'status.remove_bookmark', defaultMessage: 'Remove bookmark' },
|
|
open: { id: 'status.open', defaultMessage: 'Expand this status' },
|
|
report: { id: 'status.report', defaultMessage: 'Report @{name}' },
|
|
muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
|
|
unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
|
|
pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
|
|
unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
|
|
embed: { id: 'status.embed', defaultMessage: 'Embed' },
|
|
admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
|
|
admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
|
|
copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
|
|
hide: { id: 'status.hide', defaultMessage: 'Hide toot' },
|
|
blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
|
|
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
|
|
unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
|
|
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
|
|
});
|
|
|
|
const mapStateToProps = (state, { status }) => ({
|
|
relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
|
|
});
|
|
|
|
export default @connect(mapStateToProps)
|
|
@injectIntl
|
|
class StatusActionBar extends ImmutablePureComponent {
|
|
|
|
static contextTypes = {
|
|
router: PropTypes.object,
|
|
};
|
|
|
|
static propTypes = {
|
|
status: ImmutablePropTypes.map.isRequired,
|
|
relationship: ImmutablePropTypes.map,
|
|
onReply: PropTypes.func,
|
|
onFavourite: PropTypes.func,
|
|
onReblog: PropTypes.func,
|
|
onDelete: PropTypes.func,
|
|
onDirect: PropTypes.func,
|
|
onMention: PropTypes.func,
|
|
onMute: PropTypes.func,
|
|
onUnmute: PropTypes.func,
|
|
onBlock: PropTypes.func,
|
|
onUnblock: PropTypes.func,
|
|
onBlockDomain: PropTypes.func,
|
|
onUnblockDomain: PropTypes.func,
|
|
onReport: PropTypes.func,
|
|
onEmbed: PropTypes.func,
|
|
onMuteConversation: PropTypes.func,
|
|
onPin: PropTypes.func,
|
|
onBookmark: PropTypes.func,
|
|
onFilter: PropTypes.func,
|
|
withDismiss: PropTypes.bool,
|
|
withCounters: PropTypes.bool,
|
|
scrollKey: PropTypes.string,
|
|
intl: PropTypes.object.isRequired,
|
|
};
|
|
|
|
// Avoid checking props that are functions (and whose equality will always
|
|
// evaluate to false. See react-immutable-pure-component for usage.
|
|
updateOnProps = [
|
|
'status',
|
|
'relationship',
|
|
'withDismiss',
|
|
]
|
|
|
|
handleReplyClick = () => {
|
|
if (me) {
|
|
this.props.onReply(this.props.status, this.context.router.history);
|
|
} else {
|
|
this._openInteractionDialog('reply');
|
|
}
|
|
}
|
|
|
|
handleShareClick = () => {
|
|
navigator.share({
|
|
text: this.props.status.get('search_index'),
|
|
url: this.props.status.get('url'),
|
|
}).catch((e) => {
|
|
if (e.name !== 'AbortError') console.error(e);
|
|
});
|
|
}
|
|
|
|
handleFavouriteClick = () => {
|
|
if (me) {
|
|
this.props.onFavourite(this.props.status);
|
|
} else {
|
|
this._openInteractionDialog('favourite');
|
|
}
|
|
}
|
|
|
|
handleReblogClick = e => {
|
|
if (me) {
|
|
this.props.onReblog(this.props.status, e);
|
|
} else {
|
|
this._openInteractionDialog('reblog');
|
|
}
|
|
}
|
|
|
|
_openInteractionDialog = type => {
|
|
window.open(`/interact/${this.props.status.get('id')}?type=${type}`, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
|
|
}
|
|
|
|
handleBookmarkClick = () => {
|
|
this.props.onBookmark(this.props.status);
|
|
}
|
|
|
|
handleDeleteClick = () => {
|
|
this.props.onDelete(this.props.status, this.context.router.history);
|
|
}
|
|
|
|
handleRedraftClick = () => {
|
|
this.props.onDelete(this.props.status, this.context.router.history, true);
|
|
}
|
|
|
|
handleEditClick = () => {
|
|
this.props.onEdit(this.props.status, this.context.router.history);
|
|
}
|
|
|
|
handlePinClick = () => {
|
|
this.props.onPin(this.props.status);
|
|
}
|
|
|
|
handleMentionClick = () => {
|
|
this.props.onMention(this.props.status.get('account'), this.context.router.history);
|
|
}
|
|
|
|
handleDirectClick = () => {
|
|
this.props.onDirect(this.props.status.get('account'), this.context.router.history);
|
|
}
|
|
|
|
handleMuteClick = () => {
|
|
const { status, relationship, onMute, onUnmute } = this.props;
|
|
const account = status.get('account');
|
|
|
|
if (relationship && relationship.get('muting')) {
|
|
onUnmute(account);
|
|
} else {
|
|
onMute(account);
|
|
}
|
|
}
|
|
|
|
handleBlockClick = () => {
|
|
const { status, relationship, onBlock, onUnblock } = this.props;
|
|
const account = status.get('account');
|
|
|
|
if (relationship && relationship.get('blocking')) {
|
|
onUnblock(account);
|
|
} else {
|
|
onBlock(status);
|
|
}
|
|
}
|
|
|
|
handleBlockDomain = () => {
|
|
const { status, onBlockDomain } = this.props;
|
|
const account = status.get('account');
|
|
|
|
onBlockDomain(account.get('acct').split('@')[1]);
|
|
}
|
|
|
|
handleUnblockDomain = () => {
|
|
const { status, onUnblockDomain } = this.props;
|
|
const account = status.get('account');
|
|
|
|
onUnblockDomain(account.get('acct').split('@')[1]);
|
|
}
|
|
|
|
handleOpen = () => {
|
|
this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}/${this.props.status.get('id')}`);
|
|
}
|
|
|
|
handleEmbed = () => {
|
|
this.props.onEmbed(this.props.status);
|
|
}
|
|
|
|
handleReport = () => {
|
|
this.props.onReport(this.props.status);
|
|
}
|
|
|
|
handleConversationMuteClick = () => {
|
|
this.props.onMuteConversation(this.props.status);
|
|
}
|
|
|
|
handleFilter = () => {
|
|
this.props.onFilter();
|
|
}
|
|
|
|
handleCopy = () => {
|
|
const url = this.props.status.get('url');
|
|
const textarea = document.createElement('textarea');
|
|
|
|
textarea.textContent = url;
|
|
textarea.style.position = 'fixed';
|
|
|
|
document.body.appendChild(textarea);
|
|
|
|
try {
|
|
textarea.select();
|
|
document.execCommand('copy');
|
|
} catch (e) {
|
|
|
|
} finally {
|
|
document.body.removeChild(textarea);
|
|
}
|
|
}
|
|
|
|
|
|
handleFilterClick = () => {
|
|
this.props.onFilter();
|
|
}
|
|
|
|
render () {
|
|
const { status, relationship, intl, withDismiss, withCounters, scrollKey } = this.props;
|
|
|
|
const anonymousAccess = !me;
|
|
const publicStatus = ['public', 'unlisted'].includes(status.get('visibility'));
|
|
const pinnableStatus = ['public', 'unlisted', 'private'].includes(status.get('visibility'));
|
|
const mutingConversation = status.get('muted');
|
|
const account = status.get('account');
|
|
const writtenByMe = status.getIn(['account', 'id']) === me;
|
|
|
|
let menu = [];
|
|
|
|
menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
|
|
|
|
if (publicStatus) {
|
|
menu.push({ text: intl.formatMessage(messages.copy), action: this.handleCopy });
|
|
menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
|
|
}
|
|
|
|
menu.push(null);
|
|
|
|
menu.push({ text: intl.formatMessage(status.get('bookmarked') ? messages.removeBookmark : messages.bookmark), action: this.handleBookmarkClick });
|
|
|
|
if (writtenByMe && pinnableStatus) {
|
|
menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
|
|
}
|
|
|
|
menu.push(null);
|
|
|
|
if (writtenByMe || withDismiss) {
|
|
menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
|
|
menu.push(null);
|
|
}
|
|
|
|
if (writtenByMe) {
|
|
// menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick });
|
|
menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
|
|
menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
|
|
} else {
|
|
menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.handleMentionClick });
|
|
menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.handleDirectClick });
|
|
menu.push(null);
|
|
|
|
if (relationship && relationship.get('muting')) {
|
|
menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.handleMuteClick });
|
|
} else {
|
|
menu.push({ text: intl.formatMessage(messages.mute, { name: account.get('username') }), action: this.handleMuteClick });
|
|
}
|
|
|
|
if (relationship && relationship.get('blocking')) {
|
|
menu.push({ text: intl.formatMessage(messages.unblock, { name: account.get('username') }), action: this.handleBlockClick });
|
|
} else {
|
|
menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.handleBlockClick });
|
|
}
|
|
|
|
menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.handleReport });
|
|
|
|
if (account.get('acct') !== account.get('username')) {
|
|
const domain = account.get('acct').split('@')[1];
|
|
|
|
menu.push(null);
|
|
|
|
if (relationship && relationship.get('domain_blocking')) {
|
|
menu.push({ text: intl.formatMessage(messages.unblockDomain, { domain }), action: this.handleUnblockDomain });
|
|
} else {
|
|
menu.push({ text: intl.formatMessage(messages.blockDomain, { domain }), action: this.handleBlockDomain });
|
|
}
|
|
}
|
|
|
|
if (isStaff) {
|
|
menu.push(null);
|
|
menu.push({ text: intl.formatMessage(messages.admin_account, { name: account.get('username') }), href: `/admin/accounts/${status.getIn(['account', 'id'])}` });
|
|
menu.push({ text: intl.formatMessage(messages.admin_status), href: `/admin/accounts/${status.getIn(['account', 'id'])}/statuses?id=${status.get('id')}` });
|
|
}
|
|
}
|
|
|
|
let replyIcon;
|
|
let replyTitle;
|
|
if (status.get('in_reply_to_id', null) === null) {
|
|
replyIcon = 'reply';
|
|
replyTitle = intl.formatMessage(messages.reply);
|
|
} else {
|
|
replyIcon = 'reply-all';
|
|
replyTitle = intl.formatMessage(messages.replyAll);
|
|
}
|
|
|
|
const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
|
|
|
|
let reblogTitle = '';
|
|
if (status.get('reblogged')) {
|
|
reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
|
|
} else if (publicStatus) {
|
|
reblogTitle = intl.formatMessage(messages.reblog);
|
|
} else if (reblogPrivate) {
|
|
reblogTitle = intl.formatMessage(messages.reblog_private);
|
|
} else {
|
|
reblogTitle = intl.formatMessage(messages.cannot_reblog);
|
|
}
|
|
|
|
const shareButton = ('share' in navigator) && publicStatus && (
|
|
<IconButton className='status__action-bar-button' title={intl.formatMessage(messages.share)} icon='share-alt' onClick={this.handleShareClick} />
|
|
);
|
|
|
|
const filterButton = this.props.onFilter && (
|
|
<IconButton className='status__action-bar-button' title={intl.formatMessage(messages.hide)} icon='eye' onClick={this.handleFilterClick} />
|
|
);
|
|
|
|
return (
|
|
<div className='status__action-bar'>
|
|
<IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
|
|
<IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
|
|
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
|
|
|
|
{shareButton}
|
|
|
|
{filterButton}
|
|
|
|
<div className='status__action-bar-dropdown'>
|
|
<DropdownMenuContainer
|
|
scrollKey={scrollKey}
|
|
disabled={anonymousAccess}
|
|
status={status}
|
|
items={menu}
|
|
icon='ellipsis-h'
|
|
size={18}
|
|
direction='right'
|
|
title={intl.formatMessage(messages.more)}
|
|
/>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|