diff --git a/api/src/routes/guilds/index.ts b/api/src/routes/guilds/index.ts
index 92feed4e..e4157384 100644
--- a/api/src/routes/guilds/index.ts
+++ b/api/src/routes/guilds/index.ts
@@ -1,11 +1,8 @@
import { Router, Request, Response } from "express";
-import { RoleModel, GuildModel, Snowflake, Guild, RoleDocument, Config } from "@fosscord/util";
+import { Role, Guild, Snowflake, Config, User, Member, Channel } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { check } from "./../../util/instanceOf";
import { GuildCreateSchema } from "../../schema/Guild";
-import { getPublicUser } from "../../util/User";
-import { addMember } from "../../util/Member";
-import { createChannel } from "../../util/Channel";
const router: Router = Router();
@@ -15,58 +12,43 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
const body = req.body as GuildCreateSchema;
const { maxGuilds } = Config.get().limits.user;
- const user = await getPublicUser(req.user_id, { guilds: true });
-
- if (user.guilds.length >= maxGuilds) {
+ const guild_count = await Member.count({ id: req.user_id });
+ if (guild_count >= maxGuilds) {
throw new HTTPError(`Maximum number of guilds reached ${maxGuilds}`, 403);
}
const guild_id = Snowflake.generate();
- const guild: Guild = {
- name: body.name,
- region: Config.get().regions.default,
- owner_id: req.user_id,
- icon: undefined,
- afk_channel_id: undefined,
- afk_timeout: 300,
- application_id: undefined,
- banner: undefined,
- default_message_notifications: 0,
- description: undefined,
- splash: undefined,
- discovery_splash: undefined,
- explicit_content_filter: 0,
- features: [],
- id: guild_id,
- large: undefined,
- max_members: 250000,
- max_presences: 250000,
- max_video_channel_users: 25,
- presence_count: 0,
- member_count: 0, // will automatically be increased by addMember()
- mfa_level: 0,
- preferred_locale: "en-US",
- premium_subscription_count: 0,
- premium_tier: 0,
- public_updates_channel_id: undefined,
- rules_channel_id: undefined,
- system_channel_flags: 0,
- system_channel_id: undefined,
- unavailable: false,
- vanity_url_code: undefined,
- verification_level: 0,
- welcome_screen: {
- enabled: false,
- description: "No description",
- welcome_channels: []
- },
- widget_channel_id: undefined,
- widget_enabled: false
- };
- const [guild_doc, role] = await Promise.all([
- new GuildModel(guild).save(),
- new RoleModel({
+ const [guild, role] = await Promise.all([
+ Guild.insert({
+ name: body.name,
+ region: Config.get().regions.default,
+ owner_id: req.user_id,
+ afk_timeout: 300,
+ default_message_notifications: 0,
+ explicit_content_filter: 0,
+ features: [],
+ id: guild_id,
+ max_members: 250000,
+ max_presences: 250000,
+ max_video_channel_users: 25,
+ presence_count: 0,
+ member_count: 0, // will automatically be increased by addMember()
+ mfa_level: 0,
+ preferred_locale: "en-US",
+ premium_subscription_count: 0,
+ premium_tier: 0,
+ system_channel_flags: 0,
+ unavailable: false,
+ verification_level: 0,
+ welcome_screen: {
+ enabled: false,
+ description: "No description",
+ welcome_channels: []
+ },
+ widget_enabled: false
+ }),
+ Role.insert({
id: guild_id,
guild_id: guild_id,
color: 0,
@@ -74,10 +56,9 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
managed: false,
mentionable: false,
name: "@everyone",
- permissions: 2251804225n,
- position: 0,
- tags: null
- }).save()
+ permissions: String("2251804225"),
+ position: 0
+ })
]);
if (!body.channels || !body.channels.length) body.channels = [{ id: "01", type: 0, name: "general" }];
@@ -94,16 +75,21 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
body.channels?.map((x) => {
var id = ids.get(x.id) || Snowflake.generate();
- // TODO: should we abort if parent_id is a category? (or not to allow sub category channels)
+ // TODO: should we abort if parent_id is a category? (to disallow sub category channels)
var parent_id = ids.get(x.parent_id);
- return createChannel({ ...x, guild_id, id, parent_id }, req.user_id, { keepId: true, skipExistsCheck: true });
+ return Channel.createChannel({ ...x, guild_id, id, parent_id }, req.user_id, {
+ keepId: true,
+ skipExistsCheck: true,
+ skipPermissionCheck: true,
+ skipEventEmit: true
+ });
})
);
- await addMember(req.user_id, guild_id);
+ await Member.addToGuild(req.user_id, guild_id);
- res.status(201).json({ id: guild.id });
+ res.status(201).json({ id: guild_id });
});
export default router;
|
