From 84a69a8a6884ebd4975167f993d8d2614d038ee5 Mon Sep 17 00:00:00 2001 From: Puyodead1 Date: Fri, 19 May 2023 15:14:40 -0400 Subject: rename pomeloEnabled to uniqueUsernames --- src/api/routes/channels/#channel_id/messages/index.ts | 4 ++-- src/api/routes/users/@me/index.ts | 4 ++-- src/api/routes/users/@me/relationships.ts | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/api') diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts index 1fe6d0ee..6741790c 100644 --- a/src/api/routes/channels/#channel_id/messages/index.ts +++ b/src/api/routes/channels/#channel_id/messages/index.ts @@ -171,11 +171,11 @@ router.get( if ((y.user_ids || []).includes(req.user_id)) y.me = true; delete y.user_ids; }); - const { pomeloEnabled } = Config.get().general; + const { uniqueUsernames } = Config.get().general; if (!x.author) x.author = User.create({ id: "4", - discriminator: pomeloEnabled ? "0" : "0000", + discriminator: uniqueUsernames ? "0" : "0000", username: "spacebarghost", global_name: "Spacebar Ghost", public_flags: 0, diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts index 1d209542..fc44e17e 100644 --- a/src/api/routes/users/@me/index.ts +++ b/src/api/routes/users/@me/index.ts @@ -140,7 +140,7 @@ router.patch( newToken = (await generateToken(user.id)) as string; } - // TODO: pomelo: disallow if pomelo is enabled + // TODO: uniqueUsernames: disallow if uniqueUsernames is enabled if (body.username) { const check_username = body?.username?.replace(/\s/g, ""); if (!check_username) { @@ -163,7 +163,7 @@ router.patch( } } - // TODO: pomelo: disallow if pomelo is enabled + // TODO: uniqueUsernames: disallow if uniqueUsernames is enabled if (body.discriminator) { if ( await User.findOne({ diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts index 08342602..5fc55e58 100644 --- a/src/api/routes/users/@me/relationships.ts +++ b/src/api/routes/users/@me/relationships.ts @@ -114,10 +114,10 @@ router.post( }, }), async (req: Request, res: Response) => { - const { pomeloEnabled } = Config.get().general; - const where = pomeloEnabled + const { uniqueUsernames } = Config.get().general; + const where = uniqueUsernames ? { - // TODO: pomelo: should we use username or add global_name property to the request? + // TODO: uniqueUsernames: should we use username or add global_name property to the request? global_name: req.body.username, } : { -- cgit 1.5.1