diff --git a/package-lock.json b/package-lock.json index e8d36370..22484238 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/src/routes/api/v8/guilds/#id/bans.ts b/src/routes/api/v8/guilds/#id/bans.ts index d9494b14..e18a1137 100644 --- a/src/routes/api/v8/guilds/#id/bans.ts +++ b/src/routes/api/v8/guilds/#id/bans.ts @@ -80,3 +80,5 @@ router.delete("/:userid", async (req: Request, res: Response) => { return res.status(204).send(); }); + +export default router; diff --git a/src/util/Config.ts b/src/util/Config.ts index 200ec1b2..cfdb0d1e 100644 --- a/src/util/Config.ts +++ b/src/util/Config.ts @@ -6,7 +6,7 @@ export default { init() { return Config.init({ api: DefaultOptions }); }, - get() { + get(): DefaultOptions { return Config.getAll().api; }, set(val: any) { 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 = {