bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update compose.js to decouple spoiler from marking media as NSFW

Browse source
This commit is contained in:
Curtis 2020-07-02 18:32:42 +00:00
parent e965c74760
commit 53d70a98bf
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/soapbox/reducers/compose.js
View file

@ -114,7 +114,7 @@ function appendMedia(state, media) {
map.set('resetFileKey', Math.floor((Math.random() * 0x10000)));
map.set('idempotencyKey', uuid());
if (prevSize === 0 && (state.get('default_sensitive') || state.get('spoiler'))) {
if (prevSize === 0 && state.get('default_sensitive')) {
map.set('sensitive', true);
}
});
@ -211,9 +211,7 @@ export default function compose(state = initialState, action) {
.set('is_composing', false);
case COMPOSE_SENSITIVITY_CHANGE:
return state.withMutations(map => {
if (!state.get('spoiler')) {
map.set('sensitive', !state.get('sensitive'));
}
map.set('sensitive', !state.get('sensitive'));
map.set('idempotencyKey', uuid());
});
@ -222,10 +220,6 @@ export default function compose(state = initialState, action) {
map.set('spoiler_text', '');
map.set('spoiler', !state.get('spoiler'));
map.set('idempotencyKey', uuid());
if (!state.get('sensitive') && state.get('media_attachments').size >= 1) {
map.set('sensitive', true);
}
});
case COMPOSE_SPOILER_TEXT_CHANGE:
return state