mirror of
https://github.com/yusufipk/OpenFrame.git
synced 2026-09-11 17:46:06 +00:00
yusufipek
b9e2006e34
A comment held one image, and the paste handler took the first item off the clipboard and dropped the rest. Reviewing a cut usually means several screenshots about the same moment, which meant one comment per screenshot or one screenshot and a paragraph describing the others. Editing a comment could not attach anything at all: the edit box had no paste handler, no file picker and no way to remove what was already there. A comment now carries up to five images, in the composer, in a reply and in the editor. One paste stages every image on the clipboard, the file picker takes a multiple selection, and a drop lands on whichever editor is open. Over the cap the extras are refused out loud rather than dropped quietly. A single image still fills the width; several tile into a grid, and either opens full screen on click. The images move into their own table. `comments.imageUrl` stays and follows the first of them, so a reader that has not been updated keeps working, and the migration copies the existing attachments across so the new table is complete from the first read. Every path that resolves a URL back to a comment now asks the new table: R2 cleanup, the orphan sweep, the storage accounting and the reference checks that decide whether an object can be deleted. Left on the old column they would have treated images two through five as unreferenced and swept them. Detaching an image while editing only breaks the link. The file stays in R2 and in the assets pane, which is where it is deleted from and where its bytes are already billed.
87 lines
2.2 KiB
TypeScript
87 lines
2.2 KiB
TypeScript
/** The only shape an image URL may take once it has been through our upload API. */
|
|
export const SAFE_IMAGE_PROXY_PATH =
|
|
/^\/api\/upload\/image\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.[a-z0-9]+$/i;
|
|
|
|
export const ALLOWED_IMAGE_MIME_TYPES = [
|
|
'image/jpeg',
|
|
'image/png',
|
|
'image/webp',
|
|
'image/gif',
|
|
] as const;
|
|
export type AllowedImageMimeType = (typeof ALLOWED_IMAGE_MIME_TYPES)[number];
|
|
|
|
const EXT_BY_MIME: Record<AllowedImageMimeType, string> = {
|
|
'image/jpeg': 'jpg',
|
|
'image/png': 'png',
|
|
'image/webp': 'webp',
|
|
'image/gif': 'gif',
|
|
};
|
|
|
|
export function normalizeImageMime(value: string): string {
|
|
if (value === 'image/jpg' || value === 'image/pjpeg') return 'image/jpeg';
|
|
return value;
|
|
}
|
|
|
|
export function isAllowedImageType(value: string): value is AllowedImageMimeType {
|
|
return (ALLOWED_IMAGE_MIME_TYPES as readonly string[]).includes(value);
|
|
}
|
|
|
|
export function detectImageMime(buffer: Uint8Array): AllowedImageMimeType | null {
|
|
// JPEG
|
|
if (buffer.length >= 2 && buffer[0] === 0xff && buffer[1] === 0xd8) {
|
|
return 'image/jpeg';
|
|
}
|
|
// PNG
|
|
if (
|
|
buffer.length >= 8 &&
|
|
buffer[0] === 0x89 &&
|
|
buffer[1] === 0x50 &&
|
|
buffer[2] === 0x4e &&
|
|
buffer[3] === 0x47 &&
|
|
buffer[4] === 0x0d &&
|
|
buffer[5] === 0x0a &&
|
|
buffer[6] === 0x1a &&
|
|
buffer[7] === 0x0a
|
|
) {
|
|
return 'image/png';
|
|
}
|
|
// GIF87a/GIF89a
|
|
if (
|
|
buffer.length >= 6 &&
|
|
buffer[0] === 0x47 &&
|
|
buffer[1] === 0x49 &&
|
|
buffer[2] === 0x46 &&
|
|
buffer[3] === 0x38 &&
|
|
(buffer[4] === 0x37 || buffer[4] === 0x39) &&
|
|
buffer[5] === 0x61
|
|
) {
|
|
return 'image/gif';
|
|
}
|
|
// WEBP: "RIFF"...."WEBP"
|
|
if (
|
|
buffer.length >= 12 &&
|
|
buffer[0] === 0x52 &&
|
|
buffer[1] === 0x49 &&
|
|
buffer[2] === 0x46 &&
|
|
buffer[3] === 0x46 &&
|
|
buffer[8] === 0x57 &&
|
|
buffer[9] === 0x45 &&
|
|
buffer[10] === 0x42 &&
|
|
buffer[11] === 0x50
|
|
) {
|
|
return 'image/webp';
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
export function getImageExtension(mime: AllowedImageMimeType): string {
|
|
return EXT_BY_MIME[mime];
|
|
}
|
|
|
|
export function firstBytesHex(buffer: Uint8Array, length = 16): string {
|
|
return Array.from(buffer.slice(0, length))
|
|
.map((byte) => byte.toString(16).padStart(2, '0'))
|
|
.join(' ');
|
|
}
|