app
controllers
helpers
javascript
fonts
images
mastodon
actions
components
containers
features
account
account_gallery
account_timeline
blocks
community_timeline
compose
emoji
favourited_statuses
favourites
follow_requests
followers
following
generic_not_found
getting_started
hashtag_timeline
home_timeline
mutes
notifications
pinned_statuses
public_timeline
reblogs
report
standalone
status
ui
components
__tests__
actions_modal.js
boost_modal.js
bundle.js
bundle_column_error.js
bundle_modal_error.js
column.js
column_header.js
column_link.js
column_loading.js
column_subheading.js
columns_area.js
confirmation_modal.js
drawer_loading.js
embed_modal.js
image_loader.js
media_modal.js
modal_loading.js
modal_root.js
mute_modal.js
onboarding_modal.js
report_modal.js
tabs_bar.js
upload_area.js
video_modal.js
containers
util
index.js
video
locales
middleware
reducers
selectors
service_worker
store
.gitkeep
api.js
base_polyfills.js
extra_polyfills.js
initial_state.js
is_mobile.js
link_header.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
stream.js
test_setup.js
uuid.js
web_push_subscription.js
packs
styles
lib
mailers
models
policies
presenters
serializers
services
validators
views
workers
bin
config
db
docs
lib
log
nanobox
public
spec
streaming
vendor
.babelrc
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.yml
.foreman
.gitattributes
.gitignore
.haml-lint.yml
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml
.ruby-version
.scss-lint.yml
.slugignore
.travis.yml
.yarnclean
Aptfile
CODEOWNERS
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Capfile
Dockerfile
Gemfile
Gemfile.lock
ISSUE_TEMPLATE.md
LICENSE
Procfile
Procfile.dev
README.md
Rakefile
Vagrantfile
app.json
boxfile.yml
config.ru
docker-compose.yml
docker_entrypoint.sh
jest.config.js
package.json
scalingo.json
yarn.lock
* Add a hide_notifications column to mutes * Add muting_notifications? and a notifications argument to mute! * block notifications in notify_service from hard muted accounts * Add specs for how mute! interacts with muting_notifications? * specs testing that hide_notifications in mutes actually hides notifications * Add support for muting notifications in MuteService * API support for muting notifications (and specs) * Less gross passing of notifications flag * Break out a separate mute modal with a hide-notifications checkbox. * Convert profile header mute to use mute modal * Satisfy eslint. * specs for MuteService notifications params * add trailing newlines to files for Pork :) * Put the label for the hide notifications checkbox in a label element. * Add a /api/v1/mutes/details route that just returns the array of mutes. * Define a serializer for /api/v1/mutes/details * Add more specs for the /api/v1/mutes/details endpoint * Expose whether a mute hides notifications in the api/v1/relationships endpoint * Show whether muted users' notifications are muted in account lists * Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint * make the hide/unhide notifications buttons work * satisfy eslint * In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. * fix a missing import * add an explanatory comment to AccountInteractions * Refactor handling of default params for muting to make code cleaner * minor code style fixes oops * Fixed a typo that was breaking the account mute API endpoint * Apply white-space: nowrap to account relationships icons * Fix code style issues * Remove superfluous blank line * Rename /api/v1/mutes/details -> /api/v2/mutes * Don't serialize "account" in MuteSerializer Doing so is somewhat unnecessary since it's always the current user's account. * Fix wrong variable name in api/v2/mutes * Use Toggle in place of checkbox in the mute modal. * Make the Toggle in the mute modal look better * Code style changes in specs and removed an extra space * Code review suggestions from akihikodaki Also fixed a syntax error in tests for AccountInteractions. * Make AddHideNotificationsToMute Concurrent It's not clear how much this will benefit instances in practice, as the number of mutes tends to be pretty small, but this should prevent any blocking migrations nonetheless. * Fix up migration things * Remove /api/v2/mutes
106 lines
3.0 KiB
JavaScript
106 lines
3.0 KiB
JavaScript
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import PropTypes from 'prop-types';
|
|
import { injectIntl, FormattedMessage } from 'react-intl';
|
|
import Toggle from 'react-toggle';
|
|
import Button from '../../../components/button';
|
|
import { closeModal } from '../../../actions/modal';
|
|
import { muteAccount } from '../../../actions/accounts';
|
|
import { toggleHideNotifications } from '../../../actions/mutes';
|
|
|
|
|
|
const mapStateToProps = state => {
|
|
return {
|
|
isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
|
|
account: state.getIn(['mutes', 'new', 'account']),
|
|
notifications: state.getIn(['mutes', 'new', 'notifications']),
|
|
};
|
|
};
|
|
|
|
const mapDispatchToProps = dispatch => {
|
|
return {
|
|
onConfirm(account, notifications) {
|
|
dispatch(muteAccount(account.get('id'), notifications));
|
|
},
|
|
|
|
onClose() {
|
|
dispatch(closeModal());
|
|
},
|
|
|
|
onToggleNotifications() {
|
|
dispatch(toggleHideNotifications());
|
|
},
|
|
};
|
|
};
|
|
|
|
@connect(mapStateToProps, mapDispatchToProps)
|
|
@injectIntl
|
|
export default class MuteModal extends React.PureComponent {
|
|
|
|
static propTypes = {
|
|
isSubmitting: PropTypes.bool.isRequired,
|
|
account: PropTypes.object.isRequired,
|
|
notifications: PropTypes.bool.isRequired,
|
|
onClose: PropTypes.func.isRequired,
|
|
onConfirm: PropTypes.func.isRequired,
|
|
onToggleNotifications: PropTypes.func.isRequired,
|
|
intl: PropTypes.object.isRequired,
|
|
};
|
|
|
|
componentDidMount() {
|
|
this.button.focus();
|
|
}
|
|
|
|
handleClick = () => {
|
|
this.props.onClose();
|
|
this.props.onConfirm(this.props.account, this.props.notifications);
|
|
}
|
|
|
|
handleCancel = () => {
|
|
this.props.onClose();
|
|
}
|
|
|
|
setRef = (c) => {
|
|
this.button = c;
|
|
}
|
|
|
|
toggleNotifications = () => {
|
|
this.props.onToggleNotifications();
|
|
}
|
|
|
|
render () {
|
|
const { account, notifications } = this.props;
|
|
|
|
return (
|
|
<div className='modal-root__modal mute-modal'>
|
|
<div className='mute-modal__container'>
|
|
<p>
|
|
<FormattedMessage
|
|
id='confirmations.mute.message'
|
|
defaultMessage='Are you sure you want to mute {name}?'
|
|
values={{ name: <strong>@{account.get('acct')}</strong> }}
|
|
/>
|
|
</p>
|
|
<div>
|
|
<label htmlFor='mute-modal__hide-notifications-checkbox'>
|
|
<FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
|
|
{' '}
|
|
<Toggle id='mute-modal__hide-notifications-checkbox' checked={notifications} onChange={this.toggleNotifications} />
|
|
</label>
|
|
</div>
|
|
</div>
|
|
|
|
<div className='mute-modal__action-bar'>
|
|
<Button onClick={this.handleCancel} className='mute-modal__cancel-button'>
|
|
<FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
|
|
</Button>
|
|
<Button onClick={this.handleClick} ref={this.setRef}>
|
|
<FormattedMessage id='confirmations.mute.confirm' defaultMessage='Mute' />
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|