From 93b76035b64ff3bffe3ab86df1da2475067533c6 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Thu, 14 Oct 2021 19:47:02 +0200
Subject: :sparkles: sticker db entities

---
 util/src/entities/StickerPack.ts | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 util/src/entities/StickerPack.ts

(limited to 'util/src/entities/StickerPack.ts')

diff --git a/util/src/entities/StickerPack.ts b/util/src/entities/StickerPack.ts
new file mode 100644
index 00000000..b80fa9c7
--- /dev/null
+++ b/util/src/entities/StickerPack.ts
@@ -0,0 +1,31 @@
+import { Column, Entity, JoinColumn, OneToMany, OneToOne, RelationId } from "typeorm";
+import { Sticker } from ".";
+import { BaseClass } from "./BaseClass";
+
+@Entity("stickers")
+export class StickerPack extends BaseClass {
+	@Column()
+	name: string;
+
+	@Column({ nullable: true })
+	description?: string;
+
+	@Column({ nullable: true })
+	banner_asset_id?: string;
+
+	@OneToMany(() => Sticker, (sticker: Sticker) => sticker.pack_id, {
+		cascade: true,
+		orphanedRowAction: "delete",
+	})
+	stickers: Sticker[];
+
+	// sku_id: string
+
+	@Column({ nullable: true })
+	@RelationId((pack: StickerPack) => pack.cover_sticker)
+	cover_sticker_id?: string;
+
+	@OneToOne(() => Sticker, { nullable: true })
+	@JoinColumn()
+	cover_sticker?: Sticker;
+}
-- 
cgit 1.5.1


From fb3f957f3027a0d6c7636dbd06edb6a4803c6937 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Fri, 15 Oct 2021 00:03:19 +0200
Subject: :bug: fix sticker packs

---
 api/src/routes/sticker-packs/index.ts | 6 ++++--
 gateway/src/opcodes/Identify.ts       | 2 ++
 util/src/entities/StickerPack.ts      | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'util/src/entities/StickerPack.ts')

diff --git a/api/src/routes/sticker-packs/index.ts b/api/src/routes/sticker-packs/index.ts
index 89b91bdb..e6560d12 100644
--- a/api/src/routes/sticker-packs/index.ts
+++ b/api/src/routes/sticker-packs/index.ts
@@ -1,11 +1,13 @@
 import { Request, Response, Router } from "express";
 import { route } from "@fosscord/api";
-import { StickerPack } from "@fosscord/util/src/entities/StickerPack";
+import { StickerPack } from "@fosscord/util";
 
 const router: Router = Router();
 
 router.get("/", route({}), async (req: Request, res: Response) => {
-	res.json(await StickerPack.find({}));
+	const sticker_packs = await StickerPack.find({ relations: ["stickers"] });
+
+	res.json({ sticker_packs });
 });
 
 export default router;
diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts
index c91ca5dd..2f9d4632 100644
--- a/gateway/src/opcodes/Identify.ts
+++ b/gateway/src/opcodes/Identify.ts
@@ -179,6 +179,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 			x.guild_hashes = {}; // @ts-ignore
 			x.guild_scheduled_events = []; // @ts-ignore
 			x.threads = [];
+			x.premium_subscription_count = 30;
+			x.premium_tier = 3;
 			return x;
 		}),
 		guild_experiments: [], // TODO
diff --git a/util/src/entities/StickerPack.ts b/util/src/entities/StickerPack.ts
index b80fa9c7..ec8c69a2 100644
--- a/util/src/entities/StickerPack.ts
+++ b/util/src/entities/StickerPack.ts
@@ -1,8 +1,8 @@
-import { Column, Entity, JoinColumn, OneToMany, OneToOne, RelationId } from "typeorm";
+import { Column, Entity, JoinColumn, ManyToOne, OneToMany, OneToOne, RelationId } from "typeorm";
 import { Sticker } from ".";
 import { BaseClass } from "./BaseClass";
 
-@Entity("stickers")
+@Entity("sticker_packs")
 export class StickerPack extends BaseClass {
 	@Column()
 	name: string;
@@ -13,7 +13,7 @@ export class StickerPack extends BaseClass {
 	@Column({ nullable: true })
 	banner_asset_id?: string;
 
-	@OneToMany(() => Sticker, (sticker: Sticker) => sticker.pack_id, {
+	@OneToMany(() => Sticker, (sticker: Sticker) => sticker.pack, {
 		cascade: true,
 		orphanedRowAction: "delete",
 	})
@@ -25,7 +25,7 @@ export class StickerPack extends BaseClass {
 	@RelationId((pack: StickerPack) => pack.cover_sticker)
 	cover_sticker_id?: string;
 
-	@OneToOne(() => Sticker, { nullable: true })
+	@ManyToOne(() => Sticker, { nullable: true })
 	@JoinColumn()
 	cover_sticker?: Sticker;
 }
-- 
cgit 1.5.1