tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #614 - extra reply-boolean on statuses to account for cases when replied-to

Browse Source 
status is not in the system at time of distribution; fix #607 - reset privacy
settings to defaults when cancelling replies
This commit is contained in:
Eugen Rochko
2017-02-09 20:25:39 +01:00
parent c424df5192
commit 6331ed16e5
11 changed files with 32 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/components/reducers/compose.jsx
View File

@ -81,11 +81,16 @@ function appendMedia(state, media) {
};
function removeMedia(state, mediaId) {
const media = state.get('media_attachments').find(item => item.get('id') === mediaId);
const media = state.get('media_attachments').find(item => item.get('id') === mediaId);
const prevSize = state.get('media_attachments').size;
return state.withMutations(map => {
map.update('media_attachments', list => list.filterNot(item => item.get('id') === mediaId));
map.update('text', text => text.replace(media.get('text_url'), '').trim());
if (prevSize === 1) {
map.update('sensitive', false);
}
});
};
@ -126,6 +131,8 @@ export default function compose(state = initialState, action) {
return state.withMutations(map => {
map.set('in_reply_to', null);
map.set('text', '');
map.set('unlisted', state.get('default_privacy') === 'unlisted');
map.set('private', state.get('default_privacy') === 'private');
});
case COMPOSE_SUBMIT_REQUEST:
return state.set('is_submitting', true);