Ensure /start navigates to /starter-pack when clicking a link int…

…ernally (bluesky-social#4745) * remove temporary metadata removal * ensure proper navigation
quiple · Jul 7, 2024 · a6b3c97 · a6b3c97
1 parent 6b5e318
commit a6b3c97
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 29 deletions.
diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts
@@ -5,6 +5,7 @@ import TLDs from 'tlds'
 import {logger} from '#/logger'
 import {BSKY_SERVICE} from 'lib/constants'
 import {isInvalidHandle} from 'lib/strings/handles'
+import {startUriToStarterPackUri} from 'lib/strings/starter-pack'
 
 export const BSKY_APP_HOST = 'https://bsky.app'
 const BSKY_TRUSTED_HOSTS = [
@@ -187,6 +188,11 @@ export function convertBskyAppUrlIfNeeded(url: string): string {
   if (isBskyAppUrl(url)) {
     try {
       const urlp = new URL(url)
+
+      if (isBskyStartUrl(url)) {
+        return startUriToStarterPackUri(urlp.pathname)
+      }
+
       return urlp.pathname
     } catch (e) {
       console.error('Unexpected error in convertBskyAppUrlIfNeeded()', e)

diff --git a/src/view/com/util/post-embeds/ExternalLinkEmbed.tsx b/src/view/com/util/post-embeds/ExternalLinkEmbed.tsx
@@ -79,37 +79,35 @@ export const ExternalLinkEmbed = ({
         ) : embedPlayerParams ? (
           <ExternalPlayer link={link} params={embedPlayerParams} />
         ) : undefined}
-        {!starterPackParsed ? (
-          <View
-            style={[
-              a.flex_1,
-              a.py_sm,
-              {
-                paddingHorizontal: isMobile ? 10 : 14,
-              },
-            ]}>
+        <View
+          style={[
+            a.flex_1,
+            a.py_sm,
+            {
+              paddingHorizontal: isMobile ? 10 : 14,
+            },
+          ]}>
+          <Text
+            type="sm"
+            numberOfLines={1}
+            style={[pal.textLight, {marginVertical: 2}]}>
+            {toNiceDomain(link.uri)}
+          </Text>
+
+          {!embedPlayerParams?.isGif && !embedPlayerParams?.dimensions && (
+            <Text type="lg-bold" numberOfLines={3} style={[pal.text]}>
+              {link.title || link.uri}
+            </Text>
+          )}
+          {link.description ? (
             <Text
-              type="sm"
-              numberOfLines={1}
-              style={[pal.textLight, {marginVertical: 2}]}>
-              {toNiceDomain(link.uri)}
+              type="md"
+              numberOfLines={link.thumb ? 2 : 4}
+              style={[pal.text, a.mt_xs]}>
+              {link.description}
             </Text>
-
-            {!embedPlayerParams?.isGif && !embedPlayerParams?.dimensions && (
-              <Text type="lg-bold" numberOfLines={3} style={[pal.text]}>
-                {link.title || link.uri}
-              </Text>
-            )}
-            {link.description ? (
-              <Text
-                type="md"
-                numberOfLines={link.thumb ? 2 : 4}
-                style={[pal.text, a.mt_xs]}>
-                {link.description}
-              </Text>
-            ) : undefined}
-          </View>
-        ) : null}
+          ) : undefined}
+        </View>
       </LinkWrapper>
     </View>
   )