From 66a6190f2ba5885443c52f42e617b4050b4a8143 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 19 Feb 2021 17:47:13 +1100
Subject: [PATCH] remove unused replyable error types

---
 libtextsecure/errors.js  | 48 ----------------------------------------
 libtextsecure/index.d.ts |  4 ----
 ts/models/message.ts     |  4 +---
 3 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/libtextsecure/errors.js b/libtextsecure/errors.js
index aa17a9710..b09aad456 100644
--- a/libtextsecure/errors.js
+++ b/libtextsecure/errors.js
@@ -35,18 +35,6 @@
   }
   inherit(Error, ReplayableError);
 
-  function IncomingIdentityKeyError(number, message, key) {
-    // eslint-disable-next-line prefer-destructuring
-    this.number = number.split('.')[0];
-    this.identityKey = key;
-
-    ReplayableError.call(this, {
-      name: 'IncomingIdentityKeyError',
-      message: `The identity of ${this.number} has changed.`,
-    });
-  }
-  inherit(ReplayableError, IncomingIdentityKeyError);
-
   function SendMessageNetworkError(number, jsonData, httpError) {
     this.number = number;
     this.code = httpError.code;
@@ -60,18 +48,6 @@
   }
   inherit(ReplayableError, SendMessageNetworkError);
 
-  function MessageError(message, httpError) {
-    this.code = httpError.code;
-
-    ReplayableError.call(this, {
-      name: 'MessageError',
-      message: httpError.message,
-    });
-
-    appendStack(this, httpError);
-  }
-  inherit(ReplayableError, MessageError);
-
   function EmptySwarmError(number, message) {
     // eslint-disable-next-line prefer-destructuring
     this.number = number.split('.')[0];
@@ -83,16 +59,6 @@
   }
   inherit(ReplayableError, EmptySwarmError);
 
-  function DNSResolutionError(message) {
-    // eslint-disable-next-line prefer-destructuring
-
-    ReplayableError.call(this, {
-      name: 'DNSResolutionError',
-      message: `Error resolving url: ${message}`,
-    });
-  }
-  inherit(ReplayableError, DNSResolutionError);
-
   function NotFoundError(message, error) {
     this.name = 'NotFoundError';
     this.message = message;
@@ -161,16 +127,6 @@
     }
   }
 
-  function PublicTokenError(message) {
-    this.name = 'PublicTokenError';
-
-    ReplayableError.call(this, {
-      name: 'PublicTokenError',
-      message,
-    });
-  }
-  inherit(ReplayableError, PublicTokenError);
-
   function TimestampError(message) {
     this.name = 'TimeStampError';
 
@@ -194,17 +150,13 @@
   }
 
   window.textsecure.SendMessageNetworkError = SendMessageNetworkError;
-  window.textsecure.IncomingIdentityKeyError = IncomingIdentityKeyError;
   window.textsecure.ReplayableError = ReplayableError;
-  window.textsecure.MessageError = MessageError;
   window.textsecure.EmptySwarmError = EmptySwarmError;
   window.textsecure.SeedNodeError = SeedNodeError;
-  window.textsecure.DNSResolutionError = DNSResolutionError;
   window.textsecure.HTTPError = HTTPError;
   window.textsecure.NotFoundError = NotFoundError;
   window.textsecure.WrongSwarmError = WrongSwarmError;
   window.textsecure.WrongDifficultyError = WrongDifficultyError;
   window.textsecure.TimestampError = TimestampError;
   window.textsecure.PublicChatError = PublicChatError;
-  window.textsecure.PublicTokenError = PublicTokenError;
 })();
diff --git a/libtextsecure/index.d.ts b/libtextsecure/index.d.ts
index 894521dc2..1b65814d1 100644
--- a/libtextsecure/index.d.ts
+++ b/libtextsecure/index.d.ts
@@ -5,18 +5,14 @@ export interface LibTextsecure {
   crypto: LibTextsecureCryptoInterface;
   storage: any;
   SendMessageNetworkError: any;
-  IncomingIdentityKeyError: any;
   ReplayableError: any;
-  MessageError: any;
   EmptySwarmError: any;
   SeedNodeError: any;
-  DNSResolutionError: any;
   HTTPError: any;
   NotFoundError: any;
   WrongSwarmError: any;
   WrongDifficultyError: any;
   TimestampError: any;
   PublicChatError: any;
-  PublicTokenError: any;
   createTaskWithTimeout(task: any, id: any, options?: any): Promise<any>;
 }
diff --git a/ts/models/message.ts b/ts/models/message.ts
index cf34456e6..f260487b9 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -930,9 +930,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
   public removeOutgoingErrors(number: string) {
     const errors = _.partition(
       this.get('errors'),
-      e =>
-        e.number === number &&
-        (e.name === 'MessageError' || e.name === 'SendMessageNetworkError')
+      e => e.number === number && e.name === 'SendMessageNetworkError'
     );
     this.set({ errors: errors[1] });
     return errors[0][0];