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

Chats: make streaming mostly work

Browse source
This commit is contained in:
Alex Gleason 2020-08-26 13:39:38 -05:00
parent c0dc4a69cd
commit dbafbbc065
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import {
import { updateNotificationsQueue, expandNotifications } from './notifications';
import { updateConversations } from './conversations';
import { fetchFilters } from './filters';
import { importFetchedChat } from './importer';
import { getSettings } from 'soapbox/actions/settings';
import messages from 'soapbox/locales/messages';
@ -52,6 +53,9 @@ export function connectTimelineStream(timelineId, path, pollingRefresh = null, a
case 'filters_changed':
dispatch(fetchFilters());
break;
case 'pleroma:chat_update':
dispatch(importFetchedChat(JSON.parse(data.payload)));
break;
}
},
};

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

@ -2,16 +2,36 @@ import {
CHAT_MESSAGES_FETCH_SUCCESS,
CHAT_MESSAGE_SEND_SUCCESS,
} from 'soapbox/actions/chats';
import { Map as ImmutableMap, fromJS } from 'immutable';
import { CHAT_IMPORT, CHATS_IMPORT } from 'soapbox/actions/importer';
import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
const initialState = ImmutableMap();
const insertMessage = (state, chatId, message) => {
const newMessages = state.get(chatId, ImmutableList()).insert(0, message);
return state.set(chatId, newMessages);
};
const importMessage = (state, message) => {
const chatId = message.get('chat_id');
return insertMessage(state, chatId, message);
};
const importLastMessages = (state, chats) =>
state.withMutations(mutable =>
chats.forEach(chat => importMessage(mutable, chat.get('last_message'))));
export default function chatMessages(state = initialState, action) {
switch(action.type) {
case CHAT_IMPORT:
return importMessage(state, fromJS(action.chat.last_message));
case CHATS_IMPORT:
return importLastMessages(state, fromJS(action.chats));
case CHAT_MESSAGES_FETCH_SUCCESS:
return state.set(action.chatId, fromJS(action.data));
case CHAT_MESSAGE_SEND_SUCCESS:
return state.set(action.chatId, state.get(action.chatId).insert(0, fromJS(action.data)));
// TODO: Prevent conflicts
// case CHAT_MESSAGE_SEND_SUCCESS:
// return insertMessage(state, action.chatId, fromJS(action.data));
default:
return state;
}