mirror of
https://github.com/whippyshou/mastodon
synced 2024-12-02 16:58:45 +09:00
911cc14481
* Add follow_request notification type The notification type already existed in the backend but was never pushed to the front-end. This also means translation strings were also available for the backend, from the notification mailer. Unlike other notification types, these are off by default, to match what I remember of Gargron's view on the topic: that follow requests should not clutter notifications and should instead be reviewed at the user's own leisure in the dedicated column. Since follow requests have their own column, I've deemed it unnecessary to add a specific tab for them in the notification quick filter. * Show follow request link in single-column if there are pending requests, even if account isn't locked * Push follow requests from notifications to the follow_requests list * Offer to accept or reject follow request from the notification * Redesign follow request notification
303 lines
11 KiB
JavaScript
303 lines
11 KiB
JavaScript
import React from 'react';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
|
|
import { HotKeys } from 'react-hotkeys';
|
|
import PropTypes from 'prop-types';
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
import { me } from 'mastodon/initial_state';
|
|
import StatusContainer from 'mastodon/containers/status_container';
|
|
import AccountContainer from 'mastodon/containers/account_container';
|
|
import FollowRequestContainer from '../containers/follow_request_container';
|
|
import Icon from 'mastodon/components/icon';
|
|
import Permalink from 'mastodon/components/permalink';
|
|
|
|
const messages = defineMessages({
|
|
favourite: { id: 'notification.favourite', defaultMessage: '{name} favourited your status' },
|
|
follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
|
|
ownPoll: { id: 'notification.own_poll', defaultMessage: 'Your poll has ended' },
|
|
poll: { id: 'notification.poll', defaultMessage: 'A poll you have voted in has ended' },
|
|
reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your status' },
|
|
});
|
|
|
|
const notificationForScreenReader = (intl, message, timestamp) => {
|
|
const output = [message];
|
|
|
|
output.push(intl.formatDate(timestamp, { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }));
|
|
|
|
return output.join(', ');
|
|
};
|
|
|
|
export default @injectIntl
|
|
class Notification extends ImmutablePureComponent {
|
|
|
|
static contextTypes = {
|
|
router: PropTypes.object,
|
|
};
|
|
|
|
static propTypes = {
|
|
notification: ImmutablePropTypes.map.isRequired,
|
|
hidden: PropTypes.bool,
|
|
onMoveUp: PropTypes.func.isRequired,
|
|
onMoveDown: PropTypes.func.isRequired,
|
|
onMention: PropTypes.func.isRequired,
|
|
onFavourite: PropTypes.func.isRequired,
|
|
onReblog: PropTypes.func.isRequired,
|
|
onToggleHidden: PropTypes.func.isRequired,
|
|
status: ImmutablePropTypes.map,
|
|
intl: PropTypes.object.isRequired,
|
|
getScrollPosition: PropTypes.func,
|
|
updateScrollBottom: PropTypes.func,
|
|
cacheMediaWidth: PropTypes.func,
|
|
cachedMediaWidth: PropTypes.number,
|
|
};
|
|
|
|
handleMoveUp = () => {
|
|
const { notification, onMoveUp } = this.props;
|
|
onMoveUp(notification.get('id'));
|
|
}
|
|
|
|
handleMoveDown = () => {
|
|
const { notification, onMoveDown } = this.props;
|
|
onMoveDown(notification.get('id'));
|
|
}
|
|
|
|
handleOpen = () => {
|
|
const { notification } = this.props;
|
|
|
|
if (notification.get('status')) {
|
|
this.context.router.history.push(`/statuses/${notification.get('status')}`);
|
|
} else {
|
|
this.handleOpenProfile();
|
|
}
|
|
}
|
|
|
|
handleOpenProfile = () => {
|
|
const { notification } = this.props;
|
|
this.context.router.history.push(`/accounts/${notification.getIn(['account', 'id'])}`);
|
|
}
|
|
|
|
handleMention = e => {
|
|
e.preventDefault();
|
|
|
|
const { notification, onMention } = this.props;
|
|
onMention(notification.get('account'), this.context.router.history);
|
|
}
|
|
|
|
handleHotkeyFavourite = () => {
|
|
const { status } = this.props;
|
|
if (status) this.props.onFavourite(status);
|
|
}
|
|
|
|
handleHotkeyBoost = e => {
|
|
const { status } = this.props;
|
|
if (status) this.props.onReblog(status, e);
|
|
}
|
|
|
|
handleHotkeyToggleHidden = () => {
|
|
const { status } = this.props;
|
|
if (status) this.props.onToggleHidden(status);
|
|
}
|
|
|
|
getHandlers () {
|
|
return {
|
|
reply: this.handleMention,
|
|
favourite: this.handleHotkeyFavourite,
|
|
boost: this.handleHotkeyBoost,
|
|
mention: this.handleMention,
|
|
open: this.handleOpen,
|
|
openProfile: this.handleOpenProfile,
|
|
moveUp: this.handleMoveUp,
|
|
moveDown: this.handleMoveDown,
|
|
toggleHidden: this.handleHotkeyToggleHidden,
|
|
};
|
|
}
|
|
|
|
renderFollow (notification, account, link) {
|
|
const { intl } = this.props;
|
|
|
|
return (
|
|
<HotKeys handlers={this.getHandlers()}>
|
|
<div className='notification notification-follow focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.follow, { name: account.get('acct') }), notification.get('created_at'))}>
|
|
<div className='notification__message'>
|
|
<div className='notification__favourite-icon-wrapper'>
|
|
<Icon id='user-plus' fixedWidth />
|
|
</div>
|
|
|
|
<span title={notification.get('created_at')}>
|
|
<FormattedMessage id='notification.follow' defaultMessage='{name} followed you' values={{ name: link }} />
|
|
</span>
|
|
</div>
|
|
|
|
<AccountContainer id={account.get('id')} hidden={this.props.hidden} />
|
|
</div>
|
|
</HotKeys>
|
|
);
|
|
}
|
|
|
|
renderFollowRequest (notification, account, link) {
|
|
const { intl } = this.props;
|
|
|
|
return (
|
|
<HotKeys handlers={this.getHandlers()}>
|
|
<div className='notification notification-follow-request focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage({ id: 'notification.follow_request', defaultMessage: '{name} has requested to follow you' }, { name: account.get('acct') }), notification.get('created_at'))}>
|
|
<div className='notification__message'>
|
|
<div className='notification__favourite-icon-wrapper'>
|
|
<Icon id='user' fixedWidth />
|
|
</div>
|
|
|
|
<span title={notification.get('created_at')}>
|
|
<FormattedMessage id='notification.follow_request' defaultMessage='{name} has requested to follow you' values={{ name: link }} />
|
|
</span>
|
|
</div>
|
|
|
|
<FollowRequestContainer id={account.get('id')} withNote={false} hidden={this.props.hidden} />
|
|
</div>
|
|
</HotKeys>
|
|
);
|
|
}
|
|
|
|
renderMention (notification) {
|
|
return (
|
|
<StatusContainer
|
|
id={notification.get('status')}
|
|
withDismiss
|
|
hidden={this.props.hidden}
|
|
onMoveDown={this.handleMoveDown}
|
|
onMoveUp={this.handleMoveUp}
|
|
contextType='notifications'
|
|
getScrollPosition={this.props.getScrollPosition}
|
|
updateScrollBottom={this.props.updateScrollBottom}
|
|
cachedMediaWidth={this.props.cachedMediaWidth}
|
|
cacheMediaWidth={this.props.cacheMediaWidth}
|
|
/>
|
|
);
|
|
}
|
|
|
|
renderFavourite (notification, link) {
|
|
const { intl } = this.props;
|
|
|
|
return (
|
|
<HotKeys handlers={this.getHandlers()}>
|
|
<div className='notification notification-favourite focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.favourite, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
|
|
<div className='notification__message'>
|
|
<div className='notification__favourite-icon-wrapper'>
|
|
<Icon id='star' className='star-icon' fixedWidth />
|
|
</div>
|
|
|
|
<span title={notification.get('created_at')}>
|
|
<FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} />
|
|
</span>
|
|
</div>
|
|
|
|
<StatusContainer
|
|
id={notification.get('status')}
|
|
account={notification.get('account')}
|
|
muted
|
|
withDismiss
|
|
hidden={!!this.props.hidden}
|
|
getScrollPosition={this.props.getScrollPosition}
|
|
updateScrollBottom={this.props.updateScrollBottom}
|
|
cachedMediaWidth={this.props.cachedMediaWidth}
|
|
cacheMediaWidth={this.props.cacheMediaWidth}
|
|
/>
|
|
</div>
|
|
</HotKeys>
|
|
);
|
|
}
|
|
|
|
renderReblog (notification, link) {
|
|
const { intl } = this.props;
|
|
|
|
return (
|
|
<HotKeys handlers={this.getHandlers()}>
|
|
<div className='notification notification-reblog focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.reblog, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
|
|
<div className='notification__message'>
|
|
<div className='notification__favourite-icon-wrapper'>
|
|
<Icon id='retweet' fixedWidth />
|
|
</div>
|
|
|
|
<span title={notification.get('created_at')}>
|
|
<FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} />
|
|
</span>
|
|
</div>
|
|
|
|
<StatusContainer
|
|
id={notification.get('status')}
|
|
account={notification.get('account')}
|
|
muted
|
|
withDismiss
|
|
hidden={this.props.hidden}
|
|
getScrollPosition={this.props.getScrollPosition}
|
|
updateScrollBottom={this.props.updateScrollBottom}
|
|
cachedMediaWidth={this.props.cachedMediaWidth}
|
|
cacheMediaWidth={this.props.cacheMediaWidth}
|
|
/>
|
|
</div>
|
|
</HotKeys>
|
|
);
|
|
}
|
|
|
|
renderPoll (notification, account) {
|
|
const { intl } = this.props;
|
|
const ownPoll = me === account.get('id');
|
|
const message = ownPoll ? intl.formatMessage(messages.ownPoll) : intl.formatMessage(messages.poll);
|
|
|
|
return (
|
|
<HotKeys handlers={this.getHandlers()}>
|
|
<div className='notification notification-poll focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, message, notification.get('created_at'))}>
|
|
<div className='notification__message'>
|
|
<div className='notification__favourite-icon-wrapper'>
|
|
<Icon id='tasks' fixedWidth />
|
|
</div>
|
|
|
|
<span title={notification.get('created_at')}>
|
|
{ownPoll ? (
|
|
<FormattedMessage id='notification.own_poll' defaultMessage='Your poll has ended' />
|
|
) : (
|
|
<FormattedMessage id='notification.poll' defaultMessage='A poll you have voted in has ended' />
|
|
)}
|
|
</span>
|
|
</div>
|
|
|
|
<StatusContainer
|
|
id={notification.get('status')}
|
|
account={account}
|
|
muted
|
|
withDismiss
|
|
hidden={this.props.hidden}
|
|
getScrollPosition={this.props.getScrollPosition}
|
|
updateScrollBottom={this.props.updateScrollBottom}
|
|
cachedMediaWidth={this.props.cachedMediaWidth}
|
|
cacheMediaWidth={this.props.cacheMediaWidth}
|
|
/>
|
|
</div>
|
|
</HotKeys>
|
|
);
|
|
}
|
|
|
|
render () {
|
|
const { notification } = this.props;
|
|
const account = notification.get('account');
|
|
const displayNameHtml = { __html: account.get('display_name_html') };
|
|
const link = <bdi><Permalink className='notification__display-name' href={account.get('url')} title={account.get('acct')} to={`/accounts/${account.get('id')}`} dangerouslySetInnerHTML={displayNameHtml} /></bdi>;
|
|
|
|
switch(notification.get('type')) {
|
|
case 'follow':
|
|
return this.renderFollow(notification, account, link);
|
|
case 'follow_request':
|
|
return this.renderFollowRequest(notification, account, link);
|
|
case 'mention':
|
|
return this.renderMention(notification);
|
|
case 'favourite':
|
|
return this.renderFavourite(notification, link);
|
|
case 'reblog':
|
|
return this.renderReblog(notification, link);
|
|
case 'poll':
|
|
return this.renderPoll(notification, account);
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
}
|