diff --git a/src/cdn/Server.ts b/src/cdn/Server.ts
index 68974433d..e8380f6ab 100644
--- a/src/cdn/Server.ts
+++ b/src/cdn/Server.ts
@@ -63,9 +63,6 @@ export class CDNServer extends Server {
await registerRoutes(this, path.join(__dirname, "routes/"));
- this.app.use("/icons/", avatarsRoute);
- console.log("[Server] Route /icons registered");
-
this.app.use("/role-icons/", iconsRoute);
console.log("[Server] Route /role-icons registered");
diff --git a/src/cdn/routes/icons.ts b/src/cdn/routes/icons.ts
index e69de29bb..0106c05c5 100644
--- a/src/cdn/routes/icons.ts
+++ b/src/cdn/routes/icons.ts
@@ -0,0 +1,117 @@
+/*
+ Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+ Copyright (C) 2023 Spacebar and Spacebar Contributors
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "icons";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+ if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+ if (!req.file) throw new HTTPError("Missing file");
+ const { buffer, size } = req.file;
+ const { guild_id } = req.params as { [key: string]: string };
+
+ let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+ const type = await fileTypeFromBuffer(buffer);
+ if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+ if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+ const path = `${pathPrefix}/${guild_id}/${hash}`;
+ const endpoint = Config.get().cdn.endpointPublic;
+
+ await storage.set(path, buffer);
+
+ return res.json({
+ id: hash,
+ content_type: type.mime,
+ size,
+ url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+ });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+ let { guild_id } = req.params as { [key: string]: string };
+ guild_id = guild_id.split(".")[0]; // remove .file extension
+ const path = `${pathPrefix}/${guild_id}`;
+
+ const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+ const type = await fileTypeFromBuffer(file);
+
+ res.set("Content-Type", type?.mime);
+
+ return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+ const { guild_id } = req.params as { [key: string]: string };
+ let { hash } = req.params as { [key: string]: string };
+ hash = hash.split(".")[0]; // remove .file extension
+ const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+ const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+ const type = await fileTypeFromBuffer(file);
+
+ res.set("Content-Type", type?.mime);
+
+ return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+ if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+ const { guild_id, id } = req.params as { [key: string]: string };
+ const path = `${pathPrefix}/${guild_id}/${id}`;
+
+ await storage.delete(path);
+
+ return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+ let file = await storage.get(newPath);
+ if (!file) {
+ if (await storage.exists(oldPath)) {
+ console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+ await storage.move(oldPath, newPath);
+ file = await storage.get(newPath);
+ }
+ }
+ if (!file) throw new HTTPError("not found", 404);
+ return file;
+}
+
+export default router;
diff --git a/src/cdn/util/FileStorage.ts b/src/cdn/util/FileStorage.ts
index 6f01b3c5c..ff7a56ee8 100644
--- a/src/cdn/util/FileStorage.ts
+++ b/src/cdn/util/FileStorage.ts
@@ -74,4 +74,17 @@ export class FileStorage implements Storage {
//TODO we should delete the parent directory if empty
fs.unlinkSync(getPath(path));
}
+
+ async exists(path: string) {
+ return fs.existsSync(getPath(path));
+ }
+
+ async move(path: string, newPath: string) {
+ path = getPath(path);
+ newPath = getPath(newPath);
+
+ if (!fs.existsSync(dirname(newPath))) fs.mkdirSync(dirname(newPath), { recursive: true });
+
+ fs.renameSync(path, newPath);
+ }
}
diff --git a/src/cdn/util/S3Storage.ts b/src/cdn/util/S3Storage.ts
index 6ed7cad70..de575e5d2 100644
--- a/src/cdn/util/S3Storage.ts
+++ b/src/cdn/util/S3Storage.ts
@@ -96,4 +96,28 @@ export class S3Storage implements Storage {
Key: `${this.bucketBasePath}${path}`,
});
}
+
+ async exists(path: string): Promise {
+ try {
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-expect-error
+ await this.client.headObject({
+ Bucket: this.bucket,
+ Key: `${this.bucketBasePath}${path}`,
+ });
+ return true;
+ } catch (err) {
+ if (err && typeof err === "object" && "name" in err && (err as { [key: string]: string }).name === "NotFound") {
+ return false;
+ }
+ console.error(`[CDN] Unable to check existence of S3 object at path ${path}.`);
+ console.error(err);
+ return false;
+ }
+ }
+
+ async move(path: string, newPath: string): Promise {
+ await this.clone(path, newPath);
+ await this.delete(path);
+ }
}
diff --git a/src/cdn/util/Storage.ts b/src/cdn/util/Storage.ts
index 3888acc33..199c53ff7 100644
--- a/src/cdn/util/Storage.ts
+++ b/src/cdn/util/Storage.ts
@@ -27,6 +27,8 @@ export interface Storage {
clone(path: string, newPath: string): Promise;
get(path: string): Promise;
delete(path: string): Promise;
+ exists(path: string): Promise;
+ move(path: string, newPath: string): Promise;
}
let storage: Storage;