pull/1137/head
Audric Ackermann 5 years ago
parent a656e3ba3f
commit d48063dc82
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -262,7 +262,7 @@
messages.forEach(m => {
m.acceptFriendRequest();
lastMessage = m;
})
});
if (lastMessage) {
await this.markRead();

@ -665,13 +665,14 @@ MessageSender.prototype = {
return Promise.resolve();
}
// first get all friends with primary devices
const sessionContactsPrimary = conversations.filter(
c =>
c.isPrivate() &&
!c.isOurLocalDevice() &&
c.isFriend() &&
!c.get('secondaryStatus')
) || [];
const sessionContactsPrimary =
conversations.filter(
c =>
c.isPrivate() &&
!c.isOurLocalDevice() &&
c.isFriend() &&
!c.get('secondaryStatus')
) || [];
// then get all friends with secondary devices
let sessionContactsSecondary = conversations.filter(
@ -683,14 +684,21 @@ MessageSender.prototype = {
);
// then morph all secondary conversation to their primary
sessionContactsSecondary = await Promise.all(sessionContactsSecondary.map(async c => {
return window.ConversationController.getOrCreateAndWait(
c.getPrimaryDevicePubKey(),
'private'
);
})) || [];
sessionContactsSecondary =
(await Promise.all(
// eslint-disable-next-line arrow-body-style
sessionContactsSecondary.map(async c => {
return window.ConversationController.getOrCreateAndWait(
c.getPrimaryDevicePubKey(),
'private'
);
})
)) || [];
const contactsSet = new Set([...sessionContactsPrimary, ...sessionContactsSecondary]);
const contactsSet = new Set([
...sessionContactsPrimary,
...sessionContactsSecondary,
]);
const contacts = [...contactsSet];
if (contacts.length === 0) {

Loading…
Cancel
Save