From 2e619d3fb89851b70ebd1ef17e7ac93fe8303555 Mon Sep 17 00:00:00 2001
From: or-else <or.else@gmail.com>
Date: Wed, 16 May 2018 10:17:00 -0700
Subject: [PATCH] show unread threads in title, bug fix

---
 img/logo32x32a.png | Bin 1658 -> 1811 bytes
 index.html         |  27 ++++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/img/logo32x32a.png b/img/logo32x32a.png
index cf5e329f6cfbc860e1dd110111a70c1ca2297072..1bacf143a0e0613baa6142af8c4472a4199ac8f6 100644
GIT binary patch
delta 1722
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
QG5`Po07*qoM6N<$f=TH;1poj5

delta 1568
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
S2$He@0000<MNUMnLSTY~qyabp

diff --git a/index.html b/index.html
index 2761ad07..d75aefd1 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Tinode example: chat web application in react.js</title>
+    <title>Tinode</title>
     <link rel="manifest" href="manifest.json">
     <link id="shortcut-icon" rel="shortcut icon" href="img/logo32x32.png" />
     <link rel="apple-touch-icon" sizes="192x192" href="img/logo192.png" type="image/png" />
@@ -231,8 +231,8 @@
       reader.readAsDataURL(file);
     }
 
-    // Make shortcut icon appear with a green dot.
-    function updateFavicon(on) {
+    // Make shortcut icon appear with a green dot + show unread count in title.
+    function updateFavicon(count) {
       var oldIcon = document.getElementById("shortcut-icon");
       if (oldIcon) {
         var head = document.head || document.getElementsByTagName('head')[0];
@@ -240,10 +240,11 @@
         newIcon.type = "image/png";
         newIcon.id = "shortcut-icon";
         newIcon.rel = "shortcut icon";
-        newIcon.href = "img/logo32x32" + (on ? 'a' : '') + ".png";
+        newIcon.href = "img/logo32x32" + (count > 0 ? 'a' : '') + ".png";
         head.removeChild(oldIcon);
         head.appendChild(newIcon);
       }
+      document.title = (count > 0 ? '('+count+') ' : '') + "Tinode";
     }
 
     // Get 32 bit integer hash value for a string. Ideally it should produce the same value
@@ -1957,13 +1958,13 @@
       prepareContactList: function() {
         var instance = this;
         var contacts = [];
-        var totalUnread = 0;
+        var unreadThreads = 0;
         Tinode.getMeTopic().contacts(function(c) {
           // Force to integers;
           c.seq = ~~c.seq;
           c.read = ~~c.read;
           c.unread = c.seq - c.read;
-          totalUnread += c.unread;
+          unreadThreads += c.unread > 0 ? 1 : 0;
           contacts.push(c);
           if (instance.props.topicSelected == c.topic) {
             instance.props.onOnlineChange(c.online);
@@ -1973,7 +1974,7 @@
         contacts.sort(function(a,b){
           return b.touched - a.touched;
         });
-        updateFavicon(totalUnread > 0);
+        updateFavicon(unreadThreads);
         return contacts;
       },
 
@@ -2776,12 +2777,11 @@
       },
 
       handleShowAddMembers: function() {
-        // this.props.onAddMember(this.props.topic);
+        this.props.onInitFind();
         this.setState({showMemberPanel: true});
       },
 
       handleHideAddMembers: function() {
-        // this.props.onAddMember(this.props.topic);
         this.setState({showMemberPanel: false});
       },
 
@@ -3308,6 +3308,7 @@
         }
       },
 
+      // Get older messages
       fetchMoreMessages: function(event) {
         var instance = this;
         if (event.target.scrollTop <= 0) {
@@ -3316,7 +3317,7 @@
           this.setState(function(prevState, props) {
             if (!prevState.fetchingMessages) {
               var topic = Tinode.getTopic(instance.state.topic);
-              if (topic && topic.isSubscribed() && topic.msgHasMore()) {
+              if (topic && topic.isSubscribed() && topic.msgHasMoreMessages()) {
                 newState.fetchingMessages = true;
                 topic.getMessagesPage(MESSAGES_PAGE).then(function() {
                   instance.setState({fetchingMessages: false});
@@ -4050,13 +4051,13 @@
       /* Fnd topic: find contacts by tokens */
       tnInitFind: function() {
         var fnd = Tinode.getFndTopic();
-        fnd.onSubsUpdated = this.tnFndSubsUpdated;
-        fnd.onMetaDesc = this.tnFndMetaDesc;
-        var instance = this;
         if (fnd.isSubscribed()) {
           this.setState({contactsSearchQuery: fnd.private ? fnd.private.toString() : ''});
           this.tnFndSubsUpdated();
         } else {
+          fnd.onSubsUpdated = this.tnFndSubsUpdated;
+          fnd.onMetaDesc = this.tnFndMetaDesc;
+          var instance = this;
           fnd.subscribe(fnd.startMetaQuery().withSub().withLaterDesc().withTags().build()).catch(function(err){
             instance.handleError(err.message, "err");
           });