nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor privacyPrefence() to use priority list (#7945)

This commit is contained in:
Maciek Baron 2018-07-04 16:35:35 +01:00 committed by Eugen Rochko
parent 0bfa0f2374
commit f2d9a3c239
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/javascript/mastodon/reducers/compose.js
View File

@ -151,15 +151,8 @@ const insertEmoji = (state, position, emojiData, needsSpace) => {
}; };
const privacyPreference = (a, b) => { const privacyPreference = (a, b) => {
if (a === 'direct' || b === 'direct') { const order = ['public', 'unlisted', 'private', 'direct'];
return 'direct'; return order[Math.max(order.indexOf(a), order.indexOf(b), 0)];
} else if (a === 'private' || b === 'private') {
return 'private';
} else if (a === 'unlisted' || b === 'unlisted') {
return 'unlisted';
} else {
return 'public';
}
}; };
const hydrate = (state, hydratedState) => { const hydrate = (state, hydratedState) => {