Merge pull request #25 from eurosky-social/eurosky/fork

deploy

Author: flo-bit

src/alf/atoms.ts

@@ -2,6 +2,7 @@ import {type StyleProp, type ViewStyle} from 'react-native'
 import {atoms as baseAtoms} from '@bsky.app/alf'
 
 import {CARD_ASPECT_RATIO} from '#/lib/constants'
+import * as tokens from '#/alf/tokens'
 import {native, platform, web} from '#/alf/util/platform'
 import * as Layout from '#/components/Layout'
 
@@ -10,6 +11,14 @@ const EXP_CURVE = 'cubic-bezier(0.16, 1, 0.3, 1)'
 export const atoms = {
   ...baseAtoms,
 
+  // Eurosky fork: text size for inputs
+  // A 16px minimum keeps mobile browsers from
+  // auto-zooming when an input is focused.
+  text_input: {
+    fontSize: tokens.inputMinFontSize,
+    letterSpacing: tokens.TRACKING,
+  },
+
   h_full_vh: web({
     height: '100vh',
   }),

src/alf/tokens.ts

@@ -5,6 +5,11 @@ import {EUROSKY_GRADIENTS} from '#/config/eurosky-theme'
 
 export * from '@bsky.app/alf/dist/tokens'
 
+// Eurosky fork: minimum font size for text inputs.
+// Mobile browsers auto-zoom when a focused input renders below 16px,
+// so inputs never go under this size.
+export const inputMinFontSize = 16
+
 export const color = {
   temp_purple: tokens.labelerColor.purple,
   temp_purple_dark: tokens.labelerColor.purple_dark,

src/components/ProgressGuide/FollowDialog.tsx

@@ -710,7 +710,7 @@ function SearchInput({
         onChangeText={onChangeText}
         onFocus={onFocus}
         onBlur={onBlur}
-        style={[a.flex_1, a.py_md, a.text_md, t.atoms.text]}
+        style={[a.flex_1, a.py_md, a.text_input, t.atoms.text]}
         placeholderTextColor={t.palette.contrast_500}
         keyboardAppearance={t.name === 'light' ? 'light' : 'dark'}
         returnKeyType="search"

src/components/dialogs/SearchablePeopleList.tsx

@@ -674,7 +674,7 @@ function SearchInput({
         onChangeText={onChangeText}
         onFocus={onFocus}
         onBlur={onBlur}
-        style={[a.flex_1, a.py_md, a.text_md, t.atoms.text]}
+        style={[a.flex_1, a.py_md, a.text_input, t.atoms.text]}
         placeholderTextColor={t.palette.contrast_500}
         keyboardAppearance={t.name === 'light' ? 'light' : 'dark'}
         returnKeyType="search"

src/components/dms/components/UserSearchInput.tsx

@@ -45,7 +45,7 @@ export function UserSearchInput({
         onChangeText={onChangeText}
         onFocus={onFocus}
         onBlur={onBlur}
-        style={[a.flex_1, a.py_md, a.text_md, t.atoms.text]}
+        style={[a.flex_1, a.py_md, a.text_input, t.atoms.text]}
         placeholderTextColor={t.palette.contrast_500}
         keyboardAppearance={t.name === 'light' ? 'light' : 'dark'}
         returnKeyType="search"

src/components/forms/AutosizedTextarea.tsx

@@ -35,7 +35,7 @@ export function AutosizedTextarea({
   const {style, minInputHeight, maxInputHeight, verticalContentPadding} =
     useMemo(() => {
       const normalizedStyles = normalizeTextStyles(
-        [a.text_md, a.leading_snug, t.atoms.text, outerStyle],
+        [a.text_input, a.leading_snug, t.atoms.text, outerStyle],
         {
           fontScale: fonts.scaleMultiplier,
           fontFamily: fonts.family,

src/components/forms/TextField.tsx

@@ -207,12 +207,12 @@ export function createInput(Component: typeof TextInput) {
       a.relative,
       a.z_20,
       a.flex_1,
-      a.text_md,
+      a.text_input,
       t.atoms.text,
       a.px_xs,
       {
         // paddingVertical doesn't work w/multiline - esb
-        lineHeight: a.text_md.fontSize * 1.2,
+        lineHeight: a.text_input.fontSize * 1.2,
         textAlignVertical: rest.multiline ? 'top' : undefined,
         minHeight: rest.multiline ? 80 : undefined,
         minWidth: 0,
@@ -436,17 +436,17 @@ export function GhostText({
       <Text
         style={[
           {color: 'transparent'},
-          a.text_md,
-          {lineHeight: a.text_md.fontSize * 1.1875},
+          a.text_input,
+          {lineHeight: a.text_input.fontSize * 1.1875},
           a.w_full,
         ]}
         numberOfLines={1}>
         {children}
         <Text
           style={[
             t.atoms.text_contrast_low,
-            a.text_md,
-            {lineHeight: a.text_md.fontSize * 1.1875},
+            a.text_input,
+            {lineHeight: a.text_input.fontSize * 1.1875},
           ]}>
           {value}
         </Text>

src/config/eurosky.ts

@@ -19,4 +19,17 @@ export const EUROSKY = {
     /** Display name used in page/tab titles and in-app brand text. */
     name: 'Eurosky',
   },
+  web: {
+    /**
+     * Web hostnames this app serves its own UI on. A link pasted to one of
+     * these hosts (in the composer or a DM) is detected as a first-party
+     * record - quote post, feed, list, or starter pack - and rendered as a
+     * rich embed, exactly like a bsky.app link, instead of a plain link card.
+     *
+     * Bare hostnames only: no scheme, no trailing slash, no subdomain wildcard
+     * (matching is exact). bsky.app is always treated as first-party in
+     * addition to these.
+     */
+    hosts: ['mu.social'],
+  },
 } as const

src/lib/constants.ts

@@ -242,6 +242,7 @@ export const TRUSTED_VERIFIER_DIDS = [
   'did:plc:durcipmx2rwgzzagbiumobs5', // france-atmosphe.re
   'did:plc:ooensn4mr5mhznzypvxelfa3', // eurosky.social
   'did:plc:u5zp7npt5kpueado77kuihyz', // npmx.dev
+  'did:plc:hd564mpf6bekrwzyhvujs54b', // medsky.network
 ]
 
 /**

src/lib/strings/url-helpers.ts

@@ -6,13 +6,27 @@ import {BSKY_SERVICE} from '#/lib/constants'
 import {isInvalidHandle} from '#/lib/strings/handles'
 import {startUriToStarterPackUri} from '#/lib/strings/starter-pack'
 import {logger} from '#/logger'
+import {EUROSKY} from '#/config/eurosky'
 
 export const BSKY_APP_HOST = 'https://bsky.app'
+
+/**
+ * Hostnames whose web URLs we treat as first-party app links. Pasting one of
+ * these into the composer or a DM resolves it to an in-app record embed (quote
+ * post, feed, list, starter pack) instead of a plain external link card.
+ * Upstream only knows about bsky.app; the fork adds its own web host(s) via
+ * EUROSKY.web.hosts. See isBskyAppUrl().
+ */
+const APP_URL_HOSTS = ['bsky.app', ...EUROSKY.web.hosts]
+
 const BSKY_TRUSTED_HOSTS = [
   'bsky\\.app',
   'bsky\\.social',
   'blueskyweb\\.xyz',
   'blueskyweb\\.zendesk\\.com',
+  // Fork web host(s) are first-party too, so links to them are not treated as
+  // untrusted/external (e.g. no phishing warning interstitial).
+  ...EUROSKY.web.hosts.map(host => host.replace(/\./g, '\\.')),
   ...(__DEV__ ? ['localhost:19006', 'localhost:8100'] : []),
 ]
 
@@ -121,18 +135,22 @@ export function toBskyAppUrl(url: string): string {
 }
 
 export function isBskyAppUrl(url: string): boolean {
-  return url.startsWith('https://bsky.app/')
+  // Match by parsed hostname rather than a string prefix so that fork hosts are
+  // supported and look-alike hosts (e.g. https://bsky.app.evil.com/) are not.
+  try {
+    const urlp = new URL(url)
+    return urlp.protocol === 'https:' && APP_URL_HOSTS.includes(urlp.hostname)
+  } catch {
+    return false
+  }
 }
 
 export function isRelativeUrl(url: string): boolean {
   return /^\/[^/]/.test(url)
 }
 
 export function isBskyRSSUrl(url: string): boolean {
-  return (
-    (url.startsWith('https://bsky.app/') || isRelativeUrl(url)) &&
-    /\/rss\/?$/.test(url)
-  )
+  return (isBskyAppUrl(url) || isRelativeUrl(url)) && /\/rss\/?$/.test(url)
 }
 
 export function isExternalUrl(url: string): boolean {