conversationJobQueue: Only show captcha for bubble messages

ts/test-mock/rate-limit/viewed_test.ts

@@ -20,6 +20,7 @@ describe('challenge/receipts', function (this: Mocha.Suite) {
   let bootstrap: Bootstrap;
   let app: App;
   let contact: PrimaryDevice;
+  let contactB: PrimaryDevice;
 
   beforeEach(async () => {
     bootstrap = new Bootstrap({
@@ -34,6 +35,9 @@ describe('challenge/receipts', function (this: Mocha.Suite) {
     contact = await server.createPrimaryDevice({
       profileName: 'Jamie',
     });
+    contactB = await server.createPrimaryDevice({
+      profileName: 'Kim',
+    });
 
     let state = StorageState.getEmpty();
 
@@ -55,13 +59,28 @@ describe('challenge/receipts', function (this: Mocha.Suite) {
       },
       ServiceIdKind.PNI
     );
+    state = state.addContact(
+      contactB,
+      {
+        whitelisted: true,
+        serviceE164: contactB.device.number,
+        identityKey: contactB.getPublicKey(ServiceIdKind.PNI).serialize(),
+        pni: toUntaggedPni(contactB.device.pni),
+        givenName: 'Kim',
+      },
+      ServiceIdKind.PNI
+    );
 
     // Just to make PNI Contact visible in the left pane
     state = state.pin(contact, ServiceIdKind.PNI);
+    state = state.pin(contactB, ServiceIdKind.PNI);
 
     const ourKey = await desktop.popSingleUseKey();
     await contact.addSingleUseKey(desktop, ourKey);
 
+    const ourKeyB = await desktop.popSingleUseKey();
+    await contactB.addSingleUseKey(desktop, ourKeyB);
+
     await phone.setStorageState(state);
   });
 
@@ -95,11 +114,18 @@ describe('challenge/receipts', function (this: Mocha.Suite) {
       .locator(`[data-testid="${contact.toContact().aci}"]`)
       .click();
 
-    debug('Accept conversation from contact');
+    debug('Accept conversation from contact - does not trigger captcha!');
     await conversationStack
       .locator('.module-message-request-actions button >> "Accept"')
       .click();
 
+    debug('Sending a message back to user - will trigger captcha!');
+    {
+      const input = await app.waitForEnabledComposer();
+      await input.type('Hi, good to hear from you!');
+      await input.press('Enter');
+    }
+
     debug('Waiting for challenge');
     const request = await app.waitForChallenge();
 
@@ -114,14 +140,122 @@ describe('challenge/receipts', function (this: Mocha.Suite) {
       target: contact.device.aci,
     });
 
-    debug(`rate limited requests: ${requests}`);
-    assert.strictEqual(requests, 1);
+    debug(`Rate-limited requests: ${requests}`);
+    assert.strictEqual(requests, 1, 'rate limit requests');
 
-    debug('Waiting for receipts');
+    debug('Waiting for outgoing read receipt');
     const receipts = await app.waitForReceipts();
 
     assert.strictEqual(receipts.type, ReceiptType.Read);
-    assert.strictEqual(receipts.timestamps.length, 1);
+    assert.strictEqual(receipts.timestamps.length, 1, 'receipts');
     assert.strictEqual(receipts.timestamps[0], timestamp);
   });
+
+  it('should send non-bubble in ConvoA when ConvoB completes challenge', async () => {
+    const { server, desktop } = bootstrap;
+
+    debug(
+      `Rate limiting (desktop: ${desktop.aci}) -> (ContactA: ${contact.device.aci})`
+    );
+    server.rateLimit({ source: desktop.aci, target: contact.device.aci });
+    debug(
+      `Rate limiting (desktop: ${desktop.aci}) -> (ContactB: ${contactB.device.aci})`
+    );
+    server.rateLimit({ source: desktop.aci, target: contactB.device.aci });
+
+    const window = await app.getWindow();
+    const leftPane = window.locator('#LeftPane');
+    const conversationStack = window.locator('.Inbox__conversation-stack');
+
+    debug('Sending a message from ContactA');
+    const timestampA = bootstrap.getTimestamp();
+    await contact.sendText(desktop, 'Hello there!', {
+      timestamp: timestampA,
+    });
+
+    debug(`Opening conversation with ContactA (${contact.toContact().aci})`);
+    await leftPane
+      .locator(`[data-testid="${contact.toContact().aci}"]`)
+      .click();
+
+    debug('Accept conversation from ContactA - does not trigger captcha!');
+    await conversationStack
+      .locator('.module-message-request-actions button >> "Accept"')
+      .click();
+
+    debug('Sending a message from ContactB');
+    const timestampB = bootstrap.getTimestamp();
+    await contactB.sendText(desktop, 'Hey there!', {
+      timestamp: timestampB,
+    });
+
+    debug(`Opening conversation with ContactB (${contact.toContact().aci})`);
+    await leftPane
+      .locator(`[data-testid="${contactB.toContact().aci}"]`)
+      .click();
+
+    debug('Accept conversation from ContactB - does not trigger captcha!');
+    await conversationStack
+      .locator('.module-message-request-actions button >> "Accept"')
+      .click();
+
+    debug('Sending a message back to ContactB - will trigger captcha!');
+    {
+      const input = await app.waitForEnabledComposer();
+      await input.type('Hi, good to hear from you!');
+      await input.press('Enter');
+    }
+
+    debug('Waiting for challenge');
+    const request = await app.waitForChallenge();
+
+    debug('Solving challenge');
+    await app.solveChallenge({
+      seq: request.seq,
+      data: { captcha: 'anything' },
+    });
+
+    const requestsA = server.stopRateLimiting({
+      source: desktop.aci,
+      target: contact.device.aci,
+    });
+    const requestsB = server.stopRateLimiting({
+      source: desktop.aci,
+      target: contactB.device.aci,
+    });
+
+    debug(`Rate-limited requests to A: ${requestsA}`);
+    assert.strictEqual(requestsA, 1, 'rate limit requests');
+
+    debug(`Rate-limited requests to B: ${requestsA}`);
+    assert.strictEqual(requestsB, 1, 'rate limit requests');
+
+    debug('Waiting for outgoing read receipt #1');
+    const receipts1 = await app.waitForReceipts();
+
+    assert.strictEqual(receipts1.type, ReceiptType.Read);
+    assert.strictEqual(receipts1.timestamps.length, 1, 'receipts');
+    if (
+      !receipts1.timestamps.includes(timestampA) &&
+      !receipts1.timestamps.includes(timestampB)
+    ) {
+      throw new Error(
+        'receipts1: Failed to find both timestampA and timestampB'
+      );
+    }
+
+    debug('Waiting for outgoing read receipt #2');
+    const receipts2 = await app.waitForReceipts();
+
+    assert.strictEqual(receipts2.type, ReceiptType.Read);
+    assert.strictEqual(receipts2.timestamps.length, 1, 'receipts');
+    if (
+      !receipts2.timestamps.includes(timestampA) &&
+      !receipts2.timestamps.includes(timestampB)
+    ) {
+      throw new Error(
+        'receipts2: Failed to find both timestampA and timestampB'
+      );
+    }
+  });
 });