From 0e18bf464052c6f6851d0becc642aaab8f9893f7 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 23 Jun 2023 07:58:52 +0200 Subject: [PATCH] fix: disable expire timer tracking for all libsession logic this will need to be turned on when the disappearing branch is merged --- package.json | 2 +- ts/node/migration/sessionMigrations.ts | 16 +++++----- ts/receiver/configMessage.ts | 30 +++++++++---------- .../libsession/libsession_utils_contacts.ts | 5 ++-- .../libsession_utils_user_groups.ts | 2 +- .../libsession_utils_user_profile.ts | 8 ++--- ts/types/sqlSharedTypes.ts | 28 ++++++++--------- .../browser/libsession_worker_interface.ts | 6 ++-- yarn.lock | 6 ++-- 9 files changed, 52 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 4d9ce5ae0..514b4e3a8 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "glob": "7.1.2", "image-type": "^4.1.0", "ip2country": "1.0.1", - "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.18/libsession_util_nodejs-v0.1.18.tar.gz", + "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.19/libsession_util_nodejs-v0.1.19.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "3.0.2", "lodash": "^4.17.21", diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts index 24cbc14ce..b32222312 100644 --- a/ts/node/migration/sessionMigrations.ts +++ b/ts/node/migration/sessionMigrations.ts @@ -1223,7 +1223,7 @@ function insertContactIntoContactWrapper( const dbApprovedMe = !!contact.didApproveMe || false; const dbBlocked = blockedNumbers.includes(contact.id); const priority = contact.priority || CONVERSATION_PRIORITIES.default; - const expirationTimerSeconds = contact.expireTimer || 0; + // const expirationTimerSeconds = contact.expireTimer || 0; const wrapperContact = getContactInfoFromDBValues({ id: contact.id, @@ -1235,7 +1235,7 @@ function insertContactIntoContactWrapper( dbProfileKey: contact.profileKey || undefined, dbProfileUrl: contact.avatarPointer || undefined, priority, - expirationTimerSeconds, + // expirationTimerSeconds, }); try { @@ -1259,7 +1259,7 @@ function insertContactIntoContactWrapper( dbProfileKey: undefined, dbProfileUrl: undefined, priority: CONVERSATION_PRIORITIES.default, - expirationTimerSeconds: 0, + // expirationTimerSeconds: 0, }) ); } catch (e) { @@ -1373,7 +1373,7 @@ function insertCommunityIntoWrapper( function insertLegacyGroupIntoWrapper( legacyGroup: Pick< ConversationAttributes, - 'id' | 'priority' | 'expireTimer' | 'displayNameInProfile' | 'lastJoinedTimestamp' + 'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' // | 'expireTimer' > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here userGroupConfigWrapper: UserGroupsWrapperNode, volatileInfoConfigWrapper: ConvoInfoVolatileWrapperNode, @@ -1382,7 +1382,7 @@ function insertLegacyGroupIntoWrapper( const { priority, id, - expireTimer, + // expireTimer, groupAdmins, members, displayNameInProfile, @@ -1397,7 +1397,7 @@ function insertLegacyGroupIntoWrapper( const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({ id, priority, - expireTimer, + // expireTimer, groupAdmins, members, displayNameInProfile, @@ -1625,7 +1625,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite const ourDbProfileUrl = ourConversation.avatarPointer || ''; const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || ''); const ourConvoPriority = ourConversation.priority; - const ourConvoExpire = ourConversation.expireTimer || 0; + // const ourConvoExpire = ourConversation.expireTimer || 0; if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) { userProfileWrapper.setUserInfo( ourDbName, @@ -1634,7 +1634,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite url: ourDbProfileUrl, key: ourDbProfileKey, }, - ourConvoExpire + // ourConvoExpire ); } diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 8c51c87e8..e68e6476a 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -330,10 +330,10 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise 0 - ? expirationTimerSeconds - : 0, // TODOLATER add the expiration mode handling - expirationMode: - !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0 - ? 'disappearAfterSend' - : 'off', + // expirationTimerSeconds: + // !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0 + // ? expirationTimerSeconds + // : 0, // TODOLATER add the expiration mode handling + // expirationMode: + // !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0 + // ? 'disappearAfterSend' + // : 'off', }; if ( @@ -199,14 +199,14 @@ export function getLegacyGroupInfoFromDBValues({ priority, members: maybeMembers, displayNameInProfile, - expireTimer, + // expireTimer, encPubkeyHex, encSeckeyHex, groupAdmins: maybeAdmins, lastJoinedTimestamp, }: Pick< ConversationAttributes, - 'id' | 'priority' | 'displayNameInProfile' | 'expireTimer' | 'lastJoinedTimestamp' + 'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' //| 'expireTimer' > & { encPubkeyHex: string; encSeckeyHex: string; @@ -224,7 +224,7 @@ export function getLegacyGroupInfoFromDBValues({ }); const legacyGroup: LegacyGroupInfo = { pubkeyHex: id, - disappearingTimerSeconds: !expireTimer ? 0 : expireTimer, + // disappearingTimerSeconds: !expireTimer ? 0 : expireTimer, name: displayNameInProfile || '', priority: priority || 0, members: wrappedMembers, diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 0256e9bb9..fb2555e9a 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -104,8 +104,8 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = { setUserInfo: async ( name: string, priority: number, - profilePic: { url: string; key: Uint8Array } | null, - expireSeconds: number + profilePic: { url: string; key: Uint8Array } | null + // expireSeconds: number ) => callLibSessionWorker([ 'UserConfig', @@ -113,7 +113,7 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = { name, priority, profilePic, - expireSeconds, + // expireSeconds, ]) as Promise>, }; diff --git a/yarn.lock b/yarn.lock index ddd9ce735..84fe9eff7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5148,9 +5148,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.18/libsession_util_nodejs-v0.1.18.tar.gz": - version "0.1.18" - resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.18/libsession_util_nodejs-v0.1.18.tar.gz#2580c8b4d6c58da4c22108f88e13dd0cb2da54dc" +"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.19/libsession_util_nodejs-v0.1.19.tar.gz": + version "0.1.19" + resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.19/libsession_util_nodejs-v0.1.19.tar.gz#294c6e8ea6b767d375a9c0249bef98b65f3ae252" dependencies: cmake-js "^7.2.1" node-addon-api "^6.1.0"