treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

[Glitch] When sending a toot, ensure a CW is only set if the CW field is visible 

Partial port of fa7866c9c8 to glitch-soc

It doesn't ensure the field isn't changed, just that it isn't submitted if
the field isn't visible. Ensuring the field isn't changed would require
reworking the “always show CW field” feature.
lolsob-rspec
Thibaut Girka 2019-06-30 11:09:54 +02:00
parent c49a57e989
commit 6b21ce2daa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/flavours/glitch/actions/compose.js
View File

@ -138,7 +138,8 @@ export function submitCompose(routerHistory) {
return function (dispatch, getState) { return function (dispatch, getState) {
let status = getState().getIn(['compose', 'text'], ''); let status = getState().getIn(['compose', 'text'], '');
let media = getState().getIn(['compose', 'media_attachments']); let media = getState().getIn(['compose', 'media_attachments']);
let spoilerText = getState().getIn(['compose', 'spoiler_text'], ''); const spoilers = getState().getIn(['compose', 'spoiler']) || getState().getIn(['local_settings', 'always_show_spoilers_field']);
let spoilerText = spoilers ? getState().getIn(['compose', 'spoiler_text'], '') : '';
if ((!status || !status.length) && media.size === 0) { if ((!status || !status.length) && media.size === 0) {
return; return;