From f5c5cc7b9df5d72a562558eb4ed35abaaecb06be Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sat, 18 Apr 2026 01:24:35 +0200
Subject: [PATCH] Attachment -> PublicAttachment in schemas

---
 assets/openapi.json                           | Bin 966782 -> 968756 bytes
 assets/schemas.json                           | Bin 430651 -> 436201 bytes
 src/schemas/api/messages/Message.ts           |   4 ++--
 .../responses/AccountStandingResponse.ts      |   5 ++---
 .../responses/GuildMessagesSearchResponse.ts  |   5 +++--
 src/util/entities/Message.ts                  |   2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/assets/openapi.json b/assets/openapi.json
index 25833b9790131d9aa0c77b8cdfe4717c9611108e..3046048265f5a6c72a0c642d212c0cfe7153c34c 100644
GIT binary patch
delta 404
zcmey@V7+C6b;B0MXA;{V%xBxfHvIt?JKJ<wPIi^)1;4q~r*9Bql%FQatUP_fO;*n7
z3QO4%rYA_SDNTPb$s9lV!BZuWxY~39c6LROdQPzV=?fmQfF(Gm8|1NQPM=`F$qJEp
zaERFeVn~BIo9_0TE7@3CCvVus+WuOC5r~<9m>Gy!fS7grYYDcmZQJjyV^ijx{$K|?
z8@ppkNn&zF?sUdDw)p7{-<edWE3~oLZGXqZ*2*~jy&OyIbU#@(w&@K@Y;KbU{M@G}
zTws=;?x4xYGQC!bjeYu4T}H9#x)O}ClXKo1PcH~!6PVuB#<qU@fjw-oK45=u2l~5K
z6l@tc)UwpPlKAO~;#^{r3s^j-e>e#Y39>CUna0M>(mr2~9f&!Am=lP(fS4PId4QOA
K`+PaR`wIaOua8my

delta 188
zcmdlo!TMi=b;B0MXA+Y)Y-4SIug(a>OhC*G#4JF}y8XR6+t;?~39W4G+uuqsZe^Q(
z;3TWc<PV-4(=XiTmY?phgIRvMKQFuT^a*>|1g9q`F_umb_{)?sxqyXZ`h=UT4$~JT
z1GVNUGS;w7&-)2vzFx;B!wWJ{VEgO+Y&^c(fd(2dPF`=pK7H;{)}HML_}F&|w+E=P
a12G2>a{@6J5OV`D4-oTi4^ZQKvJe1{DoAnw

diff --git a/assets/schemas.json b/assets/schemas.json
index a7acf2b040016249995ee31f237542f1a1eddbc6..2cf6a939d17b5dcec7be9768bdf902c0a1fe7e05 100644
GIT binary patch
delta 1059
zcma)5OK1~O6y?p#og}rI={GfMo2IsEX-tBkAhn60XjV-Tm0GnCzg5~OR76lLDyS%0
z9rYM#+E7Gni!>X_!e16H{lrDBP=tURi@zACxYIXpT0z={i#Kz*_q==0z30Bi_neb&
zoXPsUx^Mr1j;;=U{jG9zf|lU-H&%qiWw{9%2lF7ZO<JP&N{T+(x7_$6nUfXxLZl$#
zSIf9dgLYG{<%Si$5y^$FFG>Nf-J!)uo+X=}wb_w=O2q>CJVq@zJVnLm$y2FtW&5Nm
zGs|6a&$?1_qfSLSMt+e$Hzd_?LxDDfMPi8D;(G2qs}!+tqg-h+iN8}UXdY9_1;F)E
zS|Re|=qlNZquco>>|j<NECj#Z1dg{No+IaMd>reZNd;){qe_#bw$x>y^xzYdeWso{
z;M>a7!u8$Vd-fjc+~3vR?niD|ir|x9T{JtT7p@k?0dJ3F)H5mYX<5)a&fJK6B_9$&
zSwm)_T8%UPRBe*ajIkBBC&;L(;6pzxpPNsxjh5lmfat|)w)bLyYUc#&J@afcLTkFc
zx=xVQBvygmgUr-e3}|AtY(wj~vT&|$(k|u|eh#fd`Xt?kCqx!B4U)s8e&w@LhMb-6
zSO0S=H7zmo*x>ZG7!p|Udx|tO%6F+kSbQ*q=q+A8{hAdTz3bZUa%dlw6ME!<6(<7f
zeDt1|O7!$tnf^Vq@mw^2A)06WNc_mDXkIx!ECjMl3xx1_E@n1P9wE@*$(UUEj?}>r
zHI<IjmLjBolA2oNq-P9a58DWP12rPJmTiOU2Nxo6K`Oz52AYSCT~wp{UbSL0$-9U(
z(#6!sD76JdZR^Z(fW4J#;JU;ilYaF+a%1MIb{en>Xnx6U_#Q(0NtRUT2d&|+h*S7y
zyYyph1FjD72bx{$!Rei}2}f445SlmBW+cAy**gNVQw0Bu^A6qjR?)xwvOT)0KD_=1
Dyv%$+

delta 154
zcmaEPUTXIesSR46CI>uqZJ*1?2*gZ4%nZaV+vhT}madw<^f`;n<Oxh1(-)Mp=}xch
zWs;fh;J_+4*`U{Bx`R5iE?jPM12@O?3$cts(-Z8O<)<%L$I8CFVJ+)%f$a?kSwGu@
v40<?y|85rc>9tQ-a;Gm?#w0O)!gNL@u-JBfX0|8%lQ&FY-EJ(#wrwH+7`Qv?

diff --git a/src/schemas/api/messages/Message.ts b/src/schemas/api/messages/Message.ts
index ee2b9a8bc..f99f2b1bf 100644
--- a/src/schemas/api/messages/Message.ts
+++ b/src/schemas/api/messages/Message.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Attachment, Sticker } from "@spacebar/util";
+import { Sticker } from "@spacebar/util";
 import { Embed, MessageActivity, MessageComponent, PartialUser, Poll, PublicChannel, Snowflake } from "@spacebar/schemas";
 import { PublicAttachment } from "./Attachments";
 
@@ -151,7 +151,7 @@ export interface MessageSnapshot {
         edited_timestamp?: Date | null;
         mentions: PartialUser[];
         mention_roles: Snowflake[];
-        attachments?: Attachment[];
+        attachments?: PublicAttachment[];
         embeds: Embed[];
         type: MessageType;
         flags: number;
diff --git a/src/schemas/responses/AccountStandingResponse.ts b/src/schemas/responses/AccountStandingResponse.ts
index 6f29ebef7..c1f603bdf 100644
--- a/src/schemas/responses/AccountStandingResponse.ts
+++ b/src/schemas/responses/AccountStandingResponse.ts
@@ -16,8 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-// TODO: remove dependency on entities...
-import { Attachment } from "@spacebar/util";
+import { PublicAttachment } from "../api/messages/Attachments";
 
 export enum AccountStandingState {
     ALL_GOOD = 100,
@@ -114,7 +113,7 @@ export interface FlaggedContent {
     type: "message";
     id: string;
     content: string;
-    attachments: Attachment[];
+    attachments: PublicAttachment[];
 }
 
 export interface Classification {
diff --git a/src/schemas/responses/GuildMessagesSearchResponse.ts b/src/schemas/responses/GuildMessagesSearchResponse.ts
index 8627b3fc2..e498f8bc0 100644
--- a/src/schemas/responses/GuildMessagesSearchResponse.ts
+++ b/src/schemas/responses/GuildMessagesSearchResponse.ts
@@ -17,8 +17,9 @@
 */
 
 // TODO: remove dependency on entities
-import { Attachment, Role } from "@spacebar/util";
+import { Role } from "@spacebar/util";
 import { BaseMessageComponents, Embed, MessageType, Poll, PublicUser } from "@spacebar/schemas";
+import { PublicAttachment } from "../api/messages/Attachments";
 
 export interface GuildMessagesSearchMessage {
     id: string;
@@ -26,7 +27,7 @@ export interface GuildMessagesSearchMessage {
     content?: string;
     channel_id: string;
     author: PublicUser;
-    attachments: Attachment[];
+    attachments: PublicAttachment[];
     embeds: Embed[];
     mentions: PublicUser[];
     mention_roles: Role[];
diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index 217f1da00..c2628e2c1 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -331,7 +331,7 @@ export class Message extends BaseClass {
     toSnapshot(): MessageSnapshot {
         return {
             message: {
-                attachments: this.attachments,
+                attachments: this.attachments?.map((x) => x.toJSON()),
                 components: this.components,
                 content: this.content!,
                 edited_timestamp: this.edited_timestamp,