Progress with DMs

Progress with DMs

app/javascript/gabsocial/reducers/chat_conversation_messages.js

@@ -97,8 +97,10 @@ export default function chat_conversation_messages(state = initialState, action)
   case CHAT_CONVERSATION_MESSAGES_EXPAND_SUCCESS:
     return expandNormalizedChatConversation(state, action.chatConversationId, fromJS(action.chatMessages), action.next, action.partial, action.isLoadingRecent)
   case CHAT_MESSAGES_SEND_SUCCESS:
-    return updateChatMessageConversation(state, action.chatConversationId, fromJS(action.chatMessage))
-  // CHAT_MESSAGES_DELETE_REQUEST
+    return updateChatMessageConversation(state, action.chatMessage.chat_conversation_id, fromJS(action.chatMessage))
+  case CHAT_MESSAGES_DELETE_REQUEST:
+    // : todo : 
+    return state
   default:
     return state
   }

app/javascript/gabsocial/reducers/chat_conversations.js

@@ -4,6 +4,10 @@ import {
   fromJS,
 } from 'immutable'
 import { me } from '../initial_state'
+import {
+  CHAT_MESSAGES_SEND_SUCCESS,
+  CHAT_MESSAGES_DELETE_REQUEST,
+} from '../actions/chat_messages'
 import { 
   CHAT_CONVERSATIONS_APPROVED_FETCH_SUCCESS,
   CHAT_CONVERSATIONS_APPROVED_EXPAND_SUCCESS,
@@ -22,6 +26,10 @@ export const normalizeChatConversation = (chatConversation) => {
   })
 }
 
+const setLastChatMessage = (state, chatMessage) => {
+  return state.setIn([chatMessage.chat_conversation_id, 'last_chat_message'], fromJS(chatMessage))
+}
+
 const importChatConversation = (state, chatConversation) => state.set(chatConversation.chat_conversation_id, normalizeChatConversation(chatConversation))
 
 const importChatConversations = (state, chatConversations) => {
@@ -37,6 +45,11 @@ export default function chat_conversations(state = initialState, action) {
   case CHAT_CONVERSATIONS_REQUESTED_FETCH_SUCCESS:
   case CHAT_CONVERSATIONS_REQUESTED_EXPAND_SUCCESS:
     return importChatConversations(state, action.chatConversations)
+  case CHAT_MESSAGES_SEND_SUCCESS:
+    return setLastChatMessage(state, action.chatMessage)
+  case CHAT_MESSAGES_DELETE_REQUEST:
+    // : todo : set last conversation message to one prior to this one
+    return state
   default:
     return state
   }

app/javascript/gabsocial/reducers/chats.js

@@ -9,11 +9,10 @@ import {
   SET_CHAT_CONVERSATION_SELECTED,
 } from '../actions/chats'
 import {
+  CHAT_CONVERSATION_APPROVED_UNREAD_COUNT_FETCH_SUCCESS,
   CHAT_CONVERSATION_REQUESTED_COUNT_FETCH_SUCCESS,
 } from '../actions/chat_conversations'
 import { 
-  CHAT_MESSAGES_SEND_SUCCESS,
-  CHAT_MESSAGES_DELETE_REQUEST,
   CHAT_MESSAGES_FETCH_SUCCESS,
   CHAT_CONVERSATION_MESSAGES_EXPAND_SUCCESS,
 } from '../actions/chat_messages'
@@ -22,6 +21,7 @@ const initialState = ImmutableMap({
   createChatConversationSuggestionIds: ImmutableList(),
   selectedChatConversationId: null,
   chatConversationRequestCount: 0,
+  chatsUnreadCount: 0,
 })
 
 export default function chats(state = initialState, action) {
@@ -32,6 +32,8 @@ export default function chats(state = initialState, action) {
     return state.set('selectedChatConversationId', action.chatConversationId)
   case CHAT_CONVERSATION_REQUESTED_COUNT_FETCH_SUCCESS:
     return state.set('chatConversationRequestCount', action.count)
+  case CHAT_CONVERSATION_APPROVED_UNREAD_COUNT_FETCH_SUCCESS:
+    return state.set('chatsUnreadCount', action.count)
   default:
     return state
   }