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: [PATCH 1/6] 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 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; 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: [PATCH 2/6] Added the bot param --- src/routes/users/#id/profile.ts | 1 + src/routes/users/@me/profile.ts | 1 + 2 files changed, 2 insertions(+) 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, } }); }); 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: [PATCH 3/6] Added accent_color --- src/routes/users/#id/profile.ts | 1 + src/routes/users/@me/profile.ts | 1 + 2 files changed, 2 insertions(+) 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, } 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: [PATCH 4/6] bug fix --- src/routes/auth/register.ts | 1 + 1 file changed, 1 insertion(+) 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, 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: [PATCH 5/6] added accent_color to UserModifySchema --- src/schema/User.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } From c84b1e876334996aafe03a51305ecb8799c7129e Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 7 Aug 2021 10:28:24 +0200 Subject: [PATCH 6/6] npm i @fosscord/server-util@1.3.36 --- package-lock.json | Bin 670953 -> 674205 bytes package.json | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index dbf98809f74b25efedb671fb1fa07ccd37ede307..60d219e70f2e9dacc55f0fc667cd4a07e89b35bd 100644 GIT binary patch delta 2078 zcmdT_OKcle6xH}|l;$IvgpgKAOsWvM_IMnRKasNVXKW|&Z#*A=+D44WpNwOV?Tq8G z4G~2`WWl1TEcK;`RLQD4XcVDYumF_}yQE0Kj=%<}#0E$g6^k$=sA{NC7bvQDi>s%5 z_4LlYI_KPnk6+*HOs@Y9*>4{He2(E8j9{1^H7r=o&fN!4^9o?5A-L1LHVJm7p;0Oq z6iKRyWMMDkSP4*5m6ki|4`Rsx+X}cMeouWd5m>~16*`Mg3C(&uy;H|G973e`B7;No9s)?uTypWTd$>vVK zlCvgT=hyqMQN<|1=d86%3p2vY&HzGF#sKWJhCG7RFW5qEf#gC&FzStl(|E}molo02 zCuf^&1#@LGXM|g`$!MKq<9N6oV+*atioaBgErD7Z8tpD~WsW^TDgOs<9;uwS4A8*Z z)qP01y04hLtAA2I?gGT_D^#7>Av|*WrHub{0_=UFxI~M|T9F`)M5ykFTP&^?;VqOB z9F;#*tanC(=!Vwnf-fu-FbSRf=e+h^Ivo z4`FVA&q3pz?-^}p?+2t~IY7WsTd4*gH@NE;{e4!iz;0 z<_pbLrXr%Ph2TpmEDIA~|EN9GUe6 z7yBc0?a_uxdbFWFnmR3Z`b@-*1Kg|~2E9WXt*rTb z5LkGi?vl3l)Hl9;@$x^0_E|+U@mvqMc11rVneJ+K`TvCnxL?*>_@@WlGizU6JLuO+ z2mLyN`%n6p?er}4KQm(h?(4b%@DZ)iOSeU(3Idk5b?0s=6g}XBO?4kw=ae?^ov7>r z-1~|y>5J<+^x|_(A$2yUAfuIj+0^xX(-w+1{1dzYy)pm* delta 391 zcmbO`S@Y#jjR~I_O(%YNvH1&QZuInxvseu#PmI-=Y^bgfS{hMiWD${-o041LTbAwY zUKZh4Z$2Y=0WUXi?if?K0!`X_uMQmrqZq zW#*nfuZEdz`6^9j3zF3oW8J(O=kK8el|9s+cz*ykG{dmvwiM0*8c0;YuB@F%wtTMZs^J) zK7HL~#@X$P3hdhz6*%T+Y~S6`D&iYt!TBvao^tz%|`qGb88r6AheKPXGWE Cxs}ua diff --git a/package.json b/package.json index 524a5477..52d413a4 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "homepage": "https://github.com/fosscord/fosscord-api#readme", "dependencies": { - "@fosscord/server-util": "^1.3.35", + "@fosscord/server-util": "^1.3.36", "@types/jest": "^26.0.22", "@types/json-schema": "^7.0.7", "ajv": "^8.4.0", @@ -41,8 +41,8 @@ "assert": "^1.5.0", "atomically": "^1.7.0", "bcrypt": "^5.0.1", - "canvas": "^2.8.0", "body-parser": "^1.19.0", + "canvas": "^2.8.0", "cheerio": "^1.0.0-rc.9", "dot-prop": "^6.0.1", "dotenv": "^8.2.0",