Owned By:@{name}
diff --git a/website/src/lib/components/Cards/Bot.svelte b/website/src/lib/components/Cards/Bot.svelte index d7e6c25..bd34c47 100644 --- a/website/src/lib/components/Cards/Bot.svelte +++ b/website/src/lib/components/Cards/Bot.svelte @@ -5,6 +5,7 @@ // props export let id: string; + export let username: string; export let votes = 0; export let description: string | null; export let avatar = '/logo.png'; @@ -17,14 +18,14 @@
-
+
@@ -33,7 +34,7 @@
{description ?? 'No Description Available...'}
-
- {bot.username}
+{bot.username}#{bot.discriminator}
Server ID: #{bot.id}
@@ -46,7 +46,7 @@
Short Description: {bot.shortDescription ?? 'No Short Description'}
+
{bot.description}
diff --git a/website/src/routes/api/+server.ts b/website/src/routes/(backend)/api/+server.ts similarity index 95% rename from website/src/routes/api/+server.ts rename to website/src/routes/(backend)/api/+server.ts index ac48a6d..2522e2c 100644 --- a/website/src/routes/api/+server.ts +++ b/website/src/routes/(backend)/api/+server.ts @@ -2,7 +2,7 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import os from 'os'; -import { version as appVersion } from '../../../package.json'; +import { version as appVersion } from '../../../../package.json'; import { version as svelteKitVersion } from '@sveltejs/kit/package.json'; import { version as prismaV } from '@prisma/client/package.json'; diff --git a/website/src/routes/api/auth/+server.ts b/website/src/routes/(backend)/api/auth/+server.ts similarity index 95% rename from website/src/routes/api/auth/+server.ts rename to website/src/routes/(backend)/api/auth/+server.ts index b367c2c..ada7835 100644 --- a/website/src/routes/api/auth/+server.ts +++ b/website/src/routes/(backend)/api/auth/+server.ts @@ -3,7 +3,7 @@ import { error, json, redirect } from '@sveltejs/kit'; import DB from '$lib/server/database'; import type { RequestHandler } from './$types'; import { encrypt } from '$lib/server/modules/JWA'; -import axios from 'axios'; +import axios, { type AxiosResponse } from 'axios'; import { env } from '$env/dynamic/private'; /* Helper functions*/ @@ -114,21 +114,21 @@ export const GET = async ({ url, cookies }: any) => { // if user not exist if (!user) { // fetch revolt user data - const revoltUserData: any = await axios + const revoltUserData: AxiosResponse = await axios .get(`https://api.revolt.chat/users/${requestOnDB.user}`, { headers: { 'X-Bot-Token': env.BOT_TOKEN } }) - .catch((e) => { - console.log(e, env.BOT_TOKEN); + .catch(() => { throw error(403, { message: 'Unable to fetch revolt profile' }); }); // create user const userData: any = { avatar: `https://autumn.revolt.chat/avatars/${revoltUserData.data.avatar._id}/${revoltUserData.data.avatar.filename}`, identifier: requestOnDB.user, - username: revoltUserData.data.username + username: revoltUserData.data.username, + discriminator: revoltUserData.data.discriminator }; const createdUser = await DB.user.create({ data: userData }).catch(() => { throw error(500, { message: 'Error in creating new user' }); diff --git a/website/src/routes/api/bots/+server.ts b/website/src/routes/(backend)/api/bots/+server.ts similarity index 100% rename from website/src/routes/api/bots/+server.ts rename to website/src/routes/(backend)/api/bots/+server.ts diff --git a/website/src/routes/api/bots/[id]/+server.ts b/website/src/routes/(backend)/api/bots/[id]/+server.ts similarity index 96% rename from website/src/routes/api/bots/[id]/+server.ts rename to website/src/routes/(backend)/api/bots/[id]/+server.ts index ad2e776..db6d3b7 100644 --- a/website/src/routes/api/bots/[id]/+server.ts +++ b/website/src/routes/(backend)/api/bots/[id]/+server.ts @@ -9,7 +9,7 @@ export const GET = (async ({ params }: any) => { const selectedBot = await DB.bot .findUnique({ where: { - username: params.id + identifier: params.id } }) .catch(() => { diff --git a/website/src/routes/(backend)/api/bots/[id]/vote/+server.ts b/website/src/routes/(backend)/api/bots/[id]/vote/+server.ts new file mode 100644 index 0000000..b8bcb67 --- /dev/null +++ b/website/src/routes/(backend)/api/bots/[id]/vote/+server.ts @@ -0,0 +1,68 @@ +// imports +import { json, error } from '@sveltejs/kit'; +import DB from '$lib/server/database'; +import type { RequestHandler } from './$types'; +import { decrypt } from '$lib/server/modules/JWA'; +import ms from 'ms'; + +// helper function +function userCanVote(vote: any) { + const result = 86400000 - (Date.now() - new Date(vote.time).getTime()); + const fmtRes = ms(result, { long: true }); + if (result <= 0 || fmtRes.includes('-')) + return { + status: true, + time_left: 'Time to vote now' + }; + return { + status: false, + time_left: fmtRes + }; +} + +// GET /api/bots/[id]/vote +export const GET = (async ({ params, cookies }: any) => { + // data + const botID = params.id; + const voterID: any = decrypt(cookies.get('revAuth')); + + // validate + if (!botID) { + throw error(400, { message: 'Missing Params' }); + } + // get user + const voter = await DB.user + .findUnique({ + where: { + id: voterID + } + }) + .catch(() => { + throw error(500, { message: 'Unable to contact database' }); + }); + if (!voter) { + throw error(401, { message: 'No user found' }); + } + // get pending req + const pendingRequest = await DB.vote + .findFirst({ + where: { + botIdentifier: botID, + voterIdentifier: voter.identifier + } + }) + .catch(() => { + throw error(500, { message: 'Unable to contact database' }); + }); + if (pendingRequest) { + return json({ vote: pendingRequest, can_vote: userCanVote(pendingRequest) }); + } + // if not pending req + return json({ + vote: null, + can_vote: { + status: true, + time_left: 'Time to vote now' + } + }); +}) satisfies RequestHandler; diff --git a/website/src/routes/api/me/+server.ts b/website/src/routes/(backend)/api/me/+server.ts similarity index 100% rename from website/src/routes/api/me/+server.ts rename to website/src/routes/(backend)/api/me/+server.ts diff --git a/website/src/routes/api/me/bots/+server.ts b/website/src/routes/(backend)/api/me/bots/+server.ts similarity index 84% rename from website/src/routes/api/me/bots/+server.ts rename to website/src/routes/(backend)/api/me/bots/+server.ts index 604c903..4001f6e 100644 --- a/website/src/routes/api/me/bots/+server.ts +++ b/website/src/routes/(backend)/api/me/bots/+server.ts @@ -3,7 +3,7 @@ import type { RequestHandler } from './$types'; import { json, error } from '@sveltejs/kit'; import DB from '$lib/server/database'; import { decrypt } from '$lib/server/modules/JWA'; -import axios from 'axios'; +import axios, { type AxiosResponse } from 'axios'; import { env } from '$env/dynamic/private'; // GET /api/me/bots @@ -12,7 +12,7 @@ export const GET = (async ({ cookies }) => { const auth: string | null = decrypt(cookies.get('revAuth')); // if if (!auth) { - throw error(401, { message: 'No auth?' }); + throw error(401, { message: 'No auth provided' }); } // get user bots @@ -49,24 +49,28 @@ export const POST = (async ({ request, cookies }) => { throw error(400, { message: 'Invalid Github Repo' }); } // check if bot exists - const botOnDB = await DB.bot.findUnique({ - where: { - identifier: data.identifier.trim().toUpperCase() - } - }); + const botOnDB = await DB.bot + .findUnique({ + where: { + identifier: data.identifier.trim().toUpperCase() + } + }) + .catch(() => { + throw error(500, { message: 'Unable to contact database' }); + }); if (botOnDB) { return json(botOnDB); } // fetch username - const bot = await axios + const bot: AxiosResponse = await axios .get(`https://api.revolt.chat/bots/${data.identifier.toString()}/invite`) .catch(() => { throw error(406, { message: 'Unable to fetch bot on revolt' }); }); // fetch revolt bot data - const revoltBotData = await axios + const revoltBotData: AxiosResponse = await axios .get(`https://api.revolt.chat/users/${data.identifier.toUpperCase()}`, { headers: { 'X-Bot-Token': env.BOT_TOKEN @@ -81,10 +85,10 @@ export const POST = (async ({ request, cookies }) => { if (revoltBotData.data.avatar) { avatar = `https://autumn.revolt.chat/avatars/${revoltBotData.data.avatar._id}/${revoltBotData.data.avatar.filename}`; } - // create bot - const botData = { + const botData: any = { username: bot.data.username, + discriminator: revoltBotData.data.discriminator, identifier: data.identifier, avatar: avatar, description: data.longDescription, @@ -102,8 +106,7 @@ export const POST = (async ({ request, cookies }) => { .create({ data: botData }) - .catch((err) => { - console.log(err); + .catch(() => { throw error(500, { message: 'Unable to create bot' }); }); diff --git a/website/src/routes/api/search/bots/+server.ts b/website/src/routes/(backend)/api/search/bots/+server.ts similarity index 100% rename from website/src/routes/api/search/bots/+server.ts rename to website/src/routes/(backend)/api/search/bots/+server.ts diff --git a/website/src/routes/api/tags/+server.ts b/website/src/routes/(backend)/api/tags/+server.ts similarity index 100% rename from website/src/routes/api/tags/+server.ts rename to website/src/routes/(backend)/api/tags/+server.ts diff --git a/website/src/routes/me/+layout.svelte b/website/src/routes/(frontend)/@me/+layout.svelte similarity index 100% rename from website/src/routes/me/+layout.svelte rename to website/src/routes/(frontend)/@me/+layout.svelte diff --git a/website/src/routes/me/+page.svelte b/website/src/routes/(frontend)/@me/+page.svelte similarity index 86% rename from website/src/routes/me/+page.svelte rename to website/src/routes/(frontend)/@me/+page.svelte index 730c5f3..8ca064e 100644 --- a/website/src/routes/me/+page.svelte +++ b/website/src/routes/(frontend)/@me/+page.svelte @@ -26,7 +26,7 @@ }); -- {$user ? $user.username : 'Not logged in'} + {$user ? `${$user.username}#${$user.discriminator}` : 'Not logged in'}
{#if $user} Logout? @@ -49,7 +49,7 @@No Bio Set...
Add Your Bot
+
+
+ {/if}
+
+
+
+ {:else}
+
+
+
+
+ + Time Remaining to vote: {userVoteData.can_vote?.time_left ?? 'Loading'} +
+
+
+
+ + You need to be logged in +
+No Bots Found :(
+
-
{/if}
{#if $nav}
-
+