3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Satisfy eslint.

signup-info-prompt
Surinna Curtis 2017-08-06 20:00:38 -03:00
parent b1576c52df
commit 2ea9b164d3
4 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/glitch/components/status/container.js
View File

@ -39,10 +39,7 @@ import {
unreblog, unreblog,
unfavourite, unfavourite,
} from '../../../mastodon/actions/interactions'; } from '../../../mastodon/actions/interactions';
import { import { blockAccount } from '../../../mastodon/actions/accounts';
blockAccount,
muteAccount,
} from '../../../mastodon/actions/accounts';
import { initMuteModal } from '../../../mastodon/actions/mutes'; import { initMuteModal } from '../../../mastodon/actions/mutes';
import { import {
muteStatus, muteStatus,

1
app/javascript/mastodon/features/account_timeline/containers/header_container.js
View File

@ -7,7 +7,6 @@ import {
unfollowAccount, unfollowAccount,
blockAccount, blockAccount,
unblockAccount, unblockAccount,
muteAccount,
unmuteAccount, unmuteAccount,
} from '../../../actions/accounts'; } from '../../../actions/accounts';
import { mentionCompose } from '../../../actions/compose'; import { mentionCompose } from '../../../actions/compose';

9
app/javascript/mastodon/features/ui/components/mute_modal.js
View File

@ -19,7 +19,7 @@ const mapStateToProps = state => {
const mapDispatchToProps = dispatch => { const mapDispatchToProps = dispatch => {
return { return {
onConfirm(account, notifications) { onConfirm(account, notifications) {
dispatch(muteAccount(account.get('id'), notifications)) dispatch(muteAccount(account.get('id'), notifications));
}, },
onClose() { onClose() {
@ -35,6 +35,7 @@ const mapDispatchToProps = dispatch => {
@connect(mapStateToProps, mapDispatchToProps) @connect(mapStateToProps, mapDispatchToProps)
@injectIntl @injectIntl
export default class MuteModal extends React.PureComponent { export default class MuteModal extends React.PureComponent {
static propTypes = { static propTypes = {
isSubmitting: PropTypes.bool.isRequired, isSubmitting: PropTypes.bool.isRequired,
account: PropTypes.object.isRequired, account: PropTypes.object.isRequired,
@ -73,14 +74,15 @@ export default class MuteModal extends React.PureComponent {
<div className='modal-root__modal mute-modal'> <div className='modal-root__modal mute-modal'>
<div className='mute-modal__container'> <div className='mute-modal__container'>
<p> <p>
<FormattedMessage id='confirmations.mute.message' <FormattedMessage
id='confirmations.mute.message'
defaultMessage='Are you sure you want to mute {name}?' defaultMessage='Are you sure you want to mute {name}?'
values={{ name: <strong>@{account.get('acct')}</strong> }} values={{ name: <strong>@{account.get('acct')}</strong> }}
/> />
</p> </p>
<p> <p>
<FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' /> <FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
<input type="checkbox" checked={notifications} onChange={this.toggleNotifications} /> <input type='checkbox' checked={notifications} onChange={this.toggleNotifications} />
</p> </p>
</div> </div>
@ -95,4 +97,5 @@ export default class MuteModal extends React.PureComponent {
</div> </div>
); );
} }
} }