Merge branch 'master' into unittests

This commit is contained in:
Flam3rboy
2021-09-20 21:49:42 +02:00
71 changed files with 1448 additions and 1066 deletions
-12
View File
@@ -1,12 +0,0 @@
import { Attachment } from "@fosscord/util";
import { deleteFile } from "@fosscord/api";
import { URL } from "url";
export async function deleteMessageAttachments(messageId: string, keep?: Attachment[]) {
let attachments = await Attachment.find({ message_id: messageId });
if (keep)
attachments = attachments.filter(x => !keep.map(k => k.id).includes(x.id));
await Promise.all(attachments.map(a => a.remove()));
attachments.forEach(a => deleteFile((new URL(a.url)).pathname)); //We don't need to await since this is done on the cdn
}
+2 -2
View File
@@ -42,9 +42,9 @@ export async function handleFile(path: string, body?: string): Promise<string |
export async function deleteFile(path: string) {
const response = await fetch(`${Config.get().cdn.endpoint || "http://localhost:3003"}${path}`, {
headers: {
signature: Config.get().security.requestSignature,
signature: Config.get().security.requestSignature
},
method: "DELETE",
method: "DELETE"
});
const result = await response.json();
-1
View File
@@ -1,5 +1,4 @@
export * from "./Base64";
export * from "./cdn";
export * from "./FieldError";
export * from "./ipAddress";
export * from "./Message";
+1
View File
@@ -14,6 +14,7 @@ export const ajv = new Ajv({
parseDate: true,
allowDate: true,
schemas,
coerceTypes: true,
messages: true,
strict: true,
strictRequired: true