Merge pull request #783 from MaddyUnderStars/feat/multiUploads

Allow multiple attachments per message

2 files changed, 20 insertions, 9 deletions

diff --git a/api/assets/schemas.json b/api/assets/schemas.json
index a930938f..2102292b 100644
--- a/api/assets/schemas.json
+++ b/api/assets/schemas.json
@@ -2,12 +2,18 @@
     "MessageCreateSchema": {
         "type": "object",
         "properties": {
+            "type": {
+                "type": "integer"
+            },
             "content": {
                 "type": "string"
             },
             "nonce": {
                 "type": "string"
             },
+            "channel_id": {
+                "type": "string"
+            },
             "tts": {
                 "type": "boolean"
             },
diff --git a/api/src/routes/channels/#channel_id/messages/index.ts b/api/src/routes/channels/#channel_id/messages/index.ts
index 2d6a2977..54e6edcc 100644
--- a/api/src/routes/channels/#channel_id/messages/index.ts
+++ b/api/src/routes/channels/#channel_id/messages/index.ts
@@ -50,8 +50,10 @@ export function isTextChannel(type: ChannelType): boolean {
 }
 
 export interface MessageCreateSchema {
+	type?: number;
 	content?: string;
 	nonce?: string;
+	channel_id?: string;
 	tts?: boolean;
 	flags?: string;
 	embeds?: Embed[];
@@ -161,7 +163,7 @@ const messageUpload = multer({
 	limits: {
 		fileSize: 1024 * 1024 * 100,
 		fields: 10,
-		files: 1
+		// files: 1
 	},
 	storage: multer.memoryStorage()
 }); // max upload 50 mb
@@ -176,7 +178,7 @@ const messageUpload = multer({
 // Send message
 router.post(
 	"/",
-	messageUpload.single("file"),
+	messageUpload.any(),
 	async (req, res, next) => {
 		if (req.body.payload_json) {
 			req.body = JSON.parse(req.body.payload_json);
@@ -190,18 +192,21 @@ router.post(
 		var body = req.body as MessageCreateSchema;
 		const attachments: Attachment[] = [];
 
-		if (req.file) {
+		const channel = await Channel.findOneOrFail({ where: { id: channel_id }, relations: ["recipients", "recipients.user"] });
+		if (!channel.isWritable()) {
+			throw new HTTPError(`Cannot send messages to channel of type ${channel.type}`, 400)
+		}
+
+		const files = req.files as Express.Multer.File[] ?? [];
+		for (var currFile of files) {
 			try {
-				const file = await uploadFile(`/attachments/${req.params.channel_id}`, req.file);
+				const file = await uploadFile(`/attachments/${channel.id}`, currFile);
 				attachments.push({ ...file, proxy_url: file.url });
-			} catch (error) {
+			}
+			catch (error) {
 				return res.status(400).json(error);
 			}
 		}
-		const channel = await Channel.findOneOrFail({ where: { id: channel_id }, relations: ["recipients", "recipients.user"] });
-		if (!channel.isWritable()) {
-			throw new HTTPError(`Cannot send messages to channel of type ${channel.type}`, 400)
-		}
 
 		const embeds = body.embeds || [];
 		if (body.embed) embeds.push(body.embed);