feat(infrastructure): convert to bun

luke-h1 · luke-h1 · commit c537e81cab9d · 2025-05-11T11:14:38.000+01:00
diff --git a/src/screens/DevTools/DebugScreen.tsx b/src/screens/DevTools/DebugScreen.tsx
@@ -4,7 +4,7 @@ import { useAuthContext } from '@app/context';
 import { useAppNavigation, useHeader, useDebugOptions } from '@app/hooks';
 import { AllowedKey, storageService, twitchService } from '@app/services';
 import { logger } from '@app/utils/logger';
-import Clipboard from 'expo-clipboard';
+import * as Clipboard from 'expo-clipboard';
 import { useState, useEffect } from 'react';
 import { Alert, FlatList, Switch, View } from 'react-native';
 import { createStyleSheet, useStyles } from 'react-native-unistyles';
@@ -41,11 +41,25 @@ function TwitchUsernameConverter() {
   const { styles } = useStyles(stylesheet);
   const [twitchUsername, setTwitchUsername] = useState<string>('');
   const [twitchUserId, setTwitchUserId] = useState<string>('');
+  const [isLoading, setIsLoading] = useState(false);
 
-  const handleConvertAndCopy = async () => {
-    const result = await twitchService.getUser(twitchUsername);
-    setTwitchUserId(result.id);
-    await Clipboard.setStringAsync(result.id);
+  const handleConvert = async () => {
+    if (!twitchUsername.trim()) {
+      Alert.alert('Error', 'Please enter a Twitch username');
+      return;
+    }
+
+    setIsLoading(true);
+    try {
+      const result = await twitchService.getUser(twitchUsername, undefined);
+      if (result.id) {
+        setTwitchUserId(result.id);
+      }
+    } catch {
+      Alert.alert('Error', 'Failed to convert username');
+    } finally {
+      setIsLoading(false);
+    }
   };
 
   return (
@@ -59,16 +73,16 @@ function TwitchUsernameConverter() {
         onChangeText={setTwitchUsername}
         style={styles.input}
       />
-      <Button
-        onPress={() => {
-          void handleConvertAndCopy();
-        }}
-        style={styles.button}
-      >
-        <Typography>Convert and Copy</Typography>
+      <Button onPress={() => void handleConvert()} style={styles.button}>
+        <Typography>
+          {isLoading ? 'Converting...' : 'Convert and Copy'}
+        </Typography>
       </Button>
       {twitchUserId ? (
-        <Typography style={styles.userId}>User ID: {twitchUserId}</Typography>
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        <Button onPress={() => Clipboard.setStringAsync(twitchUserId)}>
+          <Typography style={styles.userId}>User ID: {twitchUserId}</Typography>
+        </Button>
       ) : null}
     </View>
   );
@@ -93,10 +107,7 @@ function DisplayAccessToken() {
         </Typography>
         {authState?.token.accessToken && (
           // eslint-disable-next-line @typescript-eslint/no-misused-promises
-          <Button
-            onPress={() => handleCopyToClipboard}
-            style={styles.copyButton}
-          >
+          <Button onPress={handleCopyToClipboard} style={styles.copyButton}>
             <Typography style={styles.copyButtonText}>Copy</Typography>
           </Button>
         )}
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
@@ -18,7 +18,7 @@ export const twitchBadgeApi = new Client({
 // Better Twitch TV API
 export const bttvApi = new Client({
   baseURL: 'https://api.betterttv.net',
-  requestInterceptors: [createLoggerInterceptor('api')],
+  requestInterceptors: [createLoggerInterceptor('bttv')],
 });
 
 // cached Better Twitch TV emote API
@@ -36,18 +36,11 @@ export const sevenTvApi = new Client({
 // FrankerzFaceZ API
 export const ffzApi = new Client({
   baseURL: 'https://api.frankerfacez.com/v1',
-  requestInterceptors: [createLoggerInterceptor('api')],
+  requestInterceptors: [createLoggerInterceptor('ffz')],
 });
 
 // FrankerzFaceZ cached emote API
 export const ffzEmoteApi = new Client({
   baseURL: 'https://api.betterttv.net/3/cached/frankerfacez',
-  requestInterceptors: [createLoggerInterceptor('api')],
-});
-
-// IVR api - need to move to our own service. @see logs.ivr.fi & api.ivr.fi
-//
-export const ivrApi = new Client({
-  baseURL: 'https://api.ivr.fi/v2',
-  requestInterceptors: [createLoggerInterceptor('api')],
+  requestInterceptors: [createLoggerInterceptor('ffz')],
 });
diff --git a/src/services/ffzService.ts b/src/services/ffzService.ts
@@ -2,16 +2,7 @@
 import { logger } from '@app/utils/logger';
 import { ffzApi } from './api';
 import { SanitisiedEmoteSet } from './seventTvService';
-
-export interface SanitisedBadgeSet {
-  id: string;
-  url: string;
-  title: string;
-  color?: string;
-  owner_username?: string;
-  type?: string;
-  setId?: string;
-}
+import { SanitisedBadgeSet } from '.';
 
 interface FfzEmoticon {
   id: number;
@@ -145,8 +136,6 @@ export const ffzService = {
         return [];
       }
 
-      logger.ffz.info('result', result);
-
       if ('sets' in result) {
         const emoteSet = result.sets[result.room.set];
         const sanitistedSet =
@@ -192,6 +181,8 @@ export const ffzService = {
             title: badge.title,
             color: badge.color,
             owner_username: username,
+            set: badge.id.toString(),
+            type: 'FFZ global badge',
           });
         });
       });
diff --git a/src/services/twitchBadgeService.ts b/src/services/twitchBadgeService.ts
@@ -1,47 +1,103 @@
 import { OpenStringUnion } from '@app/utils';
-import { ivrApi } from './api';
+import { twitchApi } from './api';
 
-interface TwitchBadge {
+interface TwitchBadgeVersion {
   id: string;
   image_url_1x: string;
   image_url_2x: string;
   image_url_4x: string;
-  /**
-   * @example cheer 1
-   */
   title: string;
-
-  /**
-   * @example cheer 1
-   */
   description: string;
-  click_action: OpenStringUnion<'visit_url' | 'subscribe_to_channel'> | null;
+  click_action: string;
   click_url: string | null;
 }
 
-interface IvrChannelBadges {
-  set_id: OpenStringUnion<'bits' | 'subscriber'>;
-  versions: TwitchBadge[];
+interface TwitchBadge {
+  set_id: OpenStringUnion<'subscriber' | 'bits'>;
+  versions: TwitchBadgeVersion[];
+}
+
+export interface SanitisedBadgeSet {
+  id: string;
+  url: string;
+  type: OpenStringUnion<
+    | 'Twitch Channel Badge'
+    | 'Twitch Subscriber Badge'
+    | 'Twitch Bit Badge'
+    | 'Twitch Global Badge'
+  >;
+  title: string;
+
+  color?: string;
+  owner_username?: string;
+  /**
+   * The set ID
+   */
+  set: string;
 }
 
 export const twitchBadgeService = {
-  getBadges: async (broadcasterLogin: string) => {
-    const result = await ivrApi.get<IvrChannelBadges[]>(
-      '/twitch/badges/channel',
+  listSanitisedChannelBadges: async (
+    channelId: string,
+  ): Promise<SanitisedBadgeSet[]> => {
+    const result = await twitchApi.get<{ data: TwitchBadge[] }>(
+      '/chat/badges',
       {
         params: {
-          login: broadcasterLogin,
+          broadcaster_id: channelId,
         },
       },
     );
 
-    return result;
+    const sanitisedBadges: SanitisedBadgeSet[] = [];
+
+    result.data.forEach(badgeSet => {
+      if (badgeSet.set_id === 'bits') {
+        badgeSet.versions.forEach((badge: TwitchBadgeVersion) => {
+          sanitisedBadges.push({
+            id: badge.id,
+            url: badge.image_url_4x,
+            type: 'Twitch Bit Badge',
+            title: `Cheer ${badge.id}`,
+            set: badgeSet.set_id,
+          });
+        });
+      }
+      if (badgeSet.set_id === 'subscriber') {
+        badgeSet.versions.forEach((badge: TwitchBadgeVersion) => {
+          sanitisedBadges.push({
+            id: badge.id,
+            url: badge.image_url_4x,
+            type: 'Twitch Subscriber Badge',
+            title: badge.title,
+            set: badgeSet.set_id,
+          });
+        });
+      }
+    });
+
+    return sanitisedBadges;
   },
-  getGlobalBadges: async () => {
-    const result = await ivrApi.get<IvrChannelBadges[]>(
-      '/twitch/badges/global',
+  listSanitisedGlobalBadges: async (): Promise<SanitisedBadgeSet[]> => {
+    const result = await twitchApi.get<{ data: TwitchBadge[] }>(
+      '/chat/badges/global',
     );
 
-    return result;
+    const sanitisedBadges: SanitisedBadgeSet[] = [];
+
+    result.data.forEach(badgeSet => {
+      if (Object.keys(badgeSet).length > 0) {
+        badgeSet.versions.forEach(version => {
+          sanitisedBadges.push({
+            id: `${badgeSet.set_id}_${version.id}`, // set set_id as id
+            url: version.image_url_4x,
+            title: version.title,
+            type: 'Twitch Global Badge',
+            set: badgeSet.set_id,
+          });
+        });
+      }
+    });
+    return sanitisedBadges;
   },
 } as const;
diff --git a/src/services/twitchService.ts b/src/services/twitchService.ts
@@ -259,6 +259,7 @@ export const twitchService = {
     if (userId) {
       params.login = userId;
     }
+
     if (id) {
       params.id = id;
     }
@@ -267,7 +268,7 @@ export const twitchService = {
       params,
     });
 
-    return result.data[0] as UserInfoResponse;
+    return (result.data[0] as UserInfoResponse) ?? '';
   },
 
   searchChannels: async (query: string): Promise<SearchChannelResponse[]> => {
diff --git a/src/store/chatStore.ts b/src/store/chatStore.ts
@@ -232,6 +232,9 @@ const chatStoreCreator: StateCreator<ChatState> = set => ({
       }
 
       const [
+        /**
+         * Emotes
+         */
         sevenTvChannelEmotes,
         sevenTvGlobalEmotes,
         twitchChannelEmotes,
@@ -240,6 +243,12 @@ const chatStoreCreator: StateCreator<ChatState> = set => ({
         bttvChannelEmotes,
         ffzChannelEmotes,
         ffzGlobalEmotes,
+
+        /**
+         * Badges
+         */
+        twitchChannelBadges,
+        twitchGlobalBadges,
       ] = await Promise.allSettled([
         sevenTvService.getSanitisedEmoteSet(sevenTvSetId),
         sevenTvService.getSanitisedEmoteSet('global'),
@@ -249,13 +258,13 @@ const chatStoreCreator: StateCreator<ChatState> = set => ({
         bttvEmoteService.getSanitisedChannelEmotes(channelId),
         ffzService.getSanitisedChannelEmotes(channelId),
         ffzService.getSanitisedGlobalEmotes(),
+        twitchBadgeService.listSanitisedChannelBadges(channelId),
+        twitchBadgeService.listSanitisedGlobalBadges(),
       ]);
 
       logger.chat.info('fetched emotes 🚀');
 
-      const getValue = (
-        result: PromiseSettledResult<SanitisiedEmoteSet[]>,
-      ): SanitisiedEmoteSet[] =>
+      const getValue = <T>(result: PromiseSettledResult<T[]>): T[] =>
         result.status === 'fulfilled' ? result.value : [];
 
       // Log empty responses from emote providers
@@ -290,6 +299,8 @@ const chatStoreCreator: StateCreator<ChatState> = set => ({
         bttvChannelEmotes: getValue(bttvChannelEmotes),
         ffzChannelEmotes: getValue(ffzChannelEmotes),
         ffzGlobalEmotes: getValue(ffzGlobalEmotes),
+        twitchChannelBadges: getValue(twitchChannelBadges),
+        twitchGlobalBadges: getValue(twitchGlobalBadges),
       }));
 
       return true;

Original file line number	Diff line number	Diff line change
`@@ -259,6 +259,7 @@ export const twitchService = {`
`259`	`259`	`if (userId) {`
`260`	`260`	`params.login = userId;`
`261`	`261`	`}`
	`262`	`+`
`262`	`263`	`if (id) {`
`263`	`264`	`params.id = id;`
`264`	`265`	`}`
`@@ -267,7 +268,7 @@ export const twitchService = {`
`267`	`268`	`params,`
`268`	`269`	`});`
`269`	`270`
`270`		`- return result.data[0] as UserInfoResponse;`
	`271`	`+ return (result.data[0] as UserInfoResponse) ?? '';`
`271`	`272`	`},`
`272`	`273`
`273`	`274`	`searchChannels: async (query: string): Promise<SearchChannelResponse[]> => {`