From 489145ffb8c456a7fa58162a7fe28454a3042064 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 May 2023 18:33:41 -0500
Subject: [PATCH] Remove normalizeCard()

---
 .../normalizers/__tests__/card.test.ts        | 14 -----------
 .../normalizers/__tests__/status.test.ts      |  1 -
 app/soapbox/normalizers/card.ts               | 25 -------------------
 app/soapbox/normalizers/index.ts              |  1 -
 app/soapbox/schemas/__tests__/card.test.ts    | 11 ++++++++
 5 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 app/soapbox/normalizers/__tests__/card.test.ts
 delete mode 100644 app/soapbox/normalizers/card.ts
 create mode 100644 app/soapbox/schemas/__tests__/card.test.ts

diff --git a/app/soapbox/normalizers/__tests__/card.test.ts b/app/soapbox/normalizers/__tests__/card.test.ts
deleted file mode 100644
index fc8d06221..000000000
--- a/app/soapbox/normalizers/__tests__/card.test.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Record as ImmutableRecord } from 'immutable';
-
-import { normalizeCard } from '../card';
-
-describe('normalizeCard()', () => {
-  it('adds base fields', () => {
-    const card = {};
-    const result = normalizeCard(card);
-
-    expect(ImmutableRecord.isRecord(result)).toBe(true);
-    expect(result.type).toEqual('link');
-    expect(result.url).toEqual('');
-  });
-});
diff --git a/app/soapbox/normalizers/__tests__/status.test.ts b/app/soapbox/normalizers/__tests__/status.test.ts
index 5ad29d926..5c66a4b9b 100644
--- a/app/soapbox/normalizers/__tests__/status.test.ts
+++ b/app/soapbox/normalizers/__tests__/status.test.ts
@@ -195,7 +195,6 @@ describe('normalizeStatus()', () => {
     const result = normalizeStatus(status);
     const card = result.card as Card;
 
-    expect(ImmutableRecord.isRecord(card)).toBe(true);
     expect(card.type).toEqual('link');
     expect(card.provider_url).toEqual('https://soapbox.pub');
   });
diff --git a/app/soapbox/normalizers/card.ts b/app/soapbox/normalizers/card.ts
deleted file mode 100644
index c29a0c40b..000000000
--- a/app/soapbox/normalizers/card.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { cardSchema, type Card } from 'soapbox/schemas/card';
-
-export const normalizeCard = (card: unknown): Card => {
-  try {
-    return cardSchema.parse(card);
-  } catch (_e) {
-    return {
-      author_name: '',
-      author_url: '',
-      blurhash: null,
-      description: '',
-      embed_url: '',
-      group: null,
-      height: 0,
-      html: '',
-      image: null,
-      provider_name: '',
-      provider_url: '',
-      title: '',
-      type: 'link',
-      url: '',
-      width: 0,
-    };
-  }
-};
diff --git a/app/soapbox/normalizers/index.ts b/app/soapbox/normalizers/index.ts
index 42c075daf..ef7dbd7ca 100644
--- a/app/soapbox/normalizers/index.ts
+++ b/app/soapbox/normalizers/index.ts
@@ -4,7 +4,6 @@ export { AdminReportRecord, normalizeAdminReport } from './admin-report';
 export { AnnouncementRecord, normalizeAnnouncement } from './announcement';
 export { AnnouncementReactionRecord, normalizeAnnouncementReaction } from './announcement-reaction';
 export { AttachmentRecord, normalizeAttachment } from './attachment';
-export { normalizeCard } from './card';
 export { ChatRecord, normalizeChat } from './chat';
 export { ChatMessageRecord, normalizeChatMessage } from './chat-message';
 export { EmojiRecord, normalizeEmoji } from './emoji';
diff --git a/app/soapbox/schemas/__tests__/card.test.ts b/app/soapbox/schemas/__tests__/card.test.ts
new file mode 100644
index 000000000..d66730c21
--- /dev/null
+++ b/app/soapbox/schemas/__tests__/card.test.ts
@@ -0,0 +1,11 @@
+import { cardSchema } from '../card';
+
+describe('cardSchema', () => {
+  it('adds base fields', () => {
+    const card = { url: 'https://soapbox.test' };
+    const result = cardSchema.parse(card);
+
+    expect(result.type).toEqual('link');
+    expect(result.url).toEqual(card.url);
+  });
+});