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

Chats: handle null last_message

Browse source
This commit is contained in:
Alex Gleason 2020-08-26 20:20:14 -05:00
parent 02b3b08999
commit c4aae14148
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/soapbox/actions/importer/normalizer.js
View file

@ -83,9 +83,10 @@ export function normalizePoll(poll) {
export function normalizeChat(chat, normalOldChat) { export function normalizeChat(chat, normalOldChat) {
const normalChat = { ...chat }; const normalChat = { ...chat };
const { account, last_message: lastMessage } = chat;
normalChat.account = chat.account.id; if (account) normalChat.account = account.id;
normalChat.last_message = chat.last_message.id; if (lastMessage) normalChat.last_message = lastMessage.id;
return normalChat; return normalChat;
} }

1
app/soapbox/features/account_timeline/components/header.js
View file

@ -100,6 +100,7 @@ export default class Header extends ImmutablePureComponent {
onBlock={this.handleBlock} onBlock={this.handleBlock}
onMention={this.handleMention} onMention={this.handleMention}
onDirect={this.handleDirect} onDirect={this.handleDirect}
onMessage={this.handleMessage}
onReblogToggle={this.handleReblogToggle} onReblogToggle={this.handleReblogToggle}
onReport={this.handleReport} onReport={this.handleReport}
onMute={this.handleMute} onMute={this.handleMute}

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

@ -26,14 +26,19 @@ const importMessages = (state, chatMessages) => (
const importLastMessages = (state, chats) => const importLastMessages = (state, chats) =>
state.withMutations(mutable => state.withMutations(mutable =>
chats.forEach(chat => importMessage(mutable, chat.last_message))); chats.forEach(chat => {
if (chat.last_message) importMessage(mutable, chat.last_message);
}));
export default function chatMessageLists(state = initialState, action) { export default function chatMessageLists(state = initialState, action) {
switch(action.type) { switch(action.type) {
case CHATS_FETCH_SUCCESS: case CHATS_FETCH_SUCCESS:
return importLastMessages(state, action.chats); return importLastMessages(state, action.chats);
case STREAMING_CHAT_UPDATE: case STREAMING_CHAT_UPDATE:
if (action.chat.last_message)
return importMessages(state, [action.chat.last_message]); return importMessages(state, [action.chat.last_message]);
else
return state;
case CHAT_MESSAGES_FETCH_SUCCESS: case CHAT_MESSAGES_FETCH_SUCCESS:
return updateList(state, action.chatId, action.chatMessages.map(chat => chat.id).reverse()); return updateList(state, action.chatId, action.chatMessages.map(chat => chat.id).reverse());
case CHAT_MESSAGE_SEND_SUCCESS: case CHAT_MESSAGE_SEND_SUCCESS:

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

@ -18,7 +18,10 @@ const importMessages = (state, messages) =>
const importLastMessages = (state, chats) => const importLastMessages = (state, chats) =>
state.withMutations(mutable => state.withMutations(mutable =>
chats.forEach(chat => importMessage(mutable, chat.get('last_message')))); chats.forEach(chat => {
if (chat.get('last_message'))
importMessage(mutable, chat.get('last_message'));
}));
export default function chatMessages(state = initialState, action) { export default function chatMessages(state = initialState, action) {
switch(action.type) { switch(action.type) {