Unify lightbox types

src/screens/Profile/Header/Shell.tsx

@@ -55,8 +55,18 @@ let ProfileHeaderShell = ({
     const modui = moderation.ui('avatar')
     if (profile.avatar && !(modui.blur && modui.noOverride)) {
       openLightbox({
-        type: 'profile-image',
+        images: [
-        profile: profile,
+          {
+            uri: profile.avatar,
+            thumbUri: profile.avatar,
+            dimensions: {
+              // It's fine if it's actually smaller but we know it's 1:1.
+              height: 1000,
+              width: 1000,
+            },
+          },
+        ],
+        index: 0,
         thumbDims: null,
       })
     }

src/state/lightbox.tsx

@@ -1,16 +1,9 @@
 import React from 'react'
 import type {MeasuredDimensions} from 'react-native-reanimated'
-import {AppBskyActorDefs} from '@atproto/api'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
 import {Dimensions} from '#/lib/media/types'
 
-type ProfileImageLightbox = {
-  type: 'profile-image'
-  profile: AppBskyActorDefs.ProfileViewDetailed
-  thumbDims: null
-}
-
 type ImagesLightboxItem = {
   uri: string
   thumbUri: string
@@ -18,15 +11,12 @@ type ImagesLightboxItem = {
   dimensions: Dimensions | null
 }
 
-type ImagesLightbox = {
+type Lightbox = {
-  type: 'images'
   images: ImagesLightboxItem[]
   thumbDims: MeasuredDimensions | null
   index: number
 }
 
-type Lightbox = ProfileImageLightbox | ImagesLightbox
-
 const LightboxContext = React.createContext<{
   activeLightbox: Lightbox | null
 }>({

src/view/com/lightbox/Lightbox.tsx

@@ -27,33 +27,11 @@ export function Lightbox() {
 
   if (!activeLightbox) {
     return null
-  } else if (activeLightbox.type === 'profile-image') {
+  } else {
     const opts = activeLightbox
     return (
       <ImageView
-        images={[
+        images={opts.images}
-          {
-            uri: opts.profile.avatar || '',
-            thumbUri: opts.profile.avatar || '',
-            dimensions: {
-              // It's fine if it's actually smaller but we know it's 1:1.
-              height: 1000,
-              width: 1000,
-            },
-          },
-        ]}
-        initialImageIndex={0}
-        thumbDims={opts.thumbDims}
-        visible
-        onRequestClose={onClose}
-        renderFooter={() => <LightboxFooter uri={opts.profile.avatar || ''} />}
-      />
-    )
-  } else if (activeLightbox.type === 'images') {
-    const opts = activeLightbox
-    return (
-      <ImageView
-        images={opts.images.map(img => ({...img}))}
         initialImageIndex={opts.index}
         thumbDims={opts.thumbDims}
         visible
@@ -66,8 +44,6 @@ export function Lightbox() {
         )}
       />
     )
-  } else {
-    return null
   }
 }
 

src/view/com/lightbox/Lightbox.web.tsx

@@ -38,24 +38,8 @@ export function Lightbox() {
     return null
   }
 
-  const initialIndex =
+  const initialIndex = activeLightbox.index
-    activeLightbox.type === 'images' ? activeLightbox.index : 0
+  const imgs = activeLightbox.images
-
-  let imgs: Img[] | undefined
-  if (activeLightbox.type === 'profile-image') {
-    const opts = activeLightbox
-    if (opts.profile.avatar) {
-      imgs = [{uri: opts.profile.avatar}]
-    }
-  } else if (activeLightbox.type === 'images') {
-    const opts = activeLightbox
-    imgs = opts.images
-  }
-
-  if (!imgs) {
-    return null
-  }
-
   return (
     <LightboxInner
       imgs={imgs}

src/view/com/profile/ProfileSubpageHeader.tsx

@@ -71,7 +71,6 @@ export function ProfileSubpageHeader({
       avatar // TODO && !(view.moderation.avatar.blur && view.moderation.avatar.noOverride)
     ) {
       openLightbox({
-        type: 'images',
         images: [
           {
             uri: avatar,

src/view/com/util/post-embeds/index.tsx

@@ -152,7 +152,6 @@ export function PostEmbeds({
         thumbDims: MeasuredDimensions | null,
       ) => {
         openLightbox({
-          type: 'images',
           images: items,
           index,
           thumbDims,