π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Revert "[web][space] Show whose friend limit was reached"
Anande1a477cbc3a6
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rsindex 102246a3e7..b18942c889 100644--- a/rust/bindings/wasm/space/src/space.rs+++ b/rust/bindings/wasm/space/src/space.rs@@ -31,9 +31,6 @@ impl Error {Self::Space(ente_space::Error::InvalidSpaceSlug) => Some("invalid_space_slug"),Self::Space(ente_space::Error::PostLimitReached) => Some("post_limit_reached"),Self::Space(ente_space::Error::FriendLimitReached) => Some("friend_limit_reached"),- Self::Space(ente_space::Error::OtherFriendLimitReached) => {- Some("other_friend_limit_reached")- }Self::Space(ente_space::Error::ProfileNotFound) => Some("profile_not_found"),Self::Space(ente_space::Error::SelfFriendship) => Some("self_friendship"),Self::Space(ente_space::Error::FriendRequestLimitReached) => {diff --git a/rust/crates/space/src/client/friends.rs b/rust/crates/space/src/client/friends.rsindex a4c4748154..301e543761 100644--- a/rust/crates/space/src/client/friends.rs+++ b/rust/crates/space/src/client/friends.rs@@ -13,7 +13,6 @@ fn map_friend_mutation_error(error: http::Error) -> Error {match &error {http::Error::Api { code, .. } => match code.as_str() {"SPACE_FRIEND_LIMIT_REACHED" => Error::FriendLimitReached,- "SPACE_OTHER_FRIEND_LIMIT_REACHED" => Error::OtherFriendLimitReached,"SPACE_SELF_FRIENDSHIP" => Error::SelfFriendship,"SPACE_FRIEND_REQUEST_LIMIT_REACHED" => Error::FriendRequestLimitReached,"SPACE_FRIEND_REQUEST_UNAVAILABLE" => Error::FriendRequestUnavailable,diff --git a/rust/crates/space/src/error.rs b/rust/crates/space/src/error.rsindex d43b04a83d..55a0bdd880 100644--- a/rust/crates/space/src/error.rs+++ b/rust/crates/space/src/error.rs@@ -42,9 +42,6 @@ pub enum Error {#[error("space friend limit reached")]FriendLimitReached,- #[error("other space friend limit reached")]- OtherFriendLimitReached,-#[error("space profile not found")]ProfileNotFound,diff --git a/web/apps/space/src/components/FriendLimitToast.tsx b/web/apps/space/src/components/FriendLimitToast.tsxindex 5ccedcce8d..5cbb5df605 100644--- a/web/apps/space/src/components/FriendLimitToast.tsx+++ b/web/apps/space/src/components/FriendLimitToast.tsx@@ -1,65 +1,34 @@import { AlertCircleIcon } from "@hugeicons/core-free-icons";import { HugeiconsIcon } from "@hugeicons/react";-import { Box } from "@mui/material";import {SpaceActionToast,spaceToastAutoDismissDurationMs,} from "components/ActionToast";import React from "react";+import { spaceFriendLimitMessage } from "utils/friend-limits";const dangerColor = "#F63A3A";interface SpaceFriendLimitToastProps {- message: string;onClose: () => void;}export const SpaceFriendLimitToast: React.FC<SpaceFriendLimitToastProps> = ({- message,onClose,-}) => {- const username = message.startsWith("@")- ? message.split(" ", 1)[0]- : undefined;-- return (- <SpaceActionToast- animateEntrance- autoDismissAfterMs={spaceToastAutoDismissDurationMs}- closeLabel="Dismiss friend limit"- icon={- <HugeiconsIcon- color={dangerColor}- icon={AlertCircleIcon}- size={20}- strokeWidth={1.8}- />- }- message={- username ? (- <Box sx={{ display: "flex" }}>- <Box- component="span"- sx={{- minWidth: 0,- overflow: "hidden",- textOverflow: "ellipsis",- }}- >- {username}- </Box>- <Box- component="span"- sx={{ flexShrink: 0, whiteSpace: "pre" }}- >- {message.slice(username.length)}- </Box>- </Box>- ) : (- message- )- }- onClose={onClose}- />- );-};+}) => (+ <SpaceActionToast+ animateEntrance+ autoDismissAfterMs={spaceToastAutoDismissDurationMs}+ closeLabel="Dismiss friend limit"+ icon={+ <HugeiconsIcon+ color={dangerColor}+ icon={AlertCircleIcon}+ size={20}+ strokeWidth={1.8}+ />+ }+ message={spaceFriendLimitMessage}+ onClose={onClose}+ />+);diff --git a/web/apps/space/src/components/MessagesPage.tsx b/web/apps/space/src/components/MessagesPage.tsxindex 5a08fe3eac..246a20ae31 100644--- a/web/apps/space/src/components/MessagesPage.tsx+++ b/web/apps/space/src/components/MessagesPage.tsx@@ -29,7 +29,7 @@ import { useSpaceAppState } from "state/app-state";import { spaceAppBackgroundColor } from "styles/colors";import {isFriendRequestCanceledError,- spaceFriendLimitErrorMessage,+ isSpaceFriendLimitError,} from "utils/friend-errors";import { useSpaceRouter } from "utils/route-transitions";import { spaceRoutes } from "utils/routes";@@ -138,8 +138,8 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({const [isThreadLoading, setIsThreadLoading] = React.useState(false);const [showFriendRequestCanceledToast, setShowFriendRequestCanceledToast] =React.useState(false);- const [friendLimitMessage, setFriendLimitMessage] =- React.useState<string>();+ const [showFriendLimitToast, setShowFriendLimitToast] =+ React.useState(false);const [messages, setMessages] = React.useState<SpaceMessage[]>([]);const [selectedFriendProfile, setSelectedFriendProfile] =React.useState<SpaceMessageConversation["friend"]>();@@ -407,12 +407,8 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({friendRequestIdFromConversation(conversation),);} catch (error: unknown) {- const limitMessage = spaceFriendLimitErrorMessage(- error,- conversation.friend.username,- );- if (limitMessage) {- setFriendLimitMessage(limitMessage);+ if (isSpaceFriendLimitError(error)) {+ setShowFriendLimitToast(true);return;}if (!isFriendRequestCanceledError(error)) throw error;@@ -851,10 +847,9 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({onClose={() => setShowFriendRequestCanceledToast(false)}/>)}- {friendLimitMessage && (+ {showFriendLimitToast && (<SpaceFriendLimitToast- message={friendLimitMessage}- onClose={() => setFriendLimitMessage(undefined)}+ onClose={() => setShowFriendLimitToast(false)}/>)}</>diff --git a/web/apps/space/src/pages/app/friends/index.tsx b/web/apps/space/src/pages/app/friends/index.tsxindex edcb4d39b6..b43f1a6244 100644--- a/web/apps/space/src/pages/app/friends/index.tsx+++ b/web/apps/space/src/pages/app/friends/index.tsx@@ -22,12 +22,9 @@ import { useSpaceAppState } from "state/app-state";import { spaceAppBackgroundColor } from "styles/colors";import {isFriendRequestCanceledError,- spaceFriendLimitErrorMessage,+ isSpaceFriendLimitError,} from "utils/friend-errors";-import {- maximumSpaceFriendCount,- spaceFriendLimitMessage,-} from "utils/friend-limits";+import { maximumSpaceFriendCount } from "utils/friend-limits";import { useSpaceRouter } from "utils/route-transitions";import { spaceRoutes } from "utils/routes";@@ -46,8 +43,8 @@ const Page: React.FC = () => {const [isFriendsLoading, setIsFriendsLoading] = React.useState(true);const [showFriendRequestCanceledToast, setShowFriendRequestCanceledToast] =React.useState(false);- const [friendLimitMessage, setFriendLimitMessage] =- React.useState<string>();+ const [showFriendLimitToast, setShowFriendLimitToast] =+ React.useState(false);useEffect(() => {if (profileLoadStatus == "ready" && !profile) {@@ -164,7 +161,7 @@ const Page: React.FC = () => {friends.length + sentRequestCount >=maximumSpaceFriendCount) {- setFriendLimitMessage(spaceFriendLimitMessage);+ setShowFriendLimitToast(true);return;}@@ -174,14 +171,8 @@ const Page: React.FC = () => {requestID,);} catch (error: unknown) {- const limitMessage = spaceFriendLimitErrorMessage(- error,- friendRequests.find(- (request) => request.requestId == requestID,- )?.friend.username,- );- if (limitMessage) {- setFriendLimitMessage(limitMessage);+ if (isSpaceFriendLimitError(error)) {+ setShowFriendLimitToast(true);return;}if (!isFriendRequestCanceledError(error)) throw error;@@ -263,10 +254,9 @@ const Page: React.FC = () => {onClose={() => setShowFriendRequestCanceledToast(false)}/>)}- {friendLimitMessage && (+ {showFriendLimitToast && (<SpaceFriendLimitToast- message={friendLimitMessage}- onClose={() => setFriendLimitMessage(undefined)}+ onClose={() => setShowFriendLimitToast(false)}/>)}</>diff --git a/web/apps/space/src/pages/app/index.tsx b/web/apps/space/src/pages/app/index.tsxindex 18bb6dc849..e4c41de91e 100644--- a/web/apps/space/src/pages/app/index.tsx+++ b/web/apps/space/src/pages/app/index.tsx@@ -38,12 +38,9 @@ import { useSpaceAppState } from "state/app-state";import { spaceAppBackgroundColor } from "styles/colors";import {isFriendRequestCanceledError,- spaceFriendLimitErrorMessage,+ isSpaceFriendLimitError,} from "utils/friend-errors";-import {- maximumSpaceFriendCount,- spaceFriendLimitMessage,-} from "utils/friend-limits";+import { maximumSpaceFriendCount } from "utils/friend-limits";import { useSpaceRouter } from "utils/route-transitions";import { spaceRoutes } from "utils/routes";@@ -80,7 +77,7 @@ const Page: React.FC = () => {const [hasLoadedHomeItems, setHasLoadedHomeItems] = useState(false);const [showFriendRequestCanceledToast, setShowFriendRequestCanceledToast] =useState(false);- const [friendLimitMessage, setFriendLimitMessage] = useState<string>();+ const [showFriendLimitToast, setShowFriendLimitToast] = useState(false);const closeFriendRequestSentToast = React.useCallback(() => setFriendRequestSentToastName(undefined),[],@@ -291,7 +288,7 @@ const Page: React.FC = () => {friends.length + sentRequestCount >=maximumSpaceFriendCount) {- setFriendLimitMessage(spaceFriendLimitMessage);+ setShowFriendLimitToast(true);return;}@@ -301,14 +298,8 @@ const Page: React.FC = () => {requestID,);} catch (error: unknown) {- const limitMessage = spaceFriendLimitErrorMessage(- error,- friendRequests.find(- (request) => request.requestId == requestID,- )?.friend.username,- );- if (limitMessage) {- setFriendLimitMessage(limitMessage);+ if (isSpaceFriendLimitError(error)) {+ setShowFriendLimitToast(true);return;}if (!isFriendRequestCanceledError(error)) throw error;@@ -525,10 +516,9 @@ const Page: React.FC = () => {}}/>)}- {friendLimitMessage && (+ {showFriendLimitToast && (<SpaceFriendLimitToast- message={friendLimitMessage}- onClose={() => setFriendLimitMessage(undefined)}+ onClose={() => setShowFriendLimitToast(false)}/>)}</>diff --git a/web/apps/space/src/pages/index.tsx b/web/apps/space/src/pages/index.tsxindex 01e9ea9c19..9903e12e60 100644--- a/web/apps/space/src/pages/index.tsx+++ b/web/apps/space/src/pages/index.tsx@@ -36,7 +36,7 @@ import {} from "services/space";import { useSpaceAppState, type OnboardingEntrySource } from "state/app-state";import { spaceAppBackgroundColor } from "styles/colors";-import { spaceFriendLimitErrorMessage } from "utils/friend-errors";+import { isSpaceFriendLimitError } from "utils/friend-errors";import { profilePostItemsFromPosts } from "utils/post-display";import { useSpaceRouter } from "utils/route-transitions";import { spaceRoutes } from "utils/routes";@@ -333,7 +333,7 @@ export const Page: React.FC<PageProps> = ({ invitePreview }) => {const [pendingInviteIntent, setPendingInviteIntent] =useState<SpaceInviteIntent>();const [isAddingFriend, setIsAddingFriend] = useState(false);- const [friendLimitMessage, setFriendLimitMessage] = useState<string>();+ const [showFriendLimitToast, setShowFriendLimitToast] = useState(false);const publicPostItems = useMemo(() => profilePostItemsFromPosts(publicPosts),[publicPosts],@@ -617,15 +617,11 @@ export const Page: React.FC<PageProps> = ({ invitePreview }) => {void router.push(spaceRoutes.home);} catch (error) {setIsAddingFriend(false);- const limitMessage = spaceFriendLimitErrorMessage(- error,- invite.spaceUsername,- );- if (limitMessage) {+ if (isSpaceFriendLimitError(error)) {clearPendingSpaceInvite();clearPendingSpaceInviteFriend();clearPendingSpaceInviteIntent();- setFriendLimitMessage(limitMessage);+ setShowFriendLimitToast(true);return;}log.error("Failed to send friend request", error);@@ -687,10 +683,9 @@ export const Page: React.FC<PageProps> = ({ invitePreview }) => {}/>)}- {friendLimitMessage && (+ {showFriendLimitToast && (<SpaceFriendLimitToast- message={friendLimitMessage}- onClose={() => setFriendLimitMessage(undefined)}+ onClose={() => setShowFriendLimitToast(false)}/>)}</>diff --git a/web/apps/space/src/utils/friend-errors.ts b/web/apps/space/src/utils/friend-errors.tsindex a568f53408..02e79ec7b1 100644--- a/web/apps/space/src/utils/friend-errors.ts+++ b/web/apps/space/src/utils/friend-errors.ts@@ -1,31 +1,14 @@import { isNamedError } from "ente-base/error";-import {- maximumSpaceFriendCount,- spaceFriendLimitMessage,-} from "./friend-limits";+import { spaceFriendLimitMessage } from "./friend-limits";export const isSpaceFriendLimitError = (error: unknown) =>- isNamedError(error, "friend_limit_reached") ||- isNamedError(error, "other_friend_limit_reached");--export const spaceFriendLimitErrorMessage = (- error: unknown,- username: string | undefined,-) => {- if (isNamedError(error, "other_friend_limit_reached")) {- return `${username ? `@${username} has` : "They've"} filled all ${maximumSpaceFriendCount} friend spots.`;- }- if (isNamedError(error, "friend_limit_reached"))- return spaceFriendLimitMessage;- return undefined;-};+ isNamedError(error, "friend_limit_reached");export const isFriendRequestCanceledError = (error: unknown) =>isNamedError(error, "friend_request_unavailable");export const friendRequestErrorMessage = (error: unknown, username: string) => {- const limitMessage = spaceFriendLimitErrorMessage(error, username);- if (limitMessage) return limitMessage;+ if (isSpaceFriendLimitError(error)) return spaceFriendLimitMessage;if (isNamedError(error, "profile_not_found")) {return `No Space profile found for @${username}.`;}diff --git a/web/apps/space/tests/friend-errors.test.ts b/web/apps/space/tests/friend-errors.test.tsindex 77e634c51f..e33bd69db7 100644--- a/web/apps/space/tests/friend-errors.test.ts+++ b/web/apps/space/tests/friend-errors.test.ts@@ -7,8 +7,6 @@ import { afterEach, beforeEach, expect, test, vi } from "vitest";import {friendRequestErrorMessage,isFriendRequestCanceledError,- isSpaceFriendLimitError,- spaceFriendLimitErrorMessage,} from "../src/utils/friend-errors";import { spaceFriendLimitMessage } from "../src/utils/friend-limits";@@ -92,25 +90,6 @@ test("a missing profile reaches the add-friend message", async () => {);});-test.each([- ["SPACE_FRIEND_LIMIT_REACHED", "You've filled all 9 friend spots."],- [- "SPACE_OTHER_FRIEND_LIMIT_REACHED",- "@friend has filled all 9 friend spots.",- ],-] as const)(- "%s identifies whose limit blocked acceptance",- async (code, message) => {- mockAPI(code, 409);- const error: unknown = await ctx- .confirmFriendRequest("self", 1n)- .catch((e: unknown) => e);- expect(error).toBeInstanceOf(Error);- expect(isSpaceFriendLimitError(error)).toBe(true);- expect(spaceFriendLimitErrorMessage(error, "friend")).toBe(message);- },-);-test.each([["SPACE_SELF_FRIENDSHIP", 400, "You can't add yourself as a friend."],[@@ -119,11 +98,6 @@ test.each(["@friend can't receive more friend requests right now.",],["SPACE_FRIEND_LIMIT_REACHED", 409, spaceFriendLimitMessage],- [- "SPACE_OTHER_FRIEND_LIMIT_REACHED",- 409,- "@friend has filled all 9 friend spots.",- ],["CONFLICT", 409, "Couldn't send the friend request. Please try again."],] as const)("%s reaches the add-friend message",