@songsid/agend 2.3.0-beta.21 → 2.3.0-beta.22

package/dist/web-app-icon-worker.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/web-app-icon-worker.js

@@ -0,0 +1,15 @@
+/**
+ * #2308 review: the app icon's conversion (decode, five resizes, PNG/ICO encoding) runs here, off the fleet's event
+ * loop — a 2048 px 16-bit source takes about a second. One source in (workerData), the made files or a reason out.
+ */
+import { parentPort, workerData } from "node:worker_threads";
+import { appIconSet } from "./web-app-icon.js";
+import { PngError } from "./web-png.js";
+try {
+    const files = appIconSet(new Uint8Array(workerData.source));
+    parentPort.postMessage({ ok: true, files });
+}
+catch (err) {
+    parentPort.postMessage({ ok: false, detail: err instanceof PngError ? err.message : "the image could not be read" });
+}
+//# sourceMappingURL=web-app-icon-worker.js.map

package/dist/web-app-icon-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"web-app-icon-worker.js","sourceRoot":"","sources":["../src/web-app-icon-worker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,IAAI,CAAC;IACH,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,UAAU,CAAE,UAAsC,CAAC,MAAM,CAAC,CAAC,CAAC;IACzF,UAAW,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAC/C,CAAC;AAAC,OAAO,GAAG,EAAE,CAAC;IACb,UAAW,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,YAAY,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,6BAA6B,EAAE,CAAC,CAAC;AACxH,CAAC"}

package/dist/web-app-icon.d.ts

@@ -0,0 +1,107 @@
+/** What an upload may weigh (the route stops reading past it). */
+export declare const APP_ICON_MAX_BYTES: number;
+/** The source's side: at least the manifest's largest icon, at most what decodes in a few MB of memory. */
+export declare const APP_ICON_MIN_SIDE = 512;
+export declare const APP_ICON_MAX_SIDE = 2048;
+/** The files made from the source, by the name each is served as. */
+export declare const APP_ICON_FILES: readonly ["apple-touch-icon.png", "favicon.ico", "icon-192.png", "icon-512.png"];
+export type AppIconFile = (typeof APP_ICON_FILES)[number];
+export interface AppIconState {
+    version: string;
+    updatedAt: string;
+    by: string;
+}
+export type AppIconResult = {
+    ok: true;
+    state: AppIconState;
+} | {
+    ok: false;
+    status: 400 | 409 | 413 | 415 | 500 | 503;
+    error: string;
+    detail?: string;
+};
+/** A source checked and made into its files (prepare), not yet in force (commit). */
+export interface AppIconPrepared {
+    version: string;
+    source: Uint8Array;
+    files: Record<AppIconFile, Buffer>;
+    epoch: number;
+}
+export type AppIconPrepareResult = {
+    ok: true;
+    prepared: AppIconPrepared;
+} | Extract<AppIconResult, {
+    ok: false;
+}>;
+/** The conversion's bounds off the event loop: its time, and its worker's heap. */
+export declare const APP_ICON_CONVERT_MS = 30000;
+/** Make the files from a source somewhere: a worker thread in the fleet (the default), in-process where a test says so. */
+export type AppIconConvert = (bytes: Uint8Array) => Promise<{
+    ok: true;
+    files: Record<AppIconFile, Buffer>;
+} | {
+    ok: false;
+    detail: string;
+}>;
+/** What the conversion needs of a worker thread (a test gives one that ends when it says). */
+export interface IconWorker {
+    on(event: "message" | "error" | "exit", listener: (...args: any[]) => void): unknown;
+    terminate(): Promise<number>;
+}
+/** The fleet's worker: its own heap; TypeScript sources through tsx, the built .js otherwise. */
+export declare function spawnIconWorker(source: ArrayBuffer): IconWorker;
+/**
+ * The conversion in a one-off worker thread: its own heap, a deadline (terminated past it), never the fleet's loop.
+ * It settles only once the worker has exited (#2319 review): a timed-out or finished conversion whose thread is still
+ * winding down keeps its claim, so the store never runs two threads at once.
+ */
+export declare function convertWithWorker(spawn?: (source: ArrayBuffer) => IconWorker, deadlineMs?: number): AppIconConvert;
+export declare const convertInWorker: AppIconConvert;
+/** The conversion on this thread (tests, tools): the same code, without the worker. */
+export declare const convertInProcess: AppIconConvert;
+/** The sizes made from one decoded source. */
+export declare function appIconSet(bytes: Uint8Array): Record<AppIconFile, Buffer>;
+export declare class AppIconStore {
+    private readonly dataDir;
+    private readonly now;
+    private readonly convert;
+    private cached;
+    /** One conversion at a time: a second upload meanwhile is told to wait (409). */
+    private converting;
+    private closed;
+    /** Moved by every reset: an icon prepared before it is no longer the person's latest wish, and is not used. */
+    private epoch;
+    constructor(dataDir: string, now?: () => Date, convert?: AppIconConvert);
+    /** The fleet is stopping: nothing more is converted or switched to. */
+    close(): void;
+    get isClosed(): boolean;
+    private get root();
+    private get pointer();
+    /** The custom icon in force, or null for the bundled one. Read again only when the pointer file changed. */
+    current(): AppIconState | null;
+    /** A made file of the icon in force (or of `version`), or null. */
+    file(name: AppIconFile, version?: string): Buffer | null;
+    /**
+     * Check a source (its size and magic here; decoding and the sizes in the conversion, off the event loop) and make its
+     * files. Nothing on disk changes: commit() switches to them, after its caller checked again who asks.
+     */
+    prepare(bytes: Uint8Array): Promise<AppIconPrepareResult>;
+    /** Switch to a prepared icon: its files under its version, then the pointer (last, atomically), then old versions go. */
+    commit(prepared: AppIconPrepared, by: string): AppIconResult;
+    /** prepare() then commit(), for a caller with nothing to check in between. */
+    set(bytes: Uint8Array, by: string): Promise<AppIconResult>;
+    /**
+     * Back to the bundled icon: the pointer removed (none there is already the default), then the files. A pointer that
+     * cannot be removed is a failure — nothing is pruned, so the icon in force keeps its files (#2308 review).
+     */
+    reset(): {
+        ok: true;
+    } | {
+        ok: false;
+        status: 500;
+        error: string;
+        detail?: string;
+    };
+    /** Remove every version folder but `keep`. */
+    private prune;
+}

package/dist/web-app-icon.js

@@ -0,0 +1,256 @@
+/**
+ * #2308: the person's own app icon. One square PNG (the admin's page crops and draws whatever they chose into one) is
+ * checked and decoded here (web-png.ts), and made into the sizes a browser and a home screen ask for: the touch icon
+ * (180, on white — iOS shows transparency as black), the favicon (an ICO of 32 and 48) and the manifest's 192 and 512.
+ *
+ * Under the state dir: `web-app-icon/<version>/…`, the version being the source's sha256 (16 hex), and
+ * `web-app-icon/current.json` naming the version in force — written last, atomically, so a reader sees the old set or
+ * the new one, never half of one. Older version folders are removed once the pointer has moved.
+ */
+import { createHash } from "node:crypto";
+import { Worker } from "node:worker_threads";
+import { mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { decodePng, encodeIco, encodePng, flatten, isPng, PngError, resize } from "./web-png.js";
+/** What an upload may weigh (the route stops reading past it). */
+export const APP_ICON_MAX_BYTES = 5 * 1024 * 1024;
+/** The source's side: at least the manifest's largest icon, at most what decodes in a few MB of memory. */
+export const APP_ICON_MIN_SIDE = 512;
+export const APP_ICON_MAX_SIDE = 2048;
+/** The files made from the source, by the name each is served as. */
+export const APP_ICON_FILES = ["apple-touch-icon.png", "favicon.ico", "icon-192.png", "icon-512.png"];
+/** The conversion's bounds off the event loop: its time, and its worker's heap. */
+export const APP_ICON_CONVERT_MS = 30_000;
+const CONVERT_HEAP_MB = 256;
+/** The fleet's worker: its own heap; TypeScript sources through tsx, the built .js otherwise. */
+export function spawnIconWorker(source) {
+    return import.meta.url.endsWith(".ts")
+        ? new Worker(`const { workerData } = require("node:worker_threads"); import("tsx/esm/api").then(({ tsImport }) => tsImport(workerData.entry, workerData.entry));`, { eval: true, execArgv: [], resourceLimits: { maxOldGenerationSizeMb: CONVERT_HEAP_MB }, workerData: { entry: new URL("./web-app-icon-worker.ts", import.meta.url).href, source } })
+        : new Worker(new URL("./web-app-icon-worker.js", import.meta.url), { execArgv: [], resourceLimits: { maxOldGenerationSizeMb: CONVERT_HEAP_MB }, workerData: { source }, transferList: [source] });
+}
+/**
+ * The conversion in a one-off worker thread: its own heap, a deadline (terminated past it), never the fleet's loop.
+ * It settles only once the worker has exited (#2319 review): a timed-out or finished conversion whose thread is still
+ * winding down keeps its claim, so the store never runs two threads at once.
+ */
+export function convertWithWorker(spawn = spawnIconWorker, deadlineMs = APP_ICON_CONVERT_MS) {
+    return (bytes) => new Promise((resolve) => {
+        const worker = spawn(new Uint8Array(bytes).buffer);
+        let result = null;
+        let exited = false;
+        const settle = () => { if (result && exited)
+            resolve(result); };
+        const finish = (r) => {
+            if (result)
+                return;
+            result = r;
+            clearTimeout(timer);
+            if (!exited)
+                void worker.terminate().catch(() => { });
+            settle();
+        };
+        const timer = setTimeout(() => finish({ ok: false, detail: "it took too long to read" }), deadlineMs);
+        worker.on("message", (m) => {
+            if (!m || !m.ok || !m.files) {
+                finish({ ok: false, detail: (m && m.detail) || "the image could not be read" });
+                return;
+            }
+            const files = {};
+            for (const name of APP_ICON_FILES) {
+                const f = m.files[name];
+                if (!f) {
+                    finish({ ok: false, detail: "the image could not be read" });
+                    return;
+                }
+                files[name] = Buffer.from(f.buffer, f.byteOffset, f.byteLength);
+            }
+            finish({ ok: true, files });
+        });
+        worker.on("error", () => finish({ ok: false, detail: "the image could not be read" }));
+        worker.on("exit", () => { exited = true; finish({ ok: false, detail: "the image could not be read" }); settle(); });
+    });
+}
+export const convertInWorker = convertWithWorker();
+/** The conversion on this thread (tests, tools): the same code, without the worker. */
+export const convertInProcess = async (bytes) => {
+    try {
+        return { ok: true, files: appIconSet(bytes) };
+    }
+    catch (err) {
+        return { ok: false, detail: err instanceof PngError ? err.message : "the image could not be read" };
+    }
+};
+function writeBytesAtomic(path, bytes) {
+    const tmp = `${path}.${process.pid}.${Date.now()}.tmp`;
+    try {
+        writeFileSync(tmp, bytes, { mode: 0o600 });
+        renameSync(tmp, path);
+    }
+    catch (err) {
+        try {
+            unlinkSync(tmp);
+        }
+        catch { /* none */ }
+        throw err;
+    }
+}
+/** The sizes made from one decoded source. */
+export function appIconSet(bytes) {
+    const src = decodePng(bytes, { maxSide: APP_ICON_MAX_SIDE });
+    if (src.width !== src.height)
+        throw new PngError(`not square (${src.width}×${src.height})`);
+    if (src.width < APP_ICON_MIN_SIDE)
+        throw new PngError(`smaller than ${APP_ICON_MIN_SIDE}×${APP_ICON_MIN_SIDE}`);
+    const at = (n) => resize(src, n, n);
+    return {
+        "apple-touch-icon.png": encodePng(flatten(at(180), [255, 255, 255])),
+        "favicon.ico": encodeIco([{ size: 32, png: encodePng(at(32)) }, { size: 48, png: encodePng(at(48)) }]),
+        "icon-192.png": encodePng(at(192)),
+        "icon-512.png": encodePng(at(512)),
+    };
+}
+export class AppIconStore {
+    dataDir;
+    now;
+    convert;
+    cached = null;
+    /** One conversion at a time: a second upload meanwhile is told to wait (409). */
+    converting = false;
+    closed = false;
+    /** Moved by every reset: an icon prepared before it is no longer the person's latest wish, and is not used. */
+    epoch = 0;
+    constructor(dataDir, now = () => new Date(), convert = convertInWorker) {
+        this.dataDir = dataDir;
+        this.now = now;
+        this.convert = convert;
+    }
+    /** The fleet is stopping: nothing more is converted or switched to. */
+    close() { this.closed = true; }
+    get isClosed() { return this.closed; }
+    get root() { return join(this.dataDir, "web-app-icon"); }
+    get pointer() { return join(this.root, "current.json"); }
+    /** The custom icon in force, or null for the bundled one. Read again only when the pointer file changed. */
+    current() {
+        let mtimeMs;
+        try {
+            mtimeMs = statSync(this.pointer).mtimeMs;
+        }
+        catch {
+            this.cached = { mtimeMs: -1, state: null };
+            return null;
+        }
+        if (this.cached && this.cached.mtimeMs === mtimeMs)
+            return this.cached.state;
+        let state = null;
+        try {
+            const v = JSON.parse(readFileSync(this.pointer, "utf8"));
+            if (typeof v.version === "string" && /^[0-9a-f]{16}$/.test(v.version) && typeof v.updatedAt === "string" && typeof v.by === "string") {
+                state = { version: v.version, updatedAt: v.updatedAt, by: v.by };
+            }
+        }
+        catch { /* unreadable: the bundled icon */ }
+        this.cached = { mtimeMs, state };
+        return state;
+    }
+    /** A made file of the icon in force (or of `version`), or null. */
+    file(name, version) {
+        const v = version ?? this.current()?.version;
+        if (!v || !/^[0-9a-f]{16}$/.test(v))
+            return null;
+        try {
+            return readFileSync(join(this.root, v, name));
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * Check a source (its size and magic here; decoding and the sizes in the conversion, off the event loop) and make its
+     * files. Nothing on disk changes: commit() switches to them, after its caller checked again who asks.
+     */
+    async prepare(bytes) {
+        if (this.closed)
+            return { ok: false, status: 503, error: "app_icon_unavailable" };
+        if (bytes.length > APP_ICON_MAX_BYTES)
+            return { ok: false, status: 413, error: "app_icon_too_large", detail: "at most 5 MiB" };
+        if (!isPng(bytes))
+            return { ok: false, status: 415, error: "app_icon_not_png", detail: "a PNG image (the page converts JPG and WebP)" };
+        if (this.converting)
+            return { ok: false, status: 409, error: "app_icon_busy", detail: "another icon is being made" };
+        this.converting = true;
+        const epoch = this.epoch;
+        try {
+            const made = await this.convert(bytes);
+            if (!made.ok)
+                return { ok: false, status: 400, error: "app_icon_unreadable", detail: made.detail };
+            return { ok: true, prepared: { version: createHash("sha256").update(bytes).digest("hex").slice(0, 16), source: bytes, files: made.files, epoch } };
+        }
+        finally {
+            this.converting = false;
+        }
+    }
+    /** Switch to a prepared icon: its files under its version, then the pointer (last, atomically), then old versions go. */
+    commit(prepared, by) {
+        if (this.closed)
+            return { ok: false, status: 503, error: "app_icon_unavailable" };
+        // #2319 review: restored to the default while this one was being made — the later wish wins.
+        if (prepared.epoch !== this.epoch)
+            return { ok: false, status: 409, error: "app_icon_superseded", detail: "the icon was reset meanwhile" };
+        const { version } = prepared;
+        const state = { version, updatedAt: this.now().toISOString(), by };
+        try {
+            const dir = join(this.root, version);
+            mkdirSync(dir, { recursive: true, mode: 0o700 });
+            writeBytesAtomic(join(dir, "source.png"), prepared.source);
+            for (const name of APP_ICON_FILES)
+                writeBytesAtomic(join(dir, name), prepared.files[name]);
+            writeBytesAtomic(this.pointer, Buffer.from(JSON.stringify(state)));
+        }
+        catch {
+            return { ok: false, status: 500, error: "app_icon_not_saved" };
+        }
+        this.cached = null;
+        this.prune(version);
+        return { ok: true, state };
+    }
+    /** prepare() then commit(), for a caller with nothing to check in between. */
+    async set(bytes, by) {
+        const p = await this.prepare(bytes);
+        return p.ok ? this.commit(p.prepared, by) : p;
+    }
+    /**
+     * Back to the bundled icon: the pointer removed (none there is already the default), then the files. A pointer that
+     * cannot be removed is a failure — nothing is pruned, so the icon in force keeps its files (#2308 review).
+     */
+    reset() {
+        this.epoch++;
+        try {
+            unlinkSync(this.pointer);
+        }
+        catch (err) {
+            if (err.code !== "ENOENT")
+                return { ok: false, status: 500, error: "app_icon_not_reset", detail: err.code ?? "error" };
+        }
+        this.cached = null;
+        this.prune(null);
+        return { ok: true };
+    }
+    /** Remove every version folder but `keep`. */
+    prune(keep) {
+        let names;
+        try {
+            names = readdirSync(this.root);
+        }
+        catch {
+            return;
+        }
+        for (const n of names)
+            if (/^[0-9a-f]{16}$/.test(n) && n !== keep) {
+                try {
+                    rmSync(join(this.root, n), { recursive: true, force: true });
+                }
+                catch { /* next time */ }
+            }
+    }
+}
+//# sourceMappingURL=web-app-icon.js.map

package/dist/web-app-icon.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"web-app-icon.js","sourceRoot":"","sources":["../src/web-app-icon.ts"],"names":[],"mappings":"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"}

package/dist/web-chat-history.d.ts

@@ -101,6 +101,11 @@ export interface WebChatMessage {
      * row with files and no text. A person's messages only.
      */
     replyTo?: WebChatReplyRef;
+    /**
+     * #2305: the instance's reactions to this message — its minimal reply ("OK" answered with 👍), as on the platforms.
+     * Distinct emojis of the web set (web-reactions.ts), at most WEB_REACTIONS_MAX, in the order they were added.
+     */
+    reactions?: string[];
 }
 /** #2272: a reply's reference to an earlier message of the same chat (see WebChatMessage.replyTo). */
 export interface WebChatReplyRef {
@@ -171,6 +176,8 @@ export interface StoredWebChatMessage {
     seenSeq?: number;
     /** #2272: what a person's reply quotes (see WebChatMessage). */
     replyTo?: WebChatReplyRef;
+    /** #2305: the instance's reactions (see WebChatMessage). */
+    reactions?: string[];
 }
 /** #1565: what the history needs of the file ledger (web-upload.ts). */
 export interface WebChatFiles {
@@ -282,6 +289,22 @@ export declare class WebChatHistory {
      * #1920: a web message's channel copy was sent — it is now what the channel saw. Returns the message when this changed
      * it (the caller tells the guests), null otherwise.
      */
+    /**
+     * #2305: the instance reacted to one of its web chat's messages (by the id it was handed). Returns the message and
+     * whether this added the emoji (an emoji it already has, or a full list, changes nothing); null when the chat has
+     * no such message. `emoji` is already the web set's spelling (web-reactions.ts webReactionEmoji).
+     */
+    addReaction(instance: string, messageId: string, emoji: string): {
+        message: WebChatMessage;
+        added: boolean;
+    } | null;
+    /** #2305: every kept message's reactions (what a poll sends, as it sends the ticks): its row, and the list. */
+    reactionStates(): Array<{
+        instance: string;
+        boot: string;
+        id: number;
+        reactions: string[];
+    }>;
     markChannel(instance: string, messageId: string): WebChatMessage | null;
     /**
      * #1920 (#2085 review): the messages that became the channel's after this cursor (same boot) — what a guest's poll

package/dist/web-chat-history.js

@@ -21,6 +21,7 @@
 import { randomBytes } from "node:crypto";
 import { effectTrialOffer } from "./web-effect-trials.js";
 import { webTextLinks } from "./topic-link.js";
+import { WEB_REACTIONS_MAX, webReactionsOf } from "./web-reactions.js";
 /**
  * Ranks for the order a message moves through. Events can arrive late or twice (a queued after the spawn
  * settles, a retry): a tick never moves back. `delivered` and `failed` are final; `cancelled` is not, since
@@ -166,7 +167,7 @@ export class WebChatHistory {
     stored(m) {
         const row = { boot: m.boot, id: m.id, instance: m.instance, role: m.role, sender: m.sender, text: m.text, ts: m.ts, ...(m.click ? { click: { label: m.click.label } } : {}), ...(m.links ? { links: m.links } : {}),
             ...(m.channel ? { channel: true } : {}), ...(m.from ? { from: m.from } : {}), ...(m.channel && m.seenSeq !== undefined ? { seenSeq: m.seenSeq } : {}),
-            ...(m.replyTo ? { replyTo: m.replyTo } : {}) };
+            ...(m.replyTo ? { replyTo: m.replyTo } : {}), ...(m.reactions?.length ? { reactions: [...m.reactions] } : {}) };
         if (m.attachments?.length) {
             row.attachments = m.attachments.map((a) => {
                 const base = { kind: a.kind, name: a.name, size: a.size, mime: a.mime };
@@ -366,6 +367,31 @@ export class WebChatHistory {
      * #1920: a web message's channel copy was sent — it is now what the channel saw. Returns the message when this changed
      * it (the caller tells the guests), null otherwise.
      */
+    /**
+     * #2305: the instance reacted to one of its web chat's messages (by the id it was handed). Returns the message and
+     * whether this added the emoji (an emoji it already has, or a full list, changes nothing); null when the chat has
+     * no such message. `emoji` is already the web set's spelling (web-reactions.ts webReactionEmoji).
+     */
+    addReaction(instance, messageId, emoji) {
+        const m = this.findByMessageId(instance, messageId);
+        if (!m)
+            return null;
+        const list = m.reactions ?? [];
+        if (list.includes(emoji) || list.length >= WEB_REACTIONS_MAX)
+            return { message: m, added: false };
+        m.reactions = [...list, emoji];
+        this.persist(instance);
+        return { message: m, added: true };
+    }
+    /** #2305: every kept message's reactions (what a poll sends, as it sends the ticks): its row, and the list. */
+    reactionStates() {
+        const out = [];
+        for (const [instance, slot] of this.byInstance)
+            for (const m of slot.messages)
+                if (m.reactions?.length)
+                    out.push({ instance, boot: m.boot, id: m.id, reactions: [...m.reactions] });
+        return out;
+    }
     markChannel(instance, messageId) {
         const m = this.findByMessageId(instance, messageId);
         if (!m || m.channel)
@@ -556,7 +582,8 @@ export class WebChatHistory {
 }
 /**
  * #1565: one stored row as a restored message (and its files, to serve again), or null when it is not ours in shape.
- * Only what was said comes back: no buttons, no delivery tick, no message id — whatever a row carries of those.
+ * Only what was said comes back: no buttons, no delivery tick, no message id — whatever a row carries of those. #2305:
+ * and the instance's reactions (what was answered). With no id, a message from before the restart takes no new one.
  */
 function restoredRow(raw, instance, thisBoot) {
     if (!raw || typeof raw !== "object" || Array.isArray(raw))
@@ -588,6 +615,9 @@ function restoredRow(raw, instance, thisBoot) {
     const replyTo = role === "user" ? webChatReplyRefOf(r.replyTo) : undefined;
     if (replyTo)
         message.replyTo = replyTo;
+    const reactions = webReactionsOf(r.reactions);
+    if (reactions)
+        message.reactions = reactions;
     const files = !Array.isArray(r.attachments) ? [] : r.attachments.slice(0, 20).flatMap((a) => {
         if (!a || typeof a !== "object" || Array.isArray(a))
             return [];