runfix(core): Revert changes to sending regular ping messages (#12048)

Author: Thomas Belin

package.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "@wireapp/antiscroll-2": "1.0.2",
     "@wireapp/avs": "7.2.91",
-    "@wireapp/core": "17.20.0",
+    "@wireapp/core": "17.20.2",
     "@wireapp/react-ui-kit": "7.54.0",
     "@wireapp/store-engine-dexie": "1.6.7",
     "@wireapp/store-engine-sqleet": "1.7.11",

src/script/conversation/MessageRepository.ts

@@ -27,6 +27,7 @@ import {
   Ephemeral,
   External,
   GenericMessage,
+  Knock,
   LastRead,
   LegalHoldStatus,
   MessageDelete,
@@ -223,16 +224,42 @@ export class MessageRepository {
    * @returns Resolves after sending the knock
    */
   public async sendPing(conversation: Conversation): Promise<void> {
-    const ping = this.core.service!.conversation.messageBuilder.createPing({
-      conversationId: conversation.id,
-      ping: {
-        expectsReadConfirmation: this.expectReadReceipt(conversation),
-        hotKnock: false,
-        legalHoldStatus: conversation.legalHoldStatus(),
-      },
+    if (conversation.isFederated()) {
+      const ping = this.core.service!.conversation.messageBuilder.createPing({
+        conversationId: conversation.id,
+        ping: {
+          expectsReadConfirmation: this.expectReadReceipt(conversation),
+          hotKnock: false,
+          legalHoldStatus: conversation.legalHoldStatus(),
+        },
+      });
+
+      this.sendAndInjectGenericCoreMessage(ping, conversation, {playPingAudio: true});
+    }
+    const protoKnock = new Knock({
+      [PROTO_MESSAGE_TYPE.EXPECTS_READ_CONFIRMATION]: this.expectReadReceipt(conversation),
+      [PROTO_MESSAGE_TYPE.LEGAL_HOLD_STATUS]: conversation.legalHoldStatus(),
+      hotKnock: false,
+    });
+
+    let genericMessage = new GenericMessage({
+      [GENERIC_MESSAGE_TYPE.KNOCK]: protoKnock,
+      messageId: createRandomUuid(),
     });
 
-    this.sendAndInjectGenericCoreMessage(ping, conversation, {playPingAudio: true});
+    if (conversation.messageTimer()) {
+      genericMessage = this.wrapInEphemeralMessage(genericMessage, conversation.messageTimer());
+    }
+
+    try {
+      await this._sendAndInjectGenericMessage(conversation, genericMessage);
+    } catch (error) {
+      if (!this.isUserCancellationError(error)) {
+        this.logger.error(`Error while sending knock: ${error.message}`, error);
+        throw error;
+      }
+    }
+    return undefined;
   }
 
   /**

yarn.lock

@@ -2964,10 +2964,10 @@
     logdown "3.3.1"
     rimraf "3.0.2"
 
-"@wireapp/[email protected].0":
-  version "17.20.0"
-  resolved "https://registry.yarnpkg.com/@wireapp/core/-/core-17.20.0.tgz#ed26b22c997cb9992fbf54b2c42533364d35659a"
-  integrity sha512-Bot7Rd0IuAC0ckQZAEbgMhkfRe2WP1j0XahXURS6V/T0cb4DtZG0uZEO67fib6axkQnbZUHhL0ai0CPE5JVT4g==
+"@wireapp/[email protected].2":
+  version "17.20.2"
+  resolved "https://registry.yarnpkg.com/@wireapp/core/-/core-17.20.2.tgz#9d5a31dd0659540e5d8b0adb7f7666bdf5c3b12c"
+  integrity sha512-wyErqAQO+ucdX4mVeXtsBeKeAWmdC4y+brBdBNr2Za+aSxbiNrM8ieRb5xohutd6Fn4aaIjrAY7i9e2uXowr6g==
   dependencies:
     "@types/long" "4.0.1"
     "@types/node" "~14"