Skip to content

armgit / ente

Public Imported from GitHub
0

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

Add unread post sequences to Space

Anand Baburajancca38464c19b
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsx
index 8ff8a28f7b..36c9360902 100644
--- a/web/apps/space/src/components/FileViewer.tsx
+++ b/web/apps/space/src/components/FileViewer.tsx
@@ -58,7 +58,6 @@ const defaultPhotoHeight = 680;
const viewerSwipeMinDeltaPx = 72;
const viewerSwipeAxisRatio = 1.5;
const viewerHeaderAvatarSize = 28;
-const viewerHeaderButtonVisualSize = 28;
const draftPostExitDurationMs = 320;
const keyboardInsetThresholdPx = 80;
const keyboardDismissMaxDurationMs = 500;
@@ -182,6 +181,7 @@ interface SpaceFileViewerProps {
photos?: SpaceViewerPhoto[];
focusReplyOnOpen?: boolean;
postActionMode?: SpaceViewerPostActionMode;
+ showSequenceProgress?: boolean;
}
interface ViewerSwipeGesture {
@@ -275,23 +275,12 @@ const viewerHeaderButtonSx = {
display: "flex",
height: spaceTouchTargetSize,
justifyContent: "center",
- mx: "-8px",
+ ml: "-8px",
+ mr: "-16px",
p: 0,
width: spaceTouchTargetSize,
"&:focus-visible": { outline: `2px solid ${green}`, outlineOffset: 2 },
- "&:hover .space-viewer-header-button-visual": {
- bgcolor: controlBackgroundHover,
- },
-};
-
-const viewerHeaderButtonVisualSx = {
- alignItems: "center",
- bgcolor: controlBackground,
- borderRadius: "50%",
- display: "flex",
- height: viewerHeaderButtonVisualSize,
- justifyContent: "center",
- width: viewerHeaderButtonVisualSize,
+ "&:hover": { color: textBase },
};
const resizeCaptionInput = (
@@ -377,6 +366,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
photoIndex = 0,
photos,
postActionMode = "like-only",
+ showSequenceProgress = false,
}) => {
const activePostActionMode = postActionMode;
const isDraftPost = activePostActionMode == "draft-post";
@@ -404,6 +394,8 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
viewerPhotos.length - 1,
);
const activePhoto = viewerPhotos[activePhotoIndex] ?? photo;
+ const shouldShowSequenceProgress =
+ showSequenceProgress && !isDraftPost && viewerPhotos.length > 1;
const canUpdatePostCaption =
!isDraftPost &&
Boolean(activePhoto.postId) &&
@@ -1437,6 +1429,41 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
justifySelf: "flex-end",
}}
>
+ {shouldShowSequenceProgress && (
+ <Box
+ component="span"
+ aria-label={`Post ${activePhotoIndex + 1} of ${viewerPhotos.length}`}
+ sx={{
+ alignItems: "center",
+ bgcolor: controlBackground,
+ borderRadius: "999px",
+ boxSizing: "border-box",
+ display: "inline-flex",
+ fontFamily:
+ '"Inter Variable", Inter, sans-serif',
+ fontSize: 12,
+ fontVariantNumeric: "tabular-nums",
+ fontWeight: 700,
+ gap: "6px",
+ height: 28,
+ justifyContent: "center",
+ lineHeight: "16px",
+ minWidth: 48,
+ mr: "6px",
+ px: "9px",
+ }}
+ >
+ <Box component="span" sx={{ color: "#70EC80" }}>
+ {activePhotoIndex + 1}
+ </Box>
+ <Box component="span" sx={{ color: textTertiary }}>
+ /
+ </Box>
+ <Box component="span" sx={{ color: textBase }}>
+ {viewerPhotos.length}
+ </Box>
+ </Box>
+ )}
{canManagePost && !isCaptionEditing && (
<Box
component="button"
@@ -1488,17 +1515,11 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
onClick={closeViewer}
sx={viewerHeaderButtonSx}
>
- <Box
- className="space-viewer-header-button-visual"
- component="span"
- sx={viewerHeaderButtonVisualSx}
- >
- <HugeiconsIcon
- icon={Cancel01Icon}
- size={18}
- strokeWidth={1.8}
- />
- </Box>
+ <HugeiconsIcon
+ icon={Cancel01Icon}
+ size={18}
+ strokeWidth={1.8}
+ />
</Box>
</Box>
{canManagePost && (
@@ -2104,7 +2125,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
onFocus={() => setIsReplyFocused(true)}
onKeyDown={handleReplyKeyDown}
onPointerDown={handleReplyInputPointerDown}
- placeholder="Reply..."
+ placeholder={`Reply to ${displayName}...`}
readOnly={canAddFriendForPostAction}
rows={1}
value={replyText}
diff --git a/web/apps/space/src/pages/app/index.tsx b/web/apps/space/src/pages/app/index.tsx
index 7fe56f26cc..96de58a4b1 100644
--- a/web/apps/space/src/pages/app/index.tsx
+++ b/web/apps/space/src/pages/app/index.tsx
@@ -9,13 +9,12 @@ import {
prependCachedSpaceFeedPost,
} from "services/feed-cache";
import { consumeSentSpaceInviteFriend } from "services/invite";
-import { loadUnseenSpacePostIDs, markSpacePostSeen } from "services/post-seen";
+import { markSpacePostSeen } from "services/post-seen";
import { loadExistingSpaceId } from "services/profile";
import {
createCurrentPhotoPost,
loadCurrentFriendAvatarURL,
loadCurrentSpaceFriends,
- loadCurrentSpaceLatestPost,
loadCurrentSpacePostAssetURL,
loadCurrentUnreadStatus,
replyToCurrentPost,
@@ -23,6 +22,7 @@ import {
setCurrentPostLiked,
type SpacePost,
} from "services/space";
+import { loadUnseenSpacePosts } from "services/unseen-posts";
import { useSpaceAppState } from "state/app-state";
import { spaceWaveMessageText } from "utils/message-limits";
import { prepareSpacePostImageFromEdit } from "utils/post-image";
@@ -42,8 +42,7 @@ const Page: React.FC = () => {
} = useSpaceAppState();
const [friendRequestSentToastName, setFriendRequestSentToastName] =
useState<string>();
- const [latestPosts, setLatestPosts] = useState<SpacePost[]>([]);
- const [unseenPostIDs, setUnseenPostIDs] = useState<Set<number>>(new Set());
+ const [unseenPosts, setUnseenPosts] = useState<SpacePost[]>([]);
const [hasUnreadMessages, setHasUnreadMessages] = useState<boolean>();
const [isLatestPostsLoading, setIsLatestPostsLoading] = useState(true);
const [isFriendsLoading, setIsFriendsLoading] = useState(true);
@@ -71,8 +70,7 @@ const Page: React.FC = () => {
useEffect(() => {
let cancelled = false;
setSpaceId(undefined);
- setLatestPosts([]);
- setUnseenPostIDs(new Set());
+ setUnseenPosts([]);
setHasUnreadMessages(undefined);
setIsLatestPostsLoading(true);
setIsFriendsLoading(true);
@@ -104,33 +102,24 @@ const Page: React.FC = () => {
setIsFriendsLoading(false);
return Promise.all(
nextFriends.map(async (friend) => {
- if (!friend.spaceId) return null;
+ if (!friend.spaceId) return [];
try {
- return await loadCurrentSpaceLatestPost(
+ return await loadUnseenSpacePosts(
friend.spaceId,
nextSpaceId,
);
} catch (error) {
log.warn(
- `Failed to load latest post for ${friend.id}`,
+ `Failed to load unseen posts for ${friend.id}`,
error,
);
- return null;
+ return [];
}
}),
- ).then((latestPosts) => {
+ ).then((unseenPostGroups) => {
if (cancelled) return;
- const nextLatestPosts = latestPosts.filter(
- (post): post is SpacePost => post !== null,
- );
- setLatestPosts(nextLatestPosts);
- setUnseenPostIDs(
- loadUnseenSpacePostIDs(
- nextFriends,
- nextLatestPosts,
- ),
- );
+ setUnseenPosts(unseenPostGroups.flat());
});
},
);
@@ -158,7 +147,7 @@ const Page: React.FC = () => {
void patchCachedSpaceFeedPost(spaceId, postId, {
viewerLiked: liked,
});
- setLatestPosts((currentItems) =>
+ setUnseenPosts((currentItems) =>
currentItems.map((item) =>
item.postId == postId
? { ...item, viewerLiked: liked }
@@ -208,7 +197,7 @@ const Page: React.FC = () => {
<>
<SpacePageMeta themeColor={homeBackground} />
<HomeScreen
- latestPosts={latestPosts}
+ unseenPosts={unseenPosts}
friendRequestSentToastName={friendRequestSentToastName}
friends={friends}
hasUnreadMessages={hasUnreadMessages}
@@ -216,7 +205,6 @@ const Page: React.FC = () => {
isLatestPostsLoading={isLatestPostsLoading}
isFriendsLoading={isFriendsLoading}
profile={profile}
- unseenPostIDs={unseenPostIDs}
viewerSpaceId={spaceId ?? profile?.spaceId}
showInstallPrompt={
profileLoadStatus == "ready" &&
@@ -268,13 +256,13 @@ const Page: React.FC = () => {
onLoadPostImage={loadCurrentSpacePostAssetURL}
onPostSeen={(friendSpaceID, postID) => {
markSpacePostSeen(friendSpaceID, postID);
- setUnseenPostIDs((currentPostIDs) => {
- if (!currentPostIDs.has(postID)) return currentPostIDs;
-
- const nextPostIDs = new Set(currentPostIDs);
- nextPostIDs.delete(postID);
- return nextPostIDs;
- });
+ setUnseenPosts((currentPosts) =>
+ currentPosts.filter(
+ (post) =>
+ post.spaceId != friendSpaceID ||
+ post.postId != postID,
+ ),
+ );
}}
onOpenMessages={() => void router.push(spaceRoutes.messages)}
onOpenProfile={
diff --git a/web/apps/space/src/pages/layout-demo.tsx b/web/apps/space/src/pages/layout-demo.tsx
deleted file mode 100644
index 042dcc89bf..0000000000
--- a/web/apps/space/src/pages/layout-demo.tsx
+++ /dev/null
@@ -1,243 +0,0 @@
-import { ArrowLeft02Icon, ArrowRight01Icon } from "@hugeicons/core-free-icons";
-import { HugeiconsIcon } from "@hugeicons/react";
-import { Box } from "@mui/material";
-import { SpacePostFloatingActionButton } from "components/PostFloatingActionButton";
-import React from "react";
-import { homeCirclePlacements } from "utils/home-circle-layout";
-
-const background = "#0C1014";
-const headerChromeColor = "#202825";
-const headerHeight = 64;
-const layoutVerticalInset =
- "calc(112px + max(env(safe-area-inset-top, 0px), env(safe-area-inset-bottom, 0px)))";
-const maximumFriendCount = 15;
-
-interface CanvasSize {
- height: number;
- width: number;
-}
-
-const LayoutDemoPage: React.FC = () => {
- const [friendCount, setFriendCount] = React.useState(1);
- const [canvasSize, setCanvasSize] = React.useState<CanvasSize>({
- height: 0,
- width: 0,
- });
- const canvasRef = React.useRef<HTMLDivElement | null>(null);
-
- React.useEffect(() => {
- const canvas = canvasRef.current;
- if (!canvas) return;
-
- const updateSize = () => {
- const { height, width } = canvas.getBoundingClientRect();
- setCanvasSize({ height, width });
- };
- const observer = new ResizeObserver(updateSize);
- observer.observe(canvas);
- updateSize();
- return () => observer.disconnect();
- }, []);
-
- React.useEffect(() => {
- const handleKeyDown = (event: KeyboardEvent) => {
- if (event.key == "ArrowLeft") {
- setFriendCount((count) => Math.max(1, count - 1));
- } else if (event.key == "ArrowRight") {
- setFriendCount((count) =>
- Math.min(maximumFriendCount, count + 1),
- );
- }
- };
- window.addEventListener("keydown", handleKeyDown);
- return () => window.removeEventListener("keydown", handleKeyDown);
- }, []);
-
- const placements = homeCirclePlacements(
- friendCount,
- canvasSize.width,
- canvasSize.height,
- );
- const circleSize = placements[0]?.size ?? 0;
- const ringWidth = Math.max(1, Math.min(3, circleSize * 0.018));
- const circlePadding = Math.max(1.5, Math.min(4, circleSize * 0.025));
-
- return (
- <Box
- component="main"
- sx={{
- bgcolor: background,
- color: "#FFF",
- height: "100svh",
- overflow: "hidden",
- position: "relative",
- }}
- >
- <Box
- sx={{
- height: "100%",
- maxWidth: 390,
- mx: "auto",
- position: "relative",
- width: "100%",
- }}
- >
- <Box
- component="header"
- sx={{
- alignItems: "center",
- display: "grid",
- gridTemplateColumns: "48px minmax(0, 1fr) 48px",
- height: headerHeight,
- px: "10px",
- }}
- >
- <Box
- component="button"
- type="button"
- aria-label="Show one fewer friend"
- disabled={friendCount == 1}
- onClick={() =>
- setFriendCount((count) => Math.max(1, count - 1))
- }
- sx={{
- alignItems: "center",
- appearance: "none",
- bgcolor: headerChromeColor,
- border: 0,
- borderRadius: "50%",
- color: "#FFF",
- cursor: friendCount == 1 ? "default" : "pointer",
- display: "flex",
- height: 36,
- justifyContent: "center",
- opacity: friendCount == 1 ? 0.3 : 1,
- p: 0,
- width: 36,
- }}
- >
- <HugeiconsIcon
- icon={ArrowLeft02Icon}
- size={22}
- strokeWidth={2.2}
- />
- </Box>
- <Box
- sx={{
- alignItems: "center",
- bgcolor: headerChromeColor,
- borderRadius: "999px",
- display: "flex",
- fontFamily: '"Inter Variable", Inter, sans-serif',
- height: 36,
- justifySelf: "center",
- px: "15px",
- }}
- >
- <Box
- component="img"
- alt="Space"
- src="/images/space.svg"
- sx={{ display: "block", height: 18, width: "auto" }}
- />
- </Box>
- <Box
- component="button"
- type="button"
- aria-label="Show one more friend"
- disabled={friendCount == maximumFriendCount}
- onClick={() =>
- setFriendCount((count) =>
- Math.min(maximumFriendCount, count + 1),
- )
- }
- sx={{
- alignItems: "center",
- appearance: "none",
- bgcolor: headerChromeColor,
- border: 0,
- borderRadius: "50%",
- color: "#FFF",
- cursor:
- friendCount == maximumFriendCount
- ? "default"
- : "pointer",
- display: "flex",
- height: 36,
- justifyContent: "center",
- justifySelf: "end",
- opacity:
- friendCount == maximumFriendCount ? 0.3 : 1,
- p: 0,
- width: 36,
- }}
- >
- <HugeiconsIcon
- icon={ArrowRight01Icon}
- size={22}
- strokeWidth={2.2}
- />
- </Box>
- </Box>
- <Box
- sx={{
- bottom: layoutVerticalInset,
- left: "16px",
- position: "absolute",
- right: "16px",
- top: layoutVerticalInset,
- }}
- >
- <Box
- ref={canvasRef}
- sx={{
- height: "100%",
- position: "relative",
- width: "100%",
- }}
- >
- {circleSize > 0 &&
- placements.map(({ size, x, y }, index) => (
- <Box
- key={index}
- sx={{
- height: size,
- left: x,
- position: "absolute",
- top: y,
- width: size,
- }}
- >
- <Box
- sx={{
- aspectRatio: "1",
- border: `${ringWidth}px solid #2A3430`,
- borderRadius: "50%",
- boxSizing: "border-box",
- height: "100%",
- p: `${circlePadding}px`,
- position: "relative",
- width: "100%",
- zIndex: 1,
- }}
- >
- <Box
- sx={{
- bgcolor: "#1A211F",
- borderRadius: "50%",
- height: "100%",
- width: "100%",
- }}
- />
- </Box>
- </Box>
- ))}
- </Box>
- </Box>
- <SpacePostFloatingActionButton />
- </Box>
- </Box>
- );
-};
-
-export default LayoutDemoPage;
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 8750c75d26..9ed30553d4 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -29,6 +29,7 @@ import {
import { spaceTouchTargetSize } from "styles/touch-targets";
import { firstNameFrom } from "utils/display";
import {
+ homeCircleOrbitGap,
homeCirclePlacements,
type HomeCirclePlacement,
} from "utils/home-circle-layout";
@@ -66,7 +67,7 @@ const avatarFadeSx = {
"@media (prefers-reduced-motion: reduce)": { animation: "none" },
} as const;
interface HomeScreenProps {
- latestPosts: SpacePost[];
+ unseenPosts: SpacePost[];
friendRequestSentToastName?: string;
friends: FriendProfile[];
hasUnreadMessages?: boolean;
@@ -74,7 +75,6 @@ interface HomeScreenProps {
isLatestPostsLoading?: boolean;
isFriendsLoading?: boolean;
showInstallPrompt?: boolean;
- unseenPostIDs: ReadonlySet<number>;
onCreatePost?: (
image: DraftSpacePostImage,
caption: string,
@@ -112,13 +112,17 @@ interface PostCircleCanvasSize {
}
interface SelectedHomeViewer {
+ avatarUrl?: string | null;
draftFile?: File;
draftImageError?: string;
focusReplyOnOpen?: boolean;
+ friend?: FriendProfile;
isDraftImagePreviewPending?: boolean;
localObjectUrl?: string;
photo: SpaceViewerPhoto;
+ postIndex?: number;
postActionMode?: SpaceViewerPostActionMode;
+ posts?: SpacePost[];
}
interface DraftSpacePostImage {
@@ -134,6 +138,30 @@ interface AddedFriendToastProps {
onClose?: () => void;
}
+const viewerPhotoForPost = (
+ post: SpacePost,
+ friend: FriendProfile,
+ avatarUrl: string | null | undefined,
+ imageUrl: string,
+): SpaceViewerPhoto => {
+ const displayName = friend.fullName.trim() || friend.username.trim();
+ return {
+ alt: `${displayName} post`,
+ avatarUrl,
+ caption: post.caption,
+ friendID: post.friendID,
+ height: post.height,
+ imageUrl,
+ name: displayName,
+ postId: post.postId,
+ spaceId: post.spaceId,
+ timestampMs: post.timestampMs,
+ username: friend.username,
+ viewerLiked: post.viewerLiked,
+ width: post.width,
+ };
+};
+
const postImageCacheKey = (item: SpacePost) =>
[
item.postId,
@@ -150,6 +178,14 @@ const friendAvatarCacheKey = (friend: FriendProfile) =>
friend.avatarSize ?? "",
].join(":");
+const orbitPhaseFor = (value: string) => {
+ let hash = 0;
+ for (const character of value) {
+ hash = (hash * 31 + character.charCodeAt(0)) % 360;
+ }
+ return hash;
+};
+
const useDecodedImage = (
src?: string | null,
keepPreviousUntilReady = false,
@@ -223,10 +259,15 @@ interface FriendPostCircleProps {
onLoadAvatar?: () => Promise<string | null | undefined>;
onLoadImage?: () => Promise<string | undefined>;
onOpenFriend?: (friendID: string, username?: string) => void;
- onOpenPhoto: (photo: SpaceViewerPhoto) => void;
+ onOpenPosts: (
+ friend: FriendProfile,
+ posts: SpacePost[],
+ photo: SpaceViewerPhoto,
+ ) => void;
+ onPostUnavailable?: (friendSpaceID: string, postID: number) => void;
onWave?: () => Promise<void>;
placement: HomeCirclePlacement;
- post?: SpacePost;
+ posts: SpacePost[];
}
const FriendPostCircle: React.FC<FriendPostCircleProps> = ({
@@ -239,10 +280,11 @@ const FriendPostCircle: React.FC<FriendPostCircleProps> = ({
onLoadAvatar,
onLoadImage,
onOpenFriend,
- onOpenPhoto,
+ onOpenPosts,
+ onPostUnavailable,
onWave,
placement,
- post,
+ posts,
}) => {
const rootRef = React.useRef<HTMLLIElement | null>(null);
const holdOriginRef = React.useRef<
@@ -251,7 +293,6 @@ const FriendPostCircle: React.FC<FriendPostCircleProps> = ({
const holdTimeoutRef = React.useRef<number | undefined>(undefined);
const suppressClickRef = React.useRef(false);
const waveAnimationTimeoutRef = React.useRef<number | undefined>(undefined);
- const ringGradientID = `space-new-post-${React.useId().replaceAll(":", "")}`;
const [shouldLoadMedia, setShouldLoadMedia] = useState(Boolean(imageUrl));
const [isHoldingWave, setIsHoldingWave] = useState(false);
const [isWaveSending, setIsWaveSending] = useState(false);
@@ -263,8 +304,9 @@ const FriendPostCircle: React.FC<FriendPostCircleProps> = ({
);
const displayName = friend.fullName.trim() || friend.username.trim();
const firstName = firstNameFrom(displayName);
+ const post = posts[0];
const postUnavailable = isUnavailable || decodedPhoto.failed;
- const hasNewPost = Boolean(post && !postUnavailable);
+ const hasNewPost = posts.length > 0 && !postUnavailable;
const displayImageUrl =
(decodedPhoto.failed
? undefined
@@ -281,8 +323,15 @@ const FriendPostCircle: React.FC<FriendPostCircleProps> = ({
const canOpenPost = Boolean(post) && !postUnavailable && isPhotoReady;
const isCircleDisabled =
isLoading || Boolean(post && !postUnavailable && !isPhotoReady);
- const circleBorderWidth = Math.max(1, Math.min(3, placement.size * 0.018));
- const circlePadding = Math.max(1.5, Math.min(4, placement.size * 0.025));
+ const orbitDotSize = Math.max(8, Math.min(12, placement.size * 0.05));
+ const orbitDurationSeconds = Math.max(
+ 30,
+ Math.min(42, placement.size * 0.13),
+ );
+ const orbitGap = homeCircleOrbitGap(placement.size);
+ const orbitAnimationDelaySeconds =
+ -(orbitPhaseFor(friend.spaceId ?? friend.id) / 360) *
+ orbitDurationSeconds;
React.useEffect(() => {
if (isLoading || !post || postUnavailable || shouldLoadMedia) return;
@@ -318,6 +367,12 @@ const FriendPostCircle: React.FC<FriendPostCircleProps> = ({
if (!imageUrl) void onLoadImage?.();
}, [imageUrl, onLoadImage, postUnavailable, shouldLoadMedia]);
+ React.useEffect(() => {
+ if (decodedPhoto.failed && post) {
+ onPostUnavailable?.(post.spaceId, post.postId);
+ }
+ }, [decodedPhoto.failed, onPostUnavailable, post]);
+
React.useEffect(
() => () => {
if (holdTimeoutRef.current !== undefined) {
@@ -426,7 +481,7 @@ const FriendPostCircle: React.FC<FriendPostCircleProps> = ({
}
if (!canOpenPost || !displayImageUrl) return;
- onOpenPhoto({
+ onOpenPosts(friend, posts, {
alt: `${displayName} post`,
avatarUrl: displayAvatarUrl,
caption: post.caption,
@@ -465,55 +520,60 @@ const FriendPostCircle: React.FC<FriendPostCircleProps> = ({
<Box
sx={{
aspectRatio: "1",
- border: `${circleBorderWidth}px solid transparent`,
- borderRadius: "50%",
- boxSizing: "border-box",
height: "100%",
- p: `${circlePadding}px`,
position: "relative",
width: "100%",
zIndex: 1,
}}
>
- <Box
- component="svg"
- viewBox="0 0 100 100"
- aria-hidden
- sx={{
- display: "block",
- inset: `-${circleBorderWidth}px`,
- overflow: "visible",
- pointerEvents: "none",
- position: "absolute",
- transform: "rotate(-90deg)",
- }}
- >
- <defs>
- <linearGradient
- id={ringGradientID}
- x1="0"
- y1="0"
- x2="100"
- y2="100"
- gradientUnits="userSpaceOnUse"
- >
- <stop offset="0%" stopColor={green} />
- <stop offset="32%" stopColor="#70EC80" />
- <stop offset="62%" stopColor={green} />
- <stop offset="100%" stopColor="#049C1B" />
- </linearGradient>
- </defs>
+ {hasNewPost && (
<Box
- component="circle"
- cx="50"
- cy="50"
- r="49"
- fill="none"
- stroke={`url(#${ringGradientID})`}
- strokeWidth={(circleBorderWidth / placement.size) * 100}
- sx={{ opacity: hasNewPost ? 1 : 0 }}
- />
- </Box>
+ aria-hidden
+ sx={{
+ "@keyframes spaceUnreadPostOrbit": {
+ from: { transform: "rotate(0deg)" },
+ to: { transform: "rotate(360deg)" },
+ },
+ animation: `spaceUnreadPostOrbit ${orbitDurationSeconds}s linear infinite`,
+ animationDelay: `${orbitAnimationDelaySeconds}s`,
+ border: "1px solid rgba(159, 181, 164, 0.3)",
+ borderRadius: "50%",
+ boxSizing: "border-box",
+ inset: `-${orbitGap}px`,
+ pointerEvents: "none",
+ position: "absolute",
+ zIndex: 3,
+ "@media (prefers-reduced-motion: reduce)": {
+ animation: "none",
+ transform: `rotate(${orbitPhaseFor(friend.spaceId ?? friend.id)}deg)`,
+ },
+ }}
+ >
+ {posts.map((item, index) => {
+ const angle =
+ -Math.PI / 2 +
+ (index * Math.PI * 2) / posts.length;
+ return (
+ <Box
+ key={item.postId}
+ component="span"
+ sx={{
+ bgcolor: green,
+ borderRadius: "50%",
+ boxShadow:
+ "0 2px 6px rgba(0, 0, 0, 0.5), 0 0 10px rgba(8, 194, 37, 0.8)",
+ height: orbitDotSize,
+ left: `${50 + Math.cos(angle) * 50}%`,
+ position: "absolute",
+ top: `${50 + Math.sin(angle) * 50}%`,
+ transform: "translate(-50%, -50%)",
+ width: orbitDotSize,
+ }}
+ />
+ );
+ })}
+ </Box>
+ )}
<Box
component="button"
type="button"
@@ -521,7 +581,7 @@ const FriendPostCircle: React.FC<FriendPostCircleProps> = ({
isLoading
? `Loading ${firstName}`
: post && !postUnavailable
- ? `View ${firstName}'s new post`
+ ? `View ${posts.length} new ${posts.length == 1 ? "post" : "posts"} from ${firstName}`
: `View ${firstName}'s profile`
}
disabled={isCircleDisabled}
@@ -745,7 +805,7 @@ const AddedFriendToast: React.FC<AddedFriendToastProps> = ({
);
export const HomeScreen: React.FC<HomeScreenProps> = ({
- latestPosts,
+ unseenPosts,
friendRequestSentToastName,
friends,
hasUnreadMessages,
@@ -753,7 +813,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
isLatestPostsLoading = false,
isFriendsLoading = false,
showInstallPrompt = false,
- unseenPostIDs,
onCreatePost,
onLoadFriendAvatar,
onLoadPostImage,
@@ -801,14 +860,22 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
const selectedPhotoFriendID = selectedViewer?.photo.friendID;
const selectedPhotoIsOwn =
Boolean(viewerSpaceId) && selectedPhotoFriendID == viewerSpaceId;
- const latestPostByFriendID = React.useMemo(() => {
- const posts = new Map<string, SpacePost>();
- for (const post of latestPosts) {
- posts.set(post.friendID, post);
- posts.set(post.spaceId, post);
+ const unseenPostsByFriendID = React.useMemo(() => {
+ const postsByFriendID = new Map<string, SpacePost[]>();
+ for (const post of unseenPosts) {
+ for (const friendID of new Set([post.friendID, post.spaceId])) {
+ const posts = postsByFriendID.get(friendID) ?? [];
+ posts.push(post);
+ postsByFriendID.set(friendID, posts);
+ }
+ }
+ for (const posts of postsByFriendID.values()) {
+ posts.sort(
+ (a, b) => b.timestampMs - a.timestampMs || b.postId - a.postId,
+ );
}
- return posts;
- }, [latestPosts]);
+ return postsByFriendID;
+ }, [unseenPosts]);
const orderedFriends = React.useMemo(
() =>
[...friends].sort((a, b) =>
@@ -855,9 +922,10 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
postInputRef.current?.click();
};
- const openPostPhoto = (
+ const openPostPhotos = (
+ friend: FriendProfile,
+ posts: SpacePost[],
photo: SpaceViewerPhoto,
- focusReplyOnOpen = false,
) => {
const isOwnPost =
Boolean(viewerSpaceId) && photo.friendID == viewerSpaceId;
@@ -865,9 +933,12 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
onPostSeen?.(photo.spaceId, photo.postId);
}
setSelectedViewer({
- focusReplyOnOpen: isOwnPost ? false : focusReplyOnOpen,
+ avatarUrl: photo.avatarUrl,
+ friend,
photo,
+ postIndex: 0,
postActionMode: isOwnPost ? "hidden" : "like-only",
+ posts,
});
};
const closeSelectedPhoto = () => {
@@ -929,6 +1000,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
...current,
[cacheKey]: true,
}));
+ onPostSeen?.(item.spaceId, item.postId);
}
return undefined;
})
@@ -938,7 +1010,12 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
imageLoadsInFlightRef.current.set(cacheKey, load);
return load;
},
- [loadedPostImageURLFor, onLoadPostImage, unavailablePostsByKey],
+ [
+ loadedPostImageURLFor,
+ onLoadPostImage,
+ onPostSeen,
+ unavailablePostsByKey,
+ ],
);
const loadFriendAvatar = React.useCallback(
(friend: FriendProfile) => {
@@ -980,15 +1057,126 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
},
[loadedFriendAvatarURLFor, onLoadFriendAvatar],
);
+ const selectedViewerPostIndex = selectedViewer?.postIndex;
+ const selectedViewerPosts = selectedViewer?.posts;
+ const selectedViewerPhotos = React.useMemo(() => {
+ const friend = selectedViewer?.friend;
+ if (
+ !selectedViewerPosts ||
+ !friend ||
+ selectedViewerPostIndex == undefined
+ ) {
+ return undefined;
+ }
+
+ return selectedViewerPosts.map((post) =>
+ viewerPhotoForPost(
+ post,
+ friend,
+ selectedViewer.avatarUrl,
+ loadedPostImageURLFor(post) ??
+ (selectedViewer.photo.postId == post.postId
+ ? selectedViewer.photo.imageUrl
+ : ""),
+ ),
+ );
+ }, [
+ loadedPostImageURLFor,
+ selectedViewer,
+ selectedViewerPostIndex,
+ selectedViewerPosts,
+ ]);
+ const handleSelectedViewerPostIndexChange = React.useCallback(
+ (postIndex: number) => {
+ const currentViewer = selectedViewer;
+ const post = currentViewer?.posts?.[postIndex];
+ const friend = currentViewer?.friend;
+ if (!post || !friend) return;
+
+ onPostSeen?.(post.spaceId, post.postId);
+ const updateSelectedViewer = (imageUrl: string) => {
+ setSelectedViewer((viewer) => {
+ if (
+ !viewer?.posts ||
+ viewer.posts !== currentViewer.posts
+ ) {
+ return viewer;
+ }
+ return {
+ ...viewer,
+ photo: viewerPhotoForPost(
+ post,
+ friend,
+ viewer.avatarUrl,
+ imageUrl,
+ ),
+ postIndex,
+ };
+ });
+ };
+
+ const imageUrl = loadedPostImageURLFor(post);
+ if (imageUrl) {
+ updateSelectedViewer(imageUrl);
+ return;
+ }
+
+ updateSelectedViewer("");
+ void loadPostImage(post).then((loadedImageUrl) => {
+ if (loadedImageUrl) updateSelectedViewer(loadedImageUrl);
+ });
+ },
+ [loadPostImage, loadedPostImageURLFor, onPostSeen, selectedViewer],
+ );
+ const setSelectedViewerPostLiked = React.useCallback(
+ async (postID: number, liked: boolean) => {
+ await onSetPostLiked?.(postID, liked);
+ setSelectedViewer((viewer) =>
+ viewer
+ ? {
+ ...viewer,
+ photo:
+ viewer.photo.postId == postID
+ ? { ...viewer.photo, viewerLiked: liked }
+ : viewer.photo,
+ posts: viewer.posts?.map((post) =>
+ post.postId == postID
+ ? { ...post, viewerLiked: liked }
+ : post,
+ ),
+ }
+ : viewer,
+ );
+ },
+ [onSetPostLiked],
+ );
+
+ React.useEffect(() => {
+ if (!selectedViewerPosts || selectedViewerPostIndex == undefined)
+ return;
+
+ for (const offset of [-1, 1]) {
+ const adjacentPost =
+ selectedViewerPosts[selectedViewerPostIndex + offset];
+ if (!adjacentPost || loadedPostImageURLFor(adjacentPost)) continue;
+ void loadPostImage(adjacentPost);
+ }
+ }, [
+ loadPostImage,
+ loadedPostImageURLFor,
+ selectedViewerPostIndex,
+ selectedViewerPosts,
+ ]);
const friendPostCircleFor = (friend: FriendProfile, index: number) => {
const placement = postCirclePlacements[index]!;
- const latestPost = latestPostByFriendID.get(
- friend.spaceId ?? friend.id,
+ const posts = (
+ unseenPostsByFriendID.get(friend.spaceId ?? friend.id) ?? []
+ ).filter(
+ (post) =>
+ !post.isUnavailable &&
+ !unavailablePostsByKey[postImageCacheKey(post)],
);
- const item =
- latestPost && unseenPostIDs.has(latestPost.postId)
- ? latestPost
- : undefined;
+ const item = posts[0];
const imageUrl = item ? loadedPostImageURLFor(item) : undefined;
const avatarUrl = loadedFriendAvatarURLFor(friend);
const isAvatarPending = Boolean(
@@ -1019,10 +1207,11 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
: undefined
}
onOpenFriend={onOpenFriend}
- onOpenPhoto={openPostPhoto}
+ onOpenPosts={openPostPhotos}
+ onPostUnavailable={onPostSeen}
onWave={onWaveFriend ? () => onWaveFriend(friend) : undefined}
placement={placement}
- post={item}
+ posts={posts}
/>
);
};
@@ -1490,6 +1679,8 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
<SpaceFileViewer
focusReplyOnOpen={selectedViewer.focusReplyOnOpen}
photo={selectedViewer.photo}
+ photos={selectedViewerPhotos}
+ photoIndex={selectedViewerPostIndex}
draftPostPreparationError={
selectedViewer.draftImageError
}
@@ -1497,6 +1688,15 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
selectedViewer.isDraftImagePreviewPending
}
postActionMode={selectedViewer.postActionMode}
+ showSequenceProgress={Boolean(
+ selectedViewerPosts &&
+ selectedViewerPosts.length > 1,
+ )}
+ onPhotoIndexChange={
+ selectedViewerPosts
+ ? handleSelectedViewerPostIndexChange
+ : undefined
+ }
onClose={closeSelectedPhoto}
onOpenProfile={
selectedPhotoIsOwn && onOpenProfile
@@ -1522,7 +1722,13 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
}
: undefined
}
- onSwipeLeft={closeSelectedPhoto}
+ onSwipeLeft={
+ !selectedViewerPosts ||
+ selectedViewerPostIndex ==
+ selectedViewerPosts.length - 1
+ ? closeSelectedPhoto
+ : undefined
+ }
onReplyToPost={
!selectedPhotoIsOwn &&
selectedViewer.photo.friendID != viewerSpaceId
@@ -1557,7 +1763,11 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
onDraftPostExitStart={() => {
setIsDraftPostExiting(true);
}}
- onSetPostLiked={onSetPostLiked}
+ onSetPostLiked={
+ onSetPostLiked
+ ? setSelectedViewerPostLiked
+ : undefined
+ }
/>
)}
{friendRequestSentToastName ? (
diff --git a/web/apps/space/src/services/post-seen.ts b/web/apps/space/src/services/post-seen.ts
index 7319bd3db9..f23f37df6b 100644
--- a/web/apps/space/src/services/post-seen.ts
+++ b/web/apps/space/src/services/post-seen.ts
@@ -1,16 +1,59 @@
import type { FriendProfile } from "data/friends";
import type { SpacePost } from "services/space";
+export interface StoredSpacePostState {
+ latestKnownPostID: number;
+ unreadPostIDs: number[];
+ version: 2;
+}
+
const storageKeyFor = (friendSpaceID: string) =>
`space.posts.lastSeen.${friendSpaceID}`;
-const storedPostID = (value: string | null) => {
+const validPostID = (value: unknown): value is number =>
+ typeof value == "number" && Number.isSafeInteger(value) && value >= 0;
+
+const storedPostState = (value: string | null) => {
if (value === null) return undefined;
- const postID = Number(value);
- return Number.isSafeInteger(postID) && postID >= 0 ? postID : undefined;
+ const legacyPostID = Number(value);
+ if (validPostID(legacyPostID)) {
+ return {
+ latestKnownPostID: legacyPostID,
+ unreadPostIDs: [],
+ version: 2,
+ } satisfies StoredSpacePostState;
+ }
+
+ try {
+ const parsed = JSON.parse(value) as Partial<StoredSpacePostState>;
+ if (
+ parsed.version != 2 ||
+ !validPostID(parsed.latestKnownPostID) ||
+ !Array.isArray(parsed.unreadPostIDs) ||
+ !parsed.unreadPostIDs.every(validPostID)
+ ) {
+ return undefined;
+ }
+
+ return {
+ latestKnownPostID: parsed.latestKnownPostID,
+ unreadPostIDs: [...new Set(parsed.unreadPostIDs)],
+ version: 2,
+ } satisfies StoredSpacePostState;
+ } catch {
+ return undefined;
+ }
};
+export const loadStoredSpacePostState = (friendSpaceID: string) =>
+ storedPostState(localStorage.getItem(storageKeyFor(friendSpaceID)));
+
+export const saveStoredSpacePostState = (
+ friendSpaceID: string,
+ state: StoredSpacePostState,
+) => localStorage.setItem(storageKeyFor(friendSpaceID), JSON.stringify(state));
+
export const loadUnseenSpacePostIDs = (
friends: FriendProfile[],
latestPosts: SpacePost[],
@@ -20,39 +63,38 @@ export const loadUnseenSpacePostIDs = (
);
const unseenPostIDs = new Set<number>();
- try {
- for (const friend of friends) {
- const friendSpaceID = friend.spaceId ?? friend.id;
- const latestPost = latestPostBySpaceID.get(friendSpaceID);
- const storageKey = storageKeyFor(friendSpaceID);
- const lastSeenPostID = storedPostID(
- localStorage.getItem(storageKey),
- );
-
- if (lastSeenPostID === undefined) {
- localStorage.setItem(
- storageKey,
- String(latestPost?.postId ?? 0),
- );
- } else if (latestPost && latestPost.postId > lastSeenPostID) {
- unseenPostIDs.add(latestPost.postId);
- }
+ for (const friend of friends) {
+ const friendSpaceID = friend.spaceId ?? friend.id;
+ const latestPost = latestPostBySpaceID.get(friendSpaceID);
+ const storedState = loadStoredSpacePostState(friendSpaceID);
+ if (!storedState) {
+ saveStoredSpacePostState(friendSpaceID, {
+ latestKnownPostID: latestPost?.postId ?? 0,
+ unreadPostIDs: [],
+ version: 2,
+ });
+ } else if (
+ latestPost &&
+ latestPost.postId > storedState.latestKnownPostID
+ ) {
+ unseenPostIDs.add(latestPost.postId);
}
- } catch {
- unseenPostIDs.clear();
}
return unseenPostIDs;
};
export const markSpacePostSeen = (friendSpaceID: string, postID: number) => {
- try {
- const storageKey = storageKeyFor(friendSpaceID);
- const lastSeenPostID = storedPostID(localStorage.getItem(storageKey));
- if (lastSeenPostID === undefined || postID > lastSeenPostID) {
- localStorage.setItem(storageKey, String(postID));
- }
- } catch {
- return;
- }
+ const storedState = loadStoredSpacePostState(friendSpaceID);
+ saveStoredSpacePostState(friendSpaceID, {
+ latestKnownPostID: Math.max(
+ storedState?.latestKnownPostID ?? 0,
+ postID,
+ ),
+ unreadPostIDs:
+ storedState?.unreadPostIDs.filter(
+ (unreadPostID) => unreadPostID != postID,
+ ) ?? [],
+ version: 2,
+ });
};
diff --git a/web/apps/space/src/services/unseen-posts.ts b/web/apps/space/src/services/unseen-posts.ts
new file mode 100644
index 0000000000..f46016d45d
--- /dev/null
+++ b/web/apps/space/src/services/unseen-posts.ts
@@ -0,0 +1,71 @@
+import {
+ loadStoredSpacePostState,
+ saveStoredSpacePostState,
+} from "services/post-seen";
+import {
+ loadCurrentSpaceProfilePostsPage,
+ type SpacePost,
+} from "services/space";
+
+export const loadUnseenSpacePosts = async (
+ friendSpaceID: string,
+ viewerSpaceID: string,
+): Promise<SpacePost[]> => {
+ const storedState = loadStoredSpacePostState(friendSpaceID);
+ let page = await loadCurrentSpaceProfilePostsPage(
+ friendSpaceID,
+ viewerSpaceID,
+ );
+ const latestPostID = page.items[0]?.postId ?? 0;
+ if (!storedState) {
+ saveStoredSpacePostState(friendSpaceID, {
+ latestKnownPostID: latestPostID,
+ unreadPostIDs: [],
+ version: 2,
+ });
+ return [];
+ }
+
+ const unreadPostIDs = new Set(storedState.unreadPostIDs);
+ const unreadPostsByID = new Map<number, SpacePost>();
+
+ while (true) {
+ for (const post of page.items) {
+ if (post.postId > storedState.latestKnownPostID) {
+ unreadPostIDs.add(post.postId);
+ }
+ if (unreadPostIDs.has(post.postId) && !post.isUnavailable) {
+ unreadPostsByID.set(post.postId, post);
+ }
+ }
+
+ const oldestLoadedPostID = page.items.at(-1)?.postId;
+ const hasMoreNewPosts =
+ oldestLoadedPostID != undefined &&
+ oldestLoadedPostID > storedState.latestKnownPostID;
+ const hasMissingUnreadPosts = [...unreadPostIDs].some(
+ (postID) => !unreadPostsByID.has(postID),
+ );
+ if (!page.nextCursor || (!hasMoreNewPosts && !hasMissingUnreadPosts)) {
+ break;
+ }
+ page = await loadCurrentSpaceProfilePostsPage(
+ friendSpaceID,
+ viewerSpaceID,
+ page.nextCursor,
+ );
+ }
+
+ const unseenPosts = [...unreadPostsByID.values()].sort(
+ (a, b) => b.timestampMs - a.timestampMs || b.postId - a.postId,
+ );
+ saveStoredSpacePostState(friendSpaceID, {
+ latestKnownPostID: Math.max(
+ storedState.latestKnownPostID,
+ latestPostID,
+ ),
+ unreadPostIDs: unseenPosts.map((post) => post.postId),
+ version: 2,
+ });
+ return unseenPosts;
+};
diff --git a/web/apps/space/src/utils/home-circle-layout.ts b/web/apps/space/src/utils/home-circle-layout.ts
index 2d9c528b37..f79fbdb908 100644
--- a/web/apps/space/src/utils/home-circle-layout.ts
+++ b/web/apps/space/src/utils/home-circle-layout.ts
@@ -9,6 +9,11 @@ export interface HomeCirclePlacement {
y: number;
}
+const homeCircleSizeScale = 0.94;
+
+export const homeCircleOrbitGap = (circleSize: number) =>
+ Math.max(3, Math.min(9, circleSize * 0.04));
+
const circleSlotsForCount = (count: number) => {
if (count == 1) {
return { columns: 1, rows: 1, slots: [{ column: 0, row: 0 }] };
@@ -74,18 +79,20 @@ export const homeCirclePlacements = (
? 1 / 0.48
: columns + (columns - 1) * circleGapRatio;
const layoutHeight = 1 + rowOffsets[rowOffsets.length - 1]!;
- const size = Math.min(
+ const slotSize = Math.min(
canvasWidth / layoutWidth,
canvasHeight / layoutHeight,
);
- const horizontalStep = size * (1 + circleGapRatio);
- const renderedWidth = size + horizontalStep * (columns - 1);
- const renderedHeight = size * layoutHeight;
+ const size = slotSize * homeCircleSizeScale;
+ const circleInset = (slotSize - size) / 2;
+ const horizontalStep = slotSize * (1 + circleGapRatio);
+ const renderedWidth = slotSize + horizontalStep * (columns - 1);
+ const renderedHeight = slotSize * layoutHeight;
const originX = (canvasWidth - renderedWidth) / 2;
const originY = (canvasHeight - renderedHeight) / 2;
return slots.map(({ column, row }) => ({
size,
- x: originX + column * horizontalStep,
- y: originY + rowOffsets[row]! * size,
+ x: originX + column * horizontalStep + circleInset,
+ y: originY + rowOffsets[row]! * slotSize + circleInset,
}));
};