+ {counter}
+
+ )}
);
};
diff --git a/app/javascript/mastodon/components/check_box.tsx b/app/javascript/mastodon/components/check_box.tsx
index 7da8ef0ac..9bd137abf 100644
--- a/app/javascript/mastodon/components/check_box.tsx
+++ b/app/javascript/mastodon/components/check_box.tsx
@@ -1,5 +1,6 @@
import classNames from 'classnames';
+import CheckIndeterminateSmallIcon from '@/material-icons/400-24px/check_indeterminate_small.svg?react';
import DoneIcon from '@/material-icons/400-24px/done.svg?react';
import { Icon } from './icon';
@@ -7,6 +8,7 @@ import { Icon } from './icon';
interface Props {
value: string;
checked: boolean;
+ indeterminate: boolean;
name: string;
onChange: (event: React.ChangeEvent
diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index 524dbb927..d731a8e2d 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -20,7 +20,7 @@ let id = 0;
class DropdownMenu extends PureComponent {
static propTypes = {
- items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+ items: PropTypes.array.isRequired,
loading: PropTypes.bool,
scrollable: PropTypes.bool,
onClose: PropTypes.func.isRequired,
@@ -39,6 +39,7 @@ class DropdownMenu extends PureComponent {
if (this.node && !this.node.contains(e.target)) {
this.props.onClose();
e.stopPropagation();
+ e.preventDefault();
}
};
@@ -164,7 +165,7 @@ class Dropdown extends PureComponent {
children: PropTypes.node,
icon: PropTypes.string,
iconComponent: PropTypes.func,
- items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]),
+ items: PropTypes.array.isRequired,
loading: PropTypes.bool,
size: PropTypes.number,
title: PropTypes.string,
diff --git a/app/javascript/mastodon/components/dropdown_selector.tsx b/app/javascript/mastodon/components/dropdown_selector.tsx
new file mode 100644
index 000000000..b86d2d0f8
--- /dev/null
+++ b/app/javascript/mastodon/components/dropdown_selector.tsx
@@ -0,0 +1,185 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+
+import type { IconProp } from './icon';
+import { Icon } from './icon';
+
+const listenerOptions = supportsPassiveEvents
+ ? { passive: true, capture: true }
+ : true;
+
+export interface SelectItem {
+ value: string;
+ icon?: string;
+ iconComponent?: IconProp;
+ text: string;
+ meta: string;
+ extra?: string;
+}
+
+interface Props {
+ value: string;
+ classNamePrefix: string;
+ style?: React.CSSProperties;
+ items: SelectItem[];
+ onChange: (value: string) => void;
+ onClose: () => void;
+}
+
+export const DropdownSelector: React.FC = ({
+ style,
+ items,
+ value,
+ classNamePrefix = 'privacy-dropdown',
+ onClose,
+ onChange,
+}) => {
+ const nodeRef = useRef(null);
+ const focusedItemRef = useRef(null);
+ const [currentValue, setCurrentValue] = useState(value);
+
+ const handleDocumentClick = useCallback(
+ (e: MouseEvent | TouchEvent) => {
+ if (
+ nodeRef.current &&
+ e.target instanceof Node &&
+ !nodeRef.current.contains(e.target)
+ ) {
+ onClose();
+ e.stopPropagation();
+ }
+ },
+ [nodeRef, onClose],
+ );
+
+ const handleClick = useCallback(
+ (
+ e: React.MouseEvent | React.KeyboardEvent,
+ ) => {
+ const value = e.currentTarget.getAttribute('data-index');
+
+ e.preventDefault();
+
+ onClose();
+ if (value) onChange(value);
+ },
+ [onClose, onChange],
+ );
+
+ const handleKeyDown = useCallback(
+ (e: React.KeyboardEvent) => {
+ const value = e.currentTarget.getAttribute('data-index');
+ const index = items.findIndex((item) => item.value === value);
+
+ let element: Element | null | undefined = null;
+
+ switch (e.key) {
+ case 'Escape':
+ onClose();
+ break;
+ case ' ':
+ case 'Enter':
+ handleClick(e);
+ break;
+ case 'ArrowDown':
+ element =
+ nodeRef.current?.children[index + 1] ??
+ nodeRef.current?.firstElementChild;
+ break;
+ case 'ArrowUp':
+ element =
+ nodeRef.current?.children[index - 1] ??
+ nodeRef.current?.lastElementChild;
+ break;
+ case 'Tab':
+ if (e.shiftKey) {
+ element =
+ nodeRef.current?.children[index + 1] ??
+ nodeRef.current?.firstElementChild;
+ } else {
+ element =
+ nodeRef.current?.children[index - 1] ??
+ nodeRef.current?.lastElementChild;
+ }
+ break;
+ case 'Home':
+ element = nodeRef.current?.firstElementChild;
+ break;
+ case 'End':
+ element = nodeRef.current?.lastElementChild;
+ break;
+ }
+
+ if (element && element instanceof HTMLElement) {
+ const selectedValue = element.getAttribute('data-index');
+ element.focus();
+ if (selectedValue) setCurrentValue(selectedValue);
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ },
+ [nodeRef, items, onClose, handleClick, setCurrentValue],
+ );
+
+ useEffect(() => {
+ document.addEventListener('click', handleDocumentClick, { capture: true });
+ document.addEventListener('touchend', handleDocumentClick, listenerOptions);
+ focusedItemRef.current?.focus({ preventScroll: true });
+
+ return () => {
+ document.removeEventListener('click', handleDocumentClick, {
+ capture: true,
+ });
+ document.removeEventListener(
+ 'touchend',
+ handleDocumentClick,
+ listenerOptions,
+ );
+ };
+ }, [handleDocumentClick]);
+
+ return (
+
+
+);
diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
index ecc4e1ee1..222789318 100644
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -1,13 +1,9 @@
import { useCallback, useEffect } from 'react';
-import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
import { useIdentity } from '@/mastodon/identity_context';
-import {
- fetchRelationships,
- followAccount,
- unfollowAccount,
-} from 'mastodon/actions/accounts';
+import { fetchRelationships, followAccount } from 'mastodon/actions/accounts';
import { openModal } from 'mastodon/actions/modal';
import { Button } from 'mastodon/components/button';
import { LoadingIndicator } from 'mastodon/components/loading_indicator';
@@ -60,29 +56,14 @@ export const FollowButton: React.FC<{
if (accountId === me) {
return;
- } else if (relationship.following || relationship.requested) {
+ } else if (account && (relationship.following || relationship.requested)) {
dispatch(
- openModal({
- modalType: 'CONFIRM',
- modalProps: {
- message: (
- @{account?.acct} }}
- />
- ),
- confirm: intl.formatMessage(messages.unfollow),
- onConfirm: () => {
- dispatch(unfollowAccount(accountId));
- },
- },
- }),
+ openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
);
} else {
dispatch(followAccount(accountId));
}
- }, [dispatch, intl, accountId, relationship, account, signedIn]);
+ }, [dispatch, accountId, relationship, account, signedIn]);
let label;
diff --git a/app/javascript/mastodon/components/hover_card_account.tsx b/app/javascript/mastodon/components/hover_card_account.tsx
index 8933e14a9..05033e4ac 100644
--- a/app/javascript/mastodon/components/hover_card_account.tsx
+++ b/app/javascript/mastodon/components/hover_card_account.tsx
@@ -1,5 +1,7 @@
import { useEffect, forwardRef } from 'react';
+import { FormattedMessage } from 'react-intl';
+
import classNames from 'classnames';
import { Link } from 'react-router-dom';
@@ -25,6 +27,11 @@ export const HoverCardAccount = forwardRef<
accountId ? state.accounts.get(accountId) : undefined,
);
+ const note = useAppSelector(
+ (state) =>
+ state.relationships.getIn([accountId, 'note']) as string | undefined,
+ );
+
useEffect(() => {
if (accountId && !account) {
dispatch(fetchAccount(accountId));
@@ -53,6 +60,17 @@ export const HoverCardAccount = forwardRef<
className='hover-card__bio'
/>
-
+ {items.map((item) => (
+
-
+ {item.icon && item.iconComponent && (
+ ++ )} + +
+ + {item.text} + {item.meta} ++ + {item.extra && ( +++ )} ++
+ ))}
+
+
-
+
-
+
+
+ - {note} +
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index fe5f38889..7236c9633 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -13,6 +13,8 @@ import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?re
import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import { ContentWarning } from 'mastodon/components/content_warning';
+import { FilterWarning } from 'mastodon/components/filter_warning';
import { Icon } from 'mastodon/components/icon';
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router';
@@ -119,6 +121,7 @@ class Status extends ImmutablePureComponent {
skipPrepend: PropTypes.bool,
avatarSize: PropTypes.number,
deployPictureInPicture: PropTypes.func,
+ unfocusable: PropTypes.bool,
pictureInPicture: ImmutablePropTypes.contains({
inUse: PropTypes.bool,
available: PropTypes.bool,
@@ -139,7 +142,7 @@ class Status extends ImmutablePureComponent {
state = {
showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
- forceFilter: undefined,
+ showDespiteFilter: undefined,
};
componentDidUpdate (prevProps) {
@@ -151,7 +154,7 @@ class Status extends ImmutablePureComponent {
if (this.props.status?.get('id') !== prevProps.status?.get('id')) {
this.setState({
showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
- forceFilter: undefined,
+ showDespiteFilter: undefined,
});
}
}
@@ -324,20 +327,32 @@ class Status extends ImmutablePureComponent {
};
handleHotkeyToggleHidden = () => {
- this.props.onToggleHidden(this._properStatus());
+ const { onToggleHidden } = this.props;
+ const status = this._properStatus();
+
+ if (status.get('matched_filters')) {
+ const expandedBecauseOfCW = !status.get('hidden') || status.get('spoiler_text').length === 0;
+ const expandedBecauseOfFilter = this.state.showDespiteFilter;
+
+ if (expandedBecauseOfFilter && !expandedBecauseOfCW) {
+ onToggleHidden(status);
+ } else if (expandedBecauseOfFilter && expandedBecauseOfCW) {
+ onToggleHidden(status);
+ this.handleFilterToggle();
+ } else {
+ this.handleFilterToggle();
+ }
+ } else {
+ onToggleHidden(status);
+ }
};
handleHotkeyToggleSensitive = () => {
this.handleToggleMediaVisibility();
};
- handleUnfilterClick = e => {
- this.setState({ forceFilter: false });
- e.preventDefault();
- };
-
- handleFilterClick = () => {
- this.setState({ forceFilter: true });
+ handleFilterToggle = () => {
+ this.setState(state => ({ ...state, showDespiteFilter: !state.showDespiteFilter }));
};
_properStatus () {
@@ -355,7 +370,7 @@ class Status extends ImmutablePureComponent {
};
render () {
- const { intl, hidden, featured, unread, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend, avatarSize = 46 } = this.props;
+ const { intl, hidden, featured, unfocusable, unread, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend, avatarSize = 46 } = this.props;
let { status, account, ...other } = this.props;
@@ -381,8 +396,8 @@ class Status extends ImmutablePureComponent {
if (hidden) {
return (
-
-
+
+
-
- );
- }
-
if (featured) {
prepend = (
{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}
{status.get('content')}
@@ -395,25 +410,6 @@ class Status extends ImmutablePureComponent {
const connectReply = nextInReplyToId && nextInReplyToId === status.get('id');
const matchedFilters = status.get('matched_filters');
- if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
- const minHandlers = this.props.muted ? {} : {
- moveUp: this.handleHotkeyMoveUp,
- moveDown: this.handleHotkeyMoveDown,
- };
-
- return (
-
-
-
@@ -547,11 +543,11 @@ class Status extends ImmutablePureComponent {
}
const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
- const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
+ const expanded = (!matchedFilters || this.state.showDespiteFilter) && (!status.get('hidden') || status.get('spoiler_text').length === 0);
return (
-
-
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index 2a7bd0a30..f24f81e1b 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -17,7 +17,6 @@ import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
-import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
@@ -61,7 +60,6 @@ const messages = defineMessages({
admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
copy: { id: 'status.copy', defaultMessage: 'Copy link to post' },
- hide: { id: 'status.hide', defaultMessage: 'Hide post' },
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}' },
@@ -241,10 +239,6 @@ class StatusActionBar extends ImmutablePureComponent {
navigator.clipboard.writeText(url);
};
- handleHideClick = () => {
- this.props.onFilter();
- };
-
render () {
const { status, relationship, intl, withDismiss, withCounters, scrollKey } = this.props;
const { signedIn, permissions } = this.props.identity;
@@ -377,10 +371,6 @@ class StatusActionBar extends ImmutablePureComponent {
reblogIconComponent = RepeatDisabledIcon;
}
- const filterButton = this.props.onFilter && (
- void;
+}> = ({ children, variant, expanded, onClick }) => (
+
+
+
{!skipPrepend && prepend}
@@ -573,22 +569,27 @@ class Status extends ImmutablePureComponent {
-
+ {children}
+
+
+
+);
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 96452374d..3316be835 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -4,7 +4,7 @@ import { PureComponent } from 'react';
import { FormattedMessage, injectIntl } from 'react-intl';
import classnames from 'classnames';
-import { Link, withRouter } from 'react-router-dom';
+import { withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
@@ -15,7 +15,6 @@ import PollContainer from 'mastodon/containers/poll_container';
import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
-
const MAX_HEIGHT = 706; // 22px * 32 (+ 2px padding at the top)
/**
@@ -73,8 +72,6 @@ class StatusContent extends PureComponent {
identity: identityContextPropShape,
status: ImmutablePropTypes.map.isRequired,
statusContent: PropTypes.string,
- expanded: PropTypes.bool,
- onExpandedToggle: PropTypes.func,
onTranslate: PropTypes.func,
onClick: PropTypes.func,
collapsible: PropTypes.bool,
@@ -87,10 +84,6 @@ class StatusContent extends PureComponent {
history: PropTypes.object.isRequired
};
- state = {
- hidden: true,
- };
-
_updateStatusLinks () {
const node = this.node;
@@ -218,17 +211,6 @@ class StatusContent extends PureComponent {
this.startXY = null;
};
- handleSpoilerClick = (e) => {
- e.preventDefault();
-
- if (this.props.onExpandedToggle) {
- // The parent manages the state
- this.props.onExpandedToggle();
- } else {
- this.setState({ hidden: !this.state.hidden });
- }
- };
-
handleTranslate = () => {
this.props.onTranslate();
};
@@ -240,18 +222,15 @@ class StatusContent extends PureComponent {
render () {
const { status, intl, statusContent } = this.props;
- const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
const renderReadMore = this.props.onClick && status.get('collapsed');
const contentLocale = intl.locale.replace(/[_-].*/, '');
const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
const renderTranslate = this.props.onTranslate && this.props.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
const content = { __html: statusContent ?? getStatusContent(status) };
- const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };
const language = status.getIn(['translation', 'language']) || status.get('language');
const classNames = classnames('status__content', {
'status__content--with-action': this.props.onClick && this.props.history,
- 'status__content--with-spoiler': status.get('spoiler_text').length > 0,
'status__content--collapsed': renderReadMore,
});
@@ -269,38 +248,7 @@ class StatusContent extends PureComponent {
{mentionLinks}
;
- }
-
- return (
-
-
- );
- } else if (this.props.onClick) {
+ if (this.props.onClick) {
return (
<>
- - {' '} - -
- - {mentionsPlaceholder} - - - - {!hidden && poll} - {translateButton} -
diff --git a/app/javascript/mastodon/components/timeline_hint.tsx b/app/javascript/mastodon/components/timeline_hint.tsx
index bf2a2d8bb..9e0d3676e 100644
--- a/app/javascript/mastodon/components/timeline_hint.tsx
+++ b/app/javascript/mastodon/components/timeline_hint.tsx
@@ -1,25 +1,23 @@
-import { FormattedMessage } from 'react-intl';
+import classNames from 'classnames';
interface Props {
- resource: JSX.Element;
+ message: React.ReactNode;
+ label: React.ReactNode;
url: string;
+ className?: string;
}
-export const TimelineHint: React.FC = ({ resource, url }) => (
-
-
-
+export const TimelineHint: React.FC = ({
+ className,
+ message,
+ label,
+ url,
+}) => (
+ @{account.get('acct')} }} />,
- confirm: intl.formatMessage(messages.unfollowConfirm),
- onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
- },
- }));
+ dispatch(openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }));
} else {
dispatch(followAccount(account.get('id')));
}
diff --git a/app/javascript/mastodon/containers/domain_container.jsx b/app/javascript/mastodon/containers/domain_container.jsx
deleted file mode 100644
index c719a5775..000000000
--- a/app/javascript/mastodon/containers/domain_container.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { blockDomain, unblockDomain } from '../actions/domain_blocks';
-import { openModal } from '../actions/modal';
-import { Domain } from '../components/domain';
-
-const messages = defineMessages({
- blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
-});
-
-const makeMapStateToProps = () => {
- const mapStateToProps = () => ({});
-
- return mapStateToProps;
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
- onBlockDomain (domain) {
- dispatch(openModal({
- modalType: 'CONFIRM',
- modalProps: {
- message: {domain} }} />,
- confirm: intl.formatMessage(messages.blockDomainConfirm),
- onConfirm: () => dispatch(blockDomain(domain)),
- },
- }));
- },
-
- onUnblockDomain (domain) {
- dispatch(unblockDomain(domain));
- },
-});
-
-export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Domain));
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index e2c0af353..58c5aac8f 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -1,4 +1,4 @@
-import { defineMessages, injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl';
import { connect } from 'react-redux';
@@ -21,11 +21,9 @@ import {
initAddFilter,
} from '../actions/filters';
import {
- reblog,
- favourite,
+ toggleReblog,
+ toggleFavourite,
bookmark,
- unreblog,
- unfavourite,
unbookmark,
pin,
unpin,
@@ -38,29 +36,16 @@ import {
muteStatus,
unmuteStatus,
deleteStatus,
- hideStatus,
- revealStatus,
+ toggleStatusSpoilers,
toggleStatusCollapse,
editStatus,
translateStatus,
undoStatusTranslation,
} from '../actions/statuses';
import Status from '../components/status';
-import { boostModal, deleteModal } from '../initial_state';
+import { deleteModal } from '../initial_state';
import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
-const messages = defineMessages({
- deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
- deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
- redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
- redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
- replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
- replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
- editConfirm: { id: 'confirmations.edit.confirm', defaultMessage: 'Edit' },
- editMessage: { id: 'confirmations.edit.message', defaultMessage: 'Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
- blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
-});
-
const makeMapStateToProps = () => {
const getStatus = makeGetStatus();
const getPictureInPicture = makeGetPictureInPicture();
@@ -74,48 +59,26 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
-const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
+const mapDispatchToProps = (dispatch, { contextType }) => ({
onReply (status) {
dispatch((_, getState) => {
let state = getState();
if (state.getIn(['compose', 'text']).trim().length !== 0) {
- dispatch(openModal({
- modalType: 'CONFIRM',
- modalProps: {
- message: intl.formatMessage(messages.replyMessage),
- confirm: intl.formatMessage(messages.replyConfirm),
- onConfirm: () => dispatch(replyCompose(status)) },
- }));
+ dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
} else {
dispatch(replyCompose(status));
}
});
},
- onModalReblog (status, privacy) {
- if (status.get('reblogged')) {
- dispatch(unreblog({ statusId: status.get('id') }));
- } else {
- dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
- }
- },
-
onReblog (status, e) {
- if ((e && e.shiftKey) || !boostModal) {
- this.onModalReblog(status);
- } else {
- dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
- }
+ dispatch(toggleReblog(status.get('id'), e.shiftKey));
},
onFavourite (status) {
- if (status.get('favourited')) {
- dispatch(unfavourite(status));
- } else {
- dispatch(favourite(status));
- }
+ dispatch(toggleFavourite(status.get('id')));
},
onBookmark (status) {
@@ -148,14 +111,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
if (!deleteModal) {
dispatch(deleteStatus(status.get('id'), withRedraft));
} else {
- dispatch(openModal({
- modalType: 'CONFIRM',
- modalProps: {
- message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
- confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
- onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
- },
- }));
+ dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
}
},
@@ -163,14 +119,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
dispatch((_, getState) => {
let state = getState();
if (state.getIn(['compose', 'text']).trim().length !== 0) {
- dispatch(openModal({
- modalType: 'CONFIRM',
- modalProps: {
- message: intl.formatMessage(messages.editMessage),
- confirm: intl.formatMessage(messages.editConfirm),
- onConfirm: () => dispatch(editStatus(status.get('id'))),
- },
- }));
+ dispatch(openModal({ modalType: 'CONFIRM_EDIT_STATUS', modalProps: { statusId: status.get('id') } }));
} else {
dispatch(editStatus(status.get('id')));
}
@@ -241,11 +190,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
},
onToggleHidden (status) {
- if (status.get('hidden')) {
- dispatch(revealStatus(status.get('id')));
- } else {
- dispatch(hideStatus(status.get('id')));
- }
+ dispatch(toggleStatusSpoilers(status.get('id')));
},
onToggleCollapsed (status, isCollapsed) {
diff --git a/app/javascript/mastodon/features/account/components/account_note.jsx b/app/javascript/mastodon/features/account/components/account_note.jsx
index 272a4ee31..e736e7ad6 100644
--- a/app/javascript/mastodon/features/account/components/account_note.jsx
+++ b/app/javascript/mastodon/features/account/components/account_note.jsx
@@ -151,7 +151,7 @@ class AccountNote extends ImmutablePureComponent {
return (
+export const TimelineHint: React.FC
+
);
diff --git a/app/javascript/mastodon/containers/account_container.jsx b/app/javascript/mastodon/containers/account_container.jsx
index f171fcc2f..d34962fa4 100644
--- a/app/javascript/mastodon/containers/account_container.jsx
+++ b/app/javascript/mastodon/containers/account_container.jsx
@@ -1,24 +1,20 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { injectIntl } from 'react-intl';
import { connect } from 'react-redux';
+import { openModal } from 'mastodon/actions/modal';
+
import {
followAccount,
- unfollowAccount,
blockAccount,
unblockAccount,
muteAccount,
unmuteAccount,
} from '../actions/accounts';
-import { openModal } from '../actions/modal';
import { initMuteModal } from '../actions/mutes';
import Account from '../components/account';
import { makeGetAccount } from '../selectors';
-const messages = defineMessages({
- unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
-});
-
const makeMapStateToProps = () => {
const getAccount = makeGetAccount();
@@ -29,18 +25,11 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
onFollow (account) {
if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
- dispatch(openModal({
- modalType: 'CONFIRM',
- modalProps: {
- message: {message}
+ -