diff --git a/api/src/routes/guilds/#guild_id/vanity-url.ts b/api/src/routes/guilds/#guild_id/vanity-url.ts
index 86adfeb0..1e659d8d 100644
--- a/api/src/routes/guilds/#guild_id/vanity-url.ts
+++ b/api/src/routes/guilds/#guild_id/vanity-url.ts
@@ -1,4 +1,4 @@
-import { getPermission, GuildModel, InviteModel, trimSpecial } from "@fosscord/util";
+import { ChannelModel, ChannelType, getPermission, GuildModel, InviteModel, trimSpecial } from "@fosscord/util";
import { Router, Request, Response } from "express";
import { HTTPError } from "lambert-server";
import { check, Length } from "../../../util/instanceOf";
@@ -11,11 +11,14 @@ const InviteRegex = /\W/g;
router.get("/", async (req: Request, res: Response) => {
const { guild_id } = req.params;
- await isMember(req.user_id, guild_id);
+ const permission = await getPermission(req.user_id, guild_id);
+ permission.hasThrow("MANAGE_GUILD");
+
const guild = await GuildModel.findOne({ id: guild_id }).exec();
- if (!guild.vanity_url) throw new HTTPError("This guild has no vanity url", 204);
+ if (!guild.vanity_url_code) return res.json({ code: null });
+ const { uses } = await InviteModel.findOne({ code: guild.vanity_url_code }).exec();
- return res.json({ code: guild.vanity_url.code });
+ return res.json({ code: guild.vanity_url_code, uses });
});
// TODO: check if guild is elgible for vanity url
@@ -24,11 +27,12 @@ router.patch("/", check({ code: new Length(String, 0, 20) }), async (req: Reques
var code = req.body.code.replace(InviteRegex);
if (!code) code = null;
- const permission = await getPermission(req.user_id, guild_id);
+ const guild = await GuildModel.findOne({ id: guild_id }).exec();
+ const permission = await getPermission(req.user_id, guild_id, undefined, { guild });
permission.hasThrow("MANAGE_GUILD");
const alreadyExists = await Promise.all([
- GuildModel.findOne({ "vanity_url.code": code })
+ GuildModel.findOne({ vanity_url_code: code })
.exec()
.catch(() => null),
InviteModel.findOne({ code: code })
@@ -37,7 +41,19 @@ router.patch("/", check({ code: new Length(String, 0, 20) }), async (req: Reques
]);
if (alreadyExists.some((x) => x)) throw new HTTPError("Vanity url already exists", 400);
- await GuildModel.updateOne({ id: guild_id }, { "vanity_url.code": code }).exec();
+ await GuildModel.updateOne({ id: guild_id }, { vanity_url_code: code }).exec();
+ const { id } = await ChannelModel.findOne({ guild_id, type: ChannelType.GUILD_TEXT }).exec();
+ await InviteModel.updateOne(
+ { code: guild.vanity_url_code },
+ {
+ code: code,
+ uses: 0,
+ created_at: new Date(),
+ guild_id,
+ channel_id: id
+ },
+ { upsert: true }
+ ).exec();
return res.json({ code: code });
});
diff --git a/api/src/routes/guilds/index.ts b/api/src/routes/guilds/index.ts
index e0cb3325..92feed4e 100644
--- a/api/src/routes/guilds/index.ts
+++ b/api/src/routes/guilds/index.ts
@@ -53,7 +53,7 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
system_channel_flags: 0,
system_channel_id: undefined,
unavailable: false,
- vanity_url: undefined,
+ vanity_url_code: undefined,
verification_level: 0,
welcome_screen: {
enabled: false,
|
