From f2d9a3c239bcab5fcbede22549b67bfd841a3880 Mon Sep 17 00:00:00 2001
From: Maciek Baron <thebezet@gmail.com>
Date: Wed, 4 Jul 2018 16:35:35 +0100
Subject: [PATCH] Refactor privacyPrefence() to use priority list (#7945)
---
app/javascript/mastodon/reducers/compose.js | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 8524ddb8e..552f659c9 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -151,15 +151,8 @@ const insertEmoji = (state, position, emojiData, needsSpace) => {
};
const privacyPreference = (a, b) => {
- if (a === 'direct' || b === 'direct') {
- return 'direct';
- } else if (a === 'private' || b === 'private') {
- return 'private';
- } else if (a === 'unlisted' || b === 'unlisted') {
- return 'unlisted';
- } else {
- return 'public';
- }
+ const order = ['public', 'unlisted', 'private', 'direct'];
+ return order[Math.max(order.indexOf(a), order.indexOf(b), 0)];
};
const hydrate = (state, hydratedState) => {