From 5c11bf1b87fdd150ba4caf3f6276c01014558b71 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Tue, 23 Feb 2021 22:02:50 +0100
Subject: :bug: [Member] list fix to also return user

---
 src/util/Member.ts |  2 +-
 src/util/User.ts   | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/util')

diff --git a/src/util/Member.ts b/src/util/Member.ts
index f3097828..2df34073 100644
--- a/src/util/Member.ts
+++ b/src/util/Member.ts
@@ -34,7 +34,7 @@ export async function addMember(user_id: bigint, guild_id: bigint, cache?: { gui
 
 	const { maxGuilds } = Config.get().limits.user;
 	if (guildSize >= maxGuilds) {
-		throw new HTTPError(` You are at the ${maxGuilds}  server limit.`, 403);
+		throw new HTTPError(`You are at the ${maxGuilds} server limit.`, 403);
 	}
 
 	const guild = cache?.guild || (await GuildModel.findOne({ id: guild_id }).exec());
diff --git a/src/util/User.ts b/src/util/User.ts
index 778730e2..1b13e153 100644
--- a/src/util/User.ts
+++ b/src/util/User.ts
@@ -1,15 +1,19 @@
 import { UserModel } from "fosscord-server-util";
 import { HTTPError } from "lambert-server";
 
+export const PublicUserProjection = {
+	username: true,
+	discriminator: true,
+	id: true,
+	public_flags: true,
+	avatar: true,
+};
+
 export async function getPublicUser(user_id: bigint, additional_fields?: any) {
 	const user = await UserModel.findOne(
 		{ id: user_id },
 		{
-			username: true,
-			discriminator: true,
-			id: true,
-			public_flags: true,
-			avatar: true,
+			...PublicUserProjection,
 			...additional_fields,
 		}
 	).exec();
-- 
cgit 1.5.1