mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Ensure that we have all conversations in redux store

Browse source
This commit is contained in:
Scott Nonnenberg 2019-03-25 10:22:33 -07:00
parent d96b189a07
commit 0c69d725c3
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/conversation_controller.js
View file

@ -55,6 +55,7 @@
}))(); }))();
window.getInboxCollection = () => inboxCollection; window.getInboxCollection = () => inboxCollection;
window.getConversations = () => conversations;
window.ConversationController = { window.ConversationController = {
get(id) { get(id) {

13
js/views/inbox_view.js
View file

@ -1,6 +1,7 @@
/* global /* global
ConversationController, ConversationController,
extension, extension,
getConversations,
getInboxCollection, getInboxCollection,
i18n, i18n,
Whisper, Whisper,
@ -104,8 +105,8 @@
}, },
setupLeftPane() { setupLeftPane() {
// Here we set up a full redux store with initial state for our LeftPane Root // Here we set up a full redux store with initial state for our LeftPane Root
const inboxCollection = getInboxCollection(); const convoCollection = getConversations();
const conversations = inboxCollection.map( const conversations = convoCollection.map(
conversation => conversation.cachedProps conversation => conversation.cachedProps
); );
const initialState = { const initialState = {
@ -145,19 +146,19 @@
this.openConversationAction = openConversationExternal; this.openConversationAction = openConversationExternal;
this.listenTo(inboxCollection, 'remove', conversation => { this.listenTo(convoCollection, 'remove', conversation => {
const { id } = conversation || {}; const { id } = conversation || {};
conversationRemoved(id); conversationRemoved(id);
}); });
this.listenTo(inboxCollection, 'add', conversation => { this.listenTo(convoCollection, 'add', conversation => {
const { id, cachedProps } = conversation || {}; const { id, cachedProps } = conversation || {};
conversationAdded(id, cachedProps); conversationAdded(id, cachedProps);
}); });
this.listenTo(inboxCollection, 'change', conversation => { this.listenTo(convoCollection, 'change', conversation => {
const { id, cachedProps } = conversation || {}; const { id, cachedProps } = conversation || {};
conversationChanged(id, cachedProps); conversationChanged(id, cachedProps);
}); });
this.listenTo(inboxCollection, 'reset', removeAllConversations); this.listenTo(convoCollection, 'reset', removeAllConversations);
Whisper.events.on('messageExpired', messageExpired); Whisper.events.on('messageExpired', messageExpired);
Whisper.events.on('userChanged', userChanged); Whisper.events.on('userChanged', userChanged);