From a7a51a34b48ec4315724093e8d184c109a8ba8b4 Mon Sep 17 00:00:00 2001
From: supertiger1234 <saawalkhn@googlemail.com>
Date: Wed, 6 Nov 2019 10:36:15 +0000
Subject: [PATCH] fixed a bug where notifications wouldnt show.

---
 src/components/app/FriendsList.vue |  6 +-----
 src/components/app/Navigation.vue  | 12 ++----------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/components/app/FriendsList.vue b/src/components/app/FriendsList.vue
index 8f3749e..3bfbd50 100644
--- a/src/components/app/FriendsList.vue
+++ b/src/components/app/FriendsList.vue
@@ -66,11 +66,7 @@ export default {
       const notifications = this.$store.getters.notifications;
       const channels = this.$store.getters.channels;
       const notification = notifications.find(e => {
-        return (
-          channels[e.channelID] &&
-          !channels[e.channelID].server_id &&
-          e.channelID !== this.$store.getters.selectedChannelID
-        );
+        return channels[e.channelID] && !channels[e.channelID].server_id;
       });
       // unopened dm
       if (!notification) {
diff --git a/src/components/app/Navigation.vue b/src/components/app/Navigation.vue
index 3532be3..94b6de5 100644
--- a/src/components/app/Navigation.vue
+++ b/src/components/app/Navigation.vue
@@ -214,11 +214,7 @@ export default {
       const notifications = this.$store.getters.notifications;
       const channels = this.$store.getters.channels;
       const notification = notifications.find(e => {
-        return (
-          channels[e.channelID] &&
-          channels[e.channelID].server_id &&
-          e.channelID !== this.$store.getters.selectedChannelID
-        );
+        return channels[e.channelID] && channels[e.channelID].server_id;
       });
       return notification;
     },
@@ -226,11 +222,7 @@ export default {
       const notifications = this.$store.getters.notifications;
       const channels = this.$store.getters.channels;
       const notification = notifications.find(e => {
-        return (
-          channels[e.channelID] &&
-          !channels[e.channelID].server_id &&
-          e.channelID !== this.$store.getters.selectedChannelID
-        );
+        return channels[e.channelID] && !channels[e.channelID].server_id;
       });
       // unopened dm
       if (!notification) {