From daf039d9bb098bb522007c96ba62db2b3ebc4b63 Mon Sep 17 00:00:00 2001 From: Mary Kate Date: Tue, 28 Jul 2020 13:24:31 -0500 Subject: [PATCH] generalize markdown to content_type --- app/soapbox/actions/compose.js | 9 +++++---- .../features/compose/components/compose_form.js | 2 +- .../compose/containers/compose_form_container.js | 2 +- .../containers/markdown_button_container.js | 6 +++--- app/soapbox/reducers/compose.js | 14 +++++++------- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js index 26d63a635..93e923c54 100644 --- a/app/soapbox/actions/compose.js +++ b/app/soapbox/actions/compose.js @@ -43,7 +43,7 @@ export const COMPOSE_UNMOUNT = 'COMPOSE_UNMOUNT'; export const COMPOSE_SENSITIVITY_CHANGE = 'COMPOSE_SENSITIVITY_CHANGE'; export const COMPOSE_SPOILERNESS_CHANGE = 'COMPOSE_SPOILERNESS_CHANGE'; -export const COMPOSE_MARKDOWN_CHANGE = 'COMPOSE_MARKDOWN_CHANGE'; +export const COMPOSE_TYPE_CHANGE = 'COMPOSE_TYPE_CHANGE'; export const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE'; export const COMPOSE_VISIBILITY_CHANGE = 'COMPOSE_VISIBILITY_CHANGE'; export const COMPOSE_LISTABILITY_CHANGE = 'COMPOSE_LISTABILITY_CHANGE'; @@ -176,7 +176,7 @@ export function submitCompose(routerHistory, group) { sensitive: getState().getIn(['compose', 'sensitive']), spoiler_text: getState().getIn(['compose', 'spoiler_text'], ''), visibility: getState().getIn(['compose', 'privacy']), - content_type: getState().getIn(['compose', 'markdown']) === true ? 'text/markdown' : 'text/plain', + content_type: getState().getIn(['compose', 'content_type']), poll: getState().getIn(['compose', 'poll'], null), group_id: group ? group.get('id') : null, }, { @@ -497,9 +497,10 @@ export function changeComposeSpoilerness() { }; }; -export function changeComposeMarkdown() { +export function changeComposeMarkdown(value) { return { - type: COMPOSE_MARKDOWN_CHANGE, + type: COMPOSE_TYPE_CHANGE, + value, }; }; diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js index 3ef832bbe..dde769ac5 100644 --- a/app/soapbox/features/compose/components/compose_form.js +++ b/app/soapbox/features/compose/components/compose_form.js @@ -49,7 +49,7 @@ class ComposeForm extends ImmutablePureComponent { text: PropTypes.string.isRequired, suggestions: ImmutablePropTypes.list, spoiler: PropTypes.bool, - markdown: PropTypes.bool, + content_type: PropTypes.string, privacy: PropTypes.string, spoilerText: PropTypes.string, focusDate: PropTypes.instanceOf(Date), diff --git a/app/soapbox/features/compose/containers/compose_form_container.js b/app/soapbox/features/compose/containers/compose_form_container.js index 957c8d773..99189385d 100644 --- a/app/soapbox/features/compose/containers/compose_form_container.js +++ b/app/soapbox/features/compose/containers/compose_form_container.js @@ -16,7 +16,7 @@ const mapStateToProps = state => ({ suggestions: state.getIn(['compose', 'suggestions']), spoiler: state.getIn(['compose', 'spoiler']), spoilerText: state.getIn(['compose', 'spoiler_text']), - markdown: state.getIn(['compose', 'markdown']), + content_type: state.getIn(['compose', 'text/markdown']), privacy: state.getIn(['compose', 'privacy']), focusDate: state.getIn(['compose', 'focusDate']), caretPosition: state.getIn(['compose', 'caretPosition']), diff --git a/app/soapbox/features/compose/containers/markdown_button_container.js b/app/soapbox/features/compose/containers/markdown_button_container.js index fc3ae9435..1fd809966 100644 --- a/app/soapbox/features/compose/containers/markdown_button_container.js +++ b/app/soapbox/features/compose/containers/markdown_button_container.js @@ -10,15 +10,15 @@ const messages = defineMessages({ const mapStateToProps = (state, { intl }) => ({ label: 'MD', - title: intl.formatMessage(state.getIn(['compose', 'markdown']) ? messages.marked : messages.unmarked), - active: state.getIn(['compose', 'markdown']), + title: intl.formatMessage(state.getIn(['compose', 'content_type']) === 'text/markdown' ? messages.marked : messages.unmarked), + active: state.getIn(['compose', 'content_type']) === 'text/markdown', ariaControls: 'markdown-input', }); const mapDispatchToProps = dispatch => ({ onClick() { - dispatch(changeComposeMarkdown()); + dispatch(changeComposeMarkdown(this.active ? 'text/plain' : 'text/markdown')); }, }); diff --git a/app/soapbox/reducers/compose.js b/app/soapbox/reducers/compose.js index b789139fb..c8294edec 100644 --- a/app/soapbox/reducers/compose.js +++ b/app/soapbox/reducers/compose.js @@ -21,7 +21,7 @@ import { COMPOSE_TAG_HISTORY_UPDATE, COMPOSE_SENSITIVITY_CHANGE, COMPOSE_SPOILERNESS_CHANGE, - COMPOSE_MARKDOWN_CHANGE, + COMPOSE_TYPE_CHANGE, COMPOSE_SPOILER_TEXT_CHANGE, COMPOSE_VISIBILITY_CHANGE, COMPOSE_COMPOSING_CHANGE, @@ -51,7 +51,7 @@ const initialState = ImmutableMap({ sensitive: false, spoiler: false, spoiler_text: '', - markdown: true, + content_type: 'text/markdown', privacy: null, text: '', focusDate: null, @@ -96,7 +96,7 @@ function clearAll(state) { map.set('text', ''); map.set('spoiler', false); map.set('spoiler_text', ''); - map.set('markdown', true); + map.set('content_type', 'text/markdown'); map.set('is_submitting', false); map.set('is_changing_upload', false); map.set('in_reply_to', null); @@ -218,9 +218,9 @@ export default function compose(state = initialState, action) { map.set('idempotencyKey', uuid()); }); - case COMPOSE_MARKDOWN_CHANGE: + case COMPOSE_TYPE_CHANGE: return state.withMutations(map => { - map.set('markdown', !state.get('markdown')); + map.set('content_type', action.value); map.set('idempotencyKey', uuid()); }); case COMPOSE_SPOILERNESS_CHANGE: @@ -251,7 +251,7 @@ export default function compose(state = initialState, action) { map.set('focusDate', new Date()); map.set('caretPosition', null); map.set('idempotencyKey', uuid()); - map.set('markdown', true); + map.set('content_type', 'text/markdown'); if (action.status.get('spoiler_text', '').length > 0) { map.set('spoiler', true); @@ -335,7 +335,7 @@ export default function compose(state = initialState, action) { map.set('focusDate', new Date()); map.set('caretPosition', null); map.set('idempotencyKey', uuid()); - map.set('markdown', true); + map.set('content_type', 'text/markdown'); if (action.status.get('spoiler_text').length > 0) { map.set('spoiler', true);