fix: track hashes for disappearing message timer changes too

ts/interactions/conversationInteractions.ts

@@ -647,6 +647,7 @@ export async function setDisappearingMessagesByConvoId(
       fromSync: false,
       fromCurrentDevice: true,
       fromConfigMessage: false,
+      messageHash: null,
     });
   } else {
     await conversation.updateExpireTimer({
@@ -655,6 +656,7 @@ export async function setDisappearingMessagesByConvoId(
       fromSync: false,
       fromCurrentDevice: true,
       fromConfigMessage: false,
+      messageHash: null,
     });
   }
 }

ts/models/conversation.ts

@@ -137,6 +137,7 @@ import { OpenGroupRequestCommonType } from '../data/types';
 import { ConversationTypeEnum, CONVERSATION_PRIORITIES } from './types';
 import { NetworkTime } from '../util/NetworkTime';
 import { MessageQueue } from '../session/sending';
+import type { WithMessageHashOrNull } from '../session/types/with';
 
 type InMemoryConvoInfos = {
   mentionedUs: boolean;
@@ -897,7 +898,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     fromCurrentDevice,
     shouldCommitConvo = true,
     existingMessage,
-  }: {
+    messageHash,
+  }: WithMessageHashOrNull & {
     providedDisappearingMode?: DisappearingMessageConversationModeType;
     providedExpireTimer?: number;
     providedSource?: string;
@@ -1005,6 +1007,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         source,
         fromSync,
       },
+      messageHash: messageHash || undefined,
     };
 
     if (!message) {

ts/receiver/closedGroups.ts

@@ -327,6 +327,7 @@ export async function handleNewClosedGroup(
         fromSync: false,
         fromCurrentDevice: false,
         fromConfigMessage: false,
+        messageHash: null, // legacy groups
       });
 
       await IncomingMessageCache.removeFromCache(envelope);

ts/receiver/configMessage.ts

@@ -278,6 +278,7 @@ async function handleUserProfileUpdate(result: IncomingUserResult): Promise<void
         shouldCommitConvo: false,
         fromCurrentDevice: false,
         fromConfigMessage: true,
+        messageHash: null,
       });
       changes = success;
     }
@@ -424,6 +425,7 @@ async function handleContactsUpdate(result: IncomingUserResult) {
           fromCurrentDevice: false,
           shouldCommitConvo: false,
           fromConfigMessage: true,
+          messageHash: null,
         });
         changes = changes || success;
       }
@@ -657,6 +659,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
         shouldCommitConvo: false,
         fromCurrentDevice: false,
         fromConfigMessage: true,
+        messageHash: null, // legacy groups
       });
       changes = success;
     }

ts/receiver/groupv2/handleGroupV2Message.ts

@@ -20,7 +20,7 @@ import { PreConditionFailed } from '../../session/utils/errors';
 import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils';
 import { SessionUtilConvoInfoVolatile } from '../../session/utils/libsession/libsession_utils_convo_info_volatile';
 import { groupInfoActions } from '../../state/ducks/metaGroups';
-import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes';
+import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes';
 import { BlockedNumberController } from '../../util';
 import {
   MetaGroupWrapperActions,
@@ -282,6 +282,7 @@ async function handleGroupInfoChangeMessage({
           fromCurrentDevice: false,
           fromSync: false,
           fromConfigMessage: false,
+          messageHash,
         });
       }
       break;
@@ -591,6 +592,9 @@ async function handleGroupUpdatePromoteMessage({
     groupSecretKey: groupKeypair.privateKey,
     inviterIsApproved: authorIsApproved,
   });
+  window.log.info(
+    `received promote to group ${ed25519Str(groupPk)} group details: ${stringify(found)}`
+  );
 
   await UserGroupsWrapperActions.setGroup(found);
   // force markedAsUnread to be true so it shows the unread banner (we only show the banner if there are unread messages on at least one msg/group request)
@@ -605,24 +609,35 @@ async function handleGroupUpdatePromoteMessage({
     await deleteAllMessagesByConvoIdNoConfirmation(groupPk);
   }
   try {
-    await MetaGroupWrapperActions.init(groupPk, {
+    let wrapperAlreadyInit = false;
-      metaDumped: null,
+    try {
-      groupEd25519Secretkey: groupKeypair.privateKey,
+      await MetaGroupWrapperActions.infoGet(groupPk);
-      userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64).buffer,
+      wrapperAlreadyInit = true;
-      groupEd25519Pubkey: toFixedUint8ArrayOfLength(HexString.fromHexStringNoPrefix(groupPk), 32)
+    } catch (e) {
-        .buffer,
+      // nothing to do
-    });
+    }
+    if (!wrapperAlreadyInit) {
+      await MetaGroupWrapperActions.init(groupPk, {
+        metaDumped: null,
+        groupEd25519Secretkey: groupKeypair.privateKey,
+        userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64).buffer,
+        groupEd25519Pubkey: toFixedUint8ArrayOfLength(HexString.fromHexStringNoPrefix(groupPk), 32)
+          .buffer,
+      });
+    }
   } catch (e) {
     window.log.warn(
-      `handleGroupUpdatePromoteMessage: init of ${ed25519Str(groupPk)} failed with ${e.message}. Trying to just load admin keys`
+      `handleGroupUpdatePromoteMessage: init of ${ed25519Str(groupPk)} failed with ${e.message}.`
+    );
+  }
+
+  try {
+    window.log.info(`Trying to just load admin keys for group ${ed25519Str(groupPk)}`);
+    await MetaGroupWrapperActions.loadAdminKeys(groupPk, groupKeypair.privateKey);
+  } catch (e2) {
+    window.log.warn(
+      `handleGroupUpdatePromoteMessage: loadAdminKeys of ${ed25519Str(groupPk)} failed with ${e2.message}`
     );
-    try {
-      await MetaGroupWrapperActions.loadAdminKeys(groupPk, groupKeypair.privateKey);
-    } catch (e2) {
-      window.log.warn(
-        `handleGroupUpdatePromoteMessage: loadAdminKeys of ${ed25519Str(groupPk)} failed with ${e.message}`
-      );
-    }
   }
 
   await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache());

ts/receiver/queuedJob.ts

@@ -489,6 +489,7 @@ export async function handleMessageJob(
         shouldCommitConvo: false,
         fromCurrentDevice: false,
         fromConfigMessage: false,
+        messageHash,
         // NOTE we don't commit yet because we want to get the message id, see below
       });
     } else {

ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts

@@ -557,6 +557,7 @@ describe('DisappearingMessage', () => {
           existingMessage: undefined,
           fromCurrentDevice: false,
           fromConfigMessage: false,
+          messageHash: null,
         });
         await expect(promise).is.rejectedWith(
           'updateExpireTimer() Disappearing messages are only supported int groups and private chats'
@@ -587,6 +588,7 @@ describe('DisappearingMessage', () => {
           existingMessage: undefined,
           fromCurrentDevice: false,
           fromConfigMessage: false,
+          messageHash: null,
         });
         expect(updateSuccess, 'should be true').to.be.true;
       });
@@ -611,6 +613,7 @@ describe('DisappearingMessage', () => {
           existingMessage: undefined,
           fromCurrentDevice: false,
           fromConfigMessage: false,
+          messageHash: null,
         });
         expect(updateSuccess, 'should be true').to.be.true;
         expect(