From f95350405c4dba59c6113e829865ea8cc98554cb Mon Sep 17 00:00:00 2001
From: daniel31x13 <daniel31x13@gmail.com>
Date: Tue, 29 Oct 2024 18:14:35 -0400
Subject: [PATCH] rename variable

---
 .../EditCollectionSharingModal.tsx             | 12 ++++++------
 lib/client/addMemberToCollection.ts            | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/components/ModalContent/EditCollectionSharingModal.tsx b/components/ModalContent/EditCollectionSharingModal.tsx
index f44336f..ba7bfdd 100644
--- a/components/ModalContent/EditCollectionSharingModal.tsx
+++ b/components/ModalContent/EditCollectionSharingModal.tsx
@@ -66,7 +66,7 @@ export default function EditCollectionSharingModal({
 
   const publicCollectionURL = `${currentURL.origin}/public/collections/${collection.id}`;
 
-  const [memberUsername, setMemberUsername] = useState("");
+  const [memberIdentifier, setMemberIdentifier] = useState("");
 
   const [collectionOwner, setCollectionOwner] = useState<
     Partial<AccountSettings>
@@ -91,7 +91,7 @@ export default function EditCollectionSharingModal({
       members: [...collection.members, newMember],
     });
 
-    setMemberUsername("");
+    setMemberIdentifier("");
   };
 
   return (
@@ -148,15 +148,15 @@ export default function EditCollectionSharingModal({
 
             <div className="flex items-center gap-2">
               <TextInput
-                value={memberUsername || ""}
+                value={memberIdentifier || ""}
                 className="bg-base-200"
                 placeholder={t("add_member_placeholder")}
-                onChange={(e) => setMemberUsername(e.target.value)}
+                onChange={(e) => setMemberIdentifier(e.target.value)}
                 onKeyDown={(e) =>
                   e.key === "Enter" &&
                   addMemberToCollection(
                     user,
-                    memberUsername || "",
+                    memberIdentifier.replace(/^@/, "") || "",
                     collection,
                     setMemberState,
                     t
@@ -168,7 +168,7 @@ export default function EditCollectionSharingModal({
                 onClick={() =>
                   addMemberToCollection(
                     user,
-                    memberUsername || "",
+                    memberIdentifier.replace(/^@/, "") || "",
                     collection,
                     setMemberState,
                     t
diff --git a/lib/client/addMemberToCollection.ts b/lib/client/addMemberToCollection.ts
index 7fa138f..4b23399 100644
--- a/lib/client/addMemberToCollection.ts
+++ b/lib/client/addMemberToCollection.ts
@@ -6,7 +6,7 @@ import { User } from "@prisma/client";
 
 const addMemberToCollection = async (
   owner: User,
-  memberUsername: string,
+  memberIdentifier: string,
   collection: CollectionIncludingMembersAndLinkCount,
   setMember: (newMember: Member) => null | undefined,
   t: TFunction<"translation", undefined>
@@ -16,8 +16,8 @@ const addMemberToCollection = async (
     const email = (e.user.email || "").toLowerCase();
 
     return (
-      username === memberUsername.toLowerCase() ||
-      email === memberUsername.toLowerCase()
+      username === memberIdentifier.toLowerCase() ||
+      email === memberIdentifier.toLowerCase()
     );
   });
 
@@ -25,13 +25,13 @@ const addMemberToCollection = async (
     // no duplicate members
     !checkIfMemberAlreadyExists &&
     // member can't be empty
-    memberUsername.trim() !== "" &&
+    memberIdentifier.trim() !== "" &&
     // member can't be the owner
-    memberUsername.trim().toLowerCase() !== owner.username?.toLowerCase() &&
-    memberUsername.trim().toLowerCase() !== owner.email?.toLowerCase()
+    memberIdentifier.trim().toLowerCase() !== owner.username?.toLowerCase() &&
+    memberIdentifier.trim().toLowerCase() !== owner.email?.toLowerCase()
   ) {
     // Lookup, get data/err, list ...
-    const user = await getPublicUserData(memberUsername.trim().toLowerCase());
+    const user = await getPublicUserData(memberIdentifier.trim().toLowerCase());
 
     if (user.username) {
       setMember({
@@ -51,8 +51,8 @@ const addMemberToCollection = async (
     }
   } else if (checkIfMemberAlreadyExists) toast.error(t("user_already_member"));
   else if (
-    memberUsername.trim().toLowerCase() === owner.username?.toLowerCase() ||
-    memberUsername.trim().toLowerCase() === owner.email?.toLowerCase()
+    memberIdentifier.trim().toLowerCase() === owner.username?.toLowerCase() ||
+    memberIdentifier.trim().toLowerCase() === owner.email?.toLowerCase()
   )
     toast.error(t("you_are_already_collection_owner"));
 };