prevent race condition
This commit is contained in:
parent
d0bef5ea2c
commit
33d1343974
1 changed files with 8 additions and 9 deletions
|
|
@ -577,17 +577,16 @@ const onChats = (cb, gun, user, SEA) => {
|
||||||
await Utils.asyncForEach(Object.values(outgoings), async outgoing => {
|
await Utils.asyncForEach(Object.values(outgoings), async outgoing => {
|
||||||
const recipientPK = outgoing.with
|
const recipientPK = outgoing.with
|
||||||
const incomingID = await Getters.userToIncomingID(recipientPK)
|
const incomingID = await Getters.userToIncomingID(recipientPK)
|
||||||
|
const didDisconnect =
|
||||||
|
!!incomingID && (await Utils.didDisconnect(recipientPK, incomingID))
|
||||||
|
|
||||||
if (!recipientPKToChat[recipientPK]) {
|
if (!recipientPKToChat[recipientPK]) {
|
||||||
// eslint-disable-next-line require-atomic-updates
|
|
||||||
recipientPKToChat[recipientPK] = {
|
recipientPKToChat[recipientPK] = {
|
||||||
messages: [],
|
messages: [],
|
||||||
recipientAvatar: '',
|
recipientAvatar: '',
|
||||||
recipientDisplayName: Utils.defaultName(recipientPK),
|
recipientDisplayName: Utils.defaultName(recipientPK),
|
||||||
recipientPublicKey: recipientPK,
|
recipientPublicKey: recipientPK,
|
||||||
didDisconnect:
|
didDisconnect
|
||||||
!!incomingID &&
|
|
||||||
(await Utils.didDisconnect(recipientPK, incomingID))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -616,17 +615,17 @@ const onChats = (cb, gun, user, SEA) => {
|
||||||
await Utils.asyncForEach(
|
await Utils.asyncForEach(
|
||||||
Object.entries(uti),
|
Object.entries(uti),
|
||||||
async ([recipientPK, incomingFeedID]) => {
|
async ([recipientPK, incomingFeedID]) => {
|
||||||
|
const didDisconnect = await Utils.didDisconnect(
|
||||||
|
recipientPK,
|
||||||
|
incomingFeedID
|
||||||
|
)
|
||||||
if (!recipientPKToChat[recipientPK]) {
|
if (!recipientPKToChat[recipientPK]) {
|
||||||
// eslint-disable-next-line require-atomic-updates
|
|
||||||
recipientPKToChat[recipientPK] = {
|
recipientPKToChat[recipientPK] = {
|
||||||
messages: [],
|
messages: [],
|
||||||
recipientAvatar: '',
|
recipientAvatar: '',
|
||||||
recipientDisplayName: Utils.defaultName(recipientPK),
|
recipientDisplayName: Utils.defaultName(recipientPK),
|
||||||
recipientPublicKey: recipientPK,
|
recipientPublicKey: recipientPK,
|
||||||
didDisconnect: await Utils.didDisconnect(
|
didDisconnect
|
||||||
recipientPK,
|
|
||||||
incomingFeedID
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue