direct join

Author: rohittp0

netlify/functions/discord-auth.js

@@ -1,6 +1,5 @@
 // netlify/functions/discord-auth.js
 const admin = require('firebase-admin');
-const { Client, GatewayIntentBits, Partials } = require("discord.js");
 
 if (!admin.apps.length) {
     admin.initializeApp({
@@ -9,19 +8,8 @@ if (!admin.apps.length) {
 }
 const db = admin.firestore();
 
-const client = new Client({
-    intents: [
-        GatewayIntentBits.DirectMessages,
-        GatewayIntentBits.Guilds,
-        GatewayIntentBits.GuildMessages,
-        GatewayIntentBits.MessageContent,
-        GatewayIntentBits.GuildMembers,
-    ],
-    partials: [Partials.Channel],
-});
-
 exports.handler = async function (event) {
-    const { access_token, state, token_type  } = event.queryStringParameters;
+    const { access_token, state, token_type } = event.queryStringParameters;
 
     if (!access_token || !state || !token_type) {
         return {
@@ -31,8 +19,6 @@ exports.handler = async function (event) {
     }
 
     try {
-        client.login(process.env.DISCORD_TOKEN).then();
-
         const response = await fetch('https://discord.com/api/users/@me', {
             headers: {
                 Authorization: `${token_type} ${access_token}`,
@@ -42,36 +28,37 @@ exports.handler = async function (event) {
         const discordId = response.id;
         const userId = decodeURIComponent(state);
 
-        await new Promise(async (resolve) => client.once('ready', resolve));
-
-        const server = client.guilds.cache.get(process.env.guildID) || await client.guilds.fetch(process.env.guildID);
-        const channel = server.channels.cache.get(process.env.START_CHANNEL) || await server.channels.fetch(process.env.START_CHANNEL);
+        // Create an invitation link
+        const inviteResponse = await fetch(`https://discord.com/api/v10/channels/${process.env.START_CHANNEL}/invites`, {
+            method: 'POST',
+            headers: {
+                'Authorization': `Bot ${process.env.DISCORD_TOKEN}`,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                max_age: 300,  // 5 minutes
+                max_uses: 1,
+            }),
+        }).then((res) => res.json());
 
-        const invite = await channel.createInvite({
-            maxAge: 300,  // 5 minutes
-            maxUses: 1,
-        });
+        const inviteUrl = `https://discord.gg/${inviteResponse.code}`;
 
         const userDoc = db.collection('users').doc(userId);
         await userDoc.set({
-            discordId,
-            discordInvite: {
-                url: invite.url,
-                expiry: Date.now() + 300 * 1000,  // Current timestamp + 5 minutes in milliseconds
-            }
+            discordId
         }, { merge: true });
 
         return {
-            statusCode: 302,
-            headers: {
-                Location: `${process.env.URL}/profile`
-            }
+            statusCode: 200,
+            body: JSON.stringify({
+                url: inviteUrl,
+                expiry: Date.now() + 300 * 1000,  // Current timestamp + 5 minutes in milliseconds
+            }),
         };
     } catch (error) {
-        console.error(error);
         return {
             statusCode: 500,
-            body: 'Internal Server Error',
+            body: error.message || error,
         };
     }
 }

src/pages/404.tsx

@@ -7,6 +7,8 @@ import { useRouter } from 'next/router';
 const Error = () => {
   const router = useRouter();
 
+  const error = router.query.error || "Looks Like You're Lost";
+
   return (
     <Flex
       flexDirection='column'
@@ -18,7 +20,7 @@ const Error = () => {
       <TopBar />
       <Image src='/404.svg' height='400' width='300' alt='' />
       <Heading textAlign='center' color='#407BFF' size='2xl'>
-        Looks Like You&apos;re Lost
+        {error}
       </Heading>
       <Heading textAlign='center' size='md' fontWeight='300' mt='20px'>
         Here&apos;s is your way back to home

src/pages/auth/discord.tsx

@@ -7,11 +7,21 @@ const DiscordAuth = () => {
     const router = useRouter();
 
     useEffect(() => {
-        if(typeof window === 'undefined')
+        if (typeof window === 'undefined')
             return;
 
         const query = window.location.hash.slice(1);
-        router.push(`/.netlify/functions/discord-auth?${query}`).then();
+        fetch(`/.netlify/functions/discord-auth?${query}`).then(async (res) => {
+            if(res.status !== 200)
+                return router.push(`/404?error=${await res.text()}`);
+
+            const data = await res.json();
+
+            if (!data.url)
+                return router.push("/404?error=Unable to Create Invite");
+
+            return router.push(data.url);
+        })
     }, [router]);
 
     return (

src/pages/profile.tsx

@@ -111,7 +111,6 @@ const Index = () => {
         const skillsArr = val?.skills?.map((el: any) => el.value);
         const dbData: Form = {
             discordId: user?.discordId || null,
-            discordInvite: user?.discordInvite || null,
             team: user?.team || null,
             accept: user?.accept || false,
             college: college || user?.college || null,

src/pages/wizard.tsx

@@ -61,7 +61,6 @@ const Wizard = () => {
             const skillsArr = val.skills?.map((el: { value: string }) => el.value);
             const dbData: Form = {
                 discordId: null,
-                discordInvite: null,
                 team: null,
                 accept: null,
                 college: college || null,

src/types/index.ts

@@ -10,10 +10,6 @@ export interface Errors {
 
 export interface Form {
     discordId: string | null;
-    discordInvite: {
-        url: string;
-        expiry: number;
-    } | null;
     team: string | null;
     name: string;
     passYear: number | null;

src/views/profile/components/ProfileBar.tsx

@@ -4,7 +4,6 @@ import {BiArrowBack} from 'react-icons/bi';
 import {FiEdit} from 'react-icons/fi';
 import {AiOutlineSave} from 'react-icons/ai';
 import {useRouter} from 'next/router';
-import {CopyText} from "@/components/copy";
 import {Form} from "@/types";
 
 interface BarProp {
@@ -29,8 +28,6 @@ export const ProfileBar = ({
         return router.push(`https://discord.com/api/oauth2/authorize?client_id=${clientId}&redirect_uri=${redirectUri}&response_type=token&scope=identify&state=${state}`);
     };
 
-    const valid = user.discordInvite?.expiry && user.discordInvite.expiry > Date.now();
-
     return (
         <Box
             display="flex"
@@ -60,9 +57,9 @@ export const ProfileBar = ({
                     color: 'white',
                     borderColor: 'transparent',
                   }}
-                  onClick={valid ? () => router.push( user.discordInvite?.url || '') : handleConnectDiscord}
+                  onClick={handleConnectDiscord}
               >
-                  {valid ? "Join Discord" : "Connect Discord"}
+                  Join Discord
               </Button>
                 {isEdit && (
                     <Button