From 76f8e02fb9748bc43d34e0f166b937a0932bd6b6 Mon Sep 17 00:00:00 2001
From: crockwave <curtis.rock@wirelessmessaging.com>
Date: Mon, 7 Sep 2020 16:52:45 -0500
Subject: [PATCH] Refactor

---
 app/soapbox/actions/chats.js               | 11 ++++-------
 app/soapbox/actions/streaming.js           |  8 ++++----
 app/soapbox/reducers/accounts.js           |  2 +-
 app/soapbox/reducers/chat_message_lists.js |  2 +-
 app/soapbox/reducers/chat_messages.js      |  2 +-
 app/soapbox/reducers/chats.js              |  2 +-
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/soapbox/actions/chats.js b/app/soapbox/actions/chats.js
index 2b3a9450a..30558368c 100644
--- a/app/soapbox/actions/chats.js
+++ b/app/soapbox/actions/chats.js
@@ -23,8 +23,7 @@ export const CHAT_READ_REQUEST = 'CHAT_READ_REQUEST';
 export const CHAT_READ_SUCCESS = 'CHAT_READ_SUCCESS';
 export const CHAT_READ_FAIL    = 'CHAT_READ_FAIL';
 
-export const STREAMING_CHAT_UPDATE = 'STREAMING_CHAT_UPDATE';
-export const CHATS_UPDATE_NOOP = 'CHATS_UPDATE_NOOP';
+export const CHAT_NOTIFICATION = 'CHAT_NOTIFICATION';
 
 export function fetchChats() {
   return (dispatch, getState) => {
@@ -154,21 +153,19 @@ export function markChatRead(chatId, lastReadId) {
   };
 }
 
-export function updateChatsQueue(chat) {
+export function chatsNotification(chat) {
   return (dispatch, getState) => {
     const playSound = getSettings(getState()).getIn(['chats', 'sound']);
-    // const flashWindow = getSettings(getState()).getIn(['chats', 'flash']);
+    // const flashWindow = getSettings(getState()).getIn(['chats', 'flash']);  // implement when developing chat window flashing notification
 
     if (playSound) {
       if (chat.last_message &&
           chat.last_message.account_id !== getState().get('me')) {
         dispatch({
-          type: CHATS_UPDATE_NOOP,
+          type: CHAT_NOTIFICATION,
           meta: { sound: 'chat' },
         });
       }
     }
-
-    dispatch({ type: STREAMING_CHAT_UPDATE, chat: chat, me: getState().get('me') });
   };
 };
diff --git a/app/soapbox/actions/streaming.js b/app/soapbox/actions/streaming.js
index c3e4363da..523c7e56d 100644
--- a/app/soapbox/actions/streaming.js
+++ b/app/soapbox/actions/streaming.js
@@ -7,13 +7,13 @@ import {
   processTimelineUpdate,
 } from './timelines';
 import { updateNotificationsQueue, expandNotifications } from './notifications';
-import { updateChatsQueue } from './chats';
+import { chatsNotification } from './chats';
 import { updateConversations } from './conversations';
 import { fetchFilters } from './filters';
 import { getSettings } from 'soapbox/actions/settings';
 import messages from 'soapbox/locales/messages';
 
-// export const STREAMING_CHAT_UPDATE = 'STREAMING_CHAT_UPDATE';
+export const STREAMING_CHAT_UPDATE = 'STREAMING_CHAT_UPDATE';
 
 const validLocale = locale => Object.keys(messages).includes(locale);
 
@@ -56,8 +56,8 @@ export function connectTimelineStream(timelineId, path, pollingRefresh = null, a
           dispatch(fetchFilters());
           break;
         case 'pleroma:chat_update':
-          dispatch(updateChatsQueue(JSON.parse(data.payload)));
-          // dispatch({ type: STREAMING_CHAT_UPDATE, chat: JSON.parse(data.payload), me: getState().get('me') });
+          dispatch(chatsNotification(JSON.parse(data.payload)));
+          dispatch({ type: STREAMING_CHAT_UPDATE, chat: JSON.parse(data.payload), me: getState().get('me') });
           break;
         }
       },
diff --git a/app/soapbox/reducers/accounts.js b/app/soapbox/reducers/accounts.js
index ae565d782..b02ef763f 100644
--- a/app/soapbox/reducers/accounts.js
+++ b/app/soapbox/reducers/accounts.js
@@ -4,7 +4,7 @@ import {
   ACCOUNT_FETCH_FAIL_FOR_USERNAME_LOOKUP,
 } from '../actions/importer';
 import { CHATS_FETCH_SUCCESS, CHAT_FETCH_SUCCESS } from 'soapbox/actions/chats';
-import { STREAMING_CHAT_UPDATE } from 'soapbox/actions/chats';
+import { STREAMING_CHAT_UPDATE } from 'soapbox/actions/streaming';
 import { normalizeAccount as normalizeAccount2 } from 'soapbox/actions/importer/normalizer';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
diff --git a/app/soapbox/reducers/chat_message_lists.js b/app/soapbox/reducers/chat_message_lists.js
index b1cfcd0a4..b584dca72 100644
--- a/app/soapbox/reducers/chat_message_lists.js
+++ b/app/soapbox/reducers/chat_message_lists.js
@@ -4,7 +4,7 @@ import {
   CHAT_MESSAGE_SEND_REQUEST,
   CHAT_MESSAGE_SEND_SUCCESS,
 } from 'soapbox/actions/chats';
-import { STREAMING_CHAT_UPDATE } from 'soapbox/actions/chats';
+import { STREAMING_CHAT_UPDATE } from 'soapbox/actions/streaming';
 import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
 
 const initialState = ImmutableMap();
diff --git a/app/soapbox/reducers/chat_messages.js b/app/soapbox/reducers/chat_messages.js
index b44a1e6e5..74d83ef79 100644
--- a/app/soapbox/reducers/chat_messages.js
+++ b/app/soapbox/reducers/chat_messages.js
@@ -4,7 +4,7 @@ import {
   CHAT_MESSAGE_SEND_REQUEST,
   CHAT_MESSAGE_SEND_SUCCESS,
 } from 'soapbox/actions/chats';
-import { STREAMING_CHAT_UPDATE } from 'soapbox/actions/chats';
+import { STREAMING_CHAT_UPDATE } from 'soapbox/actions/streaming';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 const initialState = ImmutableMap();
diff --git a/app/soapbox/reducers/chats.js b/app/soapbox/reducers/chats.js
index 745a7acf7..0efb5361f 100644
--- a/app/soapbox/reducers/chats.js
+++ b/app/soapbox/reducers/chats.js
@@ -4,7 +4,7 @@ import {
   CHAT_READ_SUCCESS,
   CHAT_READ_REQUEST,
 } from 'soapbox/actions/chats';
-import { STREAMING_CHAT_UPDATE } from 'soapbox/actions/chats';
+import { STREAMING_CHAT_UPDATE } from 'soapbox/actions/streaming';
 import { normalizeChat } from 'soapbox/actions/importer/normalizer';
 import { Map as ImmutableMap, fromJS } from 'immutable';