Avoid re-fetching user if not requesting extra fields

3 files changed, 3 insertions, 5 deletions

diff --git a/src/api/routes/users/@me/mentions.ts b/src/api/routes/users/@me/mentions.ts

index 2d631e90..c2985ca4 100644
--- a/src/api/routes/users/@me/mentions.ts
+++ b/src/api/routes/users/@me/mentions.ts
@@ -43,9 +43,7 @@ router.get(
         const before = req.query.before !== undefined ? String(req.query.before as string) : undefined;
         const guild_id = req.query.guild_id !== undefined ? req.query.guild_id : undefined;
 
-        const user = await User.findOneOrFail({
-            where: { id: req.user_id },
-        });
+        const user = req.user;
 
         const memberships = await Member.find({
             where: { id: req.user_id, ...(guild_id === undefined ? {} : { guild_id: String(guild_id) }) },
diff --git a/src/api/routes/users/@me/mfa/codes-verification.ts b/src/api/routes/users/@me/mfa/codes-verification.ts

index 4cc4c072..94213037 100644
--- a/src/api/routes/users/@me/mfa/codes-verification.ts
+++ b/src/api/routes/users/@me/mfa/codes-verification.ts
@@ -46,7 +46,7 @@ router.post(
         // TODO: We don't have email/etc etc, so can't send a verification code.
         // Once that's done, this route can verify `key`
 
-        // const user = await User.findOneOrFail({ where: { id: req.user_id } });
+        // const user = req.user;
         if ((await User.count({ where: { id: req.user_id } })) === 0) throw DiscordApiErrors.UNKNOWN_USER;
 
         let codes: BackupCode[];
diff --git a/src/api/routes/users/@me/notes.ts b/src/api/routes/users/@me/notes.ts

index 8cd33304..f25aca79 100644
--- a/src/api/routes/users/@me/notes.ts
+++ b/src/api/routes/users/@me/notes.ts
@@ -65,7 +65,7 @@ router.put(
     }),
     async (req: Request, res: Response) => {
         const { user_id } = req.params;
-        const owner = await User.findOneOrFail({ where: { id: req.user_id } });
+        const owner = req.user;
         const target = await User.findOneOrFail({ where: { id: user_id } }); //if noted user does not exist throw
         const { note } = req.body;