diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-12-15 14:41:33 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-12-15 14:41:33 +0100 |
| commit | 3b58c249a81e8c64f9eb2b7a916d80432c1fe00a (patch) | |
| tree | 6b7fa7bd308557e433e3cc3aa8e150971591d7df /src/stores | |
| parent | Merge pull request #467 from meetfranz/feature/bugfixing (diff) | |
| parent | Add missing commit (diff) | |
| download | ferdium-app-3b58c249a81e8c64f9eb2b7a916d80432c1fe00a.tar.gz ferdium-app-3b58c249a81e8c64f9eb2b7a916d80432c1fe00a.tar.zst ferdium-app-3b58c249a81e8c64f9eb2b7a916d80432c1fe00a.zip | |
Merge pull request #469 from meetfranz/feature/hide-badge
[PR] Add option to completely hide a service badge
Diffstat (limited to 'src/stores')
| -rw-r--r-- | src/stores/ServicesStore.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 113df6d55..66f37af26 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
| @@ -491,13 +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 | const unreadDirectMessageCount = this.enabled | 494 | const unreadDirectMessageCount = this.allDisplayed |
| 495 | .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted) | 495 | .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled) |
| 496 | .map(s => s.unreadDirectMessageCount) | 496 | .map(s => s.unreadDirectMessageCount) |
| 497 | .reduce((a, b) => a + b, 0); | 497 | .reduce((a, b) => a + b, 0); |
| 498 | 498 | ||
| 499 | const unreadIndirectMessageCount = this.enabled | 499 | const unreadIndirectMessageCount = this.allDisplayed |
| 500 | .filter(s => (showMessageBadgeWhenMuted || s.isIndirectMessageBadgeEnabled) && showMessageBadgesEvenWhenMuted) | 500 | .filter(s => (showMessageBadgeWhenMuted || s.isIndirectMessageBadgeEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled) |
| 501 | .map(s => s.unreadIndirectMessageCount) | 501 | .map(s => s.unreadIndirectMessageCount) |
| 502 | .reduce((a, b) => a + b, 0); | 502 | .reduce((a, b) => a + b, 0); |
| 503 | 503 | ||