fix ts errors

3 files changed, 62 insertions, 72 deletions

diff --git a/api/src/routes/channels/#channel_id/messages/bulk-delete.ts b/api/src/routes/channels/#channel_id/messages/bulk-delete.ts
index 6eacf249..9e8cad23 100644
--- a/api/src/routes/channels/#channel_id/messages/bulk-delete.ts
+++ b/api/src/routes/channels/#channel_id/messages/bulk-delete.ts
@@ -17,15 +17,15 @@ export interface BulkDeleteSchema {
 // https://discord.com/developers/docs/resources/channel#bulk-delete-messages
 router.post("/", route({ body: "BulkDeleteSchema" }), async (req: Request, res: Response) => {
 	const { channel_id } = req.params;
-	const channel = await Channel.findOneOrFail({ id: channel_id });
+	const channel = await Channel.findOneByOrFail({ id: channel_id });
 	if (!channel.guild_id) throw new HTTPError("Can't bulk delete dm channel messages", 400);
 
 	const rights = await getRights(req.user_id);
 	rights.hasThrow("SELF_DELETE_MESSAGES");
-	
+
 	let superuser = rights.has("MANAGE_MESSAGES");
 	const permission = await getPermission(req.user_id, channel?.guild_id, channel_id);
-		
+
 	const { maxBulkDelete } = Config.get().limits.message;
 
 	const { messages } = req.body as { messages: string[] };
@@ -35,7 +35,7 @@ router.post("/", route({ body: "BulkDeleteSchema" }), async (req: Request, res:
 		if (messages.length > maxBulkDelete) throw new HTTPError(`You cannot delete more than ${maxBulkDelete} messages`);
 	}
 
-	await Message.delete(messages.map((x) => ({ id: x })));
+	await Message.delete({ id: In(messages) });
 
 	await emitEvent({
 		event: "MESSAGE_DELETE_BULK",
diff --git a/api/src/routes/channels/#channel_id/purge.ts b/api/src/routes/channels/#channel_id/purge.ts
index 622e06e5..3a6997b2 100644
--- a/api/src/routes/channels/#channel_id/purge.ts
+++ b/api/src/routes/channels/#channel_id/purge.ts
@@ -2,24 +2,9 @@ import { HTTPError } from "lambert-server";
 import { route } from "@fosscord/api";
 import { isTextChannel } from "./messages";
 import { FindManyOptions, Between, Not } from "typeorm";
-import {
-	Attachment,
-	Channel,
-	Config,
-	Embed,
-	DiscordApiErrors,
-	emitEvent,
-	FosscordApiErrors,
-	getPermission,
-	getRights,
- 	Message,
-	MessageDeleteBulkEvent,
-	Snowflake,
-	uploadFile 
-} from "@fosscord/util";
+import { Channel, Config, emitEvent, getPermission, getRights, Message, MessageDeleteBulkEvent } from "@fosscord/util";
 import { Router, Response, Request } from "express";
-import multer from "multer";
-import { handleMessage, postHandleMessage } from "@fosscord/api";
+import { In } from "typeorm";
 
 const router: Router = Router();
 
@@ -27,58 +12,58 @@ export default router;
 
 export interface PurgeSchema {
 	before: string;
-	after: string
+	after: string;
 }
 
 /**
 TODO: apply the delete bit by bit to prevent client and database stress
 **/
-router.post("/", route({ /*body: "PurgeSchema",*/ }), async (req: Request, res: Response) => {
-	const { channel_id } = req.params;
-	const channel = await Channel.findOneOrFail({ id: channel_id });
-	
-	if (!channel.guild_id) throw new HTTPError("Can't purge dm channels", 400);
-	isTextChannel(channel.type);
+router.post("/",route({ /*body: "PurgeSchema",*/ }), async (req: Request, res: Response) => {
+		const { channel_id } = req.params;
+		const channel = await Channel.findOneOrFail({ where: { id: channel_id } });
 
-	const rights = await getRights(req.user_id);
-	if (!rights.has("MANAGE_MESSAGES")) {
-		const permissions = await getPermission(req.user_id, channel.guild_id, channel_id);
-		permissions.hasThrow("MANAGE_MESSAGES");
-		permissions.hasThrow("MANAGE_CHANNELS");
-	}
-	
-	const { before, after } = req.body as PurgeSchema;
+		if (!channel.guild_id) throw new HTTPError("Can't purge dm channels", 400);
+		isTextChannel(channel.type);
 
-	// TODO: send the deletion event bite-by-bite to prevent client stress
+		const rights = await getRights(req.user_id);
+		if (!rights.has("MANAGE_MESSAGES")) {
+			const permissions = await getPermission(req.user_id, channel.guild_id, channel_id);
+			permissions.hasThrow("MANAGE_MESSAGES");
+			permissions.hasThrow("MANAGE_CHANNELS");
+		}
 
-	let query: FindManyOptions<Message> & { where: { id?: any; }; } = {
-		order: { id: "ASC" },
-		// take: limit,
-		where: {
-		 channel_id,
-		 id: Between(after, before), // the right way around
-		 author_id: rights.has("SELF_DELETE_MESSAGES") ? undefined : Not(req.user_id)
-		 // if you lack the right of self-deletion, you can't delete your own messages, even in purges
-		 },
-		relations: ["author", "webhook", "application", "mentions", "mention_roles", "mention_channels", "sticker_items", "attachments"]
-	};
-	
+		const { before, after } = req.body as PurgeSchema;
 
-	const messages = await Message.find(query);
-	const endpoint = Config.get().cdn.endpointPublic;
-			
-	if (messages.length == 0) { 
-		res.sendStatus(304);
-		return;
-	}
+		// TODO: send the deletion event bite-by-bite to prevent client stress
+
+		let query: FindManyOptions<Message> & { where: { id?: any } } = {
+			order: { id: "ASC" },
+			// take: limit,
+			where: {
+				channel_id,
+				id: Between(after, before), // the right way around
+				author_id: rights.has("SELF_DELETE_MESSAGES") ? undefined : Not(req.user_id)
+				// if you lack the right of self-deletion, you can't delete your own messages, even in purges
+			},
+			relations: ["author", "webhook", "application", "mentions", "mention_roles", "mention_channels", "sticker_items", "attachments"]
+		};
+
+		const messages = await Message.find(query);
+		const endpoint = Config.get().cdn.endpointPublic;
 
-	await Message.delete(messages.map((x) => ({ id: x })));
-	
-	await emitEvent({
-		event: "MESSAGE_DELETE_BULK",
-		channel_id,
-		data: { ids: messages.map(x => x.id), channel_id, guild_id: channel.guild_id }
-	} as MessageDeleteBulkEvent);
+		if (messages.length == 0) {
+			res.sendStatus(304);
+			return;
+		}
 
-	res.sendStatus(204);
-});
+		await Message.delete({ id: In(messages) });
+
+		await emitEvent({
+			event: "MESSAGE_DELETE_BULK",
+			channel_id,
+			data: { ids: messages.map((x) => x.id), channel_id, guild_id: channel.guild_id }
+		} as MessageDeleteBulkEvent);
+
+		res.sendStatus(204);
+	}
+);
diff --git a/api/src/routes/discoverable-guilds.ts b/api/src/routes/discoverable-guilds.ts
index 984916f4..fb7b844f 100644
--- a/api/src/routes/discoverable-guilds.ts
+++ b/api/src/routes/discoverable-guilds.ts
@@ -16,19 +16,24 @@ router.get("/", route({}), async (req: Request, res: Response) => {
 	if (categories == undefined) {
 		guilds = showAllGuilds
 			? await Guild.find({ take: Math.abs(Number(limit || configLimit)) })
-			: await Guild.find({ where: `"features" LIKE '%DISCOVERABLE%'`, take: Math.abs(Number(limit || configLimit)) });
+			: await Guild.find({ where: { features: Like("%DISCOVERABLE%") }, take: Math.abs(Number(limit || configLimit)) });
 	} else {
 		guilds = showAllGuilds
-				? await Guild.find({ where: `"primary_category_id" = ${categories}`, take: Math.abs(Number(limit || configLimit)) })
-				: await Guild.find({
-						where: `"primary_category_id" = ${categories} AND "features" LIKE '%DISCOVERABLE%'`,
-						take: Math.abs(Number(limit || configLimit))
-				  });
+			? await Guild.find({ where: { primary_category_id: Number(categories) }, take: Math.abs(Number(limit || configLimit)) })
+			: await Guild.find({
+					where: { primary_category_id: Number(categories), features: Like("%DISCOVERABLE%") },
+					take: Math.abs(Number(limit || configLimit))
+			  });
 	}
 
 	const total = guilds ? guilds.length : undefined;
 
-	res.send({ total: total, guilds: guilds, offset: Number(offset || Config.get().guild.discovery.offset), limit: Number(limit || configLimit) });
+	res.send({
+		total: total,
+		guilds: guilds,
+		offset: Number(offset || Config.get().guild.discovery.offset),
+		limit: Number(limit || configLimit)
+	});
 });
 
 export default router;