diff --git a/src/routes/guilds/#guild_id/channels.ts b/src/routes/guilds/#guild_id/channels.ts index 5c90b5b9..9d8a95b0 100644 --- a/src/routes/guilds/#guild_id/channels.ts +++ b/src/routes/guilds/#guild_id/channels.ts @@ -13,6 +13,7 @@ import { HTTPError } from "lambert-server"; import { ChannelModifySchema } from "../../../schema/Channel"; import { emitEvent } from "../../../util/Event"; import { check } from "../../../util/instanceOf"; +import { createChannel } from "../../../util/Channel"; const router = Router(); router.get("/", async (req, res) => { @@ -26,41 +27,7 @@ router.post("/", check(ChannelModifySchema), async (req, res) => { const { guild_id } = req.params; const body = req.body as ChannelModifySchema; - if (!body.permission_overwrites) body.permission_overwrites = []; - if (!body.topic) body.topic = ""; - if (!body.rate_limit_per_user) body.rate_limit_per_user = 0; - - switch (body.type) { - case ChannelType.DM: - case ChannelType.GROUP_DM: - throw new HTTPError("You can't create a dm channel in a guild"); - // TODO: - case ChannelType.GUILD_STORE: - throw new HTTPError("Not yet supported"); - case ChannelType.GUILD_NEWS: - // TODO: check if guild is community server - } - - if (body.parent_id) { - const exists = await ChannelModel.findOne({ id: body.parent_id }, { guild_id: true }).exec(); - if (!exists) throw new HTTPError("Parent id channel doesn't exist", 400); - if (exists.guild_id !== guild_id) throw new HTTPError("The category channel needs to be in the guild"); - } - - const guild = await GuildModel.findOne({ id: guild_id }, { id: true }).exec(); - if (!guild) throw new HTTPError("Guild not found", 404); - - const channel = { - ...body, - id: Snowflake.generate(), - created_at: new Date(), - guild_id, - recipients: null - }; - - await new ChannelModel(channel).save(); - - await emitEvent({ event: "CHANNEL_CREATE", data: channel, guild_id } as ChannelCreateEvent); + const channel = await createChannel({ ...body, guild_id }, req.user_id); res.json(channel); }); diff --git a/src/routes/guilds/#guild_id/index.ts b/src/routes/guilds/#guild_id/index.ts index 47675609..9ef0127a 100644 --- a/src/routes/guilds/#guild_id/index.ts +++ b/src/routes/guilds/#guild_id/index.ts @@ -54,15 +54,4 @@ router.patch("/", check(GuildUpdateSchema), async (req: Request, res: Response) return res.send(data); }); -router.get("/vanity-url", async (req: Request, res: Response) => { - const { guild_id } = req.params; - - const guild = await GuildModel.findOne({ id: guild_id }).exec(); - if (!guild) throw new HTTPError("Guild does not exist", 404); - - if (!guild.vanity_url) throw new HTTPError("This guild has no vanity url", 204); - - return res.json(guild.vanity_url); -}); - export default router; diff --git a/src/routes/guilds/index.ts b/src/routes/guilds/index.ts index 1ed9d0ff..c286ad51 100644 --- a/src/routes/guilds/index.ts +++ b/src/routes/guilds/index.ts @@ -6,6 +6,7 @@ import { GuildCreateSchema } from "../../schema/Guild"; import Config from "../../util/Config"; import { getPublicUser } from "../../util/User"; import { addMember } from "../../util/Member"; +import { createChannel } from "../../util/Channel"; const router: Router = Router(); @@ -80,7 +81,8 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) = }).save() ]); - await addMember(req.user_id, guild_id, { guild: guild_doc }); + await createChannel({ name: "general", type: 0, guild_id, position: 0, permission_overwrites: [] }, req.user_id); + await addMember(req.user_id, guild_id); res.status(201).json({ id: guild.id }); }); diff --git a/src/schema/Invite.ts b/src/schema/Invite.ts index 3c944037..a22449ba 100644 --- a/src/schema/Invite.ts +++ b/src/schema/Invite.ts @@ -7,7 +7,7 @@ export const InviteCreateSchema = { $temporary: Boolean, $unique: Boolean, $target_user: String, - $target_user_type: Number, + $target_user_type: Number }; export interface InviteCreateSchema { target_user_id?: String; diff --git a/src/schema/Roles.ts b/src/schema/Roles.ts index fe76dadc..f662e61b 100644 --- a/src/schema/Roles.ts +++ b/src/schema/Roles.ts @@ -1,34 +1,17 @@ -export const RoleCreateSchema = { - name: String, - permissions: BigInt, - color: Number, - hoist: Boolean, // whether the role should be displayed separately in the sidebar - mentionable: Boolean // whether the role should be mentionable -}; - -export interface RoleCreateSchema { - name: string, - permissions: BigInt, - color: number, - hoist: boolean, // whether the role should be displayed separately in the sidebar - mentionable: boolean // whether the role should be mentionable -} - export const RoleModifySchema = { $name: String, $permissions: BigInt, $color: Number, $hoist: Boolean, // whether the role should be displayed separately in the sidebar $mentionable: Boolean, // whether the role should be mentionable - $position: Number, - + $position: Number }; export interface RoleModifySchema { - name?: string, - permissions?: BigInt, - color?: number, - hoist?: boolean, // whether the role should be displayed separately in the sidebar - mentionable?: boolean, // whether the role should be mentionable - position?: number, + name?: string; + permissions?: BigInt; + color?: number; + hoist?: boolean; // whether the role should be displayed separately in the sidebar + mentionable?: boolean; // whether the role should be mentionable + position?: number; } diff --git a/src/test/test.ts b/src/test/test.ts index b7d877b3..478edcc4 100644 --- a/src/test/test.ts +++ b/src/test/test.ts @@ -1,8 +1,3 @@ -import { getPermission } from "@fosscord/server-util"; +import { Snowflake } from "@fosscord/server-util"; -async function main() { - const t = await getPermission("811642917432066048", "812327318532915201"); - console.log(t); -} - -main(); +console.log(Snowflake.deconstruct("0")); diff --git a/src/util/Channel.ts b/src/util/Channel.ts new file mode 100644 index 00000000..c8df85bc --- /dev/null +++ b/src/util/Channel.ts @@ -0,0 +1,54 @@ +import { + ChannelCreateEvent, + ChannelModel, + ChannelType, + getPermission, + GuildModel, + Snowflake, + TextChannel, + VoiceChannel +} from "@fosscord/server-util"; +import { HTTPError } from "lambert-server"; +import { emitEvent } from "./Event"; + +// TODO: DM channel +export async function createChannel(channel: Partial, user_id: string = "0") { + if (!channel.permission_overwrites) channel.permission_overwrites = []; + + switch (channel.type) { + case ChannelType.GUILD_TEXT: + case ChannelType.GUILD_VOICE: + break; + case ChannelType.DM: + case ChannelType.GROUP_DM: + throw new HTTPError("You can't create a dm channel in a guild"); + // TODO: check if guild is community server + case ChannelType.GUILD_STORE: + case ChannelType.GUILD_NEWS: + default: + throw new HTTPError("Not yet supported"); + } + + const permissions = await getPermission(user_id, channel.guild_id); + permissions.hasThrow("MANAGE_CHANNELS"); + + if (channel.parent_id) { + const exists = await ChannelModel.findOne({ id: channel.parent_id }, { guild_id: true }).exec(); + if (!exists) throw new HTTPError("Parent id channel doesn't exist", 400); + if (exists.guild_id !== channel.guild_id) throw new HTTPError("The category channel needs to be in the guild"); + } + + // TODO: auto generate position + + channel = await new ChannelModel({ + ...channel, + id: Snowflake.generate(), + created_at: new Date(), + // @ts-ignore + recipients: null + }).save(); + + await emitEvent({ event: "CHANNEL_CREATE", data: channel, guild_id: channel.guild_id } as ChannelCreateEvent); + + return channel; +} diff --git a/src/util/instanceOf.ts b/src/util/instanceOf.ts index e4e58092..b67bde27 100644 --- a/src/util/instanceOf.ts +++ b/src/util/instanceOf.ts @@ -5,7 +5,8 @@ import { Tuple } from "lambert-server"; import "missing-native-js-functions"; export const OPTIONAL_PREFIX = "$"; -export const EMAIL_REGEX = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; +export const EMAIL_REGEX = + /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; export function check(schema: any) { return (req: Request, res: Response, next: NextFunction) => { @@ -27,9 +28,9 @@ export function FieldErrors(fields: Record