From 29d4f8497cd1ced5813c62f4a3e20adfba108b63 Mon Sep 17 00:00:00 2001 From: yougotwill Date: Mon, 5 Aug 2024 15:33:46 +1000 Subject: [PATCH] fix: restoring groups should use the libsession joined at timestamp and then update using the active_at value as we read messages --- ts/receiver/configMessage.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index abe4c49d2..2b680fa07 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -602,6 +602,8 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { const members = fromWrapper.members.map(m => m.pubkeyHex); const admins = fromWrapper.members.filter(m => m.isAdmin).map(m => m.pubkeyHex); + + const creationTimestamp = fromWrapper.joinedAtSeconds ? fromWrapper.joinedAtSeconds * 1000 : 0; // then for all the existing legacy group in the wrapper, we need to override the field of what we have in the DB with what is in the wrapper // We only set group admins on group creation const groupDetails: ClosedGroup.GroupInfo = { @@ -610,10 +612,9 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { members, admins, activeAt: - !!legacyGroupConvo.get('active_at') && - legacyGroupConvo.get('active_at') < latestEnvelopeTimestamp + !!legacyGroupConvo.get('active_at') && legacyGroupConvo.get('active_at') > creationTimestamp ? legacyGroupConvo.get('active_at') - : latestEnvelopeTimestamp, + : creationTimestamp, }; await ClosedGroup.updateOrCreateClosedGroup(groupDetails);