Skip to content

armgit / ente

Public Imported from GitHub
0

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

Handle canceled friend requests in Space

Anand Baburajan53837aac0c08
diff --git a/web/apps/space/src/components/SpaceFriendRequestCanceledToast.tsx b/web/apps/space/src/components/SpaceFriendRequestCanceledToast.tsx
new file mode 100644
index 0000000000..44fffcc5f2
--- /dev/null
+++ b/web/apps/space/src/components/SpaceFriendRequestCanceledToast.tsx
@@ -0,0 +1,27 @@
+import { UserRemove01Icon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
+import { SpaceActionToast } from "components/SpaceActionToast";
+import React from "react";
+
+interface SpaceFriendRequestCanceledToastProps {
+ onClose: () => void;
+}
+
+export const SpaceFriendRequestCanceledToast: React.FC<
+ SpaceFriendRequestCanceledToastProps
+> = ({ onClose }) => (
+ <SpaceActionToast
+ animateEntrance
+ closeLabel="Dismiss canceled friend request"
+ icon={
+ <HugeiconsIcon
+ color="#000000"
+ icon={UserRemove01Icon}
+ size={20}
+ strokeWidth={2}
+ />
+ }
+ message="Friend request was canceled"
+ onClose={onClose}
+ />
+);
diff --git a/web/apps/space/src/components/SpaceMessagesPage.tsx b/web/apps/space/src/components/SpaceMessagesPage.tsx
index c8fca304e7..9e05b06fdf 100644
--- a/web/apps/space/src/components/SpaceMessagesPage.tsx
+++ b/web/apps/space/src/components/SpaceMessagesPage.tsx
@@ -1,3 +1,4 @@
+import { SpaceFriendRequestCanceledToast } from "components/SpaceFriendRequestCanceledToast";
import { SpacePageMeta } from "components/SpacePageMeta";
import { SpaceRouteFallback } from "components/SpaceRouteFallback";
import React from "react";
@@ -7,6 +8,7 @@ import {
confirmCurrentFriendRequest,
deleteCurrentFriendRequest,
deleteCurrentMessage,
+ isFriendRequestCanceledError,
loadCurrentMessageActivityPostPreview,
loadCurrentMessageConversations,
loadCurrentMessageThread,
@@ -115,6 +117,8 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
const [isConversationsLoading, setIsConversationsLoading] =
React.useState(true);
const [isThreadLoading, setIsThreadLoading] = React.useState(false);
+ const [showFriendRequestCanceledToast, setShowFriendRequestCanceledToast] =
+ React.useState(false);
const [messages, setMessages] = React.useState<SpaceMessage[]>([]);
const [selectedFriendProfile, setSelectedFriendProfile] =
React.useState<SpaceMessageConversation["friend"]>();
@@ -301,13 +305,27 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
const actorSpaceId = profile?.spaceId;
if (!actorSpaceId) throw new Error("Missing space.");
- await confirmCurrentFriendRequest(
- actorSpaceId,
- friendRequestIdFromConversation(conversation),
- );
+ try {
+ await confirmCurrentFriendRequest(
+ actorSpaceId,
+ friendRequestIdFromConversation(conversation),
+ );
+ } catch (error: unknown) {
+ if (!isFriendRequestCanceledError(error)) throw error;
+ setConversations((currentConversations) =>
+ currentConversations.filter(
+ (candidate) =>
+ conversationId(candidate) !=
+ conversationId(conversation),
+ ),
+ );
+ setShowFriendRequestCanceledToast(true);
+ void refreshConversations();
+ return;
+ }
window.location.reload();
},
- [profile?.spaceId],
+ [profile?.spaceId, refreshConversations],
);
const deleteFriendRequest = React.useCallback(
@@ -315,10 +333,24 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
const actorSpaceId = profile?.spaceId;
if (!actorSpaceId) throw new Error("Missing space.");
- await deleteCurrentFriendRequest(
- actorSpaceId,
- friendRequestIdFromConversation(conversation),
- );
+ try {
+ await deleteCurrentFriendRequest(
+ actorSpaceId,
+ friendRequestIdFromConversation(conversation),
+ );
+ } catch (error: unknown) {
+ if (!isFriendRequestCanceledError(error)) throw error;
+ setConversations((currentConversations) =>
+ currentConversations.filter(
+ (candidate) =>
+ conversationId(candidate) !=
+ conversationId(conversation),
+ ),
+ );
+ setShowFriendRequestCanceledToast(true);
+ void refreshConversations();
+ return;
+ }
void refreshConversations();
},
[profile?.spaceId, refreshConversations],
@@ -663,6 +695,11 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
profile={profile}
selectedFriend={selectedFriend}
/>
+ {showFriendRequestCanceledToast && (
+ <SpaceFriendRequestCanceledToast
+ onClose={() => setShowFriendRequestCanceledToast(false)}
+ />
+ )}
</>
);
};
diff --git a/web/apps/space/src/pages/app/friends/index.tsx b/web/apps/space/src/pages/app/friends/index.tsx
index 54da3c5aa4..50d2bcf1c2 100644
--- a/web/apps/space/src/pages/app/friends/index.tsx
+++ b/web/apps/space/src/pages/app/friends/index.tsx
@@ -1,3 +1,4 @@
+import { SpaceFriendRequestCanceledToast } from "components/SpaceFriendRequestCanceledToast";
import { SpacePageMeta } from "components/SpacePageMeta";
import { SpaceRouteFallback } from "components/SpaceRouteFallback";
import React, { useEffect } from "react";
@@ -5,6 +6,7 @@ import { FriendsScreen, friendsBackground } from "screens/FriendsScreen";
import {
confirmCurrentFriendRequest,
deleteCurrentFriendRequest,
+ isFriendRequestCanceledError,
loadCurrentFriendAvatarURL,
loadCurrentFriendRequests,
loadCurrentSpaceFriends,
@@ -29,6 +31,8 @@ const Page: React.FC = () => {
SpaceFriendRequest[]
>([]);
const [isFriendsLoading, setIsFriendsLoading] = React.useState(true);
+ const [showFriendRequestCanceledToast, setShowFriendRequestCanceledToast] =
+ React.useState(false);
useEffect(() => {
if (profileLoadStatus == "ready" && !profile) {
@@ -101,7 +105,21 @@ const Page: React.FC = () => {
const actorSpaceId = profile.spaceId;
if (!actorSpaceId) return;
- await confirmCurrentFriendRequest(actorSpaceId, requestID);
+ try {
+ await confirmCurrentFriendRequest(
+ actorSpaceId,
+ requestID,
+ );
+ } catch (error: unknown) {
+ if (!isFriendRequestCanceledError(error)) throw error;
+ setFriendRequests((currentRequests) =>
+ currentRequests.filter(
+ (request) => request.requestId != requestID,
+ ),
+ );
+ setShowFriendRequestCanceledToast(true);
+ return;
+ }
setFriendRequests((currentRequests) =>
currentRequests.filter(
(request) => request.requestId != requestID,
@@ -113,7 +131,21 @@ const Page: React.FC = () => {
const actorSpaceId = profile.spaceId;
if (!actorSpaceId) return;
- await deleteCurrentFriendRequest(actorSpaceId, requestID);
+ try {
+ await deleteCurrentFriendRequest(
+ actorSpaceId,
+ requestID,
+ );
+ } catch (error: unknown) {
+ if (!isFriendRequestCanceledError(error)) throw error;
+ setFriendRequests((currentRequests) =>
+ currentRequests.filter(
+ (request) => request.requestId != requestID,
+ ),
+ );
+ setShowFriendRequestCanceledToast(true);
+ return;
+ }
setFriendRequests((currentRequests) =>
currentRequests.filter(
(request) => request.requestId != requestID,
@@ -140,6 +172,11 @@ const Page: React.FC = () => {
);
}}
/>
+ {showFriendRequestCanceledToast && (
+ <SpaceFriendRequestCanceledToast
+ onClose={() => setShowFriendRequestCanceledToast(false)}
+ />
+ )}
</>
);
};
diff --git a/web/apps/space/src/screens/FriendsScreen.tsx b/web/apps/space/src/screens/FriendsScreen.tsx
index fda08f4596..d087b46f56 100644
--- a/web/apps/space/src/screens/FriendsScreen.tsx
+++ b/web/apps/space/src/screens/FriendsScreen.tsx
@@ -533,17 +533,18 @@ const FriendRequestRow: React.FC<FriendRequestRowProps> = ({
: { bgcolor: "#F1F1F1" },
}}
>
- <SpaceActionFeedbackIcon
- idleIcon={
- <HugeiconsIcon
- icon={Cancel01Icon}
- size={18}
- strokeWidth={2}
- />
- }
- phase={action == "delete" ? "busy" : null}
- size={18}
- />
+ {action == "delete" ? (
+ <SpaceActionFeedbackIcon
+ phase="busy"
+ size={18}
+ />
+ ) : (
+ <HugeiconsIcon
+ icon={Cancel01Icon}
+ size={18}
+ strokeWidth={2}
+ />
+ )}
</Box>
</>
) : (
diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.ts
index 6f18b169f1..bf869627f7 100644
--- a/web/apps/space/src/services/space.ts
+++ b/web/apps/space/src/services/space.ts
@@ -1340,6 +1340,23 @@ export const confirmCurrentFriendRequest = async (
}
};
+export const isFriendRequestCanceledError = (error: unknown) => {
+ if (!error || typeof error != "object") return false;
+
+ const { code, message, status } = error as {
+ code?: unknown;
+ message?: unknown;
+ status?: unknown;
+ };
+ return (
+ status == 400 ||
+ status == 404 ||
+ (code == "invalid_input" &&
+ typeof message == "string" &&
+ message.includes("friend request is not available"))
+ );
+};
+
export const deleteCurrentFriendRequest = async (
spaceId: string,
requestId: number,