Refactor ad providers to not use normalizeCard

app/soapbox/features/ads/providers/index.ts

@@ -6,7 +6,6 @@ import type { Card } from 'soapbox/types/entities';
 /** Map of available provider modules. */
 const PROVIDERS: Record<string, () => Promise<AdProvider>> = {
   soapbox: async() => (await import(/* webpackChunkName: "features/ads/soapbox" */'./soapbox-config')).default,
-  rumble: async() => (await import(/* webpackChunkName: "features/ads/rumble" */'./rumble')).default,
   truth: async() => (await import(/* webpackChunkName: "features/ads/truth" */'./truth')).default,
 };
 

app/soapbox/features/ads/providers/rumble.ts

@@ -1,58 +0,0 @@
-import axios from 'axios';
-
-import { getSettings } from 'soapbox/actions/settings';
-import { getSoapboxConfig } from 'soapbox/actions/soapbox';
-import { normalizeAd, normalizeCard } from 'soapbox/normalizers';
-
-import type { AdProvider } from '.';
-
-/** Rumble ad API entity. */
-interface RumbleAd {
-  type: number
-  impression: string
-  click: string
-  asset: string
-  expires: number
-}
-
-/** Response from Rumble ad server. */
-interface RumbleApiResponse {
-  count: number
-  ads: RumbleAd[]
-}
-
-/** Provides ads from Soapbox Config. */
-const RumbleAdProvider: AdProvider = {
-  getAds: async(getState) => {
-    const state = getState();
-    const settings = getSettings(state);
-    const soapboxConfig = getSoapboxConfig(state);
-    const endpoint = soapboxConfig.extensions.getIn(['ads', 'endpoint']) as string | undefined;
-
-    if (endpoint) {
-      try {
-        const { data } = await axios.get<RumbleApiResponse>(endpoint, {
-          headers: {
-            'Accept-Language': settings.get('locale', '*') as string,
-          },
-        });
-
-        return data.ads.map(item => normalizeAd({
-          impression: item.impression,
-          card: normalizeCard({
-            type: item.type === 1 ? 'link' : 'rich',
-            image: item.asset,
-            url: item.click,
-          }),
-          expires_at: new Date(item.expires * 1000),
-        }));
-      } catch (e) {
-        // do nothing
-      }
-    }
-
-    return [];
-  },
-};
-
-export default RumbleAdProvider;

app/soapbox/features/ads/providers/truth.ts

@@ -1,18 +1,19 @@
 import axios from 'axios';
+import { z } from 'zod';
 
 import { getSettings } from 'soapbox/actions/settings';
-import { normalizeCard } from 'soapbox/normalizers';
+import { cardSchema } from 'soapbox/schemas/card';
+import { filteredArray } from 'soapbox/schemas/utils';
 
 import type { AdProvider } from '.';
-import type { Card } from 'soapbox/types/entities';
 
 /** TruthSocial ad API entity. */
-interface TruthAd {
-  impression: string
-  card: Card
-  expires_at: string
-  reason: string
-}
+const truthAdSchema = z.object({
+  impression: z.string(),
+  card: cardSchema,
+  expires_at: z.string(),
+  reason: z.string().catch(''),
+});
 
 /** Provides ads from the TruthSocial API. */
 const TruthAdProvider: AdProvider = {
@@ -21,16 +22,13 @@ const TruthAdProvider: AdProvider = {
     const settings = getSettings(state);
 
     try {
-      const { data } = await axios.get<TruthAd[]>('/api/v2/truth/ads?device=desktop', {
+      const { data } = await axios.get('/api/v2/truth/ads?device=desktop', {
         headers: {
-          'Accept-Language': settings.get('locale', '*') as string,
+          'Accept-Language': z.string().catch('*').parse(settings.get('locale')),
         },
       });
 
-      return data.map(item => ({
-        ...item,
-        card: normalizeCard(item.card),
-      }));
+      return filteredArray(truthAdSchema).parse(data);
     } catch (e) {
       // do nothing
     }