From e4a632f601897f6cedec1e7b05fb4567da86b975 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Tue, 8 Jun 2021 15:55:37 -0500
Subject: [PATCH] Link previews: clean up AbortSignal types

---
 ts/linkPreviews/linkPreviewFetch.ts | 6 +++---
 ts/textsecure/SendMessage.ts        | 1 -
 ts/textsecure/WebAPI.ts             | 1 -
 ts/views/conversation_view.ts       | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ts/linkPreviews/linkPreviewFetch.ts b/ts/linkPreviews/linkPreviewFetch.ts
index 7a6a3d4d0d..5e1ebf551d 100644
--- a/ts/linkPreviews/linkPreviewFetch.ts
+++ b/ts/linkPreviews/linkPreviewFetch.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import { RequestInit, Response } from 'node-fetch';
-import { AbortSignal } from 'abort-controller';
+import type { AbortSignal as AbortSignalForNodeFetch } from 'abort-controller';
 
 import {
   IMAGE_GIF,
@@ -448,7 +448,7 @@ export async function fetchLinkPreviewMetadata(
         Accept: 'text/html,application/xhtml+xml',
         'User-Agent': USER_AGENT,
       },
-      signal: abortSignal,
+      signal: abortSignal as AbortSignalForNodeFetch,
     });
   } catch (err) {
     window.log.warn(
@@ -545,7 +545,7 @@ export async function fetchLinkPreviewImage(
         'User-Agent': USER_AGENT,
       },
       size: MAX_IMAGE_CONTENT_LENGTH,
-      signal: abortSignal,
+      signal: abortSignal as AbortSignalForNodeFetch,
     });
   } catch (err) {
     window.log.warn('fetchLinkPreviewImage: failed to fetch image; bailing');
diff --git a/ts/textsecure/SendMessage.ts b/ts/textsecure/SendMessage.ts
index da2a458c6b..c01b06d631 100644
--- a/ts/textsecure/SendMessage.ts
+++ b/ts/textsecure/SendMessage.ts
@@ -10,7 +10,6 @@
 
 import { Dictionary } from 'lodash';
 import PQueue from 'p-queue';
-import { AbortSignal } from 'abort-controller';
 import {
   PlaintextContent,
   ProtocolAddress,
diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts
index 43f589add7..6201e2eafc 100644
--- a/ts/textsecure/WebAPI.ts
+++ b/ts/textsecure/WebAPI.ts
@@ -10,7 +10,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import fetch, { Response } from 'node-fetch';
-import { AbortSignal } from 'abort-controller';
 import ProxyAgent from 'proxy-agent';
 import { Agent } from 'https';
 import pProps from 'p-props';
diff --git a/ts/views/conversation_view.ts b/ts/views/conversation_view.ts
index 9434239a98..9d3536428b 100644
--- a/ts/views/conversation_view.ts
+++ b/ts/views/conversation_view.ts
@@ -4088,7 +4088,7 @@ Whisper.ConversationView = Whisper.View.extend({
 
   async getStickerPackPreview(
     url: string,
-    abortSignal: any
+    abortSignal: Readonly<AbortSignal>
   ): Promise<null | GetLinkPreviewResult> {
     const isPackDownloaded = (pack: any) =>
       pack && (pack.status === 'downloaded' || pack.status === 'installed');
@@ -4164,7 +4164,7 @@ Whisper.ConversationView = Whisper.View.extend({
 
   async getGroupPreview(
     url: string,
-    abortSignal: any
+    abortSignal: Readonly<AbortSignal>
   ): Promise<null | GetLinkPreviewResult> {
     const urlObject = maybeParseUrl(url);
     if (!urlObject) {
@@ -4251,7 +4251,7 @@ Whisper.ConversationView = Whisper.View.extend({
 
   async getPreview(
     url: string,
-    abortSignal: any
+    abortSignal: Readonly<AbortSignal>
   ): Promise<null | GetLinkPreviewResult> {
     if (window.Signal.LinkPreviews.isStickerPack(url)) {
       return this.getStickerPackPreview(url, abortSignal);