summary refs log tree commit diff
path: root/api/src
diff options
context:
space:
mode:
authorFeatyre <88265031+Featyre@users.noreply.github.com>2022-01-23 15:57:00 +0000
committerGitHub <noreply@github.com>2022-01-23 15:57:00 +0000
commitf6774cb3ec219aeb8b07f101d94cefcd091f400a (patch)
treed1cad35337e6dd04169adf01a746c3924a9e449c /api/src
parentPartial integration of categories and discovery (diff)
parentClosed-join guilds (diff)
downloadserver-f6774cb3ec219aeb8b07f101d94cefcd091f400a.tar.xz
Merge branch 'fosscord:master' into master
Diffstat (limited to 'api/src')
-rw-r--r--api/src/routes/invites/index.ts3
1 files changed, 2 insertions, 1 deletions
diff --git a/api/src/routes/invites/index.ts b/api/src/routes/invites/index.ts
index ac813126..37e9e05a 100644
--- a/api/src/routes/invites/index.ts
+++ b/api/src/routes/invites/index.ts
@@ -19,7 +19,8 @@ router.post("/:code", route({}), async (req: Request, res: Response) => {
 	const { features } = await Guild.findOneOrFail({ id: guild_id});
 	const { public_flags } = await User.findOneOrFail({ id: req.user_id });
 	
-	if(features.includes("INTERNAL_EMPLOYEE_ONLY") && (public_flags & 1) !== 1) throw new HTTPError("The Maze isn't meant for you.", 401)
+	if(features.includes("INTERNAL_EMPLOYEE_ONLY") && (public_flags & 1) !== 1) throw new HTTPError("Only intended for the staff of this server.", 401);
+	if(features.includes("INVITES_CLOSED")) throw new HTTPError("Sorry, this guild has joins closed.", 403);
 	
 	const invite = await Invite.joinGuild(req.user_id, code);