From 366540889cd11dde19fc28e01534578c4b56f5e7 Mon Sep 17 00:00:00 2001
From: Simon Grim <scary@tasty.sexy>
Date: Fri, 14 Jul 2017 03:44:40 +0500
Subject: [PATCH] add check if there's no new mentions or DMs in related
 reset-save functions

---
 js/twister_newmsgs.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/js/twister_newmsgs.js b/js/twister_newmsgs.js
index dc147ff..6c03c72 100644
--- a/js/twister_newmsgs.js
+++ b/js/twister_newmsgs.js
@@ -128,6 +128,9 @@ function queryPendingPushMentions(req, res) {
 }
 
 function resetMentionsCount() {
+    if (!twister.mentions.lengthNew)
+        return;
+
     twister.mentions.lengthNew = 0;
 
     for (var j in twister.mentions.twists.cached)
@@ -420,30 +423,47 @@ function getNewGroupDMsCount() {
 }
 
 function resetNewDMsCount() {
+    var isNewDetected;
+
     for (var peerAlias in twister.DMs)
-        if (peerAlias[0] !== '*') {
+        if (twister.DMs[peerAlias].lengthNew && peerAlias[0] !== '*') {
             twister.DMs[peerAlias].lengthNew = 0;
             for (var j in twister.DMs[peerAlias].twists.cached)
                 delete twister.DMs[peerAlias].twists.cached[j].isNew;
+
+            isNewDetected = true;
         }
 
+    if (!isNewDetected)
+        return;
+
     saveDMsToStorage();
     $.MAL.updateNewDMsUI(getNewDMsCount());
 }
 
 function resetNewDMsCountGroup() {
+    var isNewDetected;
+
     for (var peerAlias in twister.DMs)
-        if (peerAlias[0] === '*') {
+        if (twister.DMs[peerAlias].lengthNew && peerAlias[0] === '*') {
             twister.DMs[peerAlias].lengthNew = 0;
             for (var j in twister.DMs[peerAlias].twists.cached)
                 delete twister.DMs[peerAlias].twists.cached[j].isNew;
+
+            isNewDetected = true;
         }
 
+    if (!isNewDetected)
+        return;
+
     saveDMsToStorage();
     $.MAL.updateNewGroupDMsUI(getNewGroupDMsCount());
 }
 
 function resetNewDMsCountForPeer(peerAlias) {
+    if (!twister.DMs[peerAlias].lengthNew)
+        return;
+
     twister.DMs[peerAlias].lengthNew = 0;
     for (var j in twister.DMs[peerAlias].twists.cached)
         delete twister.DMs[peerAlias].twists.cached[j].isNew;