Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Refine unavailable Space content handling

Anand Baburajan64d85e2425e6
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index e194000258..674f21742a 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2558,6 +2558,7 @@ dependencies = [
"ente-core",
"ente-test-support",
"futures-util",
+ "log",
"md-5 0.11.0",
"mockito",
"reqwest 0.12.28",
@@ -2577,6 +2578,7 @@ dependencies = [
"ente-core",
"ente-space",
"ente-wasm-log",
+ "log",
"serde",
"serde-wasm-bindgen",
"tokio",
diff --git a/rust/bindings/wasm/space/Cargo.toml b/rust/bindings/wasm/space/Cargo.toml
index 117651eb1a..5ece705833 100644
--- a/rust/bindings/wasm/space/Cargo.toml
+++ b/rust/bindings/wasm/space/Cargo.toml
@@ -9,6 +9,7 @@ crate-type = ["cdylib"]
ente-core.workspace = true
ente-space.workspace = true
ente-wasm-log.workspace = true
+log.workspace = true
serde.workspace = true
serde-wasm-bindgen = "0.6"
wasm-bindgen.workspace = true
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rs
index 1c2467c669..1a68bac4e6 100644
--- a/rust/bindings/wasm/space/src/space.rs
+++ b/rust/bindings/wasm/space/src/space.rs
@@ -318,7 +318,13 @@ fn created_space_to_js(value: CreatedSpace) -> CreatedSpaceJs {
}
fn profile_to_js(value: DecryptedSpaceProfile) -> Result<SpaceProfileJs, WasmSpaceError> {
- let profile = String::from_utf8(value.profile).unwrap_or_default();
+ let profile = String::from_utf8(value.profile).unwrap_or_else(|error| {
+ log::warn!(
+ "Space profile {} has invalid UTF-8: {error}",
+ value.space_id
+ );
+ String::new()
+ });
Ok(SpaceProfileJs {
space_id: value.space_id,
space_slug: value.space_slug,
@@ -357,7 +363,15 @@ async fn account_actor_to_js(
};
match converted {
Ok(actor) => Ok(actor),
- Err(error) if error.is_content_error() => public_actor_to_js(fallback),
+ Err(error) if error.is_content_error() => {
+ log::warn!(
+ "Space profile {} fell back to public fields: {}: {}",
+ fallback.space_id,
+ error.code,
+ error.message
+ );
+ public_actor_to_js(fallback)
+ }
Err(error) => Err(error),
}
}
@@ -448,6 +462,12 @@ async fn account_post_page_to_js(
match converted {
Ok(post) => items.push(post),
Err(error) if error.is_content_error() => {
+ log::warn!(
+ "Space post {} is unavailable: {}: {}",
+ fallback.post_id,
+ error.code,
+ error.message
+ );
items.push(unavailable_post_to_js(fallback)?);
}
Err(error) => return Err(error),
@@ -543,7 +563,15 @@ async fn resilient_account_message_response_to_js(
let fallback = message.clone();
match account_message_response_to_js(ctx, viewer_space_id, message).await {
Ok(message) => Ok(message),
- Err(error) if error.is_content_error() => Ok(unavailable_message_to_js(fallback)),
+ Err(error) if error.is_content_error() => {
+ log::warn!(
+ "Space message {} is unavailable: {}: {}",
+ fallback.message_id,
+ error.code,
+ error.message
+ );
+ Ok(unavailable_message_to_js(fallback))
+ }
Err(error) => Err(error),
}
}
@@ -628,6 +656,12 @@ async fn resilient_message_conversation_activity_to_js(
match message_conversation_activity_to_js(ctx, viewer_space_id, activity).await {
Ok(activity) => Ok(activity),
Err(error) if error.is_content_error() => {
+ log::warn!(
+ "Space conversation activity {} is unavailable: {}: {}",
+ fallback.id,
+ error.code,
+ error.message
+ );
Ok(unavailable_message_conversation_activity_to_js(fallback))
}
Err(error) => Err(error),
@@ -699,6 +733,12 @@ impl SpaceLinkCtxHandle {
match converted {
Ok(post) => items.push(post),
Err(error) if error.is_content_error() => {
+ log::warn!(
+ "Space post {} is unavailable: {}: {}",
+ fallback.post_id,
+ error.code,
+ error.message
+ );
items.push(unavailable_post_to_js(fallback)?);
}
Err(error) => return Err(error),
diff --git a/rust/crates/space/Cargo.toml b/rust/crates/space/Cargo.toml
index e08d5d9408..7bbb537f95 100644
--- a/rust/crates/space/Cargo.toml
+++ b/rust/crates/space/Cargo.toml
@@ -9,6 +9,7 @@ museum = []
[dependencies]
ente-core.workspace = true
futures-util = "0.3.32"
+log.workspace = true
md-5.workspace = true
serde.workspace = true
serde_json.workspace = true
diff --git a/rust/crates/space/src/client/links.rs b/rust/crates/space/src/client/links.rs
index 8b95e8083e..8adf7f67d3 100644
--- a/rust/crates/space/src/client/links.rs
+++ b/rust/crates/space/src/client/links.rs
@@ -425,6 +425,10 @@ async fn fetch_link_snapshot(
let profile = match decrypt_space_profile(&profile_response.profile, &space_key) {
Ok(profile) => profile,
Err(error) if error.is_content_error() => {
+ log::warn!(
+ "Space profile {} fell back to public fields: {error}",
+ profile_response.profile.space_id
+ );
space_profile_without_payload(&profile_response.profile)
}
Err(error) => return Err(error),
diff --git a/rust/crates/space/src/client/mod.rs b/rust/crates/space/src/client/mod.rs
index a5358ba7ec..1d8fb668a1 100644
--- a/rust/crates/space/src/client/mod.rs
+++ b/rust/crates/space/src/client/mod.rs
@@ -583,9 +583,12 @@ impl AccountSpaceCtx {
let shares = self.list_friend_shares(space_id).await?;
let mut value = Vec::with_capacity(shares.len());
for share in shares {
+ let friend = share.friend.clone();
match self.decrypt_friend_share(space_id, &share).await {
Ok(share) => value.push(share),
- Err(error) if error.is_content_error() => {}
+ Err(error) if error.is_content_error() => {
+ log::warn!("Space friend share {friend} is unusable: {error}");
+ }
Err(error) => return Err(error),
}
}
diff --git a/rust/crates/space/src/client/profiles.rs b/rust/crates/space/src/client/profiles.rs
index 9b0df19f44..f3a7dbe0c5 100644
--- a/rust/crates/space/src/client/profiles.rs
+++ b/rust/crates/space/src/client/profiles.rs
@@ -91,7 +91,10 @@ impl AccountSpaceCtx {
})?;
match decrypt_space_profile(&profile, &space_key) {
Ok(decrypted) => Ok(decrypted),
- Err(error) if error.is_content_error() => Ok(space_profile_without_payload(&profile)),
+ Err(error) if error.is_content_error() => {
+ log::warn!("Space profile {space_id} fell back to public fields: {error}");
+ Ok(space_profile_without_payload(&profile))
+ }
Err(error) => Err(error),
}
}
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 44d2067c8b..1a1420fb9e 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -387,7 +387,6 @@ interface FeedItemProps {
friendID: string;
imageUrl?: string;
isAvatarPending: boolean;
- isMediaUnavailable?: boolean;
isOwnPost: boolean;
isUnavailable?: boolean;
name: string;
@@ -734,7 +733,6 @@ const FeedItem: React.FC<FeedItemProps> = ({
friendID,
imageUrl,
isAvatarPending,
- isMediaUnavailable = false,
isOwnPost,
isUnavailable = false,
name,
@@ -766,7 +764,6 @@ const FeedItem: React.FC<FeedItemProps> = ({
() => thumbHashDataURLFromBase64(thumbHash),
[thumbHash],
);
- const showFooter = !isOwnPost && !isUnavailable;
const canOpenAuthor = isOwnPost
? Boolean(onOpenProfile)
: Boolean(onOpenFriend);
@@ -784,7 +781,8 @@ const FeedItem: React.FC<FeedItemProps> = ({
useState<LoadedFeedPhotoDimensions | null>(null);
const decodedPhoto = useDecodedImage(imageUrl, true);
const decodedAvatar = useDecodedImage(avatarUrl, true);
- const isPhotoUnavailable = isMediaUnavailable || decodedPhoto.failed;
+ const isPostUnavailable = isUnavailable || decodedPhoto.failed;
+ const showFooter = !isOwnPost && !isPostUnavailable;
const displayImageUrl =
(decodedPhoto.failed
? undefined
@@ -806,10 +804,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
feedPhotoFrameDimensionsFor(photoDimensions);
const isPhotoReady = Boolean(displayImageUrl) && decodedPhoto.ready;
const canOpenPhoto =
- !isUnavailable &&
- !isPhotoUnavailable &&
- isPhotoReady &&
- Boolean(onOpenPhoto);
+ !isPostUnavailable && isPhotoReady && Boolean(onOpenPhoto);
const [showResolvedPhoto, setShowResolvedPhoto] = useState(false);
const decodedPhotoHeight = decodedPhoto.height;
const decodedPhotoSrc = decodedPhoto.src;
@@ -876,7 +871,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
}, [viewerLiked]);
React.useEffect(() => {
- if (isUnavailable || isPhotoUnavailable) return;
+ if (isPostUnavailable) return;
if (shouldLoadMedia) return;
const element = rootRef.current;
if (!element) return;
@@ -899,10 +894,10 @@ const FeedItem: React.FC<FeedItemProps> = ({
);
observer.observe(element);
return () => observer.disconnect();
- }, [isPhotoUnavailable, isUnavailable, shouldLoadMedia]);
+ }, [isPostUnavailable, shouldLoadMedia]);
React.useEffect(() => {
- if (isUnavailable || isPhotoUnavailable) return;
+ if (isPostUnavailable) return;
if (!shouldLoadMedia) return;
if (!imageUrl) {
@@ -914,13 +909,19 @@ const FeedItem: React.FC<FeedItemProps> = ({
}, [
imageUrl,
isAvatarPending,
- isPhotoUnavailable,
- isUnavailable,
+ isPostUnavailable,
onLoadAvatar,
onLoadImage,
shouldLoadMedia,
]);
+ React.useEffect(() => {
+ if (!decodedPhoto.failed) return;
+ log.warn(
+ `Post ${postId} is unavailable because the browser could not decode its image`,
+ );
+ }, [decodedPhoto.failed, postId]);
+
React.useEffect(() => {
if (!decodedPhotoHeight || !decodedPhotoWidth) return;
if (!decodedPhotoSrc) return;
@@ -1002,11 +1003,9 @@ const FeedItem: React.FC<FeedItemProps> = ({
component="button"
type="button"
aria-label={
- isUnavailable
+ isPostUnavailable
? "Post unavailable"
- : isPhotoUnavailable
- ? "Media unavailable"
- : `Open ${name} photo`
+ : `Open ${name} photo`
}
disabled={!canOpenPhoto}
onClick={() => openPhoto()}
@@ -1029,8 +1028,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
},
}}
>
- {!isUnavailable &&
- !isPhotoUnavailable &&
+ {!isPostUnavailable &&
!thumbHashDataURL &&
!isPhotoReady && (
<Skeleton
@@ -1044,9 +1042,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
}}
/>
)}
- {!isUnavailable &&
- !isPhotoUnavailable &&
- thumbHashDataURL ? (
+ {!isPostUnavailable && thumbHashDataURL ? (
<Box
component="img"
alt=""
@@ -1065,7 +1061,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
}}
/>
) : null}
- {!isUnavailable && !isPhotoUnavailable && isPhotoReady && (
+ {!isPostUnavailable && isPhotoReady && (
<Box
component="img"
alt={`${name} post`}
@@ -1093,7 +1089,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
}}
/>
)}
- {(isUnavailable || isPhotoUnavailable) && (
+ {isPostUnavailable && (
<Box
sx={{
alignItems: "center",
@@ -1107,9 +1103,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
width: "100%",
}}
>
- {isUnavailable
- ? "Post unavailable"
- : "Media unavailable"}
+ Post unavailable
</Box>
)}
</Box>
@@ -1323,7 +1317,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
)}
</Box>
</Box>
- {displayCaption && (
+ {!isPostUnavailable && displayCaption && (
<FeedPhotoCaption caption={displayCaption} />
)}
</Box>
@@ -1595,8 +1589,9 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
const [loadedFeedImageURLsByKey, setLoadedFeedImageURLsByKey] = useState<
Record<string, string>
>({});
- const [unavailableFeedImagesByKey, setUnavailableFeedImagesByKey] =
- useState<Record<string, true>>({});
+ const [unavailableFeedPostsByKey, setUnavailableFeedPostsByKey] = useState<
+ Record<string, true>
+ >({});
const [feedScrollRequest, setFeedScrollRequest] = useState(0);
const postInputRef = React.useRef<HTMLInputElement | null>(null);
const feedLoadMoreRef = React.useRef<HTMLDivElement | null>(null);
@@ -1728,7 +1723,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
}
const cacheKey = feedPostImageCacheKey(item);
- if (unavailableFeedImagesByKey[cacheKey]) {
+ if (unavailableFeedPostsByKey[cacheKey]) {
return Promise.resolve(undefined);
}
const inFlight = feedImageLoadsInFlightRef.current.get(cacheKey);
@@ -1746,7 +1741,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
.catch((error: unknown) => {
log.warn("Failed to load feed post image", error);
if (isSpaceContentError(error)) {
- setUnavailableFeedImagesByKey((current) => ({
+ setUnavailableFeedPostsByKey((current) => ({
...current,
[cacheKey]: true,
}));
@@ -1759,7 +1754,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
feedImageLoadsInFlightRef.current.set(cacheKey, load);
return load;
},
- [loadedFeedImageURLFor, onLoadPostImage, unavailableFeedImagesByKey],
+ [loadedFeedImageURLFor, onLoadPostImage, unavailableFeedPostsByKey],
);
const loadFeedPostAvatar = React.useCallback(
(item: SpacePost) => {
@@ -1809,9 +1804,9 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
const imageUrl = loadedFeedImageURLFor(item);
const avatarUrl = loadedFeedAvatarURLFor(item);
const isAvatarPending = !item.isUnavailable && avatarUrl === undefined;
- const isMediaUnavailable = Boolean(
- unavailableFeedImagesByKey[feedPostImageCacheKey(item)],
- );
+ const isUnavailable =
+ Boolean(item.isUnavailable) ||
+ Boolean(unavailableFeedPostsByKey[feedPostImageCacheKey(item)]);
return (
<FeedItem
key={key}
@@ -1823,19 +1818,18 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
friendID={item.friendID}
imageUrl={imageUrl}
isAvatarPending={isAvatarPending}
- isMediaUnavailable={isMediaUnavailable}
isOwnPost={
Boolean(viewerSpaceId) && item.spaceId == viewerSpaceId
}
- isUnavailable={item.isUnavailable}
+ isUnavailable={isUnavailable}
name={item.name}
onLoadAvatar={
- isAvatarPending && !item.isUnavailable
+ isAvatarPending && !isUnavailable
? () => loadFeedPostAvatar(item)
: undefined
}
onLoadImage={
- imageUrl || item.isUnavailable || isMediaUnavailable
+ imageUrl || isUnavailable
? undefined
: () => loadFeedPostImage(item)
}
diff --git a/web/apps/space/src/screens/MessagesScreen.tsx b/web/apps/space/src/screens/MessagesScreen.tsx
index c6febe9676..143e796b5e 100644
--- a/web/apps/space/src/screens/MessagesScreen.tsx
+++ b/web/apps/space/src/screens/MessagesScreen.tsx
@@ -1527,6 +1527,9 @@ const MessageBubble: React.FC<{
fontFamily:
'"Inter Variable", Inter, sans-serif',
fontSize: 14,
+ fontStyle: isUnavailable
+ ? "italic"
+ : "normal",
fontWeight: 600,
lineHeight: "21px",
overflowWrap: "anywhere",
diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsx
index 32cae9975a..1e8a12cde5 100644
--- a/web/apps/space/src/screens/ProfileScreen.tsx
+++ b/web/apps/space/src/screens/ProfileScreen.tsx
@@ -295,9 +295,10 @@ interface ProfilePostTileProps {
imageUrl?: string;
index: number;
isSingleItemRow: boolean;
- isMediaUnavailable: boolean;
+ isUnavailable: boolean;
item: ProfilePostItem;
loadRootMargin: string;
+ onImageDecodeError: () => void;
onLoadImage: () => Promise<string | undefined>;
onOpen: (imageUrl: string) => void;
onRememberDimensions: (itemID: string, image: HTMLImageElement) => void;
@@ -311,9 +312,10 @@ const ProfilePostTile: React.FC<ProfilePostTileProps> = ({
imageUrl,
index,
isSingleItemRow,
- isMediaUnavailable,
+ isUnavailable: isPostUnavailable,
item,
loadRootMargin,
+ onImageDecodeError,
onLoadImage,
onOpen,
onRememberDimensions,
@@ -327,8 +329,7 @@ const ProfilePostTile: React.FC<ProfilePostTileProps> = ({
[item.thumbHash],
);
const isCurrentImageReady = Boolean(imageUrl && readyImageUrl == imageUrl);
- const isUnavailable =
- Boolean(item.isUnavailable) || isMediaUnavailable || imageDecodeFailed;
+ const isUnavailable = isPostUnavailable || imageDecodeFailed;
React.useEffect(() => {
if (imageUrl) setShouldLoad(true);
@@ -375,9 +376,7 @@ const ProfilePostTile: React.FC<ProfilePostTileProps> = ({
type="button"
aria-label={
isUnavailable
- ? item.isUnavailable
- ? "Post unavailable"
- : "Media unavailable"
+ ? "Post unavailable"
: `Open ${displayName} post ${index + 1}`
}
disabled={!imageUrl || isUnavailable}
@@ -433,7 +432,13 @@ const ProfilePostTile: React.FC<ProfilePostTileProps> = ({
setReadyImageUrl(imageUrl);
onRememberDimensions(item.id, event.currentTarget);
}}
- onError={() => setImageDecodeFailed(true)}
+ onError={() => {
+ log.warn(
+ `Post ${item.postId} is unavailable because the browser could not decode its image`,
+ );
+ setImageDecodeFailed(true);
+ onImageDecodeError();
+ }}
src={imageUrl}
sx={{
display: "block",
@@ -468,9 +473,7 @@ const ProfilePostTile: React.FC<ProfilePostTileProps> = ({
width: "100%",
}}
>
- {item.isUnavailable
- ? "Post unavailable"
- : "Media unavailable"}
+ Post unavailable
</Box>
)}
</Box>
@@ -576,8 +579,9 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
const [loadedPostImageURLsByKey, setLoadedPostImageURLsByKey] = useState<
Record<string, string>
>({});
- const [unavailablePostImagesByKey, setUnavailablePostImagesByKey] =
- useState<Record<string, true>>({});
+ const [unavailablePostsByKey, setUnavailablePostsByKey] = useState<
+ Record<string, true>
+ >({});
const [loadedCoverUrl, setLoadedCoverUrl] = useState<string | null>(null);
const postInputRef = React.useRef<HTMLInputElement | null>(null);
const postImageLoadsInFlightRef = React.useRef<
@@ -612,8 +616,13 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
}))
.filter((group) => group.items.length > 0);
const visiblePostItems = visiblePostGroups.flatMap((group) => group.items);
- const visiblePostIndexByID = new Map(
- visiblePostItems.map((item, index) => [item.id, index]),
+ const viewerPostItems = visiblePostItems.filter(
+ (item) =>
+ !item.isUnavailable &&
+ !unavailablePostsByKey[profilePostImageCacheKey(item)],
+ );
+ const viewerPostIndexByID = new Map(
+ viewerPostItems.map((item, index) => [item.id, index]),
);
const postsSharedCount = visiblePostGroups.reduce(
(count, group) => count + group.items.length,
@@ -757,7 +766,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
}
const cacheKey = profilePostImageCacheKey(item);
- if (unavailablePostImagesByKey[cacheKey]) {
+ if (unavailablePostsByKey[cacheKey]) {
return Promise.resolve(undefined);
}
const inFlight = postImageLoadsInFlightRef.current.get(cacheKey);
@@ -775,7 +784,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
.catch((error: unknown) => {
log.warn("Failed to load profile post image", error);
if (isSpaceContentError(error)) {
- setUnavailablePostImagesByKey((current) => ({
+ setUnavailablePostsByKey((current) => ({
...current,
[cacheKey]: true,
}));
@@ -788,7 +797,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
postImageLoadsInFlightRef.current.set(cacheKey, load);
return load;
},
- [loadedPostImageURLFor, onLoadPostImage, unavailablePostImagesByKey],
+ [loadedPostImageURLFor, onLoadPostImage, unavailablePostsByKey],
);
const dimensionsForPost = React.useCallback(
@@ -830,7 +839,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
const profileViewerPhotos = React.useMemo(
() =>
- visiblePostItems.map((item, index) => {
+ viewerPostItems.map((item, index) => {
const dimensions = dimensionsForPost(item);
return {
alt: `${displayName} post ${index + 1}`,
@@ -857,13 +866,13 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
profile.avatarUrl,
selectedPost?.id,
selectedPost?.photo.imageUrl,
- visiblePostItems,
+ viewerPostItems,
],
);
const handleSelectedPostIndexChange = React.useCallback(
(postIndex: number) => {
- const item = visiblePostItems[postIndex];
+ const item = viewerPostItems[postIndex];
if (!item) return;
const updateSelectedPost = (imageUrl: string) => {
@@ -895,16 +904,20 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
loadPostImage,
loadedPostImageURLFor,
selectedPostForItem,
- visiblePostItems,
+ viewerPostItems,
],
);
+ const selectedViewerPostIndex = selectedPost
+ ? viewerPostIndexByID.get(selectedPost.id)
+ : undefined;
+
React.useEffect(() => {
- const currentPostIndex = selectedPost?.postIndex;
+ const currentPostIndex = selectedViewerPostIndex;
if (currentPostIndex == undefined) return;
for (const offset of [-1, 1]) {
- const adjacentPost = visiblePostItems[currentPostIndex + offset];
+ const adjacentPost = viewerPostItems[currentPostIndex + offset];
if (!adjacentPost || loadedPostImageURLFor(adjacentPost)) continue;
void loadPostImage(adjacentPost);
@@ -912,8 +925,8 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
}, [
loadPostImage,
loadedPostImageURLFor,
- selectedPost?.postIndex,
- visiblePostItems,
+ selectedViewerPostIndex,
+ viewerPostItems,
]);
const prepareSelectedPostPhoto = async (file: File) => {
@@ -1864,13 +1877,18 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
isSingleItemRow={
isSingleItemRow
}
- isMediaUnavailable={Boolean(
- unavailablePostImagesByKey[
- profilePostImageCacheKey(
- item,
- )
- ],
- )}
+ isUnavailable={
+ Boolean(
+ item.isUnavailable,
+ ) ||
+ Boolean(
+ unavailablePostsByKey[
+ profilePostImageCacheKey(
+ item,
+ )
+ ],
+ )
+ }
item={item}
loadRootMargin={
postImageLoadRootMargin
@@ -1880,20 +1898,39 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
item,
)
}
+ onImageDecodeError={() =>
+ setUnavailablePostsByKey(
+ (
+ current,
+ ) => ({
+ ...current,
+ [profilePostImageCacheKey(
+ item,
+ )]:
+ true,
+ }),
+ )
+ }
onOpen={(
openedImageUrl,
- ) =>
+ ) => {
+ const postIndex =
+ viewerPostIndexByID.get(
+ item.id,
+ );
+ if (
+ postIndex ==
+ undefined
+ )
+ return;
setSelectedPost(
selectedPostForItem(
item,
- visiblePostIndexByID.get(
- item.id,
- ) ??
- index,
+ postIndex,
openedImageUrl,
),
- )
- }
+ );
+ }}
onRememberDimensions={
rememberLoadedPhotoDimensions
}
@@ -2020,13 +2057,13 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
selectedPostActionMode
}
photos={
- selectedPost.postIndex == undefined
+ selectedViewerPostIndex == undefined
? undefined
: profileViewerPhotos
}
- photoIndex={selectedPost.postIndex}
+ photoIndex={selectedViewerPostIndex}
onPhotoIndexChange={
- selectedPost.postIndex == undefined
+ selectedViewerPostIndex == undefined
? undefined
: handleSelectedPostIndexChange
}
diff --git a/web/apps/space/src/services/spaceProfilePayload.ts b/web/apps/space/src/services/spaceProfilePayload.ts
index 2ce469c1a7..730895a712 100644
--- a/web/apps/space/src/services/spaceProfilePayload.ts
+++ b/web/apps/space/src/services/spaceProfilePayload.ts
@@ -1,3 +1,5 @@
+import log from "ente-base/log";
+
export interface SpaceProfilePayload {
displayName?: unknown;
fullName?: unknown;
@@ -14,8 +16,8 @@ export const parseSpaceProfilePayload = (
if (parsed && typeof parsed == "object" && !Array.isArray(parsed)) {
return parsed;
}
- } catch {
- // Fall back to the public Space slug.
+ } catch (error) {
+ log.warn("Failed to decode Space profile JSON", error);
}
return {};
};