diff --git a/api/src/routes/users/#id/index.ts b/api/src/routes/users/#id/index.ts
index a2ad3ae6..3841756b 100644
--- a/api/src/routes/users/#id/index.ts
+++ b/api/src/routes/users/#id/index.ts
@@ -1,13 +1,12 @@
import { Router, Request, Response } from "express";
-import { getPublicUser } from "../../../util/User";
-import { HTTPError } from "lambert-server";
+import { User } from "../../../../../util/dist";
const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
const { id } = req.params;
- res.json(await getPublicUser(id));
+ res.json(await User.getPublicUser(id));
});
export default router;
diff --git a/api/src/routes/users/#id/profile.ts b/api/src/routes/users/#id/profile.ts
index 4b4b9439..afccfed5 100644
--- a/api/src/routes/users/#id/profile.ts
+++ b/api/src/routes/users/#id/profile.ts
@@ -1,27 +1,27 @@
import { Router, Request, Response } from "express";
-import { getPublicUser } from "../../../util/User";
+import { User } from "../../../../../util/dist";
const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
- const user = await getPublicUser(req.params.id, { user_data: true })
+ const user = await User.getPublicUser(req.params.id, { relations: ["connected_accounts"] });
- 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,
- accent_color: user.accent_color,
- banner: user.banner,
- bio: req.user_bot ? null : user.bio,
- bot: user.bot,
- }
- });
+ res.json({
+ connected_accounts: user.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,
+ accent_color: user.accent_color,
+ banner: user.banner,
+ bio: req.user_bot ? null : user.bio,
+ bot: user.bot
+ }
+ });
});
export default router;
|
