π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Improve Space browsing and sharing
Anand Baburajan9c76c793d1a9
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsxindex 3f8e02710f..81cd0cbd42 100644--- a/web/apps/space/src/components/FileViewer.tsx+++ b/web/apps/space/src/components/FileViewer.tsx@@ -954,6 +954,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({const pswp = pswpRef.current;if (!pswp) return;+ pswp.options.allowPanToNext = viewerPhotosRef.current.length > 1;const refreshIndex = (index: number) => {if (index >= 0 && index < viewerPhotosRef.current.length) {pswp.refreshSlideContent(index);diff --git a/web/apps/space/src/components/HomeHeader.tsx b/web/apps/space/src/components/HomeHeader.tsxindex c6104a805a..2da0cbe15a 100644--- a/web/apps/space/src/components/HomeHeader.tsx+++ b/web/apps/space/src/components/HomeHeader.tsx@@ -14,7 +14,7 @@ const headerAvatarSize = 36;const headerAvatarImageSize = 26;const headerChatCircleSize = 36;export const spaceHomeHeaderChromeColor = "#F0F0F0";-const headerIconSize = 24;+const headerIconSize = 25;const headerSideWidth = 36;const mediaPlaceholderColor = "#E5E7EA";const avatarFadeSx = {@@ -249,11 +249,11 @@ export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({border: `2px solid ${spaceHomeHeaderChromeColor}`,borderRadius: "50%",boxSizing: "border-box",- height: 12,+ height: 12.5,position: "absolute",- right: 5,- top: 5.5,- width: 12,+ right: 4.5,+ top: 5,+ width: 12.5,zIndex: 1,}}/>diff --git a/web/apps/space/src/pages/app/index.tsx b/web/apps/space/src/pages/app/index.tsxindex 233ab0702e..34a42ca5c9 100644--- a/web/apps/space/src/pages/app/index.tsx+++ b/web/apps/space/src/pages/app/index.tsx@@ -22,6 +22,7 @@ import {loadCurrentFriendRequests,loadCurrentSpaceFriends,loadCurrentSpacePostAssetURL,+ loadCurrentSpaceProfilePostsPage,loadCurrentUnreadStatus,replyToCurrentPost,setCurrentPostLiked,@@ -120,32 +121,47 @@ const Page: React.FC = () => {log.error("Failed to load space unread status", error),);- const [nextFriends, nextFriendRequests, savedHomePosts] =- await Promise.all([- loadCurrentSpaceFriends(nextSpaceId),- loadCurrentFriendRequests(nextSpaceId).catch(- (error: unknown) => {- log.error(- "Failed to load Space friend requests",- error,- );- return [];- },- ),- loadSpaceHomePosts(nextSpaceId),- ]);+ const [nextFriends, nextFriendRequests] = await Promise.all([+ loadCurrentSpaceFriends(nextSpaceId),+ loadCurrentFriendRequests(nextSpaceId).catch(+ (error: unknown) => {+ log.error(+ "Failed to load Space friend requests",+ error,+ );+ return [];+ },+ ),+ loadSpaceHomePosts(nextSpaceId).then((savedHomePosts) => {+ if (isCancelled() || !savedHomePosts) return;++ setLatestPosts(savedHomePosts.latestPosts);+ setUnreadPosts(savedHomePosts.unreadPosts);+ setFriends((currentFriends) =>+ currentFriends.length > 0+ ? currentFriends+ : savedHomePosts.latestPosts.map((post) => ({+ avatarKeyVersion: post.avatarKeyVersion,+ avatarObjectID: post.avatarObjectID,+ avatarSize: post.avatarSize,+ avatarUpdatedAt: post.avatarUpdatedAt,+ friendsCount: 0,+ fullName: post.name,+ id: post.friendID,+ spaceId: post.spaceId,+ username: post.username ?? "",+ })),+ );+ setIsLatestPostsLoading(false);+ setIsFriendsLoading(false);+ }),+ ]);if (isCancelled()) return;setFriends(nextFriends);setFriendRequests(nextFriendRequests);setIsFriendsLoading(false);setIsFriendRequestsLoading(false);- if (savedHomePosts) {- setLatestPosts(savedHomePosts.latestPosts);- setUnreadPosts(savedHomePosts.unreadPosts);- setIsLatestPostsLoading(false);- }-const refreshedHomePosts = await refreshSpaceHomePosts(nextSpaceId,nextFriends,@@ -308,6 +324,7 @@ const Page: React.FC = () => {}}}onLoadFriendAvatar={loadCurrentFriendAvatarURL}+ onLoadFriendPosts={loadCurrentSpaceProfilePostsPage}onLoadPostImage={loadCurrentSpacePostAssetURL}onOpenMessages={() => void router.push(spaceRoutes.messages)}onOpenFriendRequests={() =>diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsxindex 6130d1c2f5..e5c8a50b5e 100644--- a/web/apps/space/src/screens/HomeScreen.tsx+++ b/web/apps/space/src/screens/HomeScreen.tsx@@ -37,6 +37,7 @@ import {type SpaceFriendRequest,type SpacePost,type SpacePostAssetURLLoader,+ type SpaceProfilePostPage,} from "services/space";import { spaceAppBackground, spaceText, spaceTextMuted } from "styles/colors";import { firstNameFrom } from "utils/display";@@ -81,6 +82,11 @@ interface HomeScreenProps {caption: string,) => Promise<void>;onLoadFriendAvatar?: (friend: FriendProfile) => Promise<string | null>;+ onLoadFriendPosts?: (+ friendSpaceId: string,+ viewerSpaceId?: string,+ cursor?: string,+ ) => Promise<SpaceProfilePostPage>;onLoadPostImage?: SpacePostAssetURLLoader;onFriendRequestSentToastClose?: () => void;onAcceptFriendRequest?: (requestID: number) => Promise<void>;@@ -115,6 +121,7 @@ interface PostTileCanvasSize {interface SelectedHomeViewer {avatarUrl?: string | null;+ browseHistory?: boolean;draftFile?: File;draftImageError?: string;focusReplyOnOpen?: boolean;@@ -125,6 +132,7 @@ interface SelectedHomeViewer {postIndex?: number;postActionMode?: SpaceViewerPostActionMode;posts?: SpacePost[];+ sessionId?: symbol;}interface AddedFriendToastProps {@@ -1013,6 +1021,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({onAcceptFriendRequest,onDiscardFriendRequest,onLoadFriendAvatar,+ onLoadFriendPosts,onLoadPostImage,onFriendRequestSentToastClose,onOpenFriend,@@ -1175,6 +1184,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({friend: FriendProfile,posts: SpacePost[],photo: SpaceViewerPhoto,+ browseHistory = false,) => {if (photo.postId) {markPostRead({@@ -1186,11 +1196,13 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({Boolean(viewerSpaceId) && photo.friendID == viewerSpaceId;setSelectedViewer({avatarUrl: photo.avatarUrl,+ browseHistory,friend,photo,postIndex: 0,postActionMode: isOwnPost ? "hidden" : "like-only",posts,+ sessionId: Symbol(),});};const closeSelectedPhoto = () => {@@ -1303,6 +1315,60 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({);const selectedViewerPostIndex = selectedViewer?.postIndex;const selectedViewerPosts = selectedViewer?.posts;+ const historySessionId = selectedViewer?.browseHistory+ ? selectedViewer.sessionId+ : undefined;+ const selectedFriendSpaceId =+ selectedViewer?.friend?.spaceId ?? selectedViewer?.friend?.id;+ React.useEffect(() => {+ if (!historySessionId || !selectedFriendSpaceId || !onLoadFriendPosts) {+ return;+ }++ let cancelled = false;+ const loadHistory = async () => {+ let cursor: string | undefined;+ do {+ const page = await onLoadFriendPosts(+ selectedFriendSpaceId,+ viewerSpaceId,+ cursor,+ );+ if (cancelled) return;+ setSelectedViewer((viewer) => {+ if (viewer?.sessionId !== historySessionId || !viewer.posts)+ return viewer;++ const oldestPost = viewer.posts[viewer.posts.length - 1]!;+ const olderPosts = page.items.filter(+ (post) =>+ !post.isUnavailable &&+ (post.timestampMs < oldestPost.timestampMs ||+ (post.timestampMs == oldestPost.timestampMs &&+ post.postId < oldestPost.postId)),+ );+ return {+ ...viewer,+ posts: [...viewer.posts, ...olderPosts],+ };+ });+ cursor = page.nextCursor;+ } while (cursor);+ };+ void loadHistory().catch((error: unknown) =>+ log.error("Failed to load friend post history", error),+ );++ return () => {+ cancelled = true;+ };+ }, [+ historySessionId,+ onLoadFriendPosts,+ selectedFriendSpaceId,+ viewerSpaceId,+ ]);+const selectedViewerPhotos = React.useMemo(() => {const friend = selectedViewer?.friend;if (!selectedViewerPosts || !friend) return undefined;@@ -1334,7 +1400,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({setSelectedViewer((viewer) => {if (!viewer?.posts ||- viewer.posts !== currentViewer.posts ||+ viewer.sessionId !== currentViewer.sessionId ||(requireActivePost &&(viewer.postIndex != postIndex ||viewer.photo.postId != post.postId))@@ -1454,7 +1520,9 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({: undefined}onOpenFriend={onOpenFriend}- onOpenPosts={openPostPhotos}+ onOpenPosts={(friend, posts, photo) =>+ openPostPhotos(friend, posts, photo, isRead)+ }placement={placement}posts={posts}/>@@ -1888,6 +1956,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({}postActionMode={selectedViewer.postActionMode}showSequenceProgress={Boolean(+ !selectedViewer.browseHistory &&selectedViewerPosts &&selectedViewerPosts.length > 1,)}@@ -1922,9 +1991,10 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({: undefined}onSwipeLeft={- !selectedViewerPosts ||- selectedViewerPostIndex ==- selectedViewerPosts.length - 1+ !selectedViewer.browseHistory &&+ (!selectedViewerPosts ||+ selectedViewerPostIndex ==+ selectedViewerPosts.length - 1)? closeSelectedPhoto: undefined}diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsxindex a5ffa1499d..6494c69937 100644--- a/web/apps/space/src/screens/ProfileScreen.tsx+++ b/web/apps/space/src/screens/ProfileScreen.tsx@@ -4,6 +4,7 @@ import {BubbleChatIcon,Menu01Icon,MoreHorizontalIcon,+ Tick02Icon,UserRemove01Icon,} from "@hugeicons/core-free-icons";import { HugeiconsIcon } from "@hugeicons/react";@@ -12,6 +13,10 @@ import {spaceActionDoneDurationMs,type SpaceActionPhase,} from "components/ActionFeedback";+import {+ SpaceActionToast,+ spaceToastAutoDismissDurationMs,+} from "components/ActionToast";import { SpaceAvatarImage } from "components/AvatarImage";import { SpaceButtonSpinner } from "components/ButtonSpinner";import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";@@ -555,6 +560,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({useState(false);const [isDraftPostExiting, setIsDraftPostExiting] = useState(false);const [isPostPhotoOpening, setIsPostPhotoOpening] = useState(false);+ const [isInviteLinkCopied, setIsInviteLinkCopied] = useState(false);const [deletedPostIDs, setDeletedPostIDs] = useState<Set<string>>(() => new Set(),);@@ -1012,10 +1018,15 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({};const shareInvite = async () => {- if (!profileLink || typeof navigator.share != "function") return;+ if (!profileLink) return;try {- await navigator.share({ url: profileLink });+ if (typeof navigator.share == "function") {+ await navigator.share({ url: profileLink });+ } else {+ await navigator.clipboard.writeText(profileLink);+ setIsInviteLinkCopied(true);+ }} catch (error) {if (!(error instanceof DOMException && error.name == "AbortError")@@ -2004,6 +2015,21 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({/>)}</Box>+ {isInviteLinkCopied && (+ <SpaceActionToast+ autoDismissAfterMs={spaceToastAutoDismissDurationMs}+ closeLabel="Dismiss invite link copied message"+ icon={+ <HugeiconsIcon+ icon={Tick02Icon}+ size={22}+ strokeWidth={1.8}+ />+ }+ message="Invite link copied"+ onClose={() => setIsInviteLinkCopied(false)}+ />+ )}<ConfirmationActionSheetopen={isUnfriendSheetOpen}title="Are you sure you want to unfriend?"