aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-12-01 19:56:37 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2017-12-01 19:56:37 +0100
commit3ccbcf51c30c330fdf1a9ef08e79cafdbca8fae6 (patch)
tree26fc32df8f4eddf26c7bdc185b91bbd458adddf1 /src
parentfeat(App): Add option to show/hide notification badges for muted services (@m... (diff)
downloadferdium-app-3ccbcf51c30c330fdf1a9ef08e79cafdbca8fae6.tar.gz
ferdium-app-3ccbcf51c30c330fdf1a9ef08e79cafdbca8fae6.tar.zst
ferdium-app-3ccbcf51c30c330fdf1a9ef08e79cafdbca8fae6.zip
fix missing filter for indirectMessageBadge
Diffstat (limited to 'src')
-rw-r--r--src/stores/ServicesStore.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index e79677400..b04aafd78 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -491,15 +491,13 @@ export default class ServicesStore extends Store {
491 const showMessageBadgeWhenMuted = this.stores.settings.all.showMessageBadgeWhenMuted; 491 const showMessageBadgeWhenMuted = this.stores.settings.all.showMessageBadgeWhenMuted;
492 const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted; 492 const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
493 493
494 // TODO: unfinished monkey business
495
496 const unreadDirectMessageCount = this.enabled 494 const unreadDirectMessageCount = this.enabled
497 .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted) 495 .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted)
498 .map(s => s.unreadDirectMessageCount) 496 .map(s => s.unreadDirectMessageCount)
499 .reduce((a, b) => a + b, 0); 497 .reduce((a, b) => a + b, 0);
500 498
501 const unreadIndirectMessageCount = this.enabled 499 const unreadIndirectMessageCount = this.enabled
502 // .filter(s => s.isIndirectMessageBadgeEnabled && (s.isNotificationEnabled && showMessageBadgeWhenMuted)) 500 .filter(s => (showMessageBadgeWhenMuted || s.isIndirectMessageBadgeEnabled) && showMessageBadgesEvenWhenMuted)
503 .map(s => s.unreadIndirectMessageCount) 501 .map(s => s.unreadIndirectMessageCount)
504 .reduce((a, b) => a + b, 0); 502 .reduce((a, b) => a + b, 0);
505 503