fixed conversations

Eschults · Aug 24, 2016 · b23d0bf · b23d0bf
1 parent 10ca4fb
commit b23d0bf
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/app/assets/javascripts/components/inbox.jsx b/app/assets/javascripts/components/inbox.jsx
@@ -327,17 +327,27 @@ var Inbox = React.createClass({
   },
 
   updateMessageList: function(data) {
-    this.setState({
-      messages: this.state.messages.concat([data.message]),
-      conversations: data.conversations
-    })
+    if (this.props.user_id === data.sender_id) {
+      this.setState({
+        messages: this.state.messages.concat([data.message]),
+        conversations: data.sender_conversations
+      })
+    } else {
+      this.setState({
+        messages: this.state.messages.concat([data.message]),
+        conversations: data.receiver_conversations
+      })
+    }
     this._scrollWrapper();
   },
 
   setupSubscription: function() {
+    var that = this;
     App.messages = App.cable.subscriptions.create('MessagesChannel', {
       received: function(data) {
-        this.updateMessageList(data);
+        if (that.state.selectedConversationId === data.message.conversation_id) {
+          this.updateMessageList(data);
+        }
       },
 
       connected: function() {

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
@@ -8,16 +8,19 @@ def create
     @message.save
     @messages = @selected_conversation.messages.order(created_at: :desc).page(params[:page]).per(9)
     @conversations = current_user.conversations
+    other_user = @selected_conversation.other_user(current_user)
     ActionCable.server.broadcast('messages', {
       message: {
         id: @message.id,
         read_at: @message.read_at,
         writer_avatar_url: @message.user.avatar_url,
         writer_first_name: @message.user.first_name,
         created_at: @message.created_at.strftime("%b %e, %l:%M%P"),
-        content: view_context.render_markdown(@message.content)
+        content: view_context.render_markdown(@message.content),
+        conversation_id: @message.conversation.id
       },
-      conversations: @conversations.map do |conversation|
+      sender_id: current_user.id,
+      sender_conversations: @conversations.map do |conversation|
         {
           id: conversation.id,
           other_user_picture_url: conversation.other_user(current_user).one_avatar_url,
@@ -28,6 +31,18 @@ def create
           is_last_message_writer_current_user: conversation.last_message.user == current_user,
           user: conversation.other_user(current_user)
         }
+      end,
+      receiver_conversations: other_user.conversations.map do |conversation|
+        {
+          id: conversation.id,
+          other_user_picture_url: conversation.other_user(other_user).one_avatar_url,
+          other_user_first_name: conversation.other_user(other_user).first_name,
+          last_message_created_at: conversation.last_message.created_at.strftime("%b %e"),
+          last_message_content: conversation.last_message.content,
+          last_message_read_at: conversation.last_message.read_at,
+          is_last_message_writer_current_user: conversation.last_message.user == other_user,
+          user: conversation.other_user(other_user)
+        }
       end
     })
   end

diff --git a/app/views/shared/_inbox.json.jbuilder b/app/views/shared/_inbox.json.jbuilder
@@ -13,3 +13,5 @@ json.messages do
     json.partial! "conversations/message", message: message
   end
 end
+
+json.user_id current_user.id
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,3 +13,5 @@ json.messages do @@
         json.partial! "conversations/message", message: message
       end
     end
+    json.user_id current_user.id