Merge branch 'main' of https://github.com/bluesky-social/social-app

patches/@sentry+react-native+6.20.0.patch

···
+diff --git a/node_modules/@sentry/react-native/dist/js/tools/sentryMetroSerializer.js b/node_modules/@sentry/react-native/dist/js/tools/sentryMetroSerializer.js
+index d7f2350..e9c0368 100644
+--- a/node_modules/@sentry/react-native/dist/js/tools/sentryMetroSerializer.js
++++ b/node_modules/@sentry/react-native/dist/js/tools/sentryMetroSerializer.js
+@@ -12,12 +12,9 @@ exports.createSentryMetroSerializer = exports.unstable_beforeAssetSerializationP
+ const crypto = require("crypto");
+ const utils_1 = require("./utils");
+ const utils_2 = require("./vendor/metro/utils");
+-let countLines;
+-try {
+-    countLines = require('metro/private/lib/countLines');
+-}
+-catch (e) {
+-    countLines = require('metro/src/lib/countLines');
++const newline = /\r\n?|\n|\u2028|\u2029/g;
++function countLines(string) {
++    return (string.match(newline) || []).length + 1;
+ }
+ const DEBUG_ID_PLACE_HOLDER = '__debug_id_place_holder__';
+ const DEBUG_ID_MODULE_PATH = '__debugid__';
 diff --git a/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js b/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
-index c282ade..8777755 100755
+index b3783b5..d5e3e45 100755
 --- a/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
 +++ b/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
-@@ -215,7 +215,7 @@ for (const [assetGroupName, assets] of Object.entries(groupedAssets)) {
+@@ -218,7 +218,7 @@ for (const [assetGroupName, assets] of Object.entries(groupedAssets)) {
  
    const isHermes = assets.find(asset => asset.endsWith('.hbc'));
    const windowsCallback = process.platform === "win32" ? 'node ' : '';

patches/@sentry+react-native+6.20.0.patch.md

···
+# @sentry/react-native/scripts/expo-upload-sourcemaps.js patch
+
+Lets us specify the output directory for the sourcemaps via an environment variable.
+
+# @sentry/react-native/dist/js/tools/sentryMetroSerializer.js patch
+
+Patch of this: https://github.com/getsentry/sentry-react-native/issues/5180#issuecomment-3311772038
+
+Will be fixed in an upcoming release of @sentry/react-native - remove when available.

src/components/Post/Embed/VideoEmbed/index.tsx

···
       ) : (
         <ConstrainedImage
           fullBleed={crop === 'square'}
-          aspectRatio={constrained || 1}>
+          aspectRatio={constrained || 1}
+          // slightly smaller max height than images
+          // images use 16 / 9, for reference
+          minMobileAspectRatio={14 / 9}>
           {contents}
         </ConstrainedImage>
       )}

src/components/Post/Embed/VideoEmbed/index.web.tsx

···
 import {isFirefox} from '#/lib/browser'
 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
 import {ConstrainedImage} from '#/view/com/util/images/AutoSizedImage'
-import {atoms as a} from '#/alf'
+import {atoms as a, useTheme} from '#/alf'
 import {useIsWithinMessage} from '#/components/dms/MessageContext'
 import {useFullscreen} from '#/components/hooks/useFullscreen'
 import {
···
   embed: AppBskyEmbedVideo.View
   crop?: 'none' | 'square' | 'constrained'
 }) {
+  const t = useTheme()
   const ref = useRef<HTMLDivElement>(null)
   const {active, setActive, sendPosition, currentActiveView} =
     useActiveVideoWeb()
···
         sendPosition={sendPosition}
         isAnyViewActive={currentActiveView !== null}>
         {cropDisabled ? (
-          <View style={[a.w_full, a.overflow_hidden, {aspectRatio: max ?? 1}]}>
+          <View
+            style={[
+              a.w_full,
+              a.overflow_hidden,
+              {aspectRatio: max ?? 1},
+              a.rounded_md,
+              a.overflow_hidden,
+              t.atoms.bg_contrast_25,
+            ]}>
             {contents}
           </View>
         ) : (
           <ConstrainedImage
             fullBleed={crop === 'square'}
-            aspectRatio={constrained || 1}>
+            aspectRatio={constrained || 1}
+            // slightly smaller max height than images
+            // images use 16 / 9, for reference
+            minMobileAspectRatio={14 / 9}>
             {contents}
           </ConstrainedImage>
         )}

src/components/Post/Embed/index.tsx

···
         <ContentHider
           modui={rest.moderation?.ui('contentMedia')}
           activeStyle={[a.mt_sm]}>
-          <VideoEmbed embed={embed.view} />
+          <VideoEmbed embed={embed.view} crop="constrained" />
         </ContentHider>
       )
     }

src/view/com/util/images/AutoSizedImage.tsx

···
   aspectRatio,
   fullBleed,
   children,
+  minMobileAspectRatio,
 }: {
   aspectRatio: number
   fullBleed?: boolean
+  minMobileAspectRatio?: number
   children: React.ReactNode
 }) {
   const t = useTheme()
···
   const outerAspectRatio = React.useMemo<DimensionValue>(() => {
     const ratio =
       isNative || !gtMobile
-        ? Math.min(1 / aspectRatio, 16 / 9) // 9:16 bounding box
+        ? Math.min(1 / aspectRatio, minMobileAspectRatio ?? 16 / 9) // 9:16 bounding box
         : Math.min(1 / aspectRatio, 1) // 1:1 bounding box
     return `${ratio * 100}%`
-  }, [aspectRatio, gtMobile])
+  }, [aspectRatio, gtMobile, minMobileAspectRatio])
 
   return (
     <View style={[a.w_full]}>