patch for missing router schema, and also add purge route self-deletion checks
This commit is contained in:
parent
cec8cea01a
commit
6950166ee8
@ -1,7 +1,7 @@
|
|||||||
import { HTTPError } from "lambert-server";
|
import { HTTPError } from "lambert-server";
|
||||||
import { route } from "@fosscord/api";
|
import { route } from "@fosscord/api";
|
||||||
import { isTextChannel } from "./messages";
|
import { isTextChannel } from "./messages";
|
||||||
import { FindManyOptions, Between } from "typeorm";
|
import { FindManyOptions, Between, Not } from "typeorm";
|
||||||
import {
|
import {
|
||||||
Attachment,
|
Attachment,
|
||||||
Channel,
|
Channel,
|
||||||
@ -33,7 +33,7 @@ export interface PurgeSchema {
|
|||||||
// TODO: should users be able to bulk delete messages or only bots?
|
// TODO: should users be able to bulk delete messages or only bots?
|
||||||
// TODO: should this request fail, if you provide messages older than 14 days/invalid ids?
|
// TODO: should this request fail, if you provide messages older than 14 days/invalid ids?
|
||||||
// https://discord.com/developers/docs/resources/channel#bulk-delete-messages
|
// https://discord.com/developers/docs/resources/channel#bulk-delete-messages
|
||||||
router.post("/", route({ body: "PurgeSchema", right: "SELF_DELETE_MESSAGES" }), async (req: Request, res: Response) => {
|
router.post("/", route({ /*body: "PurgeSchema",*/ }), async (req: Request, res: Response) => {
|
||||||
const { channel_id } = req.params;
|
const { channel_id } = req.params;
|
||||||
const channel = await Channel.findOneOrFail({ id: channel_id });
|
const channel = await Channel.findOneOrFail({ id: channel_id });
|
||||||
|
|
||||||
@ -50,18 +50,27 @@ router.post("/", route({ body: "PurgeSchema", right: "SELF_DELETE_MESSAGES" }),
|
|||||||
const { before, after } = req.body as PurgeSchema;
|
const { before, after } = req.body as PurgeSchema;
|
||||||
|
|
||||||
// TODO: send the deletion event bite-by-bite to prevent client stress
|
// TODO: send the deletion event bite-by-bite to prevent client stress
|
||||||
|
|
||||||
var query: FindManyOptions<Message> & { where: { id?: any; }; } = {
|
var query: FindManyOptions<Message> & { where: { id?: any; }; } = {
|
||||||
order: { id: "ASC" },
|
order: { id: "ASC" },
|
||||||
// take: limit,
|
// take: limit,
|
||||||
where: {
|
where: {
|
||||||
channel_id,
|
channel_id,
|
||||||
id: Between(after, before), // the right way around
|
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"]
|
relations: ["author", "webhook", "application", "mentions", "mention_roles", "mention_channels", "sticker_items", "attachments"]
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const messages = await Message.find(query);
|
const messages = await Message.find(query);
|
||||||
const endpoint = Config.get().cdn.endpointPublic;
|
const endpoint = Config.get().cdn.endpointPublic;
|
||||||
|
|
||||||
|
if (messages.length == 0) {
|
||||||
|
res.sendStatus(304);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
await Message.delete(messages.map((x) => ({ id: x })));
|
await Message.delete(messages.map((x) => ({ id: x })));
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user