From f93e348841bfa10f490f73abe5d2593142de61a4 Mon Sep 17 00:00:00 2001 From: BuildTools <59115290+BanTheNons@users.noreply.github.com> Date: Thu, 5 Aug 2021 19:18:14 +0300 Subject: Added the profile route --- src/routes/users/#id/profile.ts | 24 ++++++++++++++++++++++++ src/routes/users/@me/profile.ts | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/routes/users/#id/profile.ts create mode 100644 src/routes/users/@me/profile.ts (limited to 'src') diff --git a/src/routes/users/#id/profile.ts b/src/routes/users/#id/profile.ts new file mode 100644 index 00000000..6fc8d5e4 --- /dev/null +++ b/src/routes/users/#id/profile.ts @@ -0,0 +1,24 @@ +import { Router, Request, Response } from "express"; +import { getPublicUser } from "../../../util/User"; + +const router: Router = Router(); + +router.get("/", async (req: Request, res: Response) => { + const user = await getPublicUser(req.params.id, { user_data: true }) + + res.json({ + connected_accounts: user.user_data.connected_accounts, + premium_guild_since: null, // TODO + premium_since: null, // TODO + user: { + username: user.username, + discriminator: user.discriminator, + id: user.id, + public_flags: user.public_flags, + avatar: user.avatar, + bio: req.user_bot ? null : user.bio, + } + }); +}); + +export default router; diff --git a/src/routes/users/@me/profile.ts b/src/routes/users/@me/profile.ts new file mode 100644 index 00000000..353607d4 --- /dev/null +++ b/src/routes/users/@me/profile.ts @@ -0,0 +1,24 @@ +import { Router, Request, Response } from "express"; +import { getPublicUser } from "../../../util/User"; + +const router: Router = Router(); + +router.get("/", async (req: Request, res: Response) => { + const user = await getPublicUser(req.user_id, { user_data: true }) + + res.json({ + connected_accounts: user.user_data.connected_accounts, + premium_guild_since: null, // TODO + premium_since: null, // TODO + user: { + username: user.username, + discriminator: user.discriminator, + id: user.id, + public_flags: user.public_flags, + avatar: user.avatar, + bio: user.bio, + } + }); +}); + +export default router; -- cgit 1.5.1 From 1727c62317826436ad92cffafb4c8846ffa72770 Mon Sep 17 00:00:00 2001 From: BuildTools <59115290+BanTheNons@users.noreply.github.com> Date: Thu, 5 Aug 2021 21:00:56 +0300 Subject: Added the bot param --- src/routes/users/#id/profile.ts | 1 + src/routes/users/@me/profile.ts | 1 + 2 files changed, 2 insertions(+) (limited to 'src') diff --git a/src/routes/users/#id/profile.ts b/src/routes/users/#id/profile.ts index 6fc8d5e4..516606f3 100644 --- a/src/routes/users/#id/profile.ts +++ b/src/routes/users/#id/profile.ts @@ -17,6 +17,7 @@ router.get("/", async (req: Request, res: Response) => { public_flags: user.public_flags, avatar: user.avatar, bio: req.user_bot ? null : user.bio, + bot: user.bot, } }); }); diff --git a/src/routes/users/@me/profile.ts b/src/routes/users/@me/profile.ts index 353607d4..366eb535 100644 --- a/src/routes/users/@me/profile.ts +++ b/src/routes/users/@me/profile.ts @@ -17,6 +17,7 @@ router.get("/", async (req: Request, res: Response) => { public_flags: user.public_flags, avatar: user.avatar, bio: user.bio, + bot: user.bot, } }); }); -- cgit 1.5.1 From 974a6ccbd58b16ed054c5c349c3655c9ace06c10 Mon Sep 17 00:00:00 2001 From: BuildTools <59115290+BanTheNons@users.noreply.github.com> Date: Fri, 6 Aug 2021 15:25:42 +0300 Subject: Added accent_color --- src/routes/users/#id/profile.ts | 1 + src/routes/users/@me/profile.ts | 1 + 2 files changed, 2 insertions(+) (limited to 'src') diff --git a/src/routes/users/#id/profile.ts b/src/routes/users/#id/profile.ts index 516606f3..b86b0b90 100644 --- a/src/routes/users/#id/profile.ts +++ b/src/routes/users/#id/profile.ts @@ -16,6 +16,7 @@ router.get("/", async (req: Request, res: Response) => { id: user.id, public_flags: user.public_flags, avatar: user.avatar, + accent_color: user.accent_color, bio: req.user_bot ? null : user.bio, bot: user.bot, } diff --git a/src/routes/users/@me/profile.ts b/src/routes/users/@me/profile.ts index 366eb535..0d295d05 100644 --- a/src/routes/users/@me/profile.ts +++ b/src/routes/users/@me/profile.ts @@ -16,6 +16,7 @@ router.get("/", async (req: Request, res: Response) => { id: user.id, public_flags: user.public_flags, avatar: user.avatar, + accent_color: user.accent_color, bio: user.bio, bot: user.bot, } -- cgit 1.5.1 From 8833c6b400c51fec403bf4afc4cf65e725fc45d1 Mon Sep 17 00:00:00 2001 From: BuildTools <59115290+BanTheNons@users.noreply.github.com> Date: Fri, 6 Aug 2021 15:42:59 +0300 Subject: bug fix --- src/routes/auth/register.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/routes/auth/register.ts b/src/routes/auth/register.ts index 41798552..279103bc 100644 --- a/src/routes/auth/register.ts +++ b/src/routes/auth/register.ts @@ -196,6 +196,7 @@ router.post( username: adjusted_username, discriminator, avatar: null, + accent_color: null, bot: false, system: false, desktop: false, -- cgit 1.5.1 From 34db2d65ee962f295f452ff6b04b8a65a60bacbf Mon Sep 17 00:00:00 2001 From: BuildTools <59115290+BanTheNons@users.noreply.github.com> Date: Sat, 7 Aug 2021 11:02:13 +0300 Subject: added accent_color to UserModifySchema --- src/schema/User.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/schema/User.ts b/src/schema/User.ts index d5a7b909..ae213ee3 100644 --- a/src/schema/User.ts +++ b/src/schema/User.ts @@ -3,11 +3,13 @@ import { Length } from "../util/instanceOf"; export const UserModifySchema = { $username: new Length(String, 2, 32), $avatar: String, - $bio: new Length(String, 0, 190) + $bio: new Length(String, 0, 190), + $accent_color: Number }; export interface UserModifySchema { username?: string; avatar?: string | null; bio?: string; + accent_color?: number | null; } -- cgit 1.5.1