From 3d09ee8bb27ca938f3e5feb8267f6610d6a69b61 Mon Sep 17 00:00:00 2001
From: vineyardbovines <spencerfpope@gmail.com>
Date: Wed, 15 Apr 2026 08:46:16 -0400
Subject: [PATCH 1/4] pr fixes

---
 src/components/dialogs/GifSelect.tsx | 64 ++++++++++++----------------
 src/state/queries/klipy.ts           |  2 +-
 2 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/src/components/dialogs/GifSelect.tsx b/src/components/dialogs/GifSelect.tsx
index ab99a9525b..bc58cbf137 100644
--- a/src/components/dialogs/GifSelect.tsx
+++ b/src/components/dialogs/GifSelect.tsx
@@ -8,9 +8,7 @@ import {
 import {type TextInput, View} from 'react-native'
 import {useWindowDimensions} from 'react-native'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
-import {Trans} from '@lingui/react/macro'
+import {Trans, useLingui} from '@lingui/react/macro'
 
 import {cleanError} from '#/lib/strings/errors'
 import {
@@ -90,7 +88,7 @@ function GifList({
   onSelectGif: (gif: Gif) => void
 }) {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
   const textInputRef = useRef<TextInput>(null)
@@ -98,14 +96,14 @@ function GifList({
   const [undeferredSearch, setSearch] = useState('')
   const search = useThrottledValue(undeferredSearch, 500)
   const {height} = useWindowDimensions()
-  const useKlipy = ax.features.enabled(ax.features.KlipyGifProviderEnable)
+  const klipyEnabled = ax.features.enabled(ax.features.KlipyGifProviderEnable)
 
   const isSearching = search.length > 0
 
-  const klipyTrending = useKlipyFeaturedGifsQuery({enabled: useKlipy})
-  const klipySearch = useKlipyGifSearchQuery(search, {enabled: useKlipy})
-  const tenorTrending = useTenorFeaturedGifsQuery({enabled: !useKlipy})
-  const tenorSearch = useTenorGifSearchQuery(search, {enabled: !useKlipy})
+  const klipyTrending = useKlipyFeaturedGifsQuery({enabled: klipyEnabled})
+  const klipySearch = useKlipyGifSearchQuery(search, {enabled: klipyEnabled})
+  const tenorTrending = useTenorFeaturedGifsQuery({enabled: !klipyEnabled})
+  const tenorSearch = useTenorGifSearchQuery(search, {enabled: !klipyEnabled})
 
   const {
     data,
@@ -116,7 +114,7 @@ function GifList({
     isPending,
     isError,
     refetch,
-  } = useKlipy
+  } = klipyEnabled
     ? isSearching
       ? klipySearch
       : klipyTrending
@@ -172,7 +170,7 @@ function GifList({
             color="secondary"
             shape="round"
             onPress={() => control.close()}
-            label={_(msg`Close GIF dialog`)}>
+            label={l`Close GIF dialog`}>
             <ButtonIcon icon={Arrow} size="md" />
           </Button>
         )}
@@ -180,8 +178,8 @@ function GifList({
         <TextField.Root style={[!gtMobile && IS_WEB && a.flex_1]}>
           <TextField.Icon icon={Search} />
           <TextField.Input
-            label={_(msg`Search GIFs`)}
-            placeholder={useKlipy ? _(msg`Search KLIPY`) : _(msg`Search Tenor`)}
+            label={l`Search GIFs`}
+            placeholder={klipyEnabled ? l`Search KLIPY` : l`Search Tenor`}
             onChangeText={text => {
               setSearch(text)
               listRef.current?.scrollToOffset({offset: 0, animated: false})
@@ -199,7 +197,7 @@ function GifList({
         </TextField.Root>
       </View>
     )
-  }, [gtMobile, t.atoms.bg, _, control, useKlipy])
+  }, [gtMobile, t.atoms.bg, l, control, klipyEnabled])
 
   return (
     <>
@@ -226,22 +224,18 @@ function GifList({
                 emptyType="results"
                 sideBorders={false}
                 topBorder={false}
-                errorTitle={_(msg`Failed to load GIFs`)}
+                errorTitle={l`Failed to load GIFs`}
                 errorMessage={
-                  useKlipy
-                    ? _(msg`There was an issue connecting to KLIPY.`)
-                    : _(msg`There was an issue connecting to Tenor.`)
+                  klipyEnabled
+                    ? l`There was an issue connecting to KLIPY.`
+                    : l`There was an issue connecting to Tenor.`
                 }
                 emptyMessage={
                   isSearching
-                    ? _(msg`No search results found for "${search}".`)
-                    : useKlipy
-                      ? _(
-                          msg`No featured GIFs found. There may be an issue with KLIPY.`,
-                        )
-                      : _(
-                          msg`No featured GIFs found. There may be an issue with Tenor.`,
-                        )
+                    ? l`No search results found for "${search}".`
+                    : klipyEnabled
+                      ? l`No featured GIFs found. There may be an issue with KLIPY.`
+                      : l`No featured GIFs found. There may be an issue with Tenor.`
                 }
               />
             )}
@@ -268,23 +262,19 @@ function GifList({
 }
 
 function DialogError({details}: {details?: string}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const control = Dialog.useDialogContext()
 
   return (
-    <Dialog.ScrollableInner
-      style={a.gap_md}
-      label={_(msg`An error has occurred`)}>
+    <Dialog.ScrollableInner style={a.gap_md} label={l`An error has occurred`}>
       <Dialog.Close />
       <ErrorScreen
-        title={_(msg`Oh no!`)}
-        message={_(
-          msg`There was an unexpected issue in the application. Please let us know if this happened to you!`,
-        )}
+        title={l`Oh no!`}
+        message={l`There was an unexpected issue in the application. Please let us know if this happened to you!`}
         details={details}
       />
       <Button
-        label={_(msg`Close dialog`)}
+        label={l`Close dialog`}
         onPress={() => control.close()}
         color="primary"
         size="large"
@@ -306,7 +296,7 @@ export function GifPreview({
 }) {
   const ax = useAnalytics()
   const {gtTablet} = useBreakpoints()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   const onPress = useCallback(() => {
@@ -316,7 +306,7 @@ export function GifPreview({
 
   return (
     <Button
-      label={_(msg`Select GIF "${gif.title}"`)}
+      label={l`Select GIF "${gif.title}"`}
       style={[a.flex_1, gtTablet ? {maxWidth: '33%'} : {maxWidth: '50%'}]}
       onPress={onPress}>
       {({pressed}) => (
diff --git a/src/state/queries/klipy.ts b/src/state/queries/klipy.ts
index f482bf8632..59e80bc0f8 100644
--- a/src/state/queries/klipy.ts
+++ b/src/state/queries/klipy.ts
@@ -79,7 +79,7 @@ function createKlipyApi<Input extends object>(
       },
     })
     if (!res.ok) {
-      throw new Error('Failed to fetch KLIPY API')
+      throw new Error(`Failed to fetch KLIPY API (status ${res.status})`)
     }
     const body: {next: string; results: Gif[]} = await res.json()
     return {

From b7f2c359f66d9dd2a2cffb081df893a682d428aa Mon Sep 17 00:00:00 2001
From: vineyardbovines <spencerfpope@gmail.com>
Date: Wed, 15 Apr 2026 12:33:51 -0400
Subject: [PATCH 2/4] use cdn

---
 __tests__/lib/string.test.ts    | 31 ++++++++++++++++++++++++-------
 src/lib/strings/embed-player.ts |  4 +++-
 src/state/queries/klipy.ts      | 15 ++++++++-------
 src/state/queries/tenor.ts      | 12 ++++++++----
 4 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/__tests__/lib/string.test.ts b/__tests__/lib/string.test.ts
index 0c441ccdc2..8d999ba7af 100644
--- a/__tests__/lib/string.test.ts
+++ b/__tests__/lib/string.test.ts
@@ -8,7 +8,7 @@ import {
   parseStarterPackUri,
 } from '#/lib/strings/starter-pack'
 import {messages} from '#/locale/locales/en/messages'
-import {klipyStaticUrl} from '#/state/queries/klipy'
+import {klipyUrlToBskyGifUrl} from '#/state/queries/klipy'
 import {tenorUrlToBskyGifUrl} from '#/state/queries/tenor'
 import {cleanError} from '../../src/lib/strings/errors'
 import {createFullHandle, makeValidHandle} from '../../src/lib/strings/handles'
@@ -858,7 +858,7 @@ describe('parseEmbedPlayerFromUrl', () => {
       source: 'klipy',
       isGif: true,
       hideDetails: true,
-      playerUri: 'https://static.klipy.com/ii/abc123/73/ac/someFile.gif',
+      playerUri: 'https://t.gifs.bsky.app/ii/abc123/73/ac/someFile.gif',
       dimensions: {
         width: 300,
         height: 200,
@@ -1073,13 +1073,30 @@ describe('tenorUrlToBskyGifUrl', () => {
   )
 })
 
-describe('klipyStaticUrl', () => {
-  it('returns the URL as-is for valid KLIPY static URLs', () => {
-    const input = 'https://static.klipy.com/ii/abc123/73/ac/someFile.gif'
-    expect(klipyStaticUrl(input)).toEqual(input)
+describe('klipyUrlToBskyGifUrl', () => {
+  const inputs = [
+    'https://static.klipy.com/ii/abc123/73/ac/someFile.gif',
+    'https://static.klipy.com/ii/abc123/73/ac/someFile.gif?hh=200&ww=300',
+  ]
+
+  it.each(inputs)(
+    'returns url with t.gifs.bsky.app as hostname for input url',
+    input => {
+      const out = klipyUrlToBskyGifUrl(input)
+      expect(out.startsWith('https://t.gifs.bsky.app/')).toEqual(true)
+    },
+  )
+
+  it('preserves the path and query params when rewriting', () => {
+    const out = klipyUrlToBskyGifUrl(
+      'https://static.klipy.com/ii/abc123/73/ac/someFile.gif?hh=200&ww=300',
+    )
+    expect(out).toEqual(
+      'https://t.gifs.bsky.app/ii/abc123/73/ac/someFile.gif?hh=200&ww=300',
+    )
   })
 
   it('returns empty string for invalid URLs', () => {
-    expect(klipyStaticUrl('not-a-url')).toEqual('')
+    expect(klipyUrlToBskyGifUrl('not-a-url')).toEqual('')
   })
 })
diff --git a/src/lib/strings/embed-player.ts b/src/lib/strings/embed-player.ts
index bbd4c11305..96978550b4 100644
--- a/src/lib/strings/embed-player.ts
+++ b/src/lib/strings/embed-player.ts
@@ -683,8 +683,10 @@ export function parseKlipyGif(urlp: URL):
     return {success: false}
   }
 
-  // Use the base URL without dimension params as the player URI
+  // Use the base URL without dimension params as the player URI,
+  // routed through the bsky proxy (t.gifs.bsky.app) — matching Tenor.
   const playerUrl = new URL(urlp.href)
+  playerUrl.hostname = 't.gifs.bsky.app'
   playerUrl.searchParams.delete('hh')
   playerUrl.searchParams.delete('ww')
 
diff --git a/src/state/queries/klipy.ts b/src/state/queries/klipy.ts
index 59e80bc0f8..4b646fb405 100644
--- a/src/state/queries/klipy.ts
+++ b/src/state/queries/klipy.ts
@@ -90,16 +90,17 @@ function createKlipyApi<Input extends object>(
 }
 
 /**
- * Returns the static URL for a KLIPY GIF preview image.
- * KLIPY images are served directly from their CDN (static.klipy.com),
- * unlike Tenor which routes through t.gifs.bsky.app.
+ * Rewrites a KLIPY static CDN URL through the bsky proxy
+ * (t.gifs.bsky.app), matching the behavior of `tenorUrlToBskyGifUrl`.
  */
-export function klipyStaticUrl(gifUrl: string) {
+export function klipyUrlToBskyGifUrl(klipyUrl: string) {
+  let url
   try {
-    new URL(gifUrl)
-    return gifUrl
+    url = new URL(klipyUrl)
   } catch (e) {
-    logger.debug('invalid url passed to klipyStaticUrl()')
+    logger.debug('invalid url passed to klipyUrlToBskyGifUrl()')
     return ''
   }
+  url.hostname = 't.gifs.bsky.app'
+  return url.href
 }
diff --git a/src/state/queries/tenor.ts b/src/state/queries/tenor.ts
index 3adc9139c8..310fa308b8 100644
--- a/src/state/queries/tenor.ts
+++ b/src/state/queries/tenor.ts
@@ -105,14 +105,18 @@ export function tenorUrlToBskyGifUrl(tenorUrl: string) {
 
 /**
  * Returns the appropriate URL for a GIF preview image.
- * Rewrites Tenor URLs through the bsky proxy (t.gifs.bsky.app);
- * KLIPY URLs pass through directly to their CDN.
+ * Both Tenor (media.tenor.com) and KLIPY (static.klipy.com) URLs are
+ * rewritten through the bsky proxy at t.gifs.bsky.app.
  */
 export function gifPreviewUrl(gifUrl: string) {
   try {
     const url = new URL(gifUrl)
-    if (url.hostname === 'media.tenor.com') {
-      return tenorUrlToBskyGifUrl(gifUrl)
+    if (
+      url.hostname === 'media.tenor.com' ||
+      url.hostname === 'static.klipy.com'
+    ) {
+      url.hostname = 't.gifs.bsky.app'
+      return url.href
     }
     return gifUrl
   } catch (e) {

From c402fbbe26ada5073ab6563cc0ebe60ebaad007c Mon Sep 17 00:00:00 2001
From: vineyardbovines <spencerfpope@gmail.com>
Date: Wed, 15 Apr 2026 12:46:52 -0400
Subject: [PATCH 3/4] ensure gif embed

---
 src/components/Post/Embed/ExternalEmbed/index.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/Post/Embed/ExternalEmbed/index.tsx b/src/components/Post/Embed/ExternalEmbed/index.tsx
index a884e4ec46..56873e6363 100644
--- a/src/components/Post/Embed/ExternalEmbed/index.tsx
+++ b/src/components/Post/Embed/ExternalEmbed/index.tsx
@@ -59,7 +59,10 @@ export const ExternalEmbed = ({
     }
   }, [link.uri, playHaptic])
 
-  if (embedPlayerParams?.source === 'tenor') {
+  if (
+    embedPlayerParams?.source === 'tenor' ||
+    embedPlayerParams?.source === 'klipy'
+  ) {
     const parsedAlt = parseAltFromGIFDescription(link.description)
     return (
       <View style={style}>

From ceea6bcf3c860758cb3c97fd24b39e0995896434 Mon Sep 17 00:00:00 2001
From: vineyardbovines <spencerfpope@gmail.com>
Date: Wed, 15 Apr 2026 13:33:26 -0400
Subject: [PATCH 4/4] update klipy cdn path

---
 __tests__/lib/string.test.ts    |  8 ++++----
 src/lib/strings/embed-player.ts |  6 ++++--
 src/state/queries/klipy.ts      |  6 ++++--
 src/state/queries/tenor.ts      | 13 +++++++------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/__tests__/lib/string.test.ts b/__tests__/lib/string.test.ts
index 8d999ba7af..753262a4f6 100644
--- a/__tests__/lib/string.test.ts
+++ b/__tests__/lib/string.test.ts
@@ -858,7 +858,7 @@ describe('parseEmbedPlayerFromUrl', () => {
       source: 'klipy',
       isGif: true,
       hideDetails: true,
-      playerUri: 'https://t.gifs.bsky.app/ii/abc123/73/ac/someFile.gif',
+      playerUri: 'https://k.gifs.bsky.app/ii/abc123/73/ac/someFile.gif',
       dimensions: {
         width: 300,
         height: 200,
@@ -1080,10 +1080,10 @@ describe('klipyUrlToBskyGifUrl', () => {
   ]
 
   it.each(inputs)(
-    'returns url with t.gifs.bsky.app as hostname for input url',
+    'returns url with k.gifs.bsky.app as hostname for input url',
     input => {
       const out = klipyUrlToBskyGifUrl(input)
-      expect(out.startsWith('https://t.gifs.bsky.app/')).toEqual(true)
+      expect(out.startsWith('https://k.gifs.bsky.app/')).toEqual(true)
     },
   )
 
@@ -1092,7 +1092,7 @@ describe('klipyUrlToBskyGifUrl', () => {
       'https://static.klipy.com/ii/abc123/73/ac/someFile.gif?hh=200&ww=300',
     )
     expect(out).toEqual(
-      'https://t.gifs.bsky.app/ii/abc123/73/ac/someFile.gif?hh=200&ww=300',
+      'https://k.gifs.bsky.app/ii/abc123/73/ac/someFile.gif?hh=200&ww=300',
     )
   })
 
diff --git a/src/lib/strings/embed-player.ts b/src/lib/strings/embed-player.ts
index 96978550b4..d8a5999797 100644
--- a/src/lib/strings/embed-player.ts
+++ b/src/lib/strings/embed-player.ts
@@ -684,9 +684,11 @@ export function parseKlipyGif(urlp: URL):
   }
 
   // Use the base URL without dimension params as the player URI,
-  // routed through the bsky proxy (t.gifs.bsky.app) — matching Tenor.
+  // routed through the bsky KLIPY proxy (k.gifs.bsky.app). Mirrors
+  // Tenor's t.gifs.bsky.app rewrite, but on a separate hostname so
+  // the two upstreams can be routed independently.
   const playerUrl = new URL(urlp.href)
-  playerUrl.hostname = 't.gifs.bsky.app'
+  playerUrl.hostname = 'k.gifs.bsky.app'
   playerUrl.searchParams.delete('hh')
   playerUrl.searchParams.delete('ww')
 
diff --git a/src/state/queries/klipy.ts b/src/state/queries/klipy.ts
index 4b646fb405..f87e031e31 100644
--- a/src/state/queries/klipy.ts
+++ b/src/state/queries/klipy.ts
@@ -91,7 +91,9 @@ function createKlipyApi<Input extends object>(
 
 /**
  * Rewrites a KLIPY static CDN URL through the bsky proxy
- * (t.gifs.bsky.app), matching the behavior of `tenorUrlToBskyGifUrl`.
+ * (k.gifs.bsky.app). Mirrors `tenorUrlToBskyGifUrl`, but uses a
+ * separate hostname from Tenor's t.gifs.bsky.app so the two
+ * upstreams can be routed independently.
  */
 export function klipyUrlToBskyGifUrl(klipyUrl: string) {
   let url
@@ -101,6 +103,6 @@ export function klipyUrlToBskyGifUrl(klipyUrl: string) {
     logger.debug('invalid url passed to klipyUrlToBskyGifUrl()')
     return ''
   }
-  url.hostname = 't.gifs.bsky.app'
+  url.hostname = 'k.gifs.bsky.app'
   return url.href
 }
diff --git a/src/state/queries/tenor.ts b/src/state/queries/tenor.ts
index 310fa308b8..97ce426e72 100644
--- a/src/state/queries/tenor.ts
+++ b/src/state/queries/tenor.ts
@@ -105,19 +105,20 @@ export function tenorUrlToBskyGifUrl(tenorUrl: string) {
 
 /**
  * Returns the appropriate URL for a GIF preview image.
- * Both Tenor (media.tenor.com) and KLIPY (static.klipy.com) URLs are
- * rewritten through the bsky proxy at t.gifs.bsky.app.
+ * Tenor URLs (media.tenor.com) are routed through t.gifs.bsky.app;
+ * KLIPY URLs (static.klipy.com) are routed through k.gifs.bsky.app.
  */
 export function gifPreviewUrl(gifUrl: string) {
   try {
     const url = new URL(gifUrl)
-    if (
-      url.hostname === 'media.tenor.com' ||
-      url.hostname === 'static.klipy.com'
-    ) {
+    if (url.hostname === 'media.tenor.com') {
       url.hostname = 't.gifs.bsky.app'
       return url.href
     }
+    if (url.hostname === 'static.klipy.com') {
+      url.hostname = 'k.gifs.bsky.app'
+      return url.href
+    }
     return gifUrl
   } catch (e) {
     logger.debug('invalid url passed to gifPreviewUrl()')