Skip to content

Commit 1e815ae

Browse files
committed
done
1 parent 6a560d8 commit 1e815ae

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

netlify/functions/discord-auth.js

+7-10
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ const client = new Client({
1919
],
2020
partials: [Partials.Channel],
2121
});
22-
client.login(process.env.DISCORD_TOKEN).then();
23-
24-
const ready = new Promise((resolve) => client.once('ready', resolve));
2522

2623
exports.handler = async function (event) {
2724
const { access_token, state, token_type } = event.queryStringParameters;
@@ -34,20 +31,21 @@ exports.handler = async function (event) {
3431
}
3532

3633
try {
34+
client.login(process.env.DISCORD_TOKEN).then();
35+
3736
const response = await fetch('https://discord.com/api/users/@me', {
3837
headers: {
3938
Authorization: `${token_type} ${access_token}`,
4039
},
4140
}).then((res) => res.json());
4241

43-
console.log(response);
44-
4542
const discordId = response.id;
4643
const userId = decodeURIComponent(state);
4744

48-
await ready
49-
const server = client.guilds.cache.get(process.env.guildID);
50-
const channel = await server.channels.fetch(process.env.START_CHANNEL);
45+
await new Promise(async (resolve) => client.once('ready', resolve));
46+
47+
const server = client.guilds.cache.get(process.env.guildID) || await client.guilds.fetch(process.env.guildID);
48+
const channel = server.channels.cache.get(process.env.START_CHANNEL) || await server.channels.fetch(process.env.START_CHANNEL);
5149

5250
const invite = await channel.createInvite({
5351
maxAge: 300, // 5 minutes
@@ -63,15 +61,14 @@ exports.handler = async function (event) {
6361
}
6462
}, { merge: true });
6563

66-
client.destroy().then();
67-
6864
return {
6965
statusCode: 302,
7066
headers: {
7167
Location: `${process.env.URL}/profile`
7268
}
7369
};
7470
} catch (error) {
71+
console.error(error);
7572
return {
7673
statusCode: 500,
7774
body: 'Internal Server Error',

0 commit comments

Comments
 (0)