diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index bd91daaae..6c3057436 100644
--- a/app/soapbox/actions/compose.js
+++ b/app/soapbox/actions/compose.js
@@ -164,6 +164,34 @@ export function submitCompose(routerHistory, group) {
return function(dispatch, getState) {
if (!isLoggedIn(getState)) return;
+ function onModalSubmitCompose() {
+ dispatch(submitComposeRequest());
+ dispatch(closeModal());
+
+ api(getState).post('/api/v1/statuses', {
+ status,
+ in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
+ media_ids: media.map(item => item.get('id')),
+ sensitive: getState().getIn(['compose', 'sensitive']),
+ spoiler_text: getState().getIn(['compose', 'spoiler_text'], ''),
+ visibility: getState().getIn(['compose', 'privacy']),
+ content_type: getState().getIn(['compose', 'content_type']),
+ poll: getState().getIn(['compose', 'poll'], null),
+ scheduled_at: getState().getIn(['compose', 'schedule'], null),
+ }, {
+ headers: {
+ 'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
+ },
+ }).then(function(response) {
+ if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
+ routerHistory.push('/messages');
+ }
+ handleComposeSubmit(dispatch, getState, response, status);
+ }).catch(function(error) {
+ dispatch(submitComposeFail(error));
+ });
+ }
+
const status = getState().getIn(['compose', 'text'], '');
const media = getState().getIn(['compose', 'media_attachments']);
@@ -171,31 +199,13 @@ export function submitCompose(routerHistory, group) {
return;
}
- dispatch(submitComposeRequest());
- dispatch(closeModal());
+ const missingDescriptionModal = getSettings(getState()).get('missingDescriptionModal');
- api(getState).post('/api/v1/statuses', {
- status,
- in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
- media_ids: media.map(item => item.get('id')),
- sensitive: getState().getIn(['compose', 'sensitive']),
- spoiler_text: getState().getIn(['compose', 'spoiler_text'], ''),
- visibility: getState().getIn(['compose', 'privacy']),
- content_type: getState().getIn(['compose', 'content_type']),
- poll: getState().getIn(['compose', 'poll'], null),
- scheduled_at: getState().getIn(['compose', 'schedule'], null),
- }, {
- headers: {
- 'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
- },
- }).then(function(response) {
- if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
- routerHistory.push('/messages');
- }
- handleComposeSubmit(dispatch, getState, response, status);
- }).catch(function(error) {
- dispatch(submitComposeFail(error));
- });
+ if (missingDescriptionModal && media.filter(item => !item.get('description')).size) {
+ dispatch(openModal('MISSING_DESCRIPTION', {
+ onContinue: () => onModalSubmitCompose(),
+ }));
+ } else onModalSubmitCompose();
};
};
diff --git a/app/soapbox/actions/settings.js b/app/soapbox/actions/settings.js
index d3d572715..d857fd1e9 100644
--- a/app/soapbox/actions/settings.js
+++ b/app/soapbox/actions/settings.js
@@ -21,6 +21,7 @@ export const defaultSettings = ImmutableMap({
unfollowModal: false,
boostModal: false,
deleteModal: true,
+ missingDescriptionModal: false,
defaultPrivacy: 'public',
defaultContentType: 'text/plain',
themeMode: 'light',
diff --git a/app/soapbox/features/compose/components/schedule_form.js b/app/soapbox/features/compose/components/schedule_form.js
index 56fed1780..ad444ec95 100644
--- a/app/soapbox/features/compose/components/schedule_form.js
+++ b/app/soapbox/features/compose/components/schedule_form.js
@@ -20,41 +20,34 @@ class ScheduleForm extends React.Component {
active: PropTypes.bool,
};
- setSchedule(date)
- {
+ setSchedule(date) {
this.setState({ schedule: date });
this.props.onSchedule(date);
}
- openDatePicker(datePicker)
- {
- if (!datePicker)
- {
+ openDatePicker(datePicker) {
+ if (!datePicker) {
return;
}
datePicker.setOpen(true);
}
- componentDidMount()
- {
+ componentDidMount() {
this.setState({ schedule: this.props.schedule });
}
- constructor(props)
- {
+ constructor(props) {
super(props);
this.setSchedule = this.setSchedule.bind(this);
}
- isCurrentOrFutureDate(date)
- {
+ isCurrentOrFutureDate(date) {
return date && new Date().setHours(0, 0, 0, 0) <= new Date(date).setHours(0, 0, 0, 0);
}
- isFiveMinutesFromNow(time)
- {
+ isFiveMinutesFromNow(time) {
const fiveMinutesFromNow = new Date(new Date().getTime() + 300000); // now, plus five minutes (Pleroma won't schedule posts )
const selectedDate = new Date(time);
@@ -62,8 +55,7 @@ class ScheduleForm extends React.Component {
};
render() {
- if (!this.props.active || !this.state)
- {
+ if (!this.props.active || !this.state) {
return null;
}
diff --git a/app/soapbox/features/preferences/index.js b/app/soapbox/features/preferences/index.js
index dd1072c49..7d188afc6 100644
--- a/app/soapbox/features/preferences/index.js
+++ b/app/soapbox/features/preferences/index.js
@@ -202,6 +202,10 @@ class Preferences extends ImmutablePureComponent {
label={}
path={['deleteModal']}
/>
+ }
+ path={['missingDescriptionModal']}
+ />
diff --git a/app/soapbox/features/ui/components/missing_description_modal.js b/app/soapbox/features/ui/components/missing_description_modal.js
new file mode 100644
index 000000000..0cbdad660
--- /dev/null
+++ b/app/soapbox/features/ui/components/missing_description_modal.js
@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { injectIntl, FormattedMessage } from 'react-intl';
+import Button from '../../../components/button';
+
+export default @injectIntl
+class MissingDescriptionModal extends React.PureComponent {
+
+ static propTypes = {
+ onClose: PropTypes.func,
+ onContinue: PropTypes.func.isRequired,
+ intl: PropTypes.object.isRequired,
+ };
+
+ componentDidMount() {
+ this.button.focus();
+ }
+
+ handleContinue = () => {
+ this.props.onClose();
+ this.props.onContinue();
+ }
+
+ handleCancel = () => {
+ this.props.onClose();
+ }
+
+ setRef = (c) => {
+ this.button = c;
+ }
+
+ render() {
+ return (
+
+
+
+
+
+
+
+
+
+