Unread counts

Update unreadCounts per-conversation on incoming messages. Render unread
conversations with font-weigh: bold in the inbox view.

To ensure that the inbox and conversation views remain in sync, the
background page now ensures that the same models objects are used for
both views.

js/background.js

@@ -194,6 +194,9 @@
                     }
                 }
                 attributes.active_at = now;
+                if (type === 'incoming') {
+                    attributes.unreadCount = conversation.get('unreadCount') + 1;
+                }
                 conversation.set(attributes);
 
                 message.set({

js/inbox_controller.js

@@ -29,9 +29,10 @@
         }
     });
 
+    inbox.on('change:active_at', inbox.sort);
+
     function fetch() {
         window.inbox.fetch({
-            reset: true,
             index: {
                 name: 'inbox', // 'inbox' index on active_at
                 order: 'desc'  // ORDER timestamp DESC

js/models/conversations.js

@@ -139,6 +139,12 @@
         return new Promise(function (resolve) { m.save().then(resolve(m)); });
     },
 
+    markRead: function() {
+        if (this.get('unreadCount') > 0) {
+            this.save({unreadCount: 0});
+        }
+    },
+
     fetchMessages: function(options) {
         return this.messageCollection.fetchConversation(this.id, options);
     },

js/panel_controller.js

@@ -42,7 +42,8 @@
     }
 
     window.openConversation = function openConversation (modelId) {
-        var conversation = conversations.add({id: modelId});
+        var conversation = window.inbox.get(modelId) || {id: modelId};
+        conversation = conversations.add(conversation);
         conversation.fetch().then(function() {
             conversation.fetchContacts();
         });

js/views/conversation_list_item_view.js

@@ -47,6 +47,13 @@
 
             twemoji.parse(this.el, { base: '/components/twemoji/', size: 16 });
 
+            var unread = this.model.get('unreadCount');
+            if (unread > 0) {
+                this.$el.addClass('unread');
+            } else {
+                this.$el.removeClass('unread');
+            }
+
             if (this.model.get('avatar')) {
                 this.$el.find('.avatar').append(
                     new Whisper.AttachmentView({model: this.model.get('avatar')}).render().el

js/views/conversation_view.js

@@ -56,10 +56,19 @@
             'click .new-group-update': 'newGroupUpdate',
             'click .verify-identity': 'verifyIdentity',
             'click .hamburger': 'toggleMenu',
-            'click' : 'closeMenu',
+            'click' : 'onClick',
             'select .entry': 'messageDetail'
         },
 
+        onClick: function(e) {
+            this.closeMenu(e);
+            this.markRead(e);
+        },
+
+        markRead: function(e) {
+            this.model.markRead();
+        },
+
         verifyIdentity: function() {
             if (this.model.isPrivate()) {
                 var number = this.model.id;

js/views/inbox_view.js

@@ -69,6 +69,8 @@
                 collection : bg.inbox
             }).render();
 
+            this.inbox.listenTo(bg.inbox, 'sort', this.inbox.render);
+
             new SocketView().render().$el.appendTo(this.$el.find('.socket-status'));
 
             window.addEventListener('beforeunload', function () {

stylesheets/_index.scss

@@ -233,3 +233,11 @@ input.new-message {
     display: block;
   }
 }
+
+.conversations .unread .contact-details {
+    .contact-name,
+    .last-message,
+    .last-timestamp {
+      font-weight: bold;
+    }
+}

stylesheets/manifest.css

@@ -300,6 +300,11 @@ input.new-message {
   .settings-open .settings {
     display: block; }
 
+.conversations .unread .contact-details .contact-name,
+.conversations .unread .contact-details .last-message,
+.conversations .unread .contact-details .last-timestamp {
+  font-weight: bold; }
+
 .conversation {
   padding: 36px 0; }