diff --git a/src/cdn/routes/attachments.ts b/src/cdn/routes/attachments.ts
index 9bd256aa..72c7da03 100644
--- a/src/cdn/routes/attachments.ts
+++ b/src/cdn/routes/attachments.ts
@@ -5,9 +5,6 @@ import FileType from "file-type";
import { HTTPError } from "lambert-server";
import { multer } from "../util/multer";
import imageSize from "image-size";
-import ffmpeg from "fluent-ffmpeg";
-import Path from "path";
-import { Duplex, Readable, Transform, Writable } from "stream";
const router = Router();
@@ -18,14 +15,6 @@ const SANITIZED_CONTENT_TYPE = [
"application/xhtml+xml",
];
-const probe = (file: string): Promise<ffmpeg.FfprobeData> => new Promise((resolve, reject) => {
- ffmpeg.setFfprobePath(process.env.FFPROBE_PATH as string);
- ffmpeg.ffprobe(file, (err, data) => {
- if (err) return reject(err);
- return resolve(data);
- });
-});
-
router.post(
"/:channel_id",
multer.single("file"),
@@ -55,13 +44,6 @@ router.post(
height = dimensions.height;
}
}
- else if (mimetype.includes("video") && process.env.FFPROBE_PATH) {
- const root = process.env.STORAGE_LOCATION || "../"; // hmm, stolen from FileStorage
- const out = await probe(Path.join(root, path));
- const stream = out.streams[0]; // hmm
- width = stream.width;
- height = stream.height;
- }
const file = {
id,
@@ -93,26 +75,6 @@ router.get(
content_type = "application/octet-stream";
}
- // lol, super gross
- if (content_type.includes("video") && format == "jpeg" && process.env.FFMPEG_PATH) {
- const promise = (): Promise<Buffer> => new Promise((resolve, reject) => {
- ffmpeg.setFfmpegPath(process.env.FFMPEG_PATH as string);
- const out: any[] = [];
- const cmd = ffmpeg(Readable.from(file as Buffer))
- .format("mjpeg")
- .frames(1)
- .on("end", () => resolve(Buffer.concat(out)))
- .on("error", (err) => reject(err))
- const stream = cmd.pipe();
- stream.on("data", (data) => {
- out.push(data)
- });
- });
- const res = await promise();
- file = res;
- content_type = "jpeg";
- }
-
res.set("Content-Type", content_type);
res.set("Cache-Control", "public, max-age=31536000");
diff --git a/src/gateway/events/Message.ts b/src/gateway/events/Message.ts
index b112fba0..12b6f8b9 100644
--- a/src/gateway/events/Message.ts
+++ b/src/gateway/events/Message.ts
@@ -16,10 +16,8 @@ export async function Message(this: WebSocket, buffer: WS.Data) {
// TODO: compression
var data: Payload;
- if (
- (buffer instanceof Buffer && buffer[0] === 123) ||
- (typeof buffer === "string")
- ) {
+ if ((buffer instanceof Buffer && buffer[0] === 123) ||
+ (typeof buffer === "string")) {
data = bigIntJson.parse(buffer.toString());
}
else if (this.encoding === "json" && buffer instanceof Buffer) {
|
