From ecea5540fa39a117055caa96c8b3d78b998da9e6 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Tue, 17 Mar 2026 02:36:54 +0100
Subject: [PATCH] Schemas for stickers

---
 assets/openapi.json                         | Bin 949503 -> 952872 bytes
 assets/schemas.json                         | Bin 415904 -> 418044 bytes
 src/api/routes/guilds/#guild_id/stickers.ts |   2 +-
 src/api/routes/sticker-packs/index.ts       |   2 +-
 src/schemas/api/guilds/Sticker.ts           |  20 ++++++++++++++++
 src/schemas/responses/TypedResponses.ts     |  25 --------------------
 src/util/entities/Attachment.ts             |   1 -
 7 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/assets/openapi.json b/assets/openapi.json
index 0e1b4fa4f0ca2ec32f9532109b59b02a62c706ee..c1df064399b85458cc9d70c30094e9a569f57a35 100644
GIT binary patch
delta 683
zcmc(c-%C?r7{__f_P*!GcBUmPSUJi=q8D=#1!_nqg5@sC{U{1GIx=&tVrR{Hk#sTG
zVBG|=SN5<AX+c33yI2;zvB(q&Dj7*s)J^QdTWQ8Fl9+XdA^rzld@i2v^Xtp={MqV%
zJU38k<b_}&61s6MK1KcIPSD<=i=fLQ4-5MR2NX83lmAx$r?*fVswKYVsqe%G1gQ`{
zx+h#4G3CHVxl53IBJxx{t7N;5)2f+=+6LFRGt)bX87)R7SRKL1J-smx#-NSif$TRP
zF8?6MOjCLstQF#-F|U)(x`seIiH^YQBH|$%#=+(e44)sN1E8Mc?6k1#Of~YXkw-t>
z?BRPf$g%qs6hNR>&{b%iAQ)EL@Mx|LhoMzL3RQm(!l}4fV~cq-i{Shr+zxNcTsy>`
zV=pAfNH?_ZGmEfPMBU(fB`8qiNGFXMQm=<}fHu!NV6D&81H0bY_i?hwG4%_Yx3k;^
z`ie8|Ix^r4Oa^A=u47yH|2R_|%)Lnz8OkYQV=Z^c;pt3Zo3Ow(FRnn(GeMAV>Y?#O
zM31^6(Mg@%S`gkKOGuxNCgQhUA$<ZK927r7sl#@+d3`4&hXfBBT^3$m*m<tMF3&*i
zif|^kWa2aHc9E^yCBL?tq^xSS)Hvw<B+Wn}DD^WrZka<&y(hgOP4znXBuiIjI4v1i
M46JN8Eth`%1&5#jy#N3J

delta 464
zcmZ26#p?f0%ME{LHg8$FealkDPx`E`x%pX{(;GH3R!q-o;ufF0;Va*Chm%Z#+m~Er
zv}c;`C(9Z?{k;s3n83}XI9-61(RRAS7e=n>|D{<wr>~P`O`QH=J|o|BgB^^j(^fE=
zO<!Qh$U0fzr|k9ydDi31(?6)PC{1@zVV0Y2z|X`w-QgdT(R7E6tSs9P++&oNWDhRM
zOwLX%g4i!Ghf5M+|K0D5w^+HM3IY<7v%!icH_T$6zA2Yg46d+!>t9A7W&&bnAZFRV
z^)IVHI!ztk#5CPLnT>6`Rvuft`1UoE*z`)LuVZ9q-#($0O@_Dq7Lav|orCl6_O^2z
zyF>UK13Zzvu`!mTZ2ALl4(I6s#jNb@JSv>qc~rOp6SxrSwkw|Ie#t!Dpqj^NdO$o6
b`}TJexTi3->veGfF*gwNY}f1J{q-LJ%UrN7

diff --git a/assets/schemas.json b/assets/schemas.json
index 1458afdb2e11b479f886abddec6d417c04d80557..a3fe6de9b6423e31b974aab8bda76ef5f132cb31 100644
GIT binary patch
delta 315
zcmZ{cF-QVo97p+|-=~F@Hw31HR$yQU<t}b6QBV}P6m?Jz4eHUU;GhUbT9iW{^xNVl
zhgvj;4_dsI=7yliAp(iE+HJ_(8{YQbvs%8NdtdXl1ml9a#QSGZluZ?D8ZE+Ok!xfl
zX&RZdnG~&lV(4I2qkz;`Xk5YODVuK3Og#`D3yw7O7#*OQXLB%W6cUzqY52hY8LPoQ
zVXJLJ>k%SvECTJBhq;+K%<jVOGe7Jo1;uwEAv&XDh}<y`>N$rK#d8+@TXJxdJVFg^
zRk|hFEm4fgrwX|hnK~wg;J;#Z=q=Kq#%NyJRr>PEj74Ey)f+TG8Q_q5gI(YLo1{1b
m%TA}<(fRhI{CMGUH`FqpK<9|ZVc$?(uIKpWo?PhheD)V|bahJr

delta 309
zcmex!P;$XW$ql#anyWguS9LPlv9P-4=4WM2Uy#cfIX%{wk$-wL8>7$mt-XwVOw$GK
zvan1Sn8@fn{eC11>-5|tR;TF`!kFBq{|{s-o*od);yL|67OVF34epF;(*-s%yKjFG
z!m^8L`hyfkmdOqVA=?+Ev5GKl7o5)6B*Y$El9`;HS_H94E{#PHV$+0`j5@5`P|1MA
z<ZQ5l$#(VZ)Ac5^@PQSz?_9?S#7scUynW|7mbIIx;<Pfc=^G}q@=cGQ!Rj)7LISJH
c_75Gb(~_s>a<Q^+m#t;B<=)=*hPA8&01@?aH2?qr

diff --git a/src/api/routes/guilds/#guild_id/stickers.ts b/src/api/routes/guilds/#guild_id/stickers.ts
index 857713de2..aa3b76b1f 100644
--- a/src/api/routes/guilds/#guild_id/stickers.ts
+++ b/src/api/routes/guilds/#guild_id/stickers.ts
@@ -29,7 +29,7 @@ router.get(
     route({
         responses: {
             200: {
-                body: "APIStickerArray",
+                body: "StickersResponse",
             },
             403: {
                 body: "APIErrorResponse",
diff --git a/src/api/routes/sticker-packs/index.ts b/src/api/routes/sticker-packs/index.ts
index b5b08cfae..ce4f214d2 100644
--- a/src/api/routes/sticker-packs/index.ts
+++ b/src/api/routes/sticker-packs/index.ts
@@ -27,7 +27,7 @@ router.get(
     route({
         responses: {
             200: {
-                body: "APIStickerPackArray",
+                body: "StickersResponse",
             },
         },
     }),
diff --git a/src/schemas/api/guilds/Sticker.ts b/src/schemas/api/guilds/Sticker.ts
index 116d72f99..212baadc1 100644
--- a/src/schemas/api/guilds/Sticker.ts
+++ b/src/schemas/api/guilds/Sticker.ts
@@ -1,3 +1,23 @@
+import { Snowflake } from "../../Identifiers";
+import { PartialUser } from "../users";
+
+export type StickersResponse = StickerResponse[];
+export interface StickerResponse {
+    id: Snowflake;
+    pack_id?: Snowflake;
+    name: string;
+    description: string | null;
+    tags: string;
+    type: StickerType;
+    format_type: StickerFormatType;
+    available?: boolean;
+    guild_id?: Snowflake;
+    // Only filled for Get Guild Sticker(/s)
+    user?: PartialUser;
+    // Only filled in for sticker packs
+    sort_value?: number;
+}
+
 export enum StickerType {
     STANDARD = 1,
     GUILD = 2,
diff --git a/src/schemas/responses/TypedResponses.ts b/src/schemas/responses/TypedResponses.ts
index 13143a9f9..9d5d6121d 100644
--- a/src/schemas/responses/TypedResponses.ts
+++ b/src/schemas/responses/TypedResponses.ts
@@ -25,15 +25,10 @@ import { GuildBansResponse, GuildCreateResponse, PrivateUser, PublicMember, Publ
 // TODO: remove this entire file!
 // removes internal properties from the guild class
 export type APIGuild = Omit<Guild, "afk_channel" | "template" | "owner" | "public_updates_channel" | "rules_channel" | "system_channel" | "widget_channel">;
-
 export type APIPublicUser = PublicUser;
-
 export type APIPrivateUser = PrivateUser;
-
 export type APIGuildArray = APIGuild[];
-
 export type APIDMChannelArray = DmChannelDTO[];
-
 export type APIBackupCodeArray = BackupCode[];
 
 export interface UserUpdateResponse extends APIPrivateUser {
@@ -41,29 +36,16 @@ export interface UserUpdateResponse extends APIPrivateUser {
 }
 
 export type ApplicationDetectableResponse = unknown[];
-
 export type ApplicationEntitlementsResponse = unknown[];
-
 export type ApplicationSkusResponse = unknown[];
-
 export type APIApplicationArray = Application[];
-
 export type APIBansArray = GuildBansResponse[];
-
 export type APIInviteArray = Invite[];
-
 export type APIMessageArray = Message[];
-
 export type APIWebhookArray = Webhook[];
-
 export type APIDiscoveryCategoryArray = Categories[];
-
 export type APIGeneralConfiguration = GeneralConfiguration;
-
 export type APIChannelArray = Channel[];
-
-export type APIEmojiArray = Emoji[];
-
 export type APIMemberArray = Member[];
 export type APIPublicMember = PublicMember;
 
@@ -72,17 +54,10 @@ export interface APIGuildWithJoinedAt extends GuildCreateResponse {
 }
 
 export type APIRoleArray = Role[];
-
-export type APIStickerArray = Sticker[];
-
 export type APITemplateArray = Template[];
-
 export type APIGuildVoiceRegion = GuildVoiceRegion[];
-
 export type APILimitsConfiguration = LimitsConfiguration;
 
-export type APIStickerPackArray = StickerPack[];
-
 export type APIConnectionsConfiguration = Record<
     string,
     {
diff --git a/src/util/entities/Attachment.ts b/src/util/entities/Attachment.ts
index 9dc9c3ac0..4dced10a7 100644
--- a/src/util/entities/Attachment.ts
+++ b/src/util/entities/Attachment.ts
@@ -17,7 +17,6 @@
 */
 
 import { BeforeRemove, Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { URL } from "url";
 import { deleteFile } from "../util";
 import { BaseClass } from "./BaseClass";
 import { getUrlSignature, NewUrlUserSignatureData, NewUrlSignatureData } from "../Signing";