bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Chats: use semantic names for action properties

Browse source
This commit is contained in:
Alex Gleason 2020-08-26 19:53:54 -05:00
parent 9a3aab27c9
commit 02b3b08999
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/soapbox/actions/chats.js
View file

@ -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 });
});

2
app/soapbox/actions/streaming.js
View file

@ -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;
}
},

4
app/soapbox/reducers/accounts.js
View file

@ -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;
}

8
app/soapbox/reducers/chat_message_lists.js
View file

@ -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;
}

8
app/soapbox/reducers/chat_messages.js
View file

@ -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;
}

4
app/soapbox/reducers/chats.js
View file

@ -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;
}