π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Preserve unseen feed posts when paging and publishing
Anand Baburajan2db7cf31bed0
diff --git a/web/apps/space/src/pages/app/index.tsx b/web/apps/space/src/pages/app/index.tsxindex 50b8f2f59f..87799637de 100644--- a/web/apps/space/src/pages/app/index.tsx+++ b/web/apps/space/src/pages/app/index.tsx@@ -189,13 +189,14 @@ const Page: React.FC = () => {}if (savedSpaceId != nextSpaceId) await loadCache(nextSpaceId);while (!isCancelled()) {+ const feedRequestedAtMs = Date.now();const feed = await loadCurrentFeedPage(nextSpaceId);if (isCancelled()) return undefined;const applied = await cacheCurrentSpaceFeedPage(nextSpaceId,feed,{ syncedAtMs: cachedFeedSyncedAtMs },- Date.now(),+ feedRequestedAtMs,);if (applied) return feed;cachedFeedSyncedAtMs = (await loadCachedSpaceFeed(nextSpaceId))@@ -471,6 +472,7 @@ const Page: React.FC = () => {try {if (status == "friend") {clearSpaceFriendsCache();+ const feedRequestedAtMs = Date.now();const [requests, friends, feed] =await Promise.all([loadCurrentFriendRequests(actorSpaceId),@@ -483,7 +485,7 @@ const Page: React.FC = () => {actorSpaceId,feed,undefined,- Date.now(),+ feedRequestedAtMs,);setFeedItems(spaceFeedSessionItems(diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsxindex fd620654b8..fe3741d2e3 100644--- a/web/apps/space/src/screens/HomeScreen.tsx+++ b/web/apps/space/src/screens/HomeScreen.tsx@@ -1905,6 +1905,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({localFeedPosts,feedSession?.newPostsSinceMs,new Set(feedSession?.latestPosts.map((post) => post.postId)),+ viewerSpaceId,);const hasFeedItems =latestFeedEntries.length > 0 || gridFeedItems.length > 0;diff --git a/web/apps/space/src/services/feed-cache.ts b/web/apps/space/src/services/feed-cache.tsindex 4f7324e892..e6e40d4525 100644--- a/web/apps/space/src/services/feed-cache.ts+++ b/web/apps/space/src/services/feed-cache.ts@@ -155,7 +155,9 @@ const feedSessionForSnapshot = (session = {newPostsSinceMs,latestPosts: (cached?.items ?? []).filter(- (post) => post.timestampMs > newPostsSinceMs,+ (post) =>+ post.spaceId != cached?.spaceId &&+ post.timestampMs > newPostsSinceMs,),presentedPostIdentities: new Set(),};@@ -189,6 +191,7 @@ export const spaceFeedSessionItems = (const rememberSessionPosts = (session: SpaceFeedSession,items: SpacePost[],+ spaceId: string,) => {const latestPostIDs = new Set(session.latestPosts.map((post) => post.postId),@@ -196,7 +199,8 @@ const rememberSessionPosts = (session.latestPosts = spaceFeedSessionItems(session, items).filter((post) =>- post.timestampMs > session.newPostsSinceMs ||+ (post.spaceId != spaceId &&+ post.timestampMs > session.newPostsSinceMs) ||latestPostIDs.has(post.postId),).map(cacheablePost);@@ -236,7 +240,7 @@ const writeCachedSpaceFeed = async (refreshedPostIDs.has(post.postId) ||(oldestPost && descendingPostOrder(post, oldestPost) > 0),);- rememberSessionPosts(session, snapshot.items);+ rememberSessionPosts(session, snapshot.items, snapshot.spaceId);}memoryCache.set(key, normalized);await setKV(key, normalized);@@ -330,15 +334,7 @@ export const rememberSpaceFeedSessionPosts = async (posts: SpacePost[],) => {const session = await loadSpaceFeedSession(spaceId);- if (session) rememberSessionPosts(session, posts);- await updateCachedSpaceFeed(spaceId, (snapshot) => ({- ...snapshot,- lastVisitedAtMs: Math.max(- snapshot.lastVisitedAtMs ?? 0,- Date.now(),- ...posts.map((post) => post.timestampMs),- ),- }));+ if (session) rememberSessionPosts(session, posts, spaceId);};export const prependCachedSpaceFeedPost = (spaceId: string, post: SpacePost) =>@@ -347,10 +343,6 @@ export const prependCachedSpaceFeedPost = (spaceId: string, post: SpacePost) =>(snapshot) => ({...snapshot,dirty: true,- lastVisitedAtMs: Math.max(- snapshot.lastVisitedAtMs ?? 0,- post.timestampMs,- ),items: [post,...snapshot.items.filter((item) => item.postId != post.postId),diff --git a/web/apps/space/src/utils/home-feed.ts b/web/apps/space/src/utils/home-feed.tsindex a8a6833c35..19208b8491 100644--- a/web/apps/space/src/utils/home-feed.ts+++ b/web/apps/space/src/utils/home-feed.ts@@ -15,6 +15,7 @@ export const homeFeedEntries = (localFeedPosts: LocalSpaceFeedPost[],newPostsSinceMs: number | undefined,latestPostIDs?: ReadonlySet<number>,+ viewerSpaceId?: string,) => {const localResolvedPostIds = new Set(localFeedPosts.map((item) =>@@ -63,7 +64,9 @@ export const homeFeedEntries = (}if (latestPostIDs?.has(post.postId) ||- (newPostsSinceMs != undefined && post.timestampMs > newPostsSinceMs)+ (post.spaceId != viewerSpaceId &&+ newPostsSinceMs != undefined &&+ post.timestampMs > newPostsSinceMs)) {latest.push(entry);} else {diff --git a/web/apps/space/tests/feed-cache.test.ts b/web/apps/space/tests/feed-cache.test.tsindex 6ffda903c2..0d1962fdb5 100644--- a/web/apps/space/tests/feed-cache.test.ts+++ b/web/apps/space/tests/feed-cache.test.ts@@ -1,7 +1,7 @@import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";import { getKV, removeKV, setKV } from "ente-base/kv";import { apiOrigin } from "ente-base/origins";-import { beforeEach, expect, test, vi } from "vitest";+import { afterEach, beforeEach, expect, test, vi } from "vitest";import {cacheCurrentSpaceFeedPage,clearSpaceFeedMemoryCache,@@ -15,6 +15,7 @@ import {spaceFeedSessionItems,} from "../src/services/feed-cache";import type { SpacePost } from "../src/services/space";+import { homeFeedEntries } from "../src/utils/home-feed";vi.mock("ente-accounts/services/accounts-db", () => ({savedPartialLocalUser: vi.fn(),@@ -48,6 +49,8 @@ const post = (postId: number, spaceId = "friend"): SpacePost => ({viewerLiked: false,});+afterEach(() => vi.useRealTimers());+beforeEach(() => {vi.resetAllMocks();storage.clear();@@ -309,6 +312,54 @@ test("the latest cutoff survives navigation and advances only on a new app sessiexpect(reopened.presentedPostIdentities.size).toBe(0);});+test.each(["pagination", "publication"])(+ "%s leaves unfetched friend posts new on the next app opening",+ async (action) => {+ vi.useFakeTimers();+ vi.setSystemTime(200);+ await cacheCurrentSpaceFeedPage(+ "self",+ { items: [post(120)], nextCursor: "older" },+ undefined,+ 200,+ );+ const session = (await loadSpaceFeedSession("self"))!;+ const unseenPost = post(250);+ const ownPost = post(300, "self");+ vi.setSystemTime(300);+ if (action == "pagination") {+ await rememberSpaceFeedSessionPosts("self", [post(110)]);+ } else {+ await prependCachedSpaceFeedPost("self", ownPost);+ expect(session.latestPosts.map((post) => post.postId)).toEqual([+ 300,+ ]);+ }+ expect((await loadCachedSpaceFeed("self"))?.lastVisitedAtMs).toBe(200);++ vi.setSystemTime(400);+ clearSpaceFeedMemoryCache();+ const reopened = (await loadSpaceFeedSession("self"))!;+ const items =+ action == "publication"+ ? [ownPost, unseenPost, post(120)]+ : [unseenPost, post(120)];+ await cacheCurrentSpaceFeedPage("self", { items }, undefined, 400);+ expect(reopened.newPostsSinceMs).toBe(200);+ expect(reopened.latestPosts.map((post) => post.postId)).toEqual([250]);+ expect(+ homeFeedEntries(+ spaceFeedSessionItems(reopened, items),+ [],+ reopened.newPostsSinceMs,+ new Set(reopened.latestPosts.map((post) => post.postId)),+ "self",+ ).latest.map((entry) => entry.identity),+ ).toEqual(["post:250"]);+ expect((await loadCachedSpaceFeed("self"))?.lastVisitedAtMs).toBe(400);+ },+);+test("returning to the feed retains more than twenty latest posts while disk caching stays bounded", async () => {await cacheCurrentSpaceFeedPage("self",diff --git a/web/apps/space/tests/home-feed.test.ts b/web/apps/space/tests/home-feed.test.tsindex 2799be2a26..e5bab67209 100644--- a/web/apps/space/tests/home-feed.test.ts+++ b/web/apps/space/tests/home-feed.test.ts@@ -85,7 +85,7 @@ test("pending and failed uploads remain cards even without a previous visit", ()});test("a post published in this session stays latest after the server replaces the local upload", () => {- const uploaded = post(3, 200);+ const uploaded = { ...post(3, 200), spaceId: "self", friendID: "self" };const local: LocalSpaceFeedPost = {id: "upload",post: uploaded,@@ -97,8 +97,15 @@ test("a post published in this session stays latest after the server replaces th[local],300,latestPostIDs,+ "self",+ );+ const remoteEntries = homeFeedEntries(+ [uploaded],+ [],+ 300,+ latestPostIDs,+ "self",);- const remoteEntries = homeFeedEntries([uploaded], [], 300, latestPostIDs);expect(localEntries.latest.map((entry) => entry.identity)).toEqual(["post:3",]);@@ -106,5 +113,8 @@ test("a post published in this session stays latest after the server replaces th"post:3",]);expect(remoteEntries.history).toEqual([]);- expect(homeFeedEntries([uploaded], [], 300).history).toEqual([uploaded]);+ expect(homeFeedEntries([uploaded], [], 100, new Set(), "self")).toEqual({+ latest: [],+ history: [uploaded],+ });});