xwx.moe/el.xwx.moe
xwx.moe/ el.xwx.moe
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Actions Packages Projects Eldonoj Wiki Activity

rename variable

This commit is contained in:
daniel31x13 2024-10-29 18:14:35 -04:00
parent 665019dc59
commit f95350405c
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/ModalContent/EditCollectionSharingModal.tsx
View File

@ -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

18
lib/client/addMemberToCollection.ts
View File

@ -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"));
};