more progress towards live unread and new counts, unread message implemented, still to implement delete messages

SamSaffron · SamSaffron · commit e93b7a3b2050 · 2013-05-30T16:49:57.000+10:00
diff --git a/app/assets/javascripts/discourse/controllers/list_controller.js b/app/assets/javascripts/discourse/controllers/list_controller.js
@@ -35,7 +35,7 @@ Discourse.ListController = Discourse.Controller.extend({
     var listController = this;
     this.set('loading', true);
 
-    var trackingState = Discourse.get('currentUser.userTrackingState');
+    var trackingState = Discourse.TopicTrackingState.current();
 
     if (filterMode === 'categories') {
       return Discourse.CategoryList.list(filterMode).then(function(items) {
diff --git a/app/assets/javascripts/discourse/controllers/list_topics_controller.js b/app/assets/javascripts/discourse/controllers/list_topics_controller.js
@@ -55,7 +55,7 @@ Discourse.ListTopicsController = Discourse.ObjectController.extend({
 
   // Show newly inserted topics
   showInserted: function(e) {
-    var tracker = Discourse.get('currentUser.userTrackingState');
+    var tracker = Discourse.TopicTrackingState.current();
 
     // Move inserted into topics
     this.get('content').loadBefore(tracker.get('newIncoming'));
diff --git a/app/assets/javascripts/discourse/models/nav_item.js b/app/assets/javascripts/discourse/models/nav_item.js
@@ -10,7 +10,10 @@ var validNavNames = ['latest', 'hot', 'categories', 'category', 'favorited', 'un
 var validAnon     = ['latest', 'hot', 'categories', 'category'];
 
 Discourse.NavItem = Discourse.Model.extend({
-  userTrackingStateBinding: Ember.Binding.oneWay('Discourse.currentUser.userTrackingState.messageCount'),
+  topicTrackingState: function(){
+    return Discourse.TopicTrackingState.current();
+  }.property(),
+
   categoryName: function() {
     var split = this.get('name').split('/');
     return split[0] === 'category' ? split[1] : null;
@@ -25,11 +28,11 @@ Discourse.NavItem = Discourse.Model.extend({
   }.property('name'),
 
   count: function() {
-    var state = Discourse.get('currentUser.userTrackingState');
+    var state = this.get('topicTrackingState');
     if (state) {
       return state.lookupCount(this.get('name'));
     }
-  }.property('userTrackingState')
+  }.property('topicTrackingState.messageCount')
 });
 
 Discourse.NavItem.reopenClass({
diff --git a/app/assets/javascripts/discourse/models/topic_tracking_state.js b/app/assets/javascripts/discourse/models/topic_tracking_state.js
@@ -1,4 +1,4 @@
-Discourse.UserTrackingState = Discourse.Model.extend({
+Discourse.TopicTrackingState = Discourse.Model.extend({
   messageCount: 0,
 
   init: function(){
@@ -17,7 +17,7 @@ Discourse.UserTrackingState = Discourse.Model.extend({
         tracker.removeTopic(data.topic_id);
       }
 
-      if (data.message_type === "new_topic") {
+      if (data.message_type === "new_topic" || data.message_type === "unread") {
         tracker.states["t" + data.topic_id] = data.payload;
         tracker.notify(data);
       }
@@ -26,7 +26,10 @@ Discourse.UserTrackingState = Discourse.Model.extend({
     };
 
     Discourse.MessageBus.subscribe("/new", process);
-    Discourse.MessageBus.subscribe("/unread/" + Discourse.currentUser.id, process);
+    var currentUser = Discourse.User.current();
+    if(currentUser) {
+      Discourse.MessageBus.subscribe("/unread/" + currentUser.id, process);
+    }
   },
 
   notify: function(data){
@@ -62,6 +65,8 @@ Discourse.UserTrackingState = Discourse.Model.extend({
   sync: function(list, filter){
     var tracker = this;
 
+    if(!list || !list.topics || !list.topics.length) { return; }
+
     if(filter === "new" && !list.more_topics_url){
       // scrub all new rows and reload from list
       $.each(this.states, function(){
@@ -88,15 +93,19 @@ Discourse.UserTrackingState = Discourse.Model.extend({
       if(topic.unseen) {
         row.last_read_post_number = null;
       } else {
-        row.last_read_post_number = topic.last_read_post_number;
+        // subtle issue here
+        row.last_read_post_number = topic.last_read_post_number || topic.highest_post_number;
       }
+
       row.highest_post_number = topic.highest_post_number;
       if (topic.category) {
         row.category_name = topic.category.name;
       }
 
       if (row.last_read_post_number === null || row.highest_post_number > row.last_read_post_number) {
         tracker.states["t" + topic.id] = row;
+      } else {
+        delete tracker.states["t" + topic.id];
       }
     });
 
@@ -151,18 +160,28 @@ Discourse.UserTrackingState = Discourse.Model.extend({
     // not exposed
     var states = this.states;
 
-    data.each(function(row){
-      states["t" + row.topic_id] = row;
-    });
+    if(data) {
+      data.each(function(row){
+        states["t" + row.topic_id] = row;
+      });
+    }
   }
 });
 
 
-Discourse.UserTrackingState.reopenClass({
+Discourse.TopicTrackingState.reopenClass({
   createFromStates: function(data){
-    var instance = Discourse.UserTrackingState.create();
+    var instance = Discourse.TopicTrackingState.create();
     instance.loadStates(data);
     instance.establishChannels();
     return instance;
+  },
+  current: function(){
+    if (!this.tracker) {
+      var data = PreloadStore.get('topicTrackingStates');
+      this.tracker = this.createFromStates(data);
+      PreloadStore.remove('topicTrackingStates');
+    }
+    return this.tracker;
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/application_route.js b/app/assets/javascripts/discourse/routes/application_route.js
diff --git a/app/assets/javascripts/discourse/templates/list/topics.js.handlebars b/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
@@ -28,12 +28,12 @@
         </tr>
         </thead>
 
-        {{#if Discourse.currentUser.userTrackingState.hasIncoming}}
+        {{#if view.topicTrackingState.hasIncoming}}
           <tbody>
             <tr>
               <td colspan="9">
                 <div class='alert alert-info'>
-                  {{countI18n new_topics_inserted countBinding="Discourse.currentUser.userTrackingState.incomingCount"}}
+                  {{countI18n new_topics_inserted countBinding="view.topicTrackingState.incomingCount"}}
                   <a href='#' {{action showInserted}}>{{i18n show_new_topics}}</a>
                 </div>
               </td>
diff --git a/app/assets/javascripts/discourse/views/list/list_topics_view.js b/app/assets/javascripts/discourse/views/list/list_topics_view.js
@@ -14,6 +14,9 @@ Discourse.ListTopicsView = Discourse.View.extend(Discourse.Scrolling, {
   listBinding: 'controller.model',
   loadedMore: false,
   currentTopicId: null,
+  topicTrackingState: function() {
+    return Discourse.TopicTrackingState.current();
+  }.property(),
 
   willDestroyElement: function() {
     this.unbindScrolling();
@@ -42,8 +45,11 @@ Discourse.ListTopicsView = Discourse.View.extend(Discourse.Scrolling, {
   },
 
   showTable: function() {
-    return this.get('list.topics').length > 0 || Discourse.get('currentUser.userTrackingState.hasIncoming');
-  }.property('list.topics','Discourse.currentUser.userTrackingState.hasIncoming'),
+    var topics = this.get('list.topics');
+    if(topics) {
+      return this.get('list.topics').length > 0 || this.get('topicTrackingState.hasIncoming');
+    }
+  }.property('list.topics','topicTrackingState.hasIncoming'),
 
   loadMore: function() {
     var listTopicsView = this;
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -107,6 +107,9 @@ def preload_json
 
       if current_user.present?
         store_preloaded("currentUser", MultiJson.dump(CurrentUserSerializer.new(current_user, root: false)))
+
+        serializer = ActiveModel::ArraySerializer.new(TopicTrackingState.report([current_user.id]), each_serializer: TopicTrackingStateSerializer)
+        store_preloaded("topicTrackingStates", MultiJson.dump(serializer))
       end
       store_preloaded("siteSettings", SiteSetting.client_settings_json)
     end
diff --git a/app/models/category.rb b/app/models/category.rb
@@ -133,6 +133,12 @@ def allow(group)
     end
   end
 
+  def secure_group_ids
+    if self.secure
+      groups.pluck("groups.id")
+    end
+  end
+
 end
 
 # == Schema Information
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
@@ -3,24 +3,61 @@
 # the allows end users to always know which topics have unread posts in them
 # and which topics are new
 
-class UserTrackingState
+class TopicTrackingState
 
   include ActiveModel::SerializerSupport
 
   CHANNEL = "/user-tracking"
 
   attr_accessor :user_id, :topic_id, :highest_post_number, :last_read_post_number, :created_at, :category_name
 
-  MessageBus.client_filter(CHANNEL) do |user_id, message|
-    if user_id
-      UserTrackingState.new(User.find(user_id)).filter(message)
-    else
-      nil
+  def self.publish_new(topic)
+
+    message = {
+      topic_id: topic.id,
+      message_type: "new_topic",
+      payload: {
+        last_read_post_number: nil,
+        highest_post_number: 1,
+        created_at: topic.created_at,
+        topic_id: topic.id
+      }
+    }
+
+    group_ids = topic.category && topic.category.secure_group_ids
+
+    MessageBus.publish("/new", message.as_json, group_ids: group_ids)
+    publish_read(topic.id, 1, topic.user_id)
+  end
+
+  def self.publish_unread(post)
+    # TODO at high scale we are going to have to defer this,
+    #   perhaps cut down to users that are around in the last 7 days as well
+    #
+    group_ids = post.topic.category && post.topic.category.secure_group_ids
+
+    TopicUser
+        .tracking(post.topic_id)
+        .select([:user_id,:last_read_post_number])
+        .each do |tu|
+
+      message = {
+        topic_id: post.topic_id,
+        message_type: "unread",
+        payload: {
+          last_read_post_number: tu.last_read_post_number,
+          highest_post_number: post.post_number,
+          created_at: post.created_at,
+          topic_id: post.topic_id
+        }
+      }
+
+      MessageBus.publish("/unread/#{tu.user_id}", message.as_json, group_ids: group_ids)
+
     end
   end
 
-  def self.trigger_change(topic_id, post_number, user_id=nil)
-    MessageBus.publish(CHANNEL, "CHANGE", user_ids: [user_id].compact)
+  def self.publish_read(topic_id, highest_post_number, user_id)
   end
 
   def self.treat_as_new_topic_clause
@@ -76,7 +113,7 @@ def self.report(user_ids, topic_id = nil)
     end
 
     SqlBuilder.new(sql)
-      .map_exec(UserTrackingState, user_ids: user_ids, topic_id: topic_id)
+      .map_exec(TopicTrackingState, user_ids: user_ids, topic_id: topic_id)
 
   end
 
diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb
@@ -5,6 +5,12 @@ class TopicUser < ActiveRecord::Base
   scope :starred_since, lambda { |sinceDaysAgo| where('starred_at > ?', sinceDaysAgo.days.ago) }
   scope :by_date_starred, group('date(starred_at)').order('date(starred_at)')
 
+  scope :tracking, lambda { |topic_id|
+    where(topic_id: topic_id)
+        .where("COALESCE(topic_users.notification_level, :regular) >= :tracking",
+                regular: TopicUser.notification_levels[:regular], tracking: TopicUser.notification_levels[:tracking])
+  }
+
   # Class methods
   class << self
 
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -576,9 +576,6 @@ def flag_linked_posts_as_spam
     end
   end
 
-  def user_tracking_states
-    UserTrackingState.report([self.id])
-  end
 
   protected
 
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
@@ -14,10 +14,6 @@ class CurrentUserSerializer < BasicUserSerializer
              :external_links_in_new_tab,
              :trust_level
 
-  has_many :user_tracking_states, serializer: UserTrackingStateSerializer, embed: :objects
-
-  # we probably want to move this into site, but that json is cached so hanging it off current user seems okish
-
   def include_site_flagged_posts_count?
     object.staff?
   end
diff --git a/app/serializers/topic_tracking_state_serializer.rb b/app/serializers/topic_tracking_state_serializer.rb
@@ -1,3 +1,3 @@
-class UserTrackingStateSerializer < ApplicationSerializer
+class TopicTrackingStateSerializer < ApplicationSerializer
   attributes :topic_id, :highest_post_number, :last_read_post_number, :created_at, :category_name
 end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
diff --git a/script/alice.txt b/script/alice.txt
diff --git a/script/user_simulator.rb b/script/user_simulator.rb
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
diff --git a/spec/models/topic_user_spec.rb b/spec/models/topic_user_spec.rb
