From 01eb91a63e73b3a5501d1570d761502939728ef6 Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Mon, 22 Feb 2021 22:15:12 +0100 Subject: :bug: fix addMember to respect max guild size --- src/util/Member.ts | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'src/util/Member.ts') diff --git a/src/util/Member.ts b/src/util/Member.ts index 3ef2b903..f3097828 100644 --- a/src/util/Member.ts +++ b/src/util/Member.ts @@ -9,11 +9,33 @@ import { UserModel, } from "fosscord-server-util"; import { HTTPError } from "lambert-server"; +import Config from "./Config"; import { emitEvent } from "./Event"; import { getPublicUser } from "./User"; +export const PublicMemberProjection = { + id: true, + guild_id: true, + nick: true, + roles: true, + joined_at: true, + pending: true, + deaf: true, + mute: true, + premium_since: true, +}; + export async function addMember(user_id: bigint, guild_id: bigint, cache?: { guild?: Guild }) { - const user = await getPublicUser(user_id); + const user = await getPublicUser(user_id, { guilds: true }); + + const guildSize = user.guilds.length; + // @ts-ignore + user.guilds = undefined; + + const { maxGuilds } = Config.get().limits.user; + if (guildSize >= maxGuilds) { + throw new HTTPError(` You are at the ${maxGuilds} server limit.`, 403); + } const guild = cache?.guild || (await GuildModel.findOne({ id: guild_id }).exec()); const member = { -- cgit 1.5.1