Skip to content

armgit / ente

Public Imported from GitHub
0

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

Fix Space unread detection and remove empty tile poke buttons

Anand Baburajan5961fa3380c2
diff --git a/web/apps/space/src/components/FriendTilePokeButton.tsx b/web/apps/space/src/components/FriendTilePokeButton.tsx
deleted file mode 100644
index 5ed99c9446..0000000000
--- a/web/apps/space/src/components/FriendTilePokeButton.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import { HandPointingLeftIcon } from "@hugeicons/core-free-icons";
-import { HugeiconsIcon } from "@hugeicons/react";
-import { Box } from "@mui/material";
-import type { SpaceActionPhase } from "components/ActionFeedback";
-import log from "ente-base/log";
-import React from "react";
-import { spaceAppBackgroundColor, spaceText } from "styles/colors";
-import { spaceTileCircleInset } from "styles/tiles";
-import { spaceTouchTargetSize } from "styles/touch-targets";
-
-const iconSize = 18;
-const pokeAnimationDurationMs = 2000;
-
-export const FriendTilePokeButton: React.FC<{
- avatarSize: number;
- name: string;
- onPoke: () => Promise<void>;
- tileWidth: number;
-}> = ({ avatarSize, name, onPoke, tileWidth }) => {
- const [phase, setPhase] = React.useState<SpaceActionPhase | null>(null);
- const [failed, setFailed] = React.useState(false);
- const iconTipInset = avatarSize / 12;
- const inset = `calc(${spaceTileCircleInset(avatarSize)} - ${(spaceTouchTargetSize - avatarSize) / 2}px)`;
- const contactX = `calc(${2 * avatarSize - iconTipInset - tileWidth}px + 2 * ${spaceTileCircleInset(avatarSize)})`;
-
- React.useEffect(() => {
- if (phase != "done") return;
- const timeout = window.setTimeout(
- () => setPhase(null),
- pokeAnimationDurationMs + 100,
- );
- return () => window.clearTimeout(timeout);
- }, [phase]);
-
- const poke = async () => {
- setPhase("busy");
- setFailed(false);
- try {
- await onPoke();
- setPhase("done");
- } catch (error) {
- log.error("Failed to send poke", error);
- setPhase(null);
- setFailed(true);
- }
- };
-
- const label = failed
- ? `Couldn't poke ${name}. Tap to retry.`
- : phase == "busy"
- ? `Poking ${name}`
- : phase == "done"
- ? `Poked ${name}`
- : `Poke ${name}`;
-
- return (
- <Box
- component="button"
- type="button"
- aria-label={label}
- aria-live="polite"
- aria-busy={phase == "busy"}
- title={label}
- disabled={phase != null}
- onClick={() => void poke()}
- sx={{
- "--space-poke-contact-x": contactX,
- "--space-poke-icon-scale": avatarSize / iconSize,
- alignItems: "center",
- appearance: "none",
- bgcolor: "transparent",
- border: 0,
- borderRadius: "999px",
- bottom: inset,
- color: failed
- ? "#F63A3A"
- : phase
- ? "#08C225"
- : spaceAppBackgroundColor,
- cursor: phase ? "default" : "pointer",
- display: "flex",
- height: spaceTouchTargetSize,
- justifyContent: "center",
- lineHeight: 0,
- p: 0,
- position: "absolute",
- right: inset,
- width: spaceTouchTargetSize,
- zIndex: 3,
- "&:focus-visible": {
- outline: `2px solid ${spaceText}`,
- outlineOffset: 2,
- },
- }}
- >
- <Box
- component="span"
- sx={{
- alignItems: "center",
- bgcolor: "#FFFFFF",
- borderRadius: "50%",
- display: "flex",
- height: avatarSize - 3,
- justifyContent: "center",
- width: avatarSize - 3,
- }}
- >
- <Box
- component="span"
- aria-hidden
- sx={{
- animation: phase
- ? `spaceTilePokeJab ${pokeAnimationDurationMs}ms ease-in-out`
- : "none",
- display: "flex",
- pointerEvents: "none",
- "@keyframes spaceTilePokeJab": {
- "0%, 100%": { transform: "translateX(0) scale(1)" },
- "27.5%, 52%, 73.75%": {
- transform:
- "translateX(calc(var(--space-poke-contact-x) + 8px)) scale(var(--space-poke-icon-scale))",
- },
- "41%, 63%": {
- transform:
- "translateX(var(--space-poke-contact-x)) scale(var(--space-poke-icon-scale))",
- },
- },
- "@media (prefers-reduced-motion: reduce)": {
- animation: "none",
- },
- }}
- >
- <HugeiconsIcon
- icon={HandPointingLeftIcon}
- size={iconSize}
- strokeWidth={2}
- />
- </Box>
- </Box>
- </Box>
- );
-};
diff --git a/web/apps/space/src/pages/layout-demo.tsx b/web/apps/space/src/pages/layout-demo.tsx
index a5ca1f2c72..38bfff719d 100644
--- a/web/apps/space/src/pages/layout-demo.tsx
+++ b/web/apps/space/src/pages/layout-demo.tsx
@@ -159,7 +159,6 @@ const LayoutDemoPost: React.FC<LayoutDemoPostProps> = ({
friendRequestDirection ? () => undefined : undefined
}
onOpenPosts={() => undefined}
- onPoke={() => Promise.resolve()}
isNineTileLayout={count == maximumHomeTileCount}
isTwoTileLayout={count == 2}
placement={placement}
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 8ebe716a78..f9947011b1 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -13,7 +13,6 @@ import {
type SpaceViewerPostActionMode,
} from "components/FileViewer";
import { FriendQuickActionsDialog } from "components/FriendQuickActionsDialog";
-import { FriendTilePokeButton } from "components/FriendTilePokeButton";
import { SpaceHomeHeader, spaceHomeHeaderHeight } from "components/HomeHeader";
import { SpaceNewPostButton } from "components/NewPostButton";
import {
@@ -270,7 +269,6 @@ interface FriendPostTileProps {
onOpenFriend?: HomeScreenProps["onOpenFriend"];
onOpenAvatar?: (anchorRect: DOMRect) => void;
onOpenFriendRequest?: () => void;
- onPoke?: () => Promise<void>;
onOpenPosts: (
friend: FriendProfile,
posts: SpacePost[],
@@ -300,7 +298,6 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
onOpenAvatar,
onOpenFriendRequest,
onOpenPosts,
- onPoke,
isNineTileLayout = false,
isTwoTileLayout = false,
placement,
@@ -319,7 +316,6 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
);
const post = posts[0];
const isRequestPending = Boolean(friendRequestDirection);
- const showPokeButton = !isLoading && !post && !isRequestPending && onPoke;
const isFriendRequestActionBusy = friendRequestAction != null;
const canOpenFriendRequest =
friendRequestDirection == "sent" && Boolean(onOpenFriendRequest);
@@ -653,14 +649,6 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
<SpacePostUnreadBadge count={posts.length} />
)}
</Box>
- {showPokeButton && (
- <FriendTilePokeButton
- avatarSize={avatarSize}
- name={displayName}
- onPoke={onPoke}
- tileWidth={placement.width}
- />
- )}
{friendRequestDirection != "received" &&
!isAvatarPending &&
decodedAvatar.ready && (
@@ -1450,7 +1438,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
setSelectedContact({ anchorRect, friend, avatarUrl })
}
onOpenPosts={openPostPhotos}
- onPoke={() => onPokeFriend(friend)}
isNineTileLayout={
orderedHomeItems.length == maximumHomeTileCount
}
diff --git a/web/apps/space/src/services/home-posts.ts b/web/apps/space/src/services/home-posts.ts
index 592c0c107b..b6e812207e 100644
--- a/web/apps/space/src/services/home-posts.ts
+++ b/web/apps/space/src/services/home-posts.ts
@@ -367,16 +367,14 @@ export const refreshSpaceHomePosts = async (
const returnedPostsByID = new Map(
result.items.map((post) => [post.postId, post]),
);
- const discoveredPosts = savedMarker
- ? result.items.filter((post) => {
- if (isAfter(post, savedMarker)) return true;
- if (latestPosts.get(post.spaceId)?.postId != post.postId) {
- return false;
- }
- const savedLatestPost = savedLatestPostsBySpace.get(post.spaceId);
- return !savedLatestPost || isAfter(post, savedLatestPost);
- })
- : [];
+ const discoveredPosts = result.items.filter((post) => {
+ if (savedMarker && isAfter(post, savedMarker)) return true;
+ if (latestPosts.get(post.spaceId)?.postId != post.postId) {
+ return false;
+ }
+ const savedLatestPost = savedLatestPostsBySpace.get(post.spaceId);
+ return !savedLatestPost || isAfter(post, savedLatestPost);
+ });
const nextMarker = markerFromCursor(result.syncCursor);
return updateState(viewerSpaceId, (state) => {
const currentMarker = markerFromCursor(state.syncCursor);
diff --git a/web/apps/space/tests/home-posts.test.ts b/web/apps/space/tests/home-posts.test.ts
new file mode 100644
index 0000000000..285a5bf419
--- /dev/null
+++ b/web/apps/space/tests/home-posts.test.ts
@@ -0,0 +1,116 @@
+import { beforeEach, expect, test, vi } from "vitest";
+import type { FriendProfile } from "../src/data/friends";
+import {
+ clearSpaceHomePostsMemoryCache,
+ loadSpaceHomePosts,
+ markSpaceHomePostRead,
+ refreshSpaceHomePosts,
+} from "../src/services/home-posts";
+import type { SpacePost } from "../src/services/space";
+
+const { storage, loadCurrentHomePostsPage } = vi.hoisted(() => ({
+ storage: new Map<string, unknown>(),
+ loadCurrentHomePostsPage:
+ vi.fn<
+ typeof import("../src/services/space").loadCurrentHomePostsPage
+ >(),
+}));
+
+vi.mock("ente-accounts/services/accounts-db", () => ({
+ savedPartialLocalUser: () => ({ id: 1 }),
+}));
+vi.mock("ente-base/origins", () => ({
+ apiOrigin: () => Promise.resolve("http://localhost:8080"),
+}));
+vi.mock("ente-base/kv", () => ({
+ getKV: (key: string) => Promise.resolve(storage.get(key)),
+ setKV: (key: string, value: unknown) => {
+ storage.set(key, structuredClone(value));
+ return Promise.resolve();
+ },
+ removeKV: (key: string) => {
+ storage.delete(key);
+ return Promise.resolve();
+ },
+}));
+vi.mock("services/space", () => ({ loadCurrentHomePostsPage }));
+
+const friend: FriendProfile = {
+ id: "friend",
+ spaceId: "friend",
+ fullName: "Friend",
+ username: "friend",
+ friendsCount: 1,
+};
+
+const firstPost: SpacePost = {
+ postId: 1,
+ spaceId: friend.spaceId!,
+ friendID: friend.id,
+ name: friend.fullName,
+ timestampMs: 2000,
+ viewerLiked: false,
+};
+
+beforeEach(() => {
+ clearSpaceHomePostsMemoryCache();
+ storage.clear();
+ loadCurrentHomePostsPage.mockReset();
+});
+
+test.each(["1000000:0", "0:0"])(
+ "a friend's first post is unread after an empty feed with cursor %s",
+ async (syncCursor) => {
+ loadCurrentHomePostsPage.mockResolvedValueOnce({
+ items: [],
+ syncCursor,
+ });
+ await refreshSpaceHomePosts("self", [friend]);
+ clearSpaceHomePostsMemoryCache();
+
+ loadCurrentHomePostsPage.mockResolvedValueOnce({
+ items: [firstPost],
+ syncCursor: "3000000:0",
+ });
+ const refreshed = await refreshSpaceHomePosts("self", [friend]);
+
+ expect(refreshed?.latestPosts).toEqual([firstPost]);
+ expect(refreshed?.unreadPosts).toEqual([firstPost]);
+ clearSpaceHomePostsMemoryCache();
+ expect((await loadSpaceHomePosts("self"))?.unreadPosts).toEqual([
+ firstPost,
+ ]);
+
+ await markSpaceHomePostRead("self", firstPost);
+ expect((await loadSpaceHomePosts("self"))?.unreadPosts).toEqual([]);
+ },
+);
+
+test("existing posts are read when the home feed is first initialized", async () => {
+ loadCurrentHomePostsPage.mockResolvedValueOnce({
+ items: [firstPost],
+ syncCursor: "3000000:0",
+ });
+
+ const initialized = await refreshSpaceHomePosts("self", [friend]);
+
+ expect(initialized?.latestPosts).toEqual([firstPost]);
+ expect(initialized?.unreadPosts).toEqual([]);
+});
+
+test("existing posts from a newly added friend are read", async () => {
+ loadCurrentHomePostsPage.mockResolvedValueOnce({
+ items: [],
+ syncCursor: "1000000:0",
+ });
+ await refreshSpaceHomePosts("self", []);
+ loadCurrentHomePostsPage.mockResolvedValueOnce({
+ items: [firstPost],
+ syncCursor: "3000000:0",
+ });
+
+ const refreshed = await refreshSpaceHomePosts("self", [friend]);
+
+ expect(refreshed?.latestPosts).toEqual([firstPost]);
+ expect(refreshed?.unreadPosts).toEqual([]);
+});
diff --git a/web/apps/space/vitest.config.ts b/web/apps/space/vitest.config.ts
index 0b2f1a1c24..02cd4c512d 100644
--- a/web/apps/space/vitest.config.ts
+++ b/web/apps/space/vitest.config.ts
@@ -1,5 +1,13 @@
+import { fileURLToPath } from "node:url";
import type { PluginOption } from "vite";
import wasm from "vite-plugin-wasm";
import { defineConfig } from "vitest/config";
-export default defineConfig({ plugins: [wasm() as PluginOption] });
+export default defineConfig({
+ plugins: [wasm() as PluginOption],
+ resolve: {
+ alias: {
+ services: fileURLToPath(new URL("./src/services", import.meta.url)),
+ },
+ },
+});