oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #632 from sachaaaaa/fix_error_public_chat

Browse source 
Fix errors showing up from invalid public chats
This commit is contained in:
sachaaaaa 2019-11-19 12:06:34 +11:00 committed by GitHub
commit 3aa53ed24a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
js/modules/loki_app_dot_net_api.js
View file

@ -987,23 +987,25 @@ class LokiPublicChannelAPI {
// sort pending messages by if slave device or not
/* eslint-disable no-param-reassign */
const slaveMessages = pendingMessages.reduce((retval, messageData) => {
// if a known slave, queue
if (slavePrimaryMap[messageData.source]) {
// delay sending the message
if (retval[messageData.source] === undefined) {
retval[messageData.source] = [messageData];
const slaveMessages = pendingMessages
.filter(messageData => !!messageData)
.reduce((retval, messageData) => {
// if a known slave, queue
if (slavePrimaryMap[messageData.source]) {
// delay sending the message
if (retval[messageData.source] === undefined) {
retval[messageData.source] = [messageData];
} else {
retval[messageData.source].push(messageData);
}
} else {
retval[messageData.source].push(messageData);
// no user or isPrimary means not multidevice, send event now
this.serverAPI.chatAPI.emit('publicMessage', {
message: messageData,
});
}
} else {
// no user or isPrimary means not multidevice, send event now
this.serverAPI.chatAPI.emit('publicMessage', {
message: messageData,
});
}
return retval;
}, {});
return retval;
}, {});
/* eslint-enable no-param-reassign */
pendingMessages = []; // allow memory to be freed