π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[space][web][rust][server] Show post likes
Anand Baburajan9db0119418f0
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rsindex 27e6ff933f..e45464dec4 100644--- a/rust/bindings/wasm/space/src/space.rs+++ b/rust/bindings/wasm/space/src/space.rs@@ -303,7 +303,7 @@ impl From<ente_space::transport::UpdateSpaceProfileResponse> for UpdateSpaceProf#[derive(Serialize, Tsify)]#[serde(rename_all = "camelCase")]-struct SpaceActorResponse {+pub struct SpaceActorResponse {space_id: String,space_slug: String,public_key: String,@@ -326,6 +326,7 @@ pub struct PostResponse {is_unavailable: bool,created_at: String,viewer_liked: bool,+ like_count: i64,}#[derive(Serialize, Tsify)]@@ -713,6 +714,7 @@ impl From<ente_space::Post> for PostResponse {is_unavailable,created_at: post.created_at,viewer_liked: post.viewer_liked,+ like_count: post.like_count,}}}@@ -1433,6 +1435,24 @@ impl SpaceAccountCtxHandle {.map_err(Into::into)}+ #[wasm_bindgen(js_name = listPostLikes)]+ pub async fn list_post_likes(+ &self,+ space_id: String,+ post_id: i64,+ ) -> Result<Vec<<SpaceActorResponse as Tsify>::JsType>, Error> {+ self.inner+ .list_post_likes(&space_id, post_id)+ .await?+ .into_iter()+ .map(|actor| {+ SpaceActorResponse::from(actor)+ .into_js()+ .map_err(Into::into)+ })+ .collect()+ }+#[wasm_bindgen(js_name = likePost)]pub async fn like_post(&self,diff --git a/rust/crates/space/src/client/posts.rs b/rust/crates/space/src/client/posts.rsindex bf5fac9172..da689519ef 100644--- a/rust/crates/space/src/client/posts.rs+++ b/rust/crates/space/src/client/posts.rs@@ -461,6 +461,35 @@ impl AccountSpaceCtx {Ok(())}+ pub async fn list_post_likes(&self, space_id: &str, post_id: i64) -> Result<Vec<SpaceActor>> {+ let path = format!("/spaces/{space_id}/posts/{post_id}/likes");+ let actors: Vec<SpaceActorResponse> = self+ .api()+ .get(&path)+ .send()+ .await?+ .error_for_status()?+ .json()+ .await?;+ if actors.is_empty() {+ return Ok(Vec::new());+ }+ let shares = self.list_decrypted_friend_shares_cached(space_id).await?;+ if actors.iter().any(|actor| {+ !actor.encrypted_profile.is_empty()+ && !shares.iter().any(|share| share.space_id == actor.space_id)+ }) {+ self.clear_friend_share_cache()?;+ self.list_decrypted_friend_shares_cached(space_id).await?;+ }+ let mut items = Vec::with_capacity(actors.len());+ for actor in actors {+ let profile = retain_content_error(self.decrypt_actor_profile(&actor).await)?;+ items.push(SpaceActor::from_response(actor, profile));+ }+ Ok(items)+ }+pub async fn like_post(&self,space_id: &str,@@ -594,6 +623,7 @@ pub(super) fn opened_post(content,created_at: post.created_at,viewer_liked: post.viewer_liked,+ like_count: post.like_count,}}@@ -624,6 +654,7 @@ mod tests {}],created_at: format!("2026-08-0{post_id}T00:00:00Z"),viewer_liked: false,+ like_count: 0,}}@@ -657,6 +688,7 @@ mod tests {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.like_count = 8;valid_post.author.key_version = 1;valid_post.author.encrypted_profile = b64::encode(&secretbox::encrypt_combined(br#"{"fullName":"Alice"}"#,@@ -740,6 +772,7 @@ mod tests {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].like_count, 8);assert_eq!(page.items[2].authordiff --git a/rust/crates/space/src/client/tests.rs b/rust/crates/space/src/client/tests.rsindex b450a8b67c..f573efc0ff 100644--- a/rust/crates/space/src/client/tests.rs+++ b/rust/crates/space/src/client/tests.rs@@ -1695,6 +1695,60 @@ async fn like_post_uses_post_like_endpoint() {like.assert_async().await;}+#[tokio::test]+async fn list_post_likes_skips_key_loading_when_empty() {+ let mut server = Server::new_async().await;+ let ctx = test_account_ctx(&server.url());+ let likes = server+ .mock("GET", "/spaces/space_owner_main/posts/42/likes")+ .with_body("[]")+ .create_async()+ .await;+ let shares = server+ .mock("GET", "/spaces/space_owner_main/friends/shares")+ .expect(0)+ .create_async()+ .await;+ assert!(+ ctx.list_post_likes("space_owner_main", 42)+ .await+ .unwrap()+ .is_empty()+ );+ likes.assert_async().await;+ shares.assert_async().await;+}++#[tokio::test]+async fn list_post_likes_returns_all_actors() {+ let mut server = Server::new_async().await;+ let ctx = test_account_ctx(&server.url());+ let likes = server+ .mock("GET", "/spaces/space_owner_main/posts/42/likes")+ .match_header("x-space-session-token", "space-session-token")+ .with_body(+ json!([+ {"spaceId":"friend1", "spaceSlug":"maya"},+ {"spaceId":"friend2", "spaceSlug":"bob"},+ {"spaceId":"friend3", "spaceSlug":"alex"}+ ])+ .to_string(),+ )+ .create_async()+ .await;+ let shares = server+ .mock("GET", "/spaces/space_owner_main/friends/shares")+ .with_body("[]")+ .create_async()+ .await;+ let actors = ctx.list_post_likes("space_owner_main", 42).await.unwrap();+ assert_eq!(actors.len(), 3);+ assert_eq!(actors[0].space_slug, "maya");+ assert_eq!(actors[2].space_id, "friend3");+ likes.assert_async().await;+ shares.assert_async().await;+}+#[tokio::test]async fn unread_badge_stops_without_loading_conversations() {for kind in ["regular", "post_reply"] {diff --git a/rust/crates/space/src/models.rs b/rust/crates/space/src/models.rsindex 55fb9c7365..e27cf776c6 100644--- a/rust/crates/space/src/models.rs+++ b/rust/crates/space/src/models.rs@@ -67,6 +67,7 @@ pub struct Post {pub content: Result<PostContent>,pub created_at: String,pub viewer_liked: bool,+ pub like_count: i64,}pub struct SpaceActor {diff --git a/rust/crates/space/src/transport.rs b/rust/crates/space/src/transport.rsindex bb3b41f6f6..5cb0551ade 100644--- a/rust/crates/space/src/transport.rs+++ b/rust/crates/space/src/transport.rs@@ -272,6 +272,8 @@ pub struct PostResponse {pub objects: Vec<PostObjectPayload>,pub created_at: String,pub viewer_liked: bool,+ #[serde(default)]+ pub like_count: i64,}#[derive(Debug, Clone, Serialize, Deserialize)]diff --git a/server/space/api/notifications_test.go b/server/space/api/notifications_test.goindex 734f82cca6..e13524dcae 100644--- a/server/space/api/notifications_test.go+++ b/server/space/api/notifications_test.go@@ -6,6 +6,7 @@ import ("encoding/json""net/http""net/http/httptest"+ "strconv""strings""testing"@@ -60,6 +61,17 @@ func TestNotificationsAPIIsRecipientScoped(t *testing.T) {require.Equal(t, int64(1), page.Items[0].ActorCount)require.True(t, page.Items[0].Unread)require.NotEmpty(t, page.NextCursor)+ likesPath := "/posts/" + strconv.FormatInt(postID, 10) + "/likes"+ response = serve(http.MethodGet, "/spaces/"+owner.SpaceID+likesPath, "")+ require.Equal(t, http.StatusOK, response.Code, response.Body.String())+ var actors []models.SpaceActorResponse+ require.NoError(t, json.Unmarshal(response.Body.Bytes(), &actors))+ require.Len(t, actors, 1)+ require.Equal(t, friend.SpaceID, actors[0].SpaceID)+ response = serve(http.MethodGet, "/spaces/"+friend.SpaceID+likesPath, "")+ require.Equal(t, http.StatusForbidden, response.Code)+ response = serve(http.MethodGet, "/spaces/"+owner.SpaceID+"/posts/0/likes", "")+ require.Equal(t, http.StatusBadRequest, response.Code)olderResponse := serve(http.MethodGet, "/spaces/"+owner.SpaceID+"/notifications?cursor="+page.NextCursor, "")require.Equal(t, http.StatusOK, olderResponse.Code, olderResponse.Body.String())var olderPage models.NotificationPagediff --git a/server/space/api/posts.go b/server/space/api/posts.goindex 48e846cafc..adf6f6cf0f 100644--- a/server/space/api/posts.go+++ b/server/space/api/posts.go@@ -65,6 +65,15 @@ func (h *Handlers) LikePost(c *gin.Context, space *spacerepo.SpaceRecord) {h.setPostLike(c, space, true)}+func (h *Handlers) ListPostLikes(c *gin.Context, space *spacerepo.SpaceRecord) {+ postID, ok := positiveInt64Param(c, "postID")+ if !ok {+ return+ }+ resp, err := h.Module.Posts.ListLikes(c, space, postID)+ respondJSON(c, resp, err)+}+func (h *Handlers) UnlikePost(c *gin.Context, space *spacerepo.SpaceRecord) {h.setPostLike(c, space, false)}diff --git a/server/space/api/register.go b/server/space/api/register.goindex 4d4adb3cbd..941b0e853c 100644--- a/server/space/api/register.go+++ b/server/space/api/register.go@@ -25,6 +25,7 @@ func Register(privateAPI, publicAPI gin.IRouter, handlers *Handlers) {spaceAPI.PATCH("/posts/:postID/caption", selected(handlers.UpdatePostCaption))spaceAPI.PUT("/posts/:postID/like", selected(handlers.LikePost))spaceAPI.DELETE("/posts/:postID/like", selected(handlers.UnlikePost))+ spaceAPI.GET("/posts/:postID/likes", selected(handlers.ListPostLikes))spaceAPI.POST("/posts/:postID/reply", selected(handlers.ReplyToPost))spaceAPI.DELETE("/posts/:postID", selected(handlers.DeletePost))spaceAPI.POST("/friends/:friendSpaceID/pokes", selected(handlers.CreatePoke))diff --git a/server/space/controller/helpers.go b/server/space/controller/helpers.goindex cde848274b..ceb1207395 100644--- a/server/space/controller/helpers.go+++ b/server/space/controller/helpers.go@@ -111,6 +111,7 @@ func toPostResponse(post *spacerepo.SpacePostRecord, assets []spacerepo.SpacePosKeyVersion: post.KeyVersion,CreatedAt: formatMicros(post.CreatedAt),ViewerLiked: post.ViewerLiked,+ LikeCount: post.LikeCount,}if len(assets) > 0 {resp.Objects = make([]models.PostObjectPayload, 0, len(assets))diff --git a/server/space/controller/posts.go b/server/space/controller/posts.goindex 450d9ba4d5..6e1dd1ecee 100644--- a/server/space/controller/posts.go+++ b/server/space/controller/posts.go@@ -277,3 +277,22 @@ func (c *PostsController) SetLike(ctx context.Context, actorSpace *repo.SpaceRecfunc (c *PostsController) Delete(ctx context.Context, space *repo.SpaceRecord, postID int64) error {return c.PostsRepo.DeletePost(ctx, postID, space.SpaceID)}++func (c *PostsController) ListLikes(ctx context.Context, space *repo.SpaceRecord, postID int64) ([]models.SpaceActorResponse, error) {+ post, err := c.PostsRepo.GetPost(ctx, postID, space.SpaceID)+ if err != nil {+ return nil, err+ }+ if post.SpaceID != space.SpaceID {+ return nil, ente.ErrPermissionDenied+ }+ actors, err := c.PostsRepo.ListLikes(ctx, postID, space.SpaceID)+ if err != nil {+ return nil, err+ }+ items := make([]models.SpaceActorResponse, 0, len(actors))+ for _, actor := range actors {+ items = append(items, toActorResponse(actor, true))+ }+ return items, nil+}diff --git a/server/space/controller/posts_test.go b/server/space/controller/posts_test.goindex 169b105742..31bc0e34d8 100644--- a/server/space/controller/posts_test.go+++ b/server/space/controller/posts_test.go@@ -11,6 +11,7 @@ import ("sync/atomic""testing"+ "github.com/ente/museum/ente""github.com/ente/museum/pkg/utils/config""github.com/ente/museum/pkg/utils/s3config"timeutil "github.com/ente/museum/pkg/utils/time"@@ -33,6 +34,82 @@ func TestPostLikeRejectsOwnPost(t *testing.T) {require.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)+ 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)+ 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)+ 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)+ }+ 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)+ 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)+ }+ 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)+ _, 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 --git a/server/space/models/models.go b/server/space/models/models.goindex bb060b3024..0d533b616f 100644--- a/server/space/models/models.go+++ b/server/space/models/models.go@@ -402,6 +402,7 @@ type PostResponse struct {Objects []PostObjectPayload `json:"objects,omitempty"`CreatedAt string `json:"createdAt"`ViewerLiked bool `json:"viewerLiked"`+ LikeCount int64 `json:"likeCount"`}type SpaceUnreadStatusResponse struct {diff --git a/server/space/repo/module.go b/server/space/repo/module.goindex 050b89b328..f06708a2d0 100644--- a/server/space/repo/module.go+++ b/server/space/repo/module.go@@ -108,6 +108,7 @@ type SpacePostRecord struct {KeyVersion intCreatedAt int64ViewerLiked bool+ LikeCount int64}type SpacePostAssetRecord struct {diff --git a/server/space/repo/posts.go b/server/space/repo/posts.goindex ccb58880b6..cb2d0e5112 100644--- a/server/space/repo/posts.go+++ b/server/space/repo/posts.go@@ -18,6 +18,37 @@ const (var ErrSpacePostLimitReached = errors.New("space post limit reached")+func (r *PostsRepository) ListLikes(ctx context.Context, postID int64, spaceID string) ([]SpaceActorRecord, error) {+ rows, err := r.DB.QueryContext(ctx, `+ SELECT `+spaceActorSelectColumns("actor", "avatar", "actor")+`+ 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+ `+spaceActorAvatarJoin("actor", "avatar")+`+ WHERE l.post_id = $1 AND EXISTS (+ SELECT 1 FROM space_friend_shares share+ WHERE share.space_id = $2 AND share.friend_space_id = l.actor_space_id+ )+ ORDER BY l.created_at DESC, l.like_id DESC+ `, postID, spaceID)+ if err != nil {+ return nil, stacktrace.Propagate(err, "")+ }+ defer rows.Close()+ actors := make([]SpaceActorRecord, 0)+ for rows.Next() {+ var actor SpaceActorRecord+ if err := rows.Scan(spaceActorScanDest(&actor)...); err != nil {+ return nil, stacktrace.Propagate(err, "")+ }+ actors = append(actors, actor)+ }+ if err := rows.Err(); err != nil {+ return nil, stacktrace.Propagate(err, "")+ }+ return actors, nil+}+func (r *PostsRepository) CountPosts(ctx context.Context, spaceID string) (int64, error) {var count int64if err := r.DB.QueryRowContext(ctx, `@@ -42,13 +73,22 @@ func (r *PostsRepository) LatestPostCreatedAt(ctx context.Context, spaceID strinreturn createdAt.Int64, nil}-func postRecordSelectSQL(viewerLikedExpr string) string {+func postRecordSelectSQL(viewerLikedExpr string, viewerSpaceParam string) string {return `SELECT p.post_id, p.space_id, w.space_slug, w.owner_id,` + spaceActorSelectColumns("w", "w_avatar", "author") + `,p.encrypted_post_key, p.caption_cipher,p.key_version, p.created_at,- ` + viewerLikedExpr + ` AS viewer_liked`+ ` + viewerLikedExpr + ` AS viewer_liked,+ 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) {@@ -151,7 +191,7 @@ func (r *PostsRepository) GetPost(ctx context.Context, postID int64, viewerSpaceFROM space_post_likes lWHERE l.post_id = p.post_idAND l.actor_space_id = $2- )`) + `+ )`, "$2") + `FROM space_posts pJOIN spaces w ON w.space_id = p.space_id` + spaceActorAvatarJoin("w", "w_avatar") + `@@ -172,7 +212,7 @@ func (r *PostsRepository) ListPostsBySpace(ctx context.Context, spaceID string,FROM space_post_likes lWHERE l.post_id = p.post_idAND l.actor_space_id = $2- )`) + `+ )`, "$2") + `FROM space_posts pJOIN spaces w ON w.space_id = p.space_id` + spaceActorAvatarJoin("w", "w_avatar") + `@@ -212,7 +252,7 @@ func (r *PostsRepository) ListFeed(ctx context.Context, viewerSpaceID string, cuFROM space_post_likes lWHERE l.post_id = p.post_idAND l.actor_space_id = $1- ) END`) + `+ ) END`, "$1") + `FROM (SELECT $1::TEXT AS space_idUNION ALL@@ -420,7 +460,7 @@ func scanPostRecord(scanner interface{ Scan(dest ...any) error }) (*SpacePostRecvar 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)+ dest = append(dest, &rec.EncryptedPostKey, &rec.CaptionCipher, &rec.KeyVersion, &rec.CreatedAt, &rec.ViewerLiked, &rec.LikeCount)if err := scanner.Scan(dest...); err != nil {return nil, stacktrace.Propagate(err, "")}diff --git a/web/apps/space/src/components/AppNavigation.tsx b/web/apps/space/src/components/AppNavigation.tsxindex 747c018ff4..b515c84801 100644--- a/web/apps/space/src/components/AppNavigation.tsx+++ b/web/apps/space/src/components/AppNavigation.tsx@@ -41,12 +41,17 @@ export const SpaceAppLayout = ({ children }: { children: React.ReactNode }) => {const isConversation = router.pathname.startsWith(`${spaceRoutes.messages}/`,);+ const isPost = router.pathname.startsWith("/app/posts/");const isFriendPreview =router.pathname == spaceRoutes.friends &&typeof router.query.friend == "string" &&router.query.expanded != "1";const showNavigation =- isAppPage && Boolean(profile) && !isConversation && !isFriendPreview;+ isAppPage &&+ Boolean(profile) &&+ !isConversation &&+ !isPost &&+ !isFriendPreview;const spaceID =isAppPage && profileLoadStatus == "ready"? profile?.spaceId@@ -174,6 +179,7 @@ export const SpaceAppLayout = ({ children }: { children: React.ReactNode }) => {ref={layoutRef}className={isAppPage ? "space-app-layout" : undefined}data-space-conversation={isConversation || undefined}+ data-space-post={isPost || undefined}>{children}{showNavigation && (diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsxindex a51abdac13..15f83e2266 100644--- a/web/apps/space/src/components/FileViewer.tsx+++ b/web/apps/space/src/components/FileViewer.tsx@@ -24,6 +24,7 @@ import { SpaceCaptionText } from "components/CaptionText";import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";import { spacePostLikePopDurationMs } from "components/post-like-animation";import { paintStretchingDot } from "components/post-photos-dots";+import { SpacePostLikes } from "components/PostLikes";import { SpacePostPhotosDots } from "components/PostPhotosDots";import { SpacePostReplyControls } from "components/PostReplyControls";import { createSpaceVideoContent } from "components/PostVideoContent";@@ -122,7 +123,11 @@ const postButtonSpin = keyframes`}`;-export type SpaceViewerPostActionMode = "draft-post" | "hidden" | "like-only";+export type SpaceViewerPostActionMode =+ | "draft-post"+ | "hidden"+ | "like-only"+ | "likes";interface SpaceViewerPostActionConfig {showLikeButton: boolean;@@ -135,9 +140,11 @@ const spaceViewerPostActionConfigs: Record<"draft-post": { showLikeButton: false },hidden: { showLikeButton: false },"like-only": { showLikeButton: true },+ likes: { showLikeButton: false },};export interface SpaceViewerPhoto {+ likeCount?: number;preparationError?: string;isVideo?: boolean;video?: SpacePostVideo;@@ -200,6 +207,7 @@ interface SpaceFileViewerProps {initialPhotoIndex?: number;photos?: SpaceViewerPhoto[];focusReplyOnOpen?: boolean;+ showLikesOnOpen?: boolean;postActionMode?: SpaceViewerPostActionMode;}@@ -486,6 +494,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({initialPhotoIndex = 0,photos,postActionMode = "like-only",+ showLikesOnOpen = false,}) => {const [localPhotoIndex, setLocalPhotoIndex] =React.useState(initialPhotoIndex);@@ -547,6 +556,11 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({const activeReplyKeyRef = React.useRef(activeReplyKey);activeReplyKeyRef.current = activeReplyKey;const activePostKey = `${activePhoto.spaceId ?? ""}:${activePhoto.postId ?? ""}`;+ const showPostLikes = activePostActionMode == "likes";+ const [likesPostKey, setLikesPostKey] = React.useState<string | undefined>(+ showLikesOnOpen ? activePostKey : undefined,+ );+ const isLikesOpen = showPostLikes && likesPostKey == activePostKey;const hasPhotoLoadError = Boolean(photoLoadErrors[activePhotoKey]);const photoRetryAt = photoLoadErrors[activePhotoKey]?.retryAt;const isPhotoRateLimited = photoRetryAt !== undefined && now < photoRetryAt;@@ -689,6 +703,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({const isSwipeBlockedRef = React.useRef(false);isSwipeBlockedRef.current =isActionsOpen ||+ isLikesOpen ||addFriendSheetOpen ||(canDeletePost && deleteSheetOpen) ||isDeleteExit ||@@ -1412,7 +1427,8 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({if (document.documentElement.hasAttribute("data-space-ios-pwa"))headerObserver.observe(viewerHeaderRef.current!);let swipeStart:- { x: number; y: number; photoIndex: number } | undefined;+ | { x: number; y: number; photoIndex: number }+ | undefined;const loadPhotoSwipe = import("photoswipe");void loadPhotoSwipe.catch((error: unknown) => {@@ -1737,6 +1753,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({const closeOnEscape = (event: KeyboardEvent) => {if (addFriendSheetOpen ||+ isLikesOpen ||deleteSheetOpen ||isCaptionDialogOpen ||isDraftPostExit ||@@ -1758,6 +1775,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({cancelCaptionEdit,isDraftPostActionRunning,addFriendSheetOpen,+ isLikesOpen,deleteSheetOpen,isDraftPostExit,isCaptionEditing,@@ -2710,6 +2728,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({{!isDraftPost &&(hasDisplayCaption ||showPhotoLikeButton ||+ showPostLikes ||postPhotoCount > 1) &&!isCaptionEditing && (<Box@@ -2784,6 +2803,20 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({}/>)}+ {showPostLikes &&+ activePhoto.spaceId &&+ activePhoto.postId && (+ <SpacePostLikes+ likeCount={activePhoto.likeCount}+ spaceId={activePhoto.spaceId}+ postId={activePhoto.postId}+ open={isLikesOpen}+ onOpen={() =>+ setLikesPostKey(activePostKey)+ }+ onClose={() => setLikesPostKey(undefined)}+ />+ )}</Box>)}<Modaldiff --git a/web/apps/space/src/components/PostLikes.tsx b/web/apps/space/src/components/PostLikes.tsxnew file mode 100644index 0000000000..ecc5e3800d--- /dev/null+++ b/web/apps/space/src/components/PostLikes.tsx@@ -0,0 +1,429 @@+import { FavouriteIcon } from "@hugeicons/core-free-icons";+import { HugeiconsIcon } from "@hugeicons/react";+import { Box, Dialog, Skeleton, useMediaQuery } from "@mui/material";+import { SpaceActivityAvatar } from "components/ActivityList";+import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";+import type { FriendProfile } from "data/friends";+import log from "ente-base/log";+import { useBrowserBackClose } from "hooks/use-browser-back-close";+import React from "react";+import {+ loadCurrentFriendAvatarURL,+ loadCurrentPostLikes,+} from "services/space";+import { spaceActivityRowSx } from "styles/activity-list";+import {+ spaceDialogBackground,+ spaceText,+ spaceTextMuted,+} from "styles/colors";+import { spaceTouchTargetSize } from "styles/touch-targets";++const LikeRow = ({+ actor,+ spaceId,+}: {+ actor: FriendProfile;+ spaceId: string;+}) => {+ const [avatarURL, setAvatarURL] = React.useState(actor.avatarUrl);+ const hasAvatar = Boolean(actor.avatarObjectID && actor.avatarKeyVersion);+ React.useEffect(() => {+ if (actor.avatarUrl || !hasAvatar) return;+ let cancelled = false;+ void loadCurrentFriendAvatarURL(actor, spaceId)+ .catch((error: unknown) => {+ log.warn("Failed to load post like avatar", error);+ return null;+ })+ .then((url) => {+ if (!cancelled) setAvatarURL(url);+ });+ return () => {+ cancelled = true;+ };+ }, [actor, hasAvatar, spaceId]);++ return (+ <Box+ component="li"+ sx={{+ ...spaceActivityRowSx,+ gridTemplateColumns: "32px minmax(0, 1fr) 20px",+ minHeight: 56,+ mx: 0,+ px: 0,+ width: "100%",+ "&:hover, &:active": { bgcolor: "transparent" },+ }}+ >+ <SpaceActivityAvatar+ avatarUrl={actor.avatarUrl || avatarURL}+ loading={+ hasAvatar && !actor.avatarUrl && avatarURL === undefined+ }+ size={32}+ />+ <Box+ sx={{+ minWidth: 0,+ fontSize: 14,+ fontWeight: 700,+ lineHeight: "20px",+ overflowWrap: "anywhere",+ }}+ >+ {actor.fullName.trim() || actor.username}+ </Box>+ <HugeiconsIcon+ aria-hidden+ icon={FavouriteIcon}+ size={20}+ color="#08C225"+ fill="currentColor"+ strokeWidth={1.8}+ />+ </Box>+ );+};++export const SpacePostLikes = ({+ likeCount,+ spaceId,+ postId,+ open,+ onOpen,+ onClose,+}: {+ likeCount?: number;+ spaceId: string;+ postId: number;+ open: boolean;+ onOpen: () => void;+ onClose: () => void;+}) => {+ const isBottomSheet = useMediaQuery("(max-width: 599px)");+ const prefersReducedMotion = useMediaQuery(+ "(prefers-reduced-motion: reduce)",+ );+ const dragStartY = React.useRef<number | undefined>(undefined);+ const wasDragged = React.useRef(false);+ const [isDragging, setIsDragging] = React.useState(false);+ const [dragOffset, setDragOffset] = React.useState(0);+ const postKey = `${spaceId}:${postId}`;+ const [postLikes, setPostLikes] = React.useState<+ Record<string, FriendProfile[]>+ >({});+ const actors = postLikes[postKey];+ const displayedLikeCount = actors?.length ?? likeCount;+ const [error, setError] = React.useState(false);+ const [retry, setRetry] = React.useState(0);+ useBrowserBackClose({ open, onClose, stateKey: "space-post-likes" });++ React.useEffect(() => {+ if (!open) return;+ let cancelled = false;+ setError(false);+ void loadCurrentPostLikes(spaceId, postId)+ .then((items) => {+ if (!cancelled)+ setPostLikes((current) => ({+ ...current,+ [postKey]: items,+ }));+ })+ .catch((error: unknown) => {+ log.error("Failed to load post likes", error);+ if (!cancelled) setError(true);+ });+ return () => {+ cancelled = true;+ };+ }, [spaceId, postId, postKey, open, retry]);++ return (+ <>+ <Box+ component="button"+ type="button"+ aria-label={+ displayedLikeCount !== undefined+ ? `View ${displayedLikeCount} ${displayedLikeCount == 1 ? "like" : "likes"}`+ : "View likes"+ }+ aria-haspopup="dialog"+ aria-expanded={open}+ onClick={onOpen}+ sx={{+ alignItems: "center",+ alignSelf: "flex-end",+ bgcolor: "transparent",+ border: 0,+ borderRadius: "24px",+ color: spaceTextMuted,+ cursor: "pointer",+ display: "flex",+ gap: "8px",+ minHeight: spaceTouchTargetSize,+ minWidth: 64,+ px: "14px",+ transform: "translate(8px, 8px)",+ fontFamily: '"Inter Variable", Inter, sans-serif',+ fontSize: 14,+ fontWeight: 600,+ "&:focus-visible": {+ outline: "2px solid #08C225",+ outlineOffset: 2,+ },+ }}+ >+ <HugeiconsIcon+ icon={FavouriteIcon}+ size={20}+ strokeWidth={1.8}+ />+ <Box+ component="span"+ sx={{+ flexShrink: 0,+ fontVariantNumeric: "tabular-nums",+ height: "20px",+ lineHeight: "20px",+ textAlign: "left",+ whiteSpace: "nowrap",+ width: "1ch",+ }}+ >+ {displayedLikeCount ?? ""}+ </Box>+ </Box>+ <Dialog+ open={open}+ onClose={onClose}+ maxWidth={false}+ slots={+ isBottomSheet && !prefersReducedMotion+ ? { transition: SpaceBottomSheetTransition }+ : undefined+ }+ transitionDuration={prefersReducedMotion ? 0 : undefined}+ sx={{+ zIndex: 1500,+ "--space-dialog-backdrop": "rgba(0 0 0 / 0.64)",+ }}+ slotProps={{+ paper: {+ "aria-label": "Likes",+ "aria-labelledby": undefined,+ style: {+ translate: `0 ${dragOffset}px`,+ transition:+ isDragging || prefersReducedMotion+ ? "none"+ : "translate 160ms ease-out",+ },+ sx: {+ bgcolor: spaceDialogBackground,+ borderRadius: "28px 28px 0 0",+ bottom: 0,+ boxShadow: "none",+ boxSizing: "border-box",+ color: spaceText,+ fontFamily: '"Inter Variable", Inter, sans-serif',+ left: 0,+ m: 0,+ maxHeight: "min(560px, calc(100dvh - 64px))",+ maxWidth: "none",+ overflow: "hidden",+ position: "fixed",+ width: "100vw",+ pb: "calc(20px + env(safe-area-inset-bottom))",+ "@media (min-width: 600px)": {+ borderRadius: "20px",+ bottom: "auto",+ left: "50%",+ top: "50%",+ transform: "translate(-50%, -50%)",+ width: 420,+ py: "20px",+ },+ },+ },+ transition: { onExited: () => setDragOffset(0) },+ }}+ >+ {isBottomSheet && (+ <Box+ component="button"+ type="button"+ aria-label="Dismiss likes"+ onClick={(+ event: React.MouseEvent<HTMLButtonElement>,+ ) => {+ if (event.detail == 0 || !wasDragged.current)+ onClose();+ wasDragged.current = false;+ }}+ onPointerDown={(+ event: React.PointerEvent<HTMLButtonElement>,+ ) => {+ if (event.button != 0) return;+ dragStartY.current = event.clientY;+ wasDragged.current = false;+ setIsDragging(true);+ event.currentTarget.setPointerCapture(+ event.pointerId,+ );+ }}+ onPointerMove={(+ event: React.PointerEvent<HTMLButtonElement>,+ ) => {+ if (dragStartY.current == undefined) return;+ const distance = event.clientY - dragStartY.current;+ if (Math.abs(distance) > 4)+ wasDragged.current = true;+ setDragOffset(Math.max(0, distance));+ }}+ onPointerUp={(+ event: React.PointerEvent<HTMLButtonElement>,+ ) => {+ if (dragStartY.current == undefined) return;+ const distance = event.clientY - dragStartY.current;+ dragStartY.current = undefined;+ setIsDragging(false);+ if (distance > 80) onClose();+ else setDragOffset(0);+ }}+ onPointerCancel={() => {+ dragStartY.current = undefined;+ wasDragged.current = true;+ setIsDragging(false);+ setDragOffset(0);+ }}+ sx={{+ alignItems: "center",+ appearance: "none",+ bgcolor: "transparent",+ border: 0,+ cursor: isDragging ? "grabbing" : "grab",+ display: "flex",+ flexShrink: 0,+ height: spaceTouchTargetSize,+ justifyContent: "center",+ p: 0,+ touchAction: "none",+ width: "100%",+ "&:focus-visible": {+ outline: `2px solid ${spaceTextMuted}`,+ outlineOffset: -2,+ },+ }}+ >+ <Box+ component="span"+ sx={{+ bgcolor: "#686868",+ borderRadius: "999px",+ height: 4,+ width: 32,+ }}+ />+ </Box>+ )}+ <Box+ sx={{+ height: "min(224px, 40dvh)",+ overflowY: "auto",+ overscrollBehaviorY: "contain",+ px: "20px",+ minHeight: 0,+ WebkitOverflowScrolling: "touch",+ }}+ >+ {error ? (+ <Box+ role="alert"+ sx={{+ color: spaceTextMuted,+ py: "28px",+ textAlign: "center",+ fontSize: 14,+ }}+ >+ Couldn't load likes.+ <Box+ component="button"+ type="button"+ onClick={() => setRetry((value) => value + 1)}+ sx={{+ bgcolor: "transparent",+ border: 0,+ color: spaceText,+ cursor: "pointer",+ display: "block",+ font: "inherit",+ fontWeight: 600,+ mx: "auto",+ mt: "8px",+ minHeight: spaceTouchTargetSize,+ p: "10px",+ }}+ >+ Try again+ </Box>+ </Box>+ ) : !actors ? (+ <Box role="status" aria-label="Loading likes">+ {[0, 1, 2].map((index) => (+ <Box+ key={index}+ sx={{+ alignItems: "center",+ display: "flex",+ gap: "12px",+ minHeight: 56,+ py: "8px",+ }}+ >+ <Skeleton+ variant="circular"+ width={32}+ height={32}+ />+ <Skeleton width={120} height={24} />+ </Box>+ ))}+ </Box>+ ) : actors.length == 0 ? (+ <Box+ sx={{+ alignItems: "center",+ color: spaceTextMuted,+ display: "flex",+ height: "100%",+ justifyContent: "center",+ textAlign: "center",+ fontSize: 14,+ }}+ >+ No likes yet+ </Box>+ ) : (+ <Box+ component="ul"+ sx={{ listStyle: "none", m: 0, p: 0 }}+ >+ {actors.map((actor) => (+ <LikeRow+ key={actor.id}+ actor={actor}+ spaceId={spaceId}+ />+ ))}+ </Box>+ )}+ </Box>+ </Dialog>+ </>+ );+};diff --git a/web/apps/space/src/components/PostTile.tsx b/web/apps/space/src/components/PostTile.tsxindex afd02da1af..e9d5042bcb 100644--- a/web/apps/space/src/components/PostTile.tsx+++ b/web/apps/space/src/components/PostTile.tsx@@ -17,6 +17,7 @@ import { thumbHashDataURLFromBase64 } from "utils/thumbhash";const green = "#08C225";export interface SpacePostTileItem {+ likeCount?: number;avatarUrl?: string | null;caption?: string;friendID?: string;diff --git a/web/apps/space/src/pages/app/notifications.tsx b/web/apps/space/src/pages/app/notifications.tsxindex 9acb841acd..65b52caac2 100644--- a/web/apps/space/src/pages/app/notifications.tsx+++ b/web/apps/space/src/pages/app/notifications.tsx@@ -230,10 +230,10 @@ const NotificationRow: React.FC<{: () => {if (isPostLike)void router.push(- spaceRoutes.post(+ `${spaceRoutes.post(spaceId,group.postId!,- ),+ )}?likes=1`,);elsevoid router.push(diff --git a/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx b/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsxindex a9ffedde1b..63eed5aa93 100644--- a/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx+++ b/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx@@ -57,6 +57,7 @@ const viewerPhotoFromPost = (post: SpacePost) => ({height: post.height,photos: post.photos,imageUrl: post.imageUrl ?? "",+ likeCount: post.likeCount,name: post.name,postId: post.postId,spaceId: post.spaceId,@@ -206,7 +207,10 @@ const Page: React.FC = () => {photos={photos}initialPhotoIndex={photoIndex}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 --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsxindex 7b50d078d3..8b0377375f 100644--- a/web/apps/space/src/screens/HomeScreen.tsx+++ b/web/apps/space/src/screens/HomeScreen.tsx@@ -1979,7 +1979,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({photos,focusReplyOnOpen: isOwnPost ? false : focusReplyOnOpen,photo,- postActionMode: isOwnPost ? "hidden" : "like-only",+ postActionMode: isOwnPost ? "likes" : "like-only",});};const closeSelectedPhoto = () => {diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsxindex 44b4280882..f67647b9ea 100644--- a/web/apps/space/src/screens/ProfileScreen.tsx+++ b/web/apps/space/src/screens/ProfileScreen.tsx@@ -362,10 +362,11 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({);const shouldShowCoverSkeleton =isCoverLoading || isCoverURLPending || isCoverImageLoading;- const selectedPostActionMode: SpaceViewerPostActionMode =- isOwnerProfile || (isPublicProfile && !onAddFriendForPostAction)- ? "hidden"- : "like-only";+ const selectedPostActionMode: SpaceViewerPostActionMode = isOwnerProfile+ ? "likes"+ : isPublicProfile && !onAddFriendForPostAction+ ? "hidden"+ : "like-only";const postImageLoadRootMargin = isAnonymousPublicProfile? publicProfilePostLoadRootMargin: profilePostLoadRootMargin;@@ -577,9 +578,9 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({setIsInviteLinkCopied(true);}} catch (error) {- if (!(- error instanceof DOMException && error.name == "AbortError"- )) {+ if (+ !(error instanceof DOMException && error.name == "AbortError")+ ) {log.warn("Failed to share Space invite link", error);}}diff --git a/web/apps/space/src/services/post-cache.ts b/web/apps/space/src/services/post-cache.tsindex f8e31c8ba2..88a6871462 100644--- a/web/apps/space/src/services/post-cache.ts+++ b/web/apps/space/src/services/post-cache.ts@@ -36,6 +36,7 @@ export const CachedSpacePost = z.object({).optional(),isUnavailable: z.boolean().optional(),+ likeCount: z.number().optional(),name: z.string(),postId: z.number(),spaceId: z.string(),diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.tsindex 43a2f3c417..6e1d3421ac 100644--- a/web/apps/space/src/services/space.ts+++ b/web/apps/space/src/services/space.ts@@ -63,6 +63,7 @@ interface SpacePostBase {caption?: string;friendID: string;height?: number;+ likeCount?: number;name: string;postId: number;timestampMs: number;@@ -454,6 +455,7 @@ const postBaseFromResponse = (caption: post.caption,friendID: author.id,isUnavailable: post.isUnavailable,+ likeCount: post.likeCount,name: author.fullName || author.username,postId: post.postId,spaceId: post.spaceId,@@ -1307,7 +1309,8 @@ export const createCurrentMediaPost = async ({return session.postId;} catch (error) {const uploadError = error as- (Error & { status?: number; code?: string }) | undefined;+ | (Error & { status?: number; code?: string })+ | undefined;logToDisk(`[error] Space post upload failed ${JSON.stringify({ requestId: session.requestId, stage, itemIndex, itemCount: images.length, bytes, status: uploadError?.status, code: uploadError?.code, name: uploadError?.name, message: uploadError?.message, stack: uploadError?.stack })}`.replaceAll(spaceId,@@ -1351,6 +1354,25 @@ export const loadCurrentCreatedPost = async (}};+export const loadCurrentPostLikes = async (spaceId: string, postId: number) => {+ const ctx = await ensureCurrentSpaceContext();+ try {+ const actors = await ctx.listPostLikes(spaceId, BigInt(postId));+ return await Promise.all(+ actors.map(async (item) => {+ const actor = actorProfile(item);+ actor.avatarUrl = await cachedAccountAvatarURLIfPresent(+ actor.spaceId,+ item.avatar,+ );+ return actor;+ }),+ );+ } finally {+ releaseCurrentSpaceContext(ctx);+ }+};+export const setCurrentPostLiked = async (spaceId: string,postId: number,diff --git a/web/apps/space/src/styles/globals.css b/web/apps/space/src/styles/globals.cssindex 240c247c18..40ce4dbc4a 100644--- a/web/apps/space/src/styles/globals.css+++ b/web/apps/space/src/styles/globals.css@@ -57,7 +57,8 @@ html[data-space-ios-pwa]padding-bottom: var(--space-bottom-nav-height);}-.space-app-layout[data-space-conversation] {+.space-app-layout[data-space-conversation],+.space-app-layout[data-space-post] {--space-bottom-nav-height: 0px;}diff --git a/web/apps/space/src/utils/post-display.ts b/web/apps/space/src/utils/post-display.tsindex 99b03021dc..fb885242d7 100644--- a/web/apps/space/src/utils/post-display.ts+++ b/web/apps/space/src/utils/post-display.ts@@ -14,6 +14,7 @@ export const profilePostItemsFromPosts = (imageUrl: post.imageUrl,photos: post.photos,isUnavailable: post.isUnavailable,+ likeCount: post.likeCount,name: post.name,postId: post.postId,spaceId: post.spaceId,diff --git a/web/apps/space/src/utils/route-transitions.tsx b/web/apps/space/src/utils/route-transitions.tsxindex c45f06151c..101edd4ada 100644--- a/web/apps/space/src/utils/route-transitions.tsx+++ b/web/apps/space/src/utils/route-transitions.tsx@@ -56,7 +56,8 @@ const initializeRouteHistory = (router: NextRouter) => {__N: boolean;};const navigation = performance.getEntriesByType("navigation")[0] as- PerformanceNavigationTiming | undefined;+ | PerformanceNavigationTiming+ | undefined;if (navigation?.type == "reload") {try {const saved = JSON.parse(@@ -124,8 +125,10 @@ const startSpaceRouteTransition = async <T,>(typeof destination == "string"? destination: (destination.pathname ?? "");- root.dataset.spaceRouteMotion = [fromPath, toPath].some((path) =>- path.startsWith(`${spaceRoutes.messages}/`),+ root.dataset.spaceRouteMotion = [fromPath, toPath].some(+ (path) =>+ path.startsWith(`${spaceRoutes.messages}/`) ||+ path.startsWith("/app/posts/"),)? "fade-with-navigation": "fade";diff --git a/web/apps/space/tests/browser-back-close.test.tsx b/web/apps/space/tests/browser-back-close.test.tsxnew file mode 100644index 0000000000..5924b4ddc4--- /dev/null+++ b/web/apps/space/tests/browser-back-close.test.tsx@@ -0,0 +1,104 @@+import type { EffectCallback } from "react";+import { renderToStaticMarkup } from "react-dom/server";+import { afterEach, beforeEach, expect, test, vi } from "vitest";+import { useBrowserBackClose } from "../src/hooks/use-browser-back-close";++const mocks = vi.hoisted(() => ({+ effects: [] as EffectCallback[],+ back: vi.fn(),+}));++vi.mock("react", async (importOriginal) => ({+ ...(await importOriginal<typeof import("react")>()),+ useEffect: (effect: EffectCallback) => mocks.effects.push(effect),+}));++const route = {+ key: "post-route",+ as: "/app/posts/owner/42?likes=1",+ url: "/app/posts/[spaceId]/[postId]?spaceId=owner&postId=42&likes=1",+};++beforeEach(() => {+ mocks.effects = [];+ mocks.back.mockReset();+ const events = new EventTarget();+ const entries: Record<string, unknown>[] = [{ ...route }];+ const history = {+ get state() {+ return entries.at(-1);+ },+ pushState: (state: Record<string, unknown>) => entries.push(state),+ replaceState: (state: Record<string, unknown>) => {+ entries[entries.length - 1] = state;+ },+ back: mocks.back.mockImplementation(() => {+ entries.pop();+ events.dispatchEvent(+ Object.assign(new Event("popstate"), { state: history.state }),+ );+ }),+ };+ vi.stubGlobal("window", {+ history,+ location: { href: `https://space.test${route.as}` },+ addEventListener: events.addEventListener.bind(events),+ removeEventListener: events.removeEventListener.bind(events),+ setTimeout,+ clearTimeout,+ });+});++afterEach(() => vi.unstubAllGlobals());++const mountOverlay = (stateKey: string, onClose: () => void) => {+ const Overlay = () => {+ useBrowserBackClose({ open: true, onClose, stateKey });+ return null;+ };+ renderToStaticMarkup(<Overlay />);+ const cleanup = mocks.effects.pop()!();+ return () => {+ if (typeof cleanup == "function") cleanup();+ };+};++test("Android Back closes likes before the containing post viewer", () => {+ const closeViewer = vi.fn();+ const closeLikes = vi.fn();+ const unmountViewer = mountOverlay("space-feed-viewer", closeViewer);+ const unmountLikes = mountOverlay("space-post-likes", closeLikes);+ expect(window.history.state).toMatchObject(route);+ window.history.back();+ expect(closeLikes).toHaveBeenCalledOnce();+ expect(closeViewer).not.toHaveBeenCalled();+ unmountLikes();+ expect(mocks.back).toHaveBeenCalledTimes(1);+ window.history.back();+ expect(closeViewer).toHaveBeenCalledOnce();+ unmountViewer();+});++test("dismissing likes removes only its history entry and preserves the post route", () => {+ const closeViewer = vi.fn();+ const closeLikes = vi.fn();+ const unmountViewer = mountOverlay("space-profile-viewer", closeViewer);+ const viewerState: unknown = window.history.state;+ const unmountLikes = mountOverlay("space-post-likes", closeLikes);+ unmountLikes();+ expect(window.history.state).toEqual(viewerState);+ expect(closeViewer).not.toHaveBeenCalled();+ expect(closeLikes).not.toHaveBeenCalled();+ unmountViewer();+ expect(window.history.state).toEqual(route);+});++test("notification-opened likes return to the same post on Back", () => {+ const closeLikes = vi.fn();+ const unmountLikes = mountOverlay("space-post-likes", closeLikes);+ window.history.back();+ expect(closeLikes).toHaveBeenCalledOnce();+ expect(window.history.state).toEqual(route);+ unmountLikes();+ expect(mocks.back).toHaveBeenCalledOnce();+});diff --git a/web/apps/space/tests/feed-cache.test.ts b/web/apps/space/tests/feed-cache.test.tsindex 7107421b00..3a3e44b11c 100644--- a/web/apps/space/tests/feed-cache.test.ts+++ b/web/apps/space/tests/feed-cache.test.ts@@ -141,6 +141,7 @@ test("shrinks an existing thirty-post cache without losing the visit cutoff or stest("restores every photo in order and preserves shared post edits", async () => {const original = post(3);+ original.likeCount = 8;original.photos = ["cover", "second", "third"].map((objectKey, index) => ({imageAsset: { ...original.imageAsset!, objectKey },imageUrl: `blob:${objectKey}`,@@ -158,6 +159,7 @@ test("restores every photo in order and preserves shared post edits", async () ="changed by caller";clearSpaceFeedMemoryCache();const restored = (await loadCachedSpaceFeed("self"))!.items[0]!;+ expect(restored.likeCount).toBe(8);expect(restored).toMatchObject({caption: "Edited caption",viewerLiked: true,diff --git a/web/apps/space/tests/notification-avatars.test.ts b/web/apps/space/tests/notification-avatars.test.tsindex dec26b25ec..15ae22eab9 100644--- a/web/apps/space/tests/notification-avatars.test.ts+++ b/web/apps/space/tests/notification-avatars.test.ts@@ -13,6 +13,7 @@ import {loadCurrentFriendAvatarURL,loadCurrentMessageConversations,loadCurrentNotifications,+ loadCurrentPostLikes,} from "../src/services/space";vi.mock("ente-base/log", () => ({ default: { warn: vi.fn() } }));@@ -43,6 +44,7 @@ const context = {downloadSpaceAvatar: vi.fn(),listNotifications: vi.fn(),listConversations: vi.fn(),+ listPostLikes: vi.fn(),};beforeEach(() => {@@ -74,6 +76,27 @@ beforeEach(() => {vi.mocked(cachedSpaceMediaBlobURLIfPresent).mockResolvedValue(undefined);});+test("post likes preserve every actor and reuse cached avatars", async () => {+ context.listPostLikes.mockResolvedValue([+ actor,+ { ...actor, spaceId: "second", spaceSlug: "bob" },+ { ...actor, spaceId: "third", spaceSlug: "alex" },+ ]);+ vi.mocked(cachedSpaceMediaBlobURLIfPresent).mockResolvedValue(+ "blob:avatar",+ );+ const actors = await loadCurrentPostLikes("owner-space", 42);+ expect(context.listPostLikes).toHaveBeenCalledWith("owner-space", 42n);+ expect(actors.map((actor) => actor.username)).toEqual([+ "maya",+ "bob",+ "alex",+ ]);+ expect(actors[0]?.avatarUrl).toBe("blob:avatar");+ expect(context.downloadSpaceAvatar).not.toHaveBeenCalled();+ expect(releaseCurrentSpaceContext).toHaveBeenCalledWith(context);+});+test("notifications restore the same cached avatar as Messages before returning rows", async () => {vi.mocked(cachedSpaceMediaBlobURLIfPresent).mockResolvedValue("blob:cached-avatar",diff --git a/web/apps/space/tests/route-transitions.test.tsx b/web/apps/space/tests/route-transitions.test.tsxindex c1f97932e2..fc6dadbde5 100644--- a/web/apps/space/tests/route-transitions.test.tsx+++ b/web/apps/space/tests/route-transitions.test.tsx@@ -154,6 +154,12 @@ describe("Space conversation transitions", () => {it.each([["/app/messages", "/app/messages/alex", "fade-with-navigation"],["/app/messages/alex", "/app/messages", "fade-with-navigation"],+ [+ "/app/notifications",+ "/app/posts/owner/42?likes=1",+ "fade-with-navigation",+ ],+ ["/app/posts/owner/42", "/app/profile", "fade-with-navigation"],["/app/friends", "/app/messages", "fade"],])("transitions from %s to %s using %s", async (from, to, motion) => {const app = await setup(from);