diff --git a/api/src/routes/guilds/#guild_id/bans.ts b/api/src/routes/guilds/#guild_id/bans.ts
index bb3eac03..cbc0b0fa 100644
--- a/api/src/routes/guilds/#guild_id/bans.ts
+++ b/api/src/routes/guilds/#guild_id/bans.ts
@@ -1,5 +1,5 @@
import { Request, Response, Router } from "express";
-import { BanModel, emitEvent, getPermission, GuildBanAddEvent, GuildBanRemoveEvent, GuildModel, toObject } from "@fosscord/util";
+import { BanModel, emitEvent, getPermission, GuildBanAddEvent, GuildBanRemoveEvent, Guild, toObject } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { getIpAdress } from "../../../util/ipAddress";
import { BanCreateSchema } from "../../../schema/Ban";
@@ -13,18 +13,18 @@ const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
const { guild_id } = req.params;
- const guild = await GuildModel.exists({ id: guild_id });
+ const guild = await Guild.exists({ id: guild_id });
if (!guild) throw new HTTPError("Guild not found", 404);
- var bans = await BanModel.find({ guild_id: guild_id }, { user_id: true, reason: true }).exec();
- return res.json(toObject(bans));
+ var bans = await Ban.find({ guild_id: guild_id }, { user_id: true, reason: true });
+ return res.json(bans);
});
router.get("/:user", async (req: Request, res: Response) => {
const { guild_id } = req.params;
const user_id = req.params.ban;
- var ban = await BanModel.findOne({ guild_id: guild_id, user_id: user_id }).exec();
+ var ban = await Ban.findOneOrFail({ guild_id: guild_id, user_id: user_id });
return res.json(ban);
});
@@ -56,7 +56,7 @@ router.put("/:user_id", check(BanCreateSchema), async (req: Request, res: Respon
guild_id: guild_id
} as GuildBanAddEvent);
- return res.json(toObject(ban));
+ return res.json(ban);
});
router.delete("/:user_id", async (req: Request, res: Response) => {
@@ -64,16 +64,16 @@ router.delete("/:user_id", async (req: Request, res: Response) => {
var banned_user_id = req.params.user_id;
const banned_user = await getPublicUser(banned_user_id);
- const guild = await GuildModel.exists({ id: guild_id });
+ const guild = await Guild.exists({ id: guild_id });
if (!guild) throw new HTTPError("Guild not found", 404);
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("BAN_MEMBERS");
- await BanModel.deleteOne({
+ await Ban.deleteOne({
user_id: banned_user_id,
guild_id
- }).exec();
+ });
await emitEvent({
event: "GUILD_BAN_REMOVE",
diff --git a/api/src/routes/guilds/#guild_id/channels.ts b/api/src/routes/guilds/#guild_id/channels.ts
index 1c55ef24..b53c9a5a 100644
--- a/api/src/routes/guilds/#guild_id/channels.ts
+++ b/api/src/routes/guilds/#guild_id/channels.ts
@@ -1,5 +1,5 @@
import { Router, Response, Request } from "express";
-import { ChannelModel, toObject, ChannelUpdateEvent, getPermission, emitEvent } from "@fosscord/util";
+import { Channel, toObject, ChannelUpdateEvent, getPermission, emitEvent } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { ChannelModifySchema } from "../../../schema/Channel";
@@ -9,9 +9,9 @@ const router = Router();
router.get("/", async (req: Request, res: Response) => {
const { guild_id } = req.params;
- const channels = await ChannelModel.find({ guild_id }).exec();
+ const channels = await Channel.find({ guild_id });
- res.json(toObject(channels));
+ res.json(channels);
});
// TODO: check if channel type is permitted
@@ -24,7 +24,7 @@ router.post("/", check(ChannelModifySchema), async (req: Request, res: Response)
const channel = await createChannel({ ...body, guild_id }, req.user_id);
- res.status(201).json(toObject(channel));
+ res.status(201).json(channel);
});
// TODO: check if parent_id exists
@@ -48,18 +48,15 @@ router.patch(
if (x.parent_id) {
opts.parent_id = x.parent_id;
- const parent_channel = await ChannelModel.findOne(
- { id: x.parent_id, guild_id },
- { permission_overwrites: true }
- ).exec();
+ const parent_channel = await Channel.findOneOrFail({ id: x.parent_id, guild_id }, { permission_overwrites: true });
if (x.lock_permissions) {
opts.permission_overwrites = parent_channel.permission_overwrites;
}
}
- const channel = await ChannelModel.findOneAndUpdate({ id: x.id, guild_id }, opts, { new: true }).exec();
+ const channel = await Channel.findOneOrFailAndUpdate({ id: x.id, guild_id }, opts, { new: true });
- await emitEvent({ event: "CHANNEL_UPDATE", data: toObject(channel), channel_id: x.id, guild_id } as ChannelUpdateEvent);
+ await emitEvent({ event: "CHANNEL_UPDATE", data: channel), channel_id: x.id, guild_id } as ChannelUpdateEvent;
})
]);
diff --git a/api/src/routes/guilds/#guild_id/delete.ts b/api/src/routes/guilds/#guild_id/delete.ts
index ba1c2fde..a53271ce 100644
--- a/api/src/routes/guilds/#guild_id/delete.ts
+++ b/api/src/routes/guilds/#guild_id/delete.ts
@@ -1,15 +1,4 @@
-import {
- ChannelModel,
- emitEvent,
- EmojiModel,
- GuildDeleteEvent,
- GuildModel,
- InviteModel,
- MemberModel,
- MessageModel,
- RoleModel,
- UserModel
-} from "@fosscord/util";
+import { Channel, emitEvent, EmojiModel, GuildDeleteEvent, Guild, InviteModel, Member, Message, Role, User } from "@fosscord/util";
import { Router, Request, Response } from "express";
import { HTTPError } from "lambert-server";
@@ -20,7 +9,7 @@ const router = Router();
router.post("/", async (req: Request, res: Response) => {
var { guild_id } = req.params;
- const guild = await GuildModel.findOne({ id: guild_id }, "owner_id").exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id }, "owner_id");
if (guild.owner_id !== req.user_id) throw new HTTPError("You are not the owner of this guild", 401);
await emitEvent({
@@ -32,14 +21,14 @@ router.post("/", async (req: Request, res: Response) => {
} as GuildDeleteEvent);
await Promise.all([
- GuildModel.deleteOne({ id: guild_id }).exec(),
- UserModel.updateMany({ guilds: guild_id }, { $pull: { guilds: guild_id } }).exec(),
- RoleModel.deleteMany({ guild_id }).exec(),
- ChannelModel.deleteMany({ guild_id }).exec(),
- EmojiModel.deleteMany({ guild_id }).exec(),
- InviteModel.deleteMany({ guild_id }).exec(),
- MessageModel.deleteMany({ guild_id }).exec(),
- MemberModel.deleteMany({ guild_id }).exec()
+ Guild.deleteOne({ id: guild_id }),
+ User.updateMany({ guilds: guild_id }, { $pull: { guilds: guild_id } }),
+ Role.deleteMany({ guild_id }),
+ Channel.deleteMany({ guild_id }),
+ Emoji.deleteMany({ guild_id }),
+ Invite.deleteMany({ guild_id }),
+ Message.deleteMany({ guild_id }),
+ Member.deleteMany({ guild_id })
]);
return res.sendStatus(204);
diff --git a/api/src/routes/guilds/#guild_id/index.ts b/api/src/routes/guilds/#guild_id/index.ts
index 87103caa..af9ea9d6 100644
--- a/api/src/routes/guilds/#guild_id/index.ts
+++ b/api/src/routes/guilds/#guild_id/index.ts
@@ -1,18 +1,18 @@
import { Request, Response, Router } from "express";
import {
- ChannelModel,
+ Channel,
emitEvent,
EmojiModel,
getPermission,
GuildDeleteEvent,
- GuildModel,
+ Guild,
GuildUpdateEvent,
InviteModel,
- MemberModel,
- MessageModel,
- RoleModel,
+ Member,
+ Message,
+ Role,
toObject,
- UserModel
+ User
} from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { GuildUpdateSchema } from "../../../schema/Guild";
@@ -26,11 +26,8 @@ const router = Router();
router.get("/", async (req: Request, res: Response) => {
const { guild_id } = req.params;
- const guild = await GuildModel.findOne({ id: guild_id })
- .populate({ path: "joined_at", match: { id: req.user_id } })
- .exec();
-
- const member = await MemberModel.exists({ guild_id: guild_id, id: req.user_id });
+ const guild = await Guild.findOneOrFail({ id: guild_id }).populate({ path: "joined_at", match: { id: req.user_id } });
+ const member = await Member.exists({ guild_id: guild_id, id: req.user_id });
if (!member) throw new HTTPError("You are not a member of the guild you are trying to access", 401);
return res.json(guild);
@@ -48,11 +45,11 @@ router.patch("/", check(GuildUpdateSchema), async (req: Request, res: Response)
if (body.banner) body.banner = await handleFile(`/banners/${guild_id}`, body.banner);
if (body.splash) body.splash = await handleFile(`/splashes/${guild_id}`, body.splash);
- const guild = await GuildModel.findOneAndUpdate({ id: guild_id }, body, { new: true })
- .populate({ path: "joined_at", match: { id: req.user_id } })
- .exec();
-
- const data = toObject(guild);
+ const guild = await Guild.findOneOrFailAndUpdate({ id: guild_id }, body, { new: true }).populate({
+ path: "joined_at",
+ match: { id: req.user_id }
+ });
+ const data = guild;
emitEvent({ event: "GUILD_UPDATE", data: data, guild_id } as GuildUpdateEvent);
diff --git a/api/src/routes/guilds/#guild_id/invites.ts b/api/src/routes/guilds/#guild_id/invites.ts
index 08048d61..ca72cce8 100644
--- a/api/src/routes/guilds/#guild_id/invites.ts
+++ b/api/src/routes/guilds/#guild_id/invites.ts
@@ -9,9 +9,9 @@ router.get("/", async (req: Request, res: Response) => {
const permissions = await getPermission(req.user_id, guild_id);
permissions.hasThrow("MANAGE_GUILD");
- const invites = await InviteModel.find({ guild_id }).exec();
+ const invites = await Invite.find({ guild_id });
- return res.json(toObject(invites));
+ return res.json(invites);
});
export default router;
diff --git a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
index 515434d6..1dacbdad 100644
--- a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
+++ b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
@@ -1,13 +1,13 @@
import { Request, Response, Router } from "express";
import {
- GuildModel,
- MemberModel,
- UserModel,
+ Guild,
+ Member,
+ User,
toObject,
GuildMemberAddEvent,
getPermission,
PermissionResolvable,
- RoleModel,
+ Role,
GuildMemberUpdateEvent,
emitEvent
} from "@fosscord/util";
@@ -22,29 +22,29 @@ router.get("/", async (req: Request, res: Response) => {
const { guild_id, member_id } = req.params;
await isMember(req.user_id, guild_id);
- const member = await MemberModel.findOne({ id: member_id, guild_id }).exec();
+ const member = await Member.findOneOrFail({ id: member_id, guild_id });
- return res.json(toObject(member));
+ return res.json(member);
});
router.patch("/", check(MemberChangeSchema), async (req: Request, res: Response) => {
const { guild_id, member_id } = req.params;
const body = req.body as MemberChangeSchema;
if (body.roles) {
- const roles = await RoleModel.find({ id: { $in: body.roles } }).exec();
+ const roles = await Role.find({ id: { $in: body.roles } });
if (body.roles.length !== roles.length) throw new HTTPError("Roles not found", 404);
// TODO: check if user has permission to add role
}
- const member = await MemberModel.findOneAndUpdate({ id: member_id, guild_id }, body, { new: true }).exec();
+ const member = await Member.findOneOrFailAndUpdate({ id: member_id, guild_id }, body, { new: true });
await emitEvent({
event: "GUILD_MEMBER_UPDATE",
guild_id,
- data: toObject(member)
+ data: member
} as GuildMemberUpdateEvent);
- res.json(toObject(member));
+ res.json(member);
});
router.put("/", async (req: Request, res: Response) => {
diff --git a/api/src/routes/guilds/#guild_id/members/index.ts b/api/src/routes/guilds/#guild_id/members/index.ts
index 70303436..656d3acd 100644
--- a/api/src/routes/guilds/#guild_id/members/index.ts
+++ b/api/src/routes/guilds/#guild_id/members/index.ts
@@ -1,5 +1,5 @@
import { Request, Response, Router } from "express";
-import { GuildModel, MemberModel, toObject } from "@fosscord/util";
+import { Guild, Member, toObject } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { instanceOf, Length } from "../../../../util/instanceOf";
import { PublicMemberProjection, isMember } from "../../../../util/Member";
@@ -10,7 +10,7 @@ const router = Router();
// TODO: send over websocket
router.get("/", async (req: Request, res: Response) => {
const { guild_id } = req.params;
- const guild = await GuildModel.findOne({ id: guild_id }).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id });
await isMember(req.user_id, guild_id);
try {
@@ -28,11 +28,8 @@ router.get("/", async (req: Request, res: Response) => {
const { limit, after } = (<unknown>req.query) as { limit: number; after: string };
const query = after ? { id: { $gt: after } } : {};
- var members = await MemberModel.find({ guild_id, ...query }, PublicMemberProjection)
- .limit(limit)
- .exec();
-
- return res.json(toObject(members));
+ var members = await Member.find({ guild_id, ...query }, PublicMemberProjection).limit(limit);
+ return res.json(members);
});
export default router;
diff --git a/api/src/routes/guilds/#guild_id/roles.ts b/api/src/routes/guilds/#guild_id/roles.ts
index f095c885..5ebc0580 100644
--- a/api/src/routes/guilds/#guild_id/roles.ts
+++ b/api/src/routes/guilds/#guild_id/roles.ts
@@ -1,12 +1,12 @@
import { Request, Response, Router } from "express";
import {
- RoleModel,
- GuildModel,
+ Role,
+ Guild,
getPermission,
toObject,
- UserModel,
+ User,
Snowflake,
- MemberModel,
+ Member,
GuildRoleCreateEvent,
GuildRoleUpdateEvent,
GuildRoleDeleteEvent,
@@ -26,23 +26,23 @@ router.get("/", async (req: Request, res: Response) => {
await isMember(req.user_id, guild_id);
- const roles = await RoleModel.find({ guild_id: guild_id }).exec();
+ const roles = await Role.find({ guild_id: guild_id });
- return res.json(toObject(roles));
+ return res.json(roles);
});
router.post("/", check(RoleModifySchema), async (req: Request, res: Response) => {
const guild_id = req.params.guild_id;
const body = req.body as RoleModifySchema;
- const guild = await GuildModel.findOne({ id: guild_id }, { id: true }).exec();
- const user = await UserModel.findOne({ id: req.user_id }).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id }, { id: true });
+ const user = await User.findOneOrFail({ id: req.user_id });
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("MANAGE_ROLES");
if (!body.name) throw new HTTPError("You need to specify a name");
- const role = await new RoleModel({
+ const role = await new Role({
...body,
id: Snowflake.generate(),
guild_id: guild_id,
@@ -57,11 +57,11 @@ router.post("/", check(RoleModifySchema), async (req: Request, res: Response) =>
guild_id,
data: {
guild_id,
- role: toObject(role)
+ role: role
}
} as GuildRoleCreateEvent);
- res.json(toObject(role));
+ res.json(role);
});
router.delete("/:role_id", async (req: Request, res: Response) => {
@@ -72,10 +72,10 @@ router.delete("/:role_id", async (req: Request, res: Response) => {
const permissions = await getPermission(req.user_id, guild_id);
permissions.hasThrow("MANAGE_ROLES");
- await RoleModel.deleteOne({
+ await Role.deleteOne({
id: role_id,
guild_id: guild_id
- }).exec();
+ });
await emitEvent({
event: "GUILD_ROLE_DELETE",
@@ -96,13 +96,13 @@ router.patch("/:role_id", check(RoleModifySchema), async (req: Request, res: Res
const { role_id } = req.params;
const body = req.body as RoleModifySchema;
- const guild = await GuildModel.findOne({ id: guild_id }, { id: true }).exec();
- const user = await UserModel.findOne({ id: req.user_id }).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id }, { id: true });
+ const user = await User.findOneOrFail({ id: req.user_id });
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("MANAGE_ROLES");
- const role = await RoleModel.findOneAndUpdate(
+ const role = await Role.findOneOrFailAndUpdate(
{
id: role_id,
guild_id: guild_id
@@ -110,7 +110,7 @@ router.patch("/:role_id", check(RoleModifySchema), async (req: Request, res: Res
// @ts-ignore
body,
{ new: true }
- ).exec();
+ );
await emitEvent({
event: "GUILD_ROLE_UPDATE",
@@ -121,7 +121,7 @@ router.patch("/:role_id", check(RoleModifySchema), async (req: Request, res: Res
}
} as GuildRoleUpdateEvent);
- res.json(toObject(role));
+ res.json(role);
});
export default router;
diff --git a/api/src/routes/guilds/#guild_id/templates.ts b/api/src/routes/guilds/#guild_id/templates.ts
index e441ee12..13917dbd 100644
--- a/api/src/routes/guilds/#guild_id/templates.ts
+++ b/api/src/routes/guilds/#guild_id/templates.ts
@@ -1,5 +1,5 @@
import { Request, Response, Router } from "express";
-import { TemplateModel, GuildModel, getPermission, toObject, UserModel, Snowflake } from "@fosscord/util";
+import { TemplateModel, Guild, getPermission, toObject, User, Snowflake } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { TemplateCreateSchema, TemplateModifySchema } from "../../../schema/Template";
import { check } from "../../../util/instanceOf";
@@ -27,20 +27,18 @@ const TemplateGuildProjection = {
router.get("/", async (req: Request, res: Response) => {
const { guild_id } = req.params;
- var templates = await TemplateModel.find({ source_guild_id: guild_id }).exec();
+ var templates = await Template.find({ source_guild_id: guild_id });
- return res.json(toObject(templates));
+ return res.json(templates);
});
router.post("/", check(TemplateCreateSchema), async (req: Request, res: Response) => {
const { guild_id } = req.params;
- const guild = await GuildModel.findOne({ id: guild_id }, TemplateGuildProjection).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id }, TemplateGuildProjection);
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("MANAGE_GUILD");
- const exists = await TemplateModel.findOne({ id: guild_id })
- .exec()
- .catch((e) => {});
+ const exists = await Template.findOneOrFail({ id: guild_id }).catch((e) => {});
if (exists) throw new HTTPError("Template already exists", 400);
const template = await new TemplateModel({
@@ -53,7 +51,7 @@ router.post("/", check(TemplateCreateSchema), async (req: Request, res: Response
serialized_source_guild: guild
}).save();
- res.json(toObject(template)).send();
+ res.json(template)).send(;
});
router.delete("/:code", async (req: Request, res: Response) => {
@@ -63,25 +61,25 @@ router.delete("/:code", async (req: Request, res: Response) => {
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("MANAGE_GUILD");
- const template = await TemplateModel.findOneAndDelete({
+ const template = await Template.findOneOrFailAndDelete({
code
- }).exec();
+ });
- res.send(toObject(template));
+ res.send(template);
});
router.put("/:code", async (req: Request, res: Response) => {
const guild_id = req.params.guild_id;
const { code } = req.params;
- const guild = await GuildModel.findOne({ id: guild_id }, TemplateGuildProjection).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id }, TemplateGuildProjection);
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("MANAGE_GUILD");
- const template = await TemplateModel.findOneAndUpdate({ code }, { serialized_source_guild: guild }, { new: true }).exec();
+ const template = await Template.findOneOrFailAndUpdate({ code }, { serialized_source_guild: guild }, { new: true });
- res.json(toObject(template)).send();
+ res.json(template)).send(;
});
router.patch("/:code", check(TemplateModifySchema), async (req: Request, res: Response) => {
@@ -91,13 +89,9 @@ router.patch("/:code", check(TemplateModifySchema), async (req: Request, res: Re
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("MANAGE_GUILD");
- const template = await TemplateModel.findOneAndUpdate(
- { code },
- { name: req.body.name, description: req.body.description },
- { new: true }
- ).exec();
+ const template = await Template.findOneOrFailAndUpdate({ code }, { name: req.body.name, description: req.body.description }, { new: true });
- res.json(toObject(template)).send();
+ res.json(template)).send(;
});
export default router;
diff --git a/api/src/routes/guilds/#guild_id/vanity-url.ts b/api/src/routes/guilds/#guild_id/vanity-url.ts
index 1e659d8d..335cea27 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 { ChannelModel, ChannelType, getPermission, GuildModel, InviteModel, trimSpecial } from "@fosscord/util";
+import { Channel, ChannelType, getPermission, Guild, InviteModel, trimSpecial } from "@fosscord/util";
import { Router, Request, Response } from "express";
import { HTTPError } from "lambert-server";
import { check, Length } from "../../../util/instanceOf";
@@ -14,9 +14,9 @@ router.get("/", async (req: Request, res: Response) => {
const permission = await getPermission(req.user_id, guild_id);
permission.hasThrow("MANAGE_GUILD");
- const guild = await GuildModel.findOne({ id: guild_id }).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id });
if (!guild.vanity_url_code) return res.json({ code: null });
- const { uses } = await InviteModel.findOne({ code: guild.vanity_url_code }).exec();
+ const { uses } = await Invite.findOneOrFail({ code: guild.vanity_url_code });
return res.json({ code: guild.vanity_url_code, uses });
});
@@ -27,23 +27,19 @@ router.patch("/", check({ code: new Length(String, 0, 20) }), async (req: Reques
var code = req.body.code.replace(InviteRegex);
if (!code) code = null;
- const guild = await GuildModel.findOne({ id: guild_id }).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id });
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 })
- .exec()
- .catch(() => null),
- InviteModel.findOne({ code: code })
- .exec()
- .catch(() => null)
+ Guild.findOneOrFail({ vanity_url_code: code }).catch(() => null),
+ Invite.findOneOrFail({ code: code }).catch(() => null)
]);
if (alreadyExists.some((x) => x)) throw new HTTPError("Vanity url already exists", 400);
- 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(
+ await Guild.update({ id: guild_id }, { vanity_url_code: code });
+ const { id } = await Channel.findOneOrFail({ guild_id, type: ChannelType.GUILD_TEXT });
+ await Invite.update(
{ code: guild.vanity_url_code },
{
code: code,
@@ -53,7 +49,7 @@ router.patch("/", check({ code: new Length(String, 0, 20) }), async (req: Reques
channel_id: id
},
{ upsert: true }
- ).exec();
+ );
return res.json({ code: code });
});
diff --git a/api/src/routes/guilds/#guild_id/welcome_screen.ts b/api/src/routes/guilds/#guild_id/welcome_screen.ts
index c717042e..b457efb6 100644
--- a/api/src/routes/guilds/#guild_id/welcome_screen.ts
+++ b/api/src/routes/guilds/#guild_id/welcome_screen.ts
@@ -1,5 +1,5 @@
import { Request, Response, Router } from "express";
-import { GuildModel, getPermission, toObject, Snowflake } from "@fosscord/util";
+import { Guild, getPermission, toObject, Snowflake } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { check } from "../../../util/instanceOf";
@@ -12,18 +12,18 @@ const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
const guild_id = req.params.guild_id;
- const guild = await GuildModel.findOne({ id: guild_id });
+ const guild = await Guild.findOneOrFail({ id: guild_id });
await isMember(req.user_id, guild_id);
- res.json(toObject(guild.welcome_screen));
+ res.json(guild.welcome_screen);
});
router.post("/", check(GuildAddChannelToWelcomeScreenSchema), async (req: Request, res: Response) => {
const guild_id = req.params.guild_id;
const body = req.body as GuildAddChannelToWelcomeScreenSchema;
- const guild = await GuildModel.findOne({ id: guild_id }).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id });
var channelObject = {
...body
@@ -36,12 +36,12 @@ router.post("/", check(GuildAddChannelToWelcomeScreenSchema), async (req: Reques
if (guild.welcome_screen.welcome_channels.some((channel) => channel.channel_id === body.channel_id))
throw new Error("Welcome Channel exists");
- await GuildModel.findOneAndUpdate(
+ await Guild.findOneOrFailAndUpdate(
{
id: guild_id
},
{ $push: { "welcome_screen.welcome_channels": channelObject } }
- ).exec();
+ );
res.sendStatus(204);
});
diff --git a/api/src/routes/guilds/#guild_id/widget.json.ts b/api/src/routes/guilds/#guild_id/widget.json.ts
index 8719bd85..10bc3ac0 100644
--- a/api/src/routes/guilds/#guild_id/widget.json.ts
+++ b/api/src/routes/guilds/#guild_id/widget.json.ts
@@ -1,5 +1,5 @@
import { Request, Response, Router } from "express";
-import { Config, Permissions, GuildModel, InviteModel, ChannelModel, MemberModel } from "@fosscord/util";
+import { Config, Permissions, Guild, InviteModel, Channel, Member } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { random } from "../../../util/RandomInviteID";
@@ -17,11 +17,11 @@ const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
const { guild_id } = req.params;
- const guild = await GuildModel.findOne({ id: guild_id }).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id });
if (!guild.widget_enabled) throw new HTTPError("Widget Disabled", 404);
// Fetch existing widget invite for widget channel
- var invite = await InviteModel.findOne({ channel_id: guild.widget_channel_id, inviter_id: { $type: 10 } }).exec();
+ var invite = await Invite.findOneOrFail({ channel_id: guild.widget_channel_id, inviter_id: { $type: 10 } });
if (guild.widget_channel_id && !invite) {
// Create invite for channel if none exists
// TODO: Refactor invite create code to a shared function
@@ -45,8 +45,7 @@ router.get("/", async (req: Request, res: Response) => {
// Fetch voice channels, and the @everyone permissions object
let channels: any[] = [];
- await ChannelModel.find({ guild_id: guild_id, type: 2 }, { permission_overwrites: { $elemMatch: { id: guild_id } } })
- .lean()
+ await Channel.find({ guild_id: guild_id, type: 2 }, { permission_overwrites: { $elemMatch: { id: guild_id } } })
.select("id name position permission_overwrites")
.sort({ position: 1 })
.cursor()
@@ -67,8 +66,7 @@ router.get("/", async (req: Request, res: Response) => {
// Fetch members
// TODO: Understand how Discord's max 100 random member sample works, and apply to here (see top of this file)
let members: any[] = [];
- await MemberModel.find({ guild_id: guild_id })
- .lean()
+ await Member.find({ guild_id: guild_id })
.populate({ path: "user", select: { _id: 0, username: 1, avatar: 1, presence: 1 } })
.select("id user nick deaf mute")
.cursor()
diff --git a/api/src/routes/guilds/#guild_id/widget.png.ts b/api/src/routes/guilds/#guild_id/widget.png.ts
index 80dc9f2b..89b31153 100644
--- a/api/src/routes/guilds/#guild_id/widget.png.ts
+++ b/api/src/routes/guilds/#guild_id/widget.png.ts
@@ -1,5 +1,5 @@
import { Request, Response, Router } from "express";
-import { GuildModel } from "@fosscord/util";
+import { Guild } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import fs from "fs";
import path from "path";
@@ -13,7 +13,7 @@ const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
const { guild_id } = req.params;
- const guild = await GuildModel.findOne({ id: guild_id }).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id });
if (!guild.widget_enabled) throw new HTTPError("Unknown Guild", 404);
// Fetch guild information
diff --git a/api/src/routes/guilds/#guild_id/widget.ts b/api/src/routes/guilds/#guild_id/widget.ts
index 85eed5e9..fcf71402 100644
--- a/api/src/routes/guilds/#guild_id/widget.ts
+++ b/api/src/routes/guilds/#guild_id/widget.ts
@@ -1,5 +1,5 @@
import { Request, Response, Router } from "express";
-import { getPermission, GuildModel } from "@fosscord/util";
+import { getPermission, Guild } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { check } from "../../../util/instanceOf";
import { WidgetModifySchema } from "../../../schema/Widget";
@@ -13,7 +13,7 @@ router.get("/", async (req: Request, res: Response) => {
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("MANAGE_GUILD");
- const guild = await GuildModel.findOne({ id: guild_id }).exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id });
return res.json({ enabled: guild.widget_enabled || false, channel_id: guild.widget_channel_id || null });
});
@@ -26,7 +26,7 @@ router.patch("/", check(WidgetModifySchema), async (req: Request, res: Response)
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("MANAGE_GUILD");
- await GuildModel.updateOne({ id: guild_id }, { widget_enabled: body.enabled, widget_channel_id: body.channel_id }).exec();
+ await Guild.update({ id: guild_id }, { widget_enabled: body.enabled, widget_channel_id: body.channel_id });
// Widget invite for the widget_channel_id gets created as part of the /guilds/{guild.id}/widget.json request
return res.json(body);
diff --git a/api/src/routes/guilds/index.ts b/api/src/routes/guilds/index.ts
index 92feed4e..05be07d9 100644
--- a/api/src/routes/guilds/index.ts
+++ b/api/src/routes/guilds/index.ts
@@ -1,5 +1,5 @@
import { Router, Request, Response } from "express";
-import { RoleModel, GuildModel, Snowflake, Guild, RoleDocument, Config } from "@fosscord/util";
+import { Role, Guild, Snowflake, Guild, RoleDocument, Config } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { check } from "./../../util/instanceOf";
import { GuildCreateSchema } from "../../schema/Guild";
@@ -65,8 +65,8 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
};
const [guild_doc, role] = await Promise.all([
- new GuildModel(guild).save(),
- new RoleModel({
+ new Guild(guild).save(),
+ new Role({
id: guild_id,
guild_id: guild_id,
color: 0,
diff --git a/api/src/routes/guilds/templates/index.ts b/api/src/routes/guilds/templates/index.ts
index 7fed3c5d..ad8b676b 100644
--- a/api/src/routes/guilds/templates/index.ts
+++ b/api/src/routes/guilds/templates/index.ts
@@ -1,6 +1,6 @@
import { Request, Response, Router } from "express";
const router: Router = Router();
-import { TemplateModel, GuildModel, toObject, UserModel, RoleModel, Snowflake, Guild, Config } from "@fosscord/util";
+import { TemplateModel, Guild, toObject, User, Role, Snowflake, Guild, Config } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { GuildTemplateCreateSchema } from "../../../schema/Guild";
import { getPublicUser } from "../../../util/User";
@@ -10,9 +10,9 @@ import { addMember } from "../../../util/Member";
router.get("/:code", async (req: Request, res: Response) => {
const { code } = req.params;
- const template = await TemplateModel.findOne({ code: code }).exec();
+ const template = await Template.findOneOrFail({ code: code });
- res.json(toObject(template)).send();
+ res.json(template)).send(;
});
router.post("/:code", check(GuildTemplateCreateSchema), async (req: Request, res: Response) => {
@@ -26,7 +26,7 @@ router.post("/:code", check(GuildTemplateCreateSchema), async (req: Request, res
throw new HTTPError(`Maximum number of guilds reached ${maxGuilds}`, 403);
}
- const template = await TemplateModel.findOne({ code: code }).exec();
+ const template = await Template.findOneOrFail({ code: code });
const guild_id = Snowflake.generate();
@@ -38,8 +38,8 @@ router.post("/:code", check(GuildTemplateCreateSchema), async (req: Request, res
};
const [guild_doc, role] = await Promise.all([
- new GuildModel(guild).save(),
- new RoleModel({
+ new Guild(guild).save(),
+ new Role({
id: guild_id,
guild_id: guild_id,
color: 0,
|
