discord id lookup

cmss13-devs · Jun 7, 2024 · 9b4d907 · 9b4d907
1 parent b4637e1
commit 9b4d907
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 10 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -54,10 +54,12 @@ export default function App(): React.ReactElement {
               <div className="text-3xl underline text-center">[cmdb]</div>
               {user && <div>{user.preferredUsername}</div>}
             </div>
+
             <div className="flex flex-col md:flex-row gap-3">
               <LookupOption type="lookup">Lookup User</LookupOption>
               <LookupOption type="ip">Lookup IP</LookupOption>
               <LookupOption type="cid">Lookup CID</LookupOption>
+              <LookupOption type="discordId">Lookup Discord</LookupOption>
             </div>
 
             <div
@@ -88,7 +90,7 @@ export default function App(): React.ReactElement {
 }
 
 interface LookupProps extends PropsWithChildren {
-  type: "lookup" | "ip" | "cid";
+  type: "lookup" | "ip" | "cid" | "discordId";
 }
 
 const LookupOption = (props: LookupProps) => {
@@ -153,6 +155,9 @@ const LookupOption = (props: LookupProps) => {
           className="md:w-11/12 md:h-11/12"
         >
           {type == "lookup" && <LookupMenu value={value} close={close} />}
+          {type == "discordId" && (
+            <LookupMenu discordId={value} close={close} />
+          )}
           {type == "cid" && <CidLookup initialCid={value} close={close} />}
           {type == "ip" && <IpLookup initialIp={value} close={close} />}
         </Dialog>

diff --git a/src/components/userLookup.tsx b/src/components/userLookup.tsx
@@ -19,16 +19,22 @@ import { StickybanMatch } from "./stickybanMatch";
 import { callApi } from "../helpers/api";
 
 type ActiveLookupType = {
-  updateUser: (string?: string) => void;
+  updateUser: (_args: UpdateUserArguments) => void;
 };
 
 const ActiveLookupContext = createContext<ActiveLookupType | null>(null);
 
 interface LookupMenuProps extends PropsWithChildren {
   value?: string;
+  discordId?: string;
   close?: () => void;
 }
 
+type UpdateUserArguments = {
+  userCkey?: string;
+  userDiscordId?: string;
+};
+
 export const LookupMenu: React.FC<LookupMenuProps> = (
   props: LookupMenuProps
 ) => {
@@ -37,12 +43,16 @@ export const LookupMenu: React.FC<LookupMenuProps> = (
   const [loading, setLoading] = useState(false);
   const global = useContext(GlobalContext);
 
-  const { value, close } = props;
+  const { value, discordId, close } = props;
 
   const updateUser = useCallback(
-    (override?: string) => {
+    (args: UpdateUserArguments) => {
+      const { userCkey, userDiscordId } = args;
+
       setLoading(true);
-      callApi(`/User?ckey=${override}`).then((value) => {
+      callApi(
+        userCkey ? `/User?ckey=${userCkey}` : `/User?discordId=${userDiscordId}`
+      ).then((value) => {
         setLoading(false);
         if (value.status == 404) {
           global?.updateAndShowToast("Failed to find user.");
@@ -61,10 +71,15 @@ export const LookupMenu: React.FC<LookupMenuProps> = (
   );
 
   useEffect(() => {
+    if (discordId && !userData) {
+      updateUser({ userDiscordId: discordId });
+      return;
+    }
     if (value && !userData) {
-      updateUser(value);
+      updateUser({ userCkey: value });
+      return;
     }
-  }, [value, userData, updateUser]);
+  }, [value, userData, discordId, updateUser]);
 
   return (
     <ActiveLookupContext.Provider value={{ updateUser: updateUser }}>
@@ -73,7 +88,7 @@ export const LookupMenu: React.FC<LookupMenuProps> = (
           className="flex flex-row justify-center gap-3"
           onSubmit={(event) => {
             event.preventDefault();
-            updateUser();
+            updateUser({});
           }}
         >
           <label htmlFor="ckey">User: </label>
@@ -538,7 +553,7 @@ const AddNote = (props: { player: Player }) => {
       }),
     }).then((response) => {
       response.text().then((response) => {
-        refetch?.updateUser(ckey);
+        refetch?.updateUser({ userCkey: ckey });
         setAdding(false);
         if (response) {
           global?.updateAndShowToast(`Added note to ${ckey}.`);
@@ -716,7 +731,10 @@ const RichUser = (props: RichUserProps) => {
   const lookup = useContext(ActiveLookupContext);
 
   return (
-    <Link onClick={() => lookup?.updateUser(props.name)} className="px-1">
+    <Link
+      onClick={() => lookup?.updateUser({ userCkey: props.name })}
+      className="px-1"
+    >
       {props.name}
     </Link>
   );