π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Merge upstream/main into space-post-comments
Anand Baburajandf40d956709e
diff --cc rust/bindings/wasm/space/src/space.rsindex 063aee694b,e45464dec4..0c27b49c61--- a/rust/bindings/wasm/space/src/space.rs+++ b/rust/bindings/wasm/space/src/space.rs@@@ -326,7 -326,7 +326,8 @@@ pub struct PostResponseis_unavailable: bool,created_at: String,viewer_liked: bool,+ comment_count: i64,+ like_count: i64,}#[derive(Serialize, Tsify)]@@@ -722,7 -714,7 +723,8 @@@ impl From<ente_space::Post> for PostResis_unavailable,created_at: post.created_at,viewer_liked: post.viewer_liked,+ comment_count: post.comment_count,+ like_count: post.like_count,}}}diff --cc rust/crates/space/src/client/posts.rsindex a1b9f6c614,e7f8ee1251..8b88c5ede4--- a/rust/crates/space/src/client/posts.rs+++ b/rust/crates/space/src/client/posts.rs@@@ -594,7 -624,7 +624,8 @@@ pub(super) fn opened_postcontent,created_at: post.created_at,viewer_liked: post.viewer_liked,+ comment_count: post.comment_count,+ like_count: post.like_count,}}@@@ -625,7 -655,7 +656,8 @@@ mod tests}],created_at: format!("2026-08-0{post_id}T00:00:00Z"),viewer_liked: false,+ comment_count: 0,+ like_count: 0,}}@@@ -659,6 -689,7 +691,8 @@@post_with_corrupt_actor_profile.author.key_version = 1;post_with_corrupt_actor_profile.author.encrypted_profile = "not-base64".into();let mut valid_post = post(3, b64::encode(&valid_post_key));++ valid_post.comment_count = 3;+ valid_post.like_count = 8;valid_post.author.key_version = 1;valid_post.author.encrypted_profile = b64::encode(&secretbox::encrypt_combined(br#"{"fullName":"Alice"}"#,@@@ -742,6 -773,7 +776,8 @@@assert!(matches!(page.items[1].content, Err(Error::Base64Decode(_))));assert_eq!(page.items[1].post_id, 2);assert!(page.items[2].content.is_ok());++ assert_eq!(page.items[2].comment_count, 3);+ assert_eq!(page.items[2].like_count, 8);assert_eq!(page.items[2].authordiff --cc rust/crates/space/src/models.rsindex ec2ae103a2,e27cf776c6..52ba4bd2d0--- a/rust/crates/space/src/models.rs+++ b/rust/crates/space/src/models.rs@@@ -67,7 -67,7 +67,8 @@@ pub struct Postpub content: Result<PostContent>,pub created_at: String,pub viewer_liked: bool,+ pub comment_count: i64,+ pub like_count: i64,}pub struct SpaceActor {diff --cc rust/crates/space/src/transport.rsindex 86ee71f638,8eb07b3a6e..5cfba8d464--- a/rust/crates/space/src/transport.rs+++ b/rust/crates/space/src/transport.rs@@@ -273,7 -273,7 +273,9 @@@ pub struct PostResponsepub created_at: String,pub viewer_liked: bool,#[serde(default)]+ pub comment_count: i64,++ #[serde(default)]+ pub like_count: i64,}#[derive(Debug, Clone, Serialize, Deserialize)]diff --cc server/space/controller/helpers.goindex b6b13f7981,ceb1207395..5108ae23df--- a/server/space/controller/helpers.go+++ b/server/space/controller/helpers.go@@@ -111,7 -111,7 +111,8 @@@ func toPostResponse(post *spacerepo.SpaKeyVersion: post.KeyVersion,CreatedAt: formatMicros(post.CreatedAt),ViewerLiked: post.ViewerLiked,+ CommentCount: post.CommentCount,+ LikeCount: post.LikeCount,}if len(assets) > 0 {resp.Objects = make([]models.PostObjectPayload, 0, len(assets))diff --cc server/space/controller/posts_test.goindex 169b105742,31bc0e34d8..e618787fc9--- a/server/space/controller/posts_test.go+++ b/server/space/controller/posts_test.go@@@ -33,6 -34,82 +34,91 @@@ func TestPostLikeRejectsOwnPost(t *testrequire.Contains(t, err.Error(), "cannot like your own post")}+ func TestPostLikesOnlyOwnerCanListCurrentLikes(t *testing.T) {+ controller, repos, ctx := setupPostsControllerTest(t)+ ownerID := insertSpaceControllerUser(t, repos, "[email protected]", "owner-public")+ owner, err := testCreateSpace(ctx, repos, ownerID, "likes_owner", "key", "public", "secret", "nonce", "profile")+ require.NoError(t, err)+ postID, err := testCreatePost(ctx, repos, ownerID, owner.SpaceID, "post-key", nil, 1, nil)+ require.NoError(t, err)++ for i := range 2 {++ require.NoError(t, repos.Comments.Create(ctx, owner.SpaceID, postID, models.CreateCommentRequest{CommentID: fmt.Sprintf("comment-%d", i)}, []byte("comment")))++ }+ assertCounts := func(want int64) {+ t.Helper()+ post, err := repos.Posts.GetPost(ctx, postID, owner.SpaceID)+ require.NoError(t, err)+ require.Equal(t, want, toPostResponse(post, nil, true).LikeCount)++ require.EqualValues(t, 2, toPostResponse(post, nil, true).CommentCount)+ posts, _, err := repos.Posts.ListPostsBySpace(ctx, owner.SpaceID, owner.SpaceID, "", 10)+ require.NoError(t, err)+ require.Len(t, posts, 1)+ require.Equal(t, want, posts[0].LikeCount)++ require.EqualValues(t, 2, posts[0].CommentCount)+ feed, err := controller.ListFeed(ctx, owner, models.ListFeedRequest{})+ require.NoError(t, err)+ require.Len(t, feed.Items, 1)+ require.Equal(t, want, feed.Items[0].LikeCount)++ require.EqualValues(t, 2, feed.Items[0].CommentCount)+ }+ assertCounts(0)+ items, err := controller.ListLikes(ctx, owner, postID)+ require.NoError(t, err)+ require.NotNil(t, items)+ require.Empty(t, items)++ var actors []*spacerepo.SpaceRecord+ for i := range 4 {+ userID := insertSpaceControllerUser(t, repos, fmt.Sprintf("liker-%[email protected]", i), "public")+ actor, err := testCreateSpace(ctx, repos, userID, fmt.Sprintf("liker_%d", i), "key", "public", "secret", "nonce", "profile")+ require.NoError(t, err)+ require.NoError(t, testAddFriend(ctx, repos, userID, actor.SpaceID, owner.SpaceID, "owner-share", 1, "actor-share", 1))+ _, err = controller.SetLike(ctx, actor, postID, true)+ require.NoError(t, err)+ _, err = repos.Posts.DB.Exec(`UPDATE space_post_likes SET created_at = $1 WHERE post_id = $2 AND actor_space_id = $3`, i+1, postID, actor.SpaceID)+ require.NoError(t, err)+ actors = append(actors, actor)+ }+ items, err = controller.ListLikes(ctx, owner, postID)+ require.NoError(t, err)+ require.Len(t, items, 4)+ require.Equal(t, actors[3].SpaceID, items[0].SpaceID)+ require.Equal(t, actors[0].SpaceID, items[3].SpaceID)+ require.NotEmpty(t, items[0].EncryptedProfile)+ assertCounts(4)+ for _, viewerSpaceID := range []string{actors[0].SpaceID, ""} {+ post, err := repos.Posts.GetPost(ctx, postID, viewerSpaceID)+ require.NoError(t, err)+ require.Zero(t, post.LikeCount)++ require.EqualValues(t, 2, post.CommentCount)+ posts, _, err := repos.Posts.ListPostsBySpace(ctx, owner.SpaceID, viewerSpaceID, "", 10)+ require.NoError(t, err)+ require.Len(t, posts, 1)+ require.Zero(t, posts[0].LikeCount)++ require.EqualValues(t, 2, posts[0].CommentCount)+ }+ friendFeed, err := controller.ListFeed(ctx, actors[0], models.ListFeedRequest{})+ require.NoError(t, err)+ require.Len(t, friendFeed.Items, 1)+ require.Zero(t, friendFeed.Items[0].LikeCount)++ require.EqualValues(t, 2, friendFeed.Items[0].CommentCount)+ _, err = controller.ListLikes(ctx, actors[0], postID)+ require.ErrorIs(t, err, ente.ErrPermissionDenied)+ _, err = controller.SetLike(ctx, actors[0], postID, false)+ require.NoError(t, err)+ require.NoError(t, repos.Friends.DeleteFriendship(ctx, owner.SpaceID, actors[1].SpaceID))+ _, err = repos.Posts.DB.Exec(`UPDATE users SET encrypted_email = NULL WHERE user_id = $1`, actors[2].OwnerID)+ require.NoError(t, err)+ items, err = controller.ListLikes(ctx, owner, postID)+ require.NoError(t, err)+ require.Len(t, items, 1)+ require.Equal(t, actors[3].SpaceID, items[0].SpaceID)+ assertCounts(1)+ require.NoError(t, controller.Delete(ctx, owner, postID))+ _, err = controller.ListLikes(ctx, owner, postID)+ require.Error(t, err)+ }+func TestCreatePostRequiresAssetMetadataCipher(t *testing.T) {controller, repos, ctx := setupPostsControllerTest(t)aliceID := insertSpaceControllerUser(t, repos, "[email protected]", "alice-public")diff --cc server/space/models/models.goindex d1f1197733,0d533b616f..ac087ee20e--- a/server/space/models/models.go+++ b/server/space/models/models.go@@@ -402,7 -402,7 +402,8 @@@ type PostResponse structObjects []PostObjectPayload `json:"objects,omitempty"`CreatedAt string `json:"createdAt"`ViewerLiked bool `json:"viewerLiked"`+ CommentCount int64 `json:"commentCount"`+ LikeCount int64 `json:"likeCount"`}type SpaceUnreadStatusResponse struct {diff --cc server/space/repo/module.goindex a0ee435c22,f06708a2d0..f3dcc91a3c--- a/server/space/repo/module.go+++ b/server/space/repo/module.go@@@ -109,7 -108,7 +109,8 @@@ type SpacePostRecord structKeyVersion intCreatedAt int64ViewerLiked bool+ CommentCount int64+ LikeCount int64}type SpacePostAssetRecord struct {diff --cc server/space/repo/posts.goindex b8f75168bd,cb2d0e5112..72e3ecc4cd--- a/server/space/repo/posts.go+++ b/server/space/repo/posts.go@@@ -49,8 -80,15 +80,17 @@@ func postRecordSelectSQL(viewerLikedExpp.encrypted_post_key, p.caption_cipher,p.key_version, p.created_at,` + viewerLikedExpr + ` AS viewer_liked,+ (SELECT COUNT(*) FROM space_comments c- WHERE c.post_id = p.post_id AND ` + commentVisibleSQL + `) AS comment_count`++ WHERE c.post_id = p.post_id AND ` + commentVisibleSQL + `) AS comment_count,+ CASE WHEN p.space_id = ` + viewerSpaceParam + ` THEN (+ SELECT COUNT(*) FROM space_post_likes l+ JOIN spaces actor ON actor.space_id = l.actor_space_id+ JOIN users actor_owner ON actor_owner.user_id = actor.owner_id AND actor_owner.encrypted_email IS NOT NULL+ WHERE l.post_id = p.post_id AND EXISTS (+ SELECT 1 FROM space_friend_shares share+ WHERE share.space_id = p.space_id AND share.friend_space_id = l.actor_space_id+ )+ ) ELSE 0 END AS like_count`}func scanPostRecords(rows *sql.Rows) ([]SpacePostRecord, error) {@@@ -422,7 -460,7 +462,7 @@@ func scanPostRecord(scanner interface{var rec SpacePostRecorddest := []any{&rec.PostID, &rec.SpaceID, &rec.SpaceSlug, &rec.OwnerID}dest = append(dest, spaceActorScanDest(&rec.Author)...)- dest = append(dest, &rec.EncryptedPostKey, &rec.CaptionCipher, &rec.KeyVersion, &rec.CreatedAt, &rec.ViewerLiked, &rec.CommentCount)- dest = append(dest, &rec.EncryptedPostKey, &rec.CaptionCipher, &rec.KeyVersion, &rec.CreatedAt, &rec.ViewerLiked, &rec.LikeCount)++ dest = append(dest, &rec.EncryptedPostKey, &rec.CaptionCipher, &rec.KeyVersion, &rec.CreatedAt, &rec.ViewerLiked, &rec.CommentCount, &rec.LikeCount)if err := scanner.Scan(dest...); err != nil {return nil, stacktrace.Propagate(err, "")}diff --cc web/apps/space/src/components/FileViewer.tsxindex d4f72a7051,dbfd22513d..61ca31a9d5--- a/web/apps/space/src/components/FileViewer.tsx+++ b/web/apps/space/src/components/FileViewer.tsx@@@ -25,7 -24,7 +25,8 @@@ import { SpaceCommentsButton } from "coimport { ConfirmationActionSheet } from "components/ConfirmationActionSheet";import { spacePostLikePopDurationMs } from "components/post-like-animation";import { paintStretchingDot } from "components/post-photos-dots";+import { PostComments } from "components/PostComments";+ import { SpacePostLikes } from "components/PostLikes";import { SpacePostPhotosDots } from "components/PostPhotosDots";import { SpacePostReplyControls } from "components/PostReplyControls";import { createSpaceVideoContent } from "components/PostVideoContent";@@@ -205,10 -203,8 +209,11 @@@ interface SpaceFileViewerPropsphotoIndex?: number;initialPhotoIndex?: number;photos?: SpaceViewerPhoto[];- focusReplyOnOpen?: boolean;+ commentsOnOpen?: boolean;+ targetCommentId?: string;+ focusCommentOnOpen?: boolean;+ privateReplyOnOpen?: boolean;+ showLikesOnOpen?: boolean;postActionMode?: SpaceViewerPostActionMode;}@@@ -500,12 -493,8 +507,13 @@@ export const SpaceFileViewer: React.FC<initialPhotoIndex = 0,photos,postActionMode = "like-only",+ showLikesOnOpen = false,}) => {+ const { profile } = useSpaceAppState();+ const [commentsOpen, setCommentsOpen] = React.useState(false);+ React.useEffect(() => {+ if (commentsOnOpen) setCommentsOpen(true);+ }, [commentsOnOpen]);const [localPhotoIndex, setLocalPhotoIndex] =React.useState(initialPhotoIndex);const [loadedPhotoURLs, setLoadedPhotoURLs] = React.useState<@@@ -723,7 -704,7 +738,8 @@@const isSwipeBlockedRef = React.useRef(false);isSwipeBlockedRef.current =isActionsOpen ||+ commentsOpen ||+ isLikesOpen ||addFriendSheetOpen ||(canDeletePost && deleteSheetOpen) ||isDeleteExit ||@@@ -2759,8 -2727,8 +2777,9 @@@)}{!isDraftPost &&(hasDisplayCaption ||+ canComment ||showPhotoLikeButton ||+ showPostLikes ||postPhotoCount > 1) &&!isCaptionEditing && (<Box@@@ -2852,34 -2806,23 +2875,54 @@@: undefined}/>- ) : canComment ? (- )}- {showPostLikes &&- activePhoto.spaceId &&- activePhoto.postId && (- <SpacePostLikes- likeCount={activePhoto.likeCount}- spaceId={activePhoto.spaceId}- postId={activePhoto.postId}- open={isLikesOpen}- onOpen={() =>- setLikesPostKey(activePostKey)- }- onClose={() => setLikesPostKey(undefined)}- />- )}++ ) : canComment || showPostLikes ? (+ <Box+ sx={{++ alignItems: "center",+ display: "flex",++ gap: "12px",+ justifyContent: "flex-end",+ }}+ >- <SpaceCommentsButton- count={commentCount}- onClick={() => setCommentsOpen(true)}- />++ {showPostLikes &&++ activePhoto.spaceId &&++ activePhoto.postId && (++ <SpacePostLikes++ likeCount={activePhoto.likeCount}++ spaceId={activePhoto.spaceId}++ postId={activePhoto.postId}++ open={isLikesOpen}++ onOpen={() =>++ setLikesPostKey(activePostKey)++ }++ onClose={() =>++ setLikesPostKey(undefined)++ }++ />++ )}++ {canComment && (++ <SpaceCommentsButton++ count={commentCount}++ onClick={() => setCommentsOpen(true)}++ />++ )}+ </Box>+ ) : null}</Box>)}+ {commentsOpen && canComment && (+ <PostComments+ key={activePhoto.postId}+ autoFocus={focusCommentOnOpen}+ targetCommentId={targetCommentId}+ viewer={profile!.spaceId!}+ postId={activePhoto.postId!}+ owner={activePhoto.spaceId!}+ draft={commentDraft}+ setDraft={setCommentDraft}+ onClose={() => setCommentsOpen(false)}+ />+ )}<Modalopen={isCaptionDialogOpen}onClose={() => setIsCaptionDialogOpen(false)}diff --cc web/apps/space/src/components/PostTile.tsxindex 9a7a358ff9,e9d5042bcb..a8a1820d76--- a/web/apps/space/src/components/PostTile.tsx+++ b/web/apps/space/src/components/PostTile.tsx@@@ -17,9 -17,9 +17,10 @@@ import { thumbHashDataURLFromBase64 } fconst green = "#08C225";export interface SpacePostTileItem {+ likeCount?: number;avatarUrl?: string | null;caption?: string;+ commentCount?: number;friendID?: string;height?: number;id: string;diff --cc web/apps/space/src/pages/app/notifications.tsxindex 7ac5e824d3,65b52caac2..b408d7b553--- a/web/apps/space/src/pages/app/notifications.tsx+++ b/web/apps/space/src/pages/app/notifications.tsx@@@ -229,15 -228,12 +229,15 @@@ const NotificationRow: React.FC<isFriendRequest? undefined: () => {- if (isPostLike)+ if (isPostLike || isDiscussion)void router.push(- `${spaceRoutes.post(- spaceId,+ spaceRoutes.post(+ group.postSpaceId ?? spaceId,group.postId!,- )}?likes=1`,+ ) ++ (isDiscussion+ ? `?comments=1&comment=${encodeURIComponent(group.commentId!)}`- : ""),++ : "?likes=1"),);elsevoid router.push(diff --cc web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsxindex 0589c15585,71dd84c09d..4fa07fc6f1--- a/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx+++ b/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx@@@ -207,10 -209,11 +211,13 @@@ const Page: React.FC = () =>photo={viewerPhotoFromPost(post)}photos={photos}initialPhotoIndex={photoIndex}+ commentsOnOpen={router.query.comments == "1"}+ targetCommentId={targetCommentId}onLoadPhoto={loadCurrentSpacePostAssetURL}- postActionMode={isOwnPost ? "hidden" : "like-only"}+ postActionMode={isOwnPost ? "likes" : "like-only"}+ showLikesOnOpen={+ isOwnPost && valueFromQuery(router.query.likes) == "1"+ }onClose={closePost}onOpenProfile={openOwnerProfile}onDeletePost={diff --cc web/apps/space/src/screens/HomeScreen.tsxindex b213c21f06,5c8ae0c18f..9dd1ca7d92--- a/web/apps/space/src/screens/HomeScreen.tsx+++ b/web/apps/space/src/screens/HomeScreen.tsx@@@ -1998,11 -1994,9 +1998,11 @@@ export const HomeScreen: React.FC<HomeSsetSelectedViewer({photoIndex,photos,- focusReplyOnOpen: isOwnPost ? false : focusReplyOnOpen,photo,- postActionMode: isOwnPost ? "hidden" : "like-only",+ postActionMode: isOwnPost ? "likes" : "like-only",+ privateReplyOnOpen: action == "reply",+ commentsOnOpen: action == "comments" || action == "comment",+ focusCommentOnOpen: action == "comment",});};const closeSelectedPhoto = () => {diff --cc web/apps/space/src/services/space.tsindex ba1893421f,ae4f5d7307..435c3edd6d--- a/web/apps/space/src/services/space.ts+++ b/web/apps/space/src/services/space.ts@@@ -66,9 -61,9 +66,10 @@@ interface SpacePostBaseavatarUpdatedAt?: string;avatarUrl?: string | null;caption?: string;+ commentCount?: number;friendID: string;height?: number;+ likeCount?: number;name: string;postId: number;timestampMs: number;@@@ -451,28 -446,23 +452,29 @@@ const postPhotosFromResponse = (post: Pconst postBaseFromResponse = (post: PostResponse,author: FriendProfile,-): SpacePostBase => ({- avatarKeyVersion: author.avatarKeyVersion,- avatarObjectID: author.avatarObjectID,- avatarSize: author.avatarSize,- avatarUpdatedAt: author.avatarUpdatedAt,- avatarUrl: author.avatarUrl,- caption: post.caption,- friendID: author.id,- isUnavailable: post.isUnavailable,- likeCount: post.likeCount,- name: author.fullName || author.username,- postId: post.postId,- spaceId: post.spaceId,- timestampMs: timestampMsFromSpaceDate(post.createdAt),- username: author.username,- viewerLiked: post.viewerLiked,-});+ countRequest?: CommentCountRequest,+): SpacePostBase => {+ return {+ avatarKeyVersion: author.avatarKeyVersion,+ avatarObjectID: author.avatarObjectID,+ avatarSize: author.avatarSize,+ avatarUpdatedAt: author.avatarUpdatedAt,+ avatarUrl: author.avatarUrl,+ caption: post.caption,+ commentCount: countRequest+ ? rememberCommentCount(countRequest, post.postId, post.commentCount)+ : post.commentCount,+ friendID: author.id,+ isUnavailable: post.isUnavailable,++ likeCount: post.likeCount,+ name: author.fullName || author.username,+ postId: post.postId,+ spaceId: post.spaceId,+ timestampMs: timestampMsFromSpaceDate(post.createdAt),+ username: author.username,+ viewerLiked: post.viewerLiked,+ };+};const postFromAccountPost = async (ctx: SpaceAccountCtxHandle,diff --cc web/apps/space/tests/feed-cache.test.tsindex 7107421b00,3a3e44b11c..90ab5138c8--- a/web/apps/space/tests/feed-cache.test.ts+++ b/web/apps/space/tests/feed-cache.test.ts@@@ -141,6 -141,7 +141,8 @@@ test("shrinks an existing thirty-post ctest("restores every photo in order and preserves shared post edits", async () => {const original = post(3);++ original.commentCount = 3;+ original.likeCount = 8;original.photos = ["cover", "second", "third"].map((objectKey, index) => ({imageAsset: { ...original.imageAsset!, objectKey },imageUrl: `blob:${objectKey}`,@@@ -158,6 -159,7 +160,8 @@@"changed by caller";clearSpaceFeedMemoryCache();const restored = (await loadCachedSpaceFeed("self"))!.items[0]!;++ expect(restored.commentCount).toBe(3);+ expect(restored.likeCount).toBe(8);expect(restored).toMatchObject({caption: "Edited caption",viewerLiked: true,diff --cc web/apps/space/tests/notification-avatars.test.tsindex 65884f4643,15ae22eab9..0538e77aa7--- a/web/apps/space/tests/notification-avatars.test.ts+++ b/web/apps/space/tests/notification-avatars.test.ts@@@ -43,7 -44,7 +44,8 @@@ const context =downloadSpaceAvatar: vi.fn(),listNotifications: vi.fn(),listConversations: vi.fn(),+ listSpaceFriends: vi.fn(),+ listPostLikes: vi.fn(),};beforeEach(() => {