From 02b3b08999f2831448bd772141facd198ae3ce72 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 26 Aug 2020 19:53:54 -0500 Subject: [PATCH] Chats: use semantic names for action properties --- app/soapbox/actions/chats.js | 6 +++--- app/soapbox/actions/streaming.js | 2 +- app/soapbox/reducers/accounts.js | 4 ++-- app/soapbox/reducers/chat_message_lists.js | 8 ++++---- app/soapbox/reducers/chat_messages.js | 8 ++++---- app/soapbox/reducers/chats.js | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/soapbox/actions/chats.js b/app/soapbox/actions/chats.js index bdd8d8a85..509eb536e 100644 --- a/app/soapbox/actions/chats.js +++ b/app/soapbox/actions/chats.js @@ -22,7 +22,7 @@ export function fetchChats() { return (dispatch, getState) => { dispatch({ type: CHATS_FETCH_REQUEST }); return api(getState).get('/api/v1/pleroma/chats').then(({ data }) => { - dispatch({ type: CHATS_FETCH_SUCCESS, data }); + dispatch({ type: CHATS_FETCH_SUCCESS, chats: data }); }).catch(error => { dispatch({ type: CHATS_FETCH_FAIL, error }); }); @@ -33,7 +33,7 @@ export function fetchChatMessages(chatId) { return (dispatch, getState) => { dispatch({ type: CHAT_MESSAGES_FETCH_REQUEST, chatId }); return api(getState).get(`/api/v1/pleroma/chats/${chatId}/messages`).then(({ data }) => { - dispatch({ type: CHAT_MESSAGES_FETCH_SUCCESS, chatId, data }); + dispatch({ type: CHAT_MESSAGES_FETCH_SUCCESS, chatId, chatMessages: data }); }).catch(error => { dispatch({ type: CHAT_MESSAGES_FETCH_FAIL, chatId, error }); }); @@ -44,7 +44,7 @@ export function sendChatMessage(chatId, params) { return (dispatch, getState) => { dispatch({ type: CHAT_MESSAGE_SEND_REQUEST, chatId, params }); return api(getState).post(`/api/v1/pleroma/chats/${chatId}/messages`, params).then(({ data }) => { - dispatch({ type: CHAT_MESSAGE_SEND_SUCCESS, chatId, data }); + dispatch({ type: CHAT_MESSAGE_SEND_SUCCESS, chatId, chatMessage: data }); }).catch(error => { dispatch({ type: CHAT_MESSAGE_SEND_FAIL, chatId, error }); }); diff --git a/app/soapbox/actions/streaming.js b/app/soapbox/actions/streaming.js index 8c6a1651d..1dddf60b2 100644 --- a/app/soapbox/actions/streaming.js +++ b/app/soapbox/actions/streaming.js @@ -55,7 +55,7 @@ export function connectTimelineStream(timelineId, path, pollingRefresh = null, a dispatch(fetchFilters()); break; case 'pleroma:chat_update': - dispatch({ type: STREAMING_CHAT_UPDATE, payload: JSON.parse(data.payload) }); + dispatch({ type: STREAMING_CHAT_UPDATE, chat: JSON.parse(data.payload) }); break; } }, diff --git a/app/soapbox/reducers/accounts.js b/app/soapbox/reducers/accounts.js index 64cf96515..847004da6 100644 --- a/app/soapbox/reducers/accounts.js +++ b/app/soapbox/reducers/accounts.js @@ -47,9 +47,9 @@ export default function accounts(state = initialState, action) { username: action.username, })); case CHATS_FETCH_SUCCESS: - return importAccountsFromChats(state, action.data); + return importAccountsFromChats(state, action.chats); case STREAMING_CHAT_UPDATE: - return importAccountsFromChats(state, [action.payload]); + return importAccountsFromChats(state, [action.chat]); default: return state; } diff --git a/app/soapbox/reducers/chat_message_lists.js b/app/soapbox/reducers/chat_message_lists.js index 535499a16..f4b2a8bfc 100644 --- a/app/soapbox/reducers/chat_message_lists.js +++ b/app/soapbox/reducers/chat_message_lists.js @@ -31,13 +31,13 @@ const importLastMessages = (state, chats) => export default function chatMessageLists(state = initialState, action) { switch(action.type) { case CHATS_FETCH_SUCCESS: - return importLastMessages(state, action.data); + return importLastMessages(state, action.chats); case STREAMING_CHAT_UPDATE: - return importMessages(state, [action.payload.last_message]); + return importMessages(state, [action.chat.last_message]); case CHAT_MESSAGES_FETCH_SUCCESS: - return updateList(state, action.chatId, action.data.map(chat => chat.id).reverse()); + return updateList(state, action.chatId, action.chatMessages.map(chat => chat.id).reverse()); case CHAT_MESSAGE_SEND_SUCCESS: - return updateList(state, action.chatId, [action.data.id]); + return updateList(state, action.chatId, [action.chatMessage.id]); default: return state; } diff --git a/app/soapbox/reducers/chat_messages.js b/app/soapbox/reducers/chat_messages.js index 96ff24c8d..766935886 100644 --- a/app/soapbox/reducers/chat_messages.js +++ b/app/soapbox/reducers/chat_messages.js @@ -23,13 +23,13 @@ const importLastMessages = (state, chats) => export default function chatMessages(state = initialState, action) { switch(action.type) { case CHATS_FETCH_SUCCESS: - return importLastMessages(state, fromJS(action.data)); + return importLastMessages(state, fromJS(action.chats)); case CHAT_MESSAGES_FETCH_SUCCESS: - return importMessages(state, fromJS(action.data)); + return importMessages(state, fromJS(action.chatMessages)); case CHAT_MESSAGE_SEND_SUCCESS: - return importMessage(state, fromJS(action.data)); + return importMessage(state, fromJS(action.chatMessage)); case STREAMING_CHAT_UPDATE: - return importLastMessages(state, fromJS([action.payload])); + return importLastMessages(state, fromJS([action.chat])); default: return state; } diff --git a/app/soapbox/reducers/chats.js b/app/soapbox/reducers/chats.js index 912a47c06..aee2ee999 100644 --- a/app/soapbox/reducers/chats.js +++ b/app/soapbox/reducers/chats.js @@ -13,9 +13,9 @@ const initialState = ImmutableMap(); export default function chats(state = initialState, action) { switch(action.type) { case CHATS_FETCH_SUCCESS: - return importChats(state, action.data); + return importChats(state, action.chats); case STREAMING_CHAT_UPDATE: - return importChats(state, [action.payload]); + return importChats(state, [action.chat]); default: return state; }