From 9a37b8d2c962a5bd6e4e82655fda589274a31351 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 9 Sep 2023 11:04:20 +0000 Subject: [PATCH 01/17] Update dependency @types/uuid to v9.0.3 --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e5ab839..3d97459 100644 --- a/yarn.lock +++ b/yarn.lock @@ -910,9 +910,9 @@ integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== "@types/uuid@^9.0.0": - version "9.0.2" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.2.tgz#ede1d1b1e451548d44919dc226253e32a6952c4b" - integrity sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ== + version "9.0.3" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.3.tgz#6cdd939b4316b4f81625de9f06028d848c4a1533" + integrity sha512-taHQQH/3ZyI3zP8M/puluDEIEvtQHVYcC6y3N8ijFtAd28+Ey/G4sg1u2gB01S8MwybLOKAp9/yCMu/uR5l3Ug== "@types/ws@^8.5.5": version "8.5.5" From 63911f43b0ee388cba571a14c9ed313ccc15b23b Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 9 Sep 2023 18:49:44 +0100 Subject: [PATCH 02/17] Fix reoll button not working --- src/buttonEvents/Reroll.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts index e5aeed9..c1a54ea 100644 --- a/src/buttonEvents/Reroll.ts +++ b/src/buttonEvents/Reroll.ts @@ -28,6 +28,8 @@ export default class Reroll extends ButtonEvent { const image = readFileSync(randomCard.Path); + await interaction.deferReply(); + const attachment = new AttachmentBuilder(image, { name: randomCard.FileName }); const embed = new EmbedBuilder() From 9058942ea54395f522c04eae6645a6ea20d9d84e Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 9 Sep 2023 18:52:57 +0100 Subject: [PATCH 03/17] Update version in .env to 0.1.2 --- .dev.env | 4 ++-- .prod.env | 4 ++-- .stage.env | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.dev.env b/.dev.env index 1635809..074e386 100644 --- a/.dev.env +++ b/.dev.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.1 DEV +BOT_VER=0.1.2 DEV BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=682942374040961060 @@ -26,4 +26,4 @@ DB_AUTH_PASS=dev DB_SYNC=true DB_LOGGING=true -DB_CARD_FILE=:memory: \ No newline at end of file +DB_CARD_FILE=:memory: diff --git a/.prod.env b/.prod.env index 17fc883..2f890c3 100644 --- a/.prod.env +++ b/.prod.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.1 +BOT_VER=0.1.2 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1093810443589529631 @@ -26,4 +26,4 @@ DB_AUTH_PASS=prod DB_SYNC=false DB_LOGGING=false -DB_CARD_FILE=:memory: \ No newline at end of file +DB_CARD_FILE=:memory: diff --git a/.stage.env b/.stage.env index 39afa54..05cfb66 100644 --- a/.stage.env +++ b/.stage.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.1 BETA +BOT_VER=0.1.2 BETA BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1147976642942214235 @@ -26,4 +26,4 @@ DB_AUTH_PASS=stage DB_SYNC=false DB_LOGGING=false -DB_CARD_FILE=:memory: \ No newline at end of file +DB_CARD_FILE=:memory: From f483467ba5bcfda03f25da79aee005b17e9e2849 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 9 Sep 2023 18:53:08 +0100 Subject: [PATCH 04/17] v0.1.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92b174d..40c6340 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "card-drop", - "version": "0.1.1", + "version": "0.1.2", "main": "./dist/bot.js", "typings": "./dist", "scripts": { From b370c6f05e8ccf150bca3b83db22dc1da746fef4 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 9 Sep 2023 18:54:29 +0100 Subject: [PATCH 05/17] Fix drone script --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index a2752f4..35df56b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ steps: - name: deploy image: appleboy/drone-ssh settings: - host: 192.168.68.121 + host: 192.168.68.120 username: vylpes password: from_secret: ssh_password @@ -28,7 +28,7 @@ steps: - name: stage image: appleboy/drone-ssh settings: - host: 192.168.68.121 + host: 192.168.68.120 username: vylpes password: from_secret: ssh_password From 0596e01b8d336f3262d54173e03196810692d2a6 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 9 Sep 2023 18:55:12 +0100 Subject: [PATCH 06/17] .env to 0.1.3 --- .dev.env | 2 +- .prod.env | 2 +- .stage.env | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.dev.env b/.dev.env index 074e386..794bc22 100644 --- a/.dev.env +++ b/.dev.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.2 DEV +BOT_VER=0.1.3 DEV BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=682942374040961060 diff --git a/.prod.env b/.prod.env index 2f890c3..52afc4f 100644 --- a/.prod.env +++ b/.prod.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.2 +BOT_VER=0.1.3 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1093810443589529631 diff --git a/.stage.env b/.stage.env index 05cfb66..33a2db6 100644 --- a/.stage.env +++ b/.stage.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.2 BETA +BOT_VER=0.1.3 BETA BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1147976642942214235 From 5970a4fe2d9bd8f9c50a195cfb8e883afac27d32 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 9 Sep 2023 18:55:19 +0100 Subject: [PATCH 07/17] v0.1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40c6340..8229147 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "card-drop", - "version": "0.1.2", + "version": "0.1.3", "main": "./dist/bot.js", "typings": "./dist", "scripts": { From 0e839992e6ee72bb850786ad047fbbeb2c5980bc Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sun, 10 Sep 2023 13:01:04 +0100 Subject: [PATCH 08/17] Fix bug where the randomiser would sometimes pick a legendary that does not exist --- src/client/client.ts | 1 - src/helpers/CardDropHelper.ts | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/client/client.ts b/src/client/client.ts index b517a28..66907bb 100644 --- a/src/client/client.ts +++ b/src/client/client.ts @@ -9,7 +9,6 @@ import { Events } from "./events"; import { Util } from "./util"; import CardSetupFunction from "../Functions/CardSetupFunction"; import CardDataSource from "../database/dataSources/cardDataSource"; -import CardDropHelper from "../helpers/CardDropHelper"; import IButtonEventItem from "../contracts/IButtonEventItem"; import { ButtonEvent } from "../type/buttonEvent"; import AppDataSource from "../database/dataSources/appDataSource"; diff --git a/src/helpers/CardDropHelper.ts b/src/helpers/CardDropHelper.ts index a7d0a02..d5d8743 100644 --- a/src/helpers/CardDropHelper.ts +++ b/src/helpers/CardDropHelper.ts @@ -4,13 +4,6 @@ import Series from "../database/entities/card/Series"; export default class CardDropHelper { public static async GetRandomCard(): Promise { - const allSeries = await Series.FetchAll(Series, [ "Cards", "Cards.Series" ]); - const allSeriesWithCards = allSeries.filter(x => x.Cards.length > 0); - - const randomSeriesIndex = Math.floor(Math.random() * allSeriesWithCards.length); - - const randomSeries = allSeriesWithCards[randomSeriesIndex]; - const randomRarity = Math.random() * 100; let cardRarity: CardRarity; @@ -24,6 +17,13 @@ export default class CardDropHelper { else if (randomRarity < goldChance) cardRarity = CardRarity.Gold; else cardRarity = CardRarity.Legendary; + const allSeries = await Series.FetchAll(Series, [ "Cards", "Cards.Series" ]); + const allSeriesWithCards = allSeries.filter(x => x.Cards.length > 0 && x.Cards.find(x => x.Rarity == cardRarity)); + + const randomSeriesIndex = Math.floor(Math.random() * allSeriesWithCards.length); + + const randomSeries = allSeriesWithCards[randomSeriesIndex]; + const allCards = randomSeries.Cards.filter(x => x.Rarity == cardRarity && x.Path && x.FileName); const randomCardIndex = Math.floor(Math.random() * allCards.length); From d5c15af9e34d59d14befaec2d3c7b08e30b1d326 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sun, 10 Sep 2023 13:01:28 +0100 Subject: [PATCH 09/17] .env 0.1.4 --- .dev.env | 2 +- .prod.env | 2 +- .stage.env | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.dev.env b/.dev.env index 794bc22..ca791ba 100644 --- a/.dev.env +++ b/.dev.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.3 DEV +BOT_VER=0.1.4 DEV BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=682942374040961060 diff --git a/.prod.env b/.prod.env index 52afc4f..f1a644e 100644 --- a/.prod.env +++ b/.prod.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.3 +BOT_VER=0.1.4 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1093810443589529631 diff --git a/.stage.env b/.stage.env index 33a2db6..60a01fc 100644 --- a/.stage.env +++ b/.stage.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.3 BETA +BOT_VER=0.1.4 BETA BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1147976642942214235 From 74cdf818d1de23c9bcbb229a438165b9889ca7e3 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sun, 10 Sep 2023 13:01:34 +0100 Subject: [PATCH 10/17] v0.1.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8229147..80f753a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "card-drop", - "version": "0.1.3", + "version": "0.1.4", "main": "./dist/bot.js", "typings": "./dist", "scripts": { From ad505b3ea29b09afd217f4c35a0d3181dd8b8f5c Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 13 Sep 2023 14:37:17 +0100 Subject: [PATCH 11/17] Fix users being able to claim a card twice if the user has multiple of it already --- .../Up/01-CreateClaim.sql | 8 ++++++ .../Up/02-MoveToClaim.sql | 10 +++++++ .../Up/03-AlterInventory.sql | 2 ++ src/buttonEvents/Claim.ts | 16 +++++++++-- src/database/entities/app/Claim.ts | 27 +++++++++++++++++++ src/database/entities/app/Inventory.ts | 22 +++++++-------- .../app/0.1.5/1694609771821-CreateClaim.ts | 17 ++++++++++++ 7 files changed, 87 insertions(+), 15 deletions(-) create mode 100644 database/0.1.5/1694609771821-CreateClaim/Up/01-CreateClaim.sql create mode 100644 database/0.1.5/1694609771821-CreateClaim/Up/02-MoveToClaim.sql create mode 100644 database/0.1.5/1694609771821-CreateClaim/Up/03-AlterInventory.sql create mode 100644 src/database/entities/app/Claim.ts create mode 100644 src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts diff --git a/database/0.1.5/1694609771821-CreateClaim/Up/01-CreateClaim.sql b/database/0.1.5/1694609771821-CreateClaim/Up/01-CreateClaim.sql new file mode 100644 index 0000000..bfd8057 --- /dev/null +++ b/database/0.1.5/1694609771821-CreateClaim/Up/01-CreateClaim.sql @@ -0,0 +1,8 @@ +CREATE TABLE `claim` ( + `Id` varchar(255) NOT NULL, + `WhenCreated` datetime NOT NULL, + `WhenUpdated` datetime NOT NULL, + `ClaimId` varchar(255) NOT NULL, + `InventoryId` varchar(255) NOT NULL, + PRIMARY KEY (`Id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; \ No newline at end of file diff --git a/database/0.1.5/1694609771821-CreateClaim/Up/02-MoveToClaim.sql b/database/0.1.5/1694609771821-CreateClaim/Up/02-MoveToClaim.sql new file mode 100644 index 0000000..b73eb32 --- /dev/null +++ b/database/0.1.5/1694609771821-CreateClaim/Up/02-MoveToClaim.sql @@ -0,0 +1,10 @@ +INSERT INTO claim ( + Id, + ClaimId, + InventoryId +) +SELECT + UUID(), + ClaimId, + Id +FROM inventory; \ No newline at end of file diff --git a/database/0.1.5/1694609771821-CreateClaim/Up/03-AlterInventory.sql b/database/0.1.5/1694609771821-CreateClaim/Up/03-AlterInventory.sql new file mode 100644 index 0000000..7005ca3 --- /dev/null +++ b/database/0.1.5/1694609771821-CreateClaim/Up/03-AlterInventory.sql @@ -0,0 +1,2 @@ +ALTER TABLE inventory +DROP ClaimId; \ No newline at end of file diff --git a/src/buttonEvents/Claim.ts b/src/buttonEvents/Claim.ts index 5412db8..ce04803 100644 --- a/src/buttonEvents/Claim.ts +++ b/src/buttonEvents/Claim.ts @@ -2,6 +2,7 @@ import { ButtonInteraction } from "discord.js"; import { ButtonEvent } from "../type/buttonEvent"; import Inventory from "../database/entities/app/Inventory"; import { CoreClient } from "../client/client"; +import { default as eClaim } from "../database/entities/app/Claim"; export default class Claim extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { @@ -11,7 +12,7 @@ export default class Claim extends ButtonEvent { const claimId = interaction.customId.split(' ')[2]; const userId = interaction.user.id; - const claimed = await Inventory.FetchOneByClaimId(claimId); + const claimed = await eClaim.FetchOneByClaimId(claimId); if (claimed) { await interaction.reply('This card has already been claimed'); @@ -26,13 +27,24 @@ export default class Claim extends ButtonEvent { let inventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber); if (!inventory) { - inventory = new Inventory(userId, cardNumber, 1, claimId); + inventory = new Inventory(userId, cardNumber, 1); } else { inventory.SetQuantity(inventory.Quantity + 1); } await inventory.Save(Inventory, inventory); + const claim = new eClaim(claimId); + await claim.Save(eClaim, claim); + + inventory = await Inventory.FetchOneById(Inventory, inventory.Id, [ "Claims" ]); + + if (inventory) { + inventory.AddClaim(claim); + + await inventory.Save(Inventory, inventory); + } + await interaction.reply('Card claimed'); } } \ No newline at end of file diff --git a/src/database/entities/app/Claim.ts b/src/database/entities/app/Claim.ts new file mode 100644 index 0000000..7e1c4f9 --- /dev/null +++ b/src/database/entities/app/Claim.ts @@ -0,0 +1,27 @@ +import { Column, Entity, ManyToOne } from "typeorm"; +import AppBaseEntity from "../../../contracts/AppBaseEntity"; +import Inventory from "./Inventory"; +import AppDataSource from "../../dataSources/appDataSource"; + +@Entity() +export default class Claim extends AppBaseEntity { + constructor(claimId: string) { + super(); + + this.ClaimId = claimId; + } + + @Column() + ClaimId: string; + + @ManyToOne(() => Inventory, x => x.Claims) + Inventory: Inventory; + + public static async FetchOneByClaimId(claimId: string): Promise { + const repository = AppDataSource.getRepository(Claim); + + const single = await repository.findOne({ where: { ClaimId: claimId }}); + + return single; + } +} \ No newline at end of file diff --git a/src/database/entities/app/Inventory.ts b/src/database/entities/app/Inventory.ts index c6319a9..adec824 100644 --- a/src/database/entities/app/Inventory.ts +++ b/src/database/entities/app/Inventory.ts @@ -1,16 +1,16 @@ -import { Column, Entity } from "typeorm"; +import { Column, Entity, OneToMany } from "typeorm"; import AppBaseEntity from "../../../contracts/AppBaseEntity"; import AppDataSource from "../../dataSources/appDataSource"; +import Claim from "./Claim"; @Entity() export default class Inventory extends AppBaseEntity { - constructor(userId: string, cardNumber: string, quantity: number, claimId: string) { + constructor(userId: string, cardNumber: string, quantity: number) { super(); this.UserId = userId; this.CardNumber = cardNumber; this.Quantity = quantity; - this.ClaimId = claimId; } @Column() @@ -22,13 +22,17 @@ export default class Inventory extends AppBaseEntity { @Column() Quantity: number; - @Column() - ClaimId: string; + @OneToMany(() => Claim, x => x.Inventory) + Claims: Claim[]; public SetQuantity(quantity: number) { this.Quantity = quantity; } + public AddClaim(claim: Claim) { + this.Claims.push(claim); + } + public static async FetchOneByCardNumberAndUserId(userId: string, cardNumber: string): Promise { const repository = AppDataSource.getRepository(Inventory); @@ -36,12 +40,4 @@ export default class Inventory extends AppBaseEntity { return single; } - - public static async FetchOneByClaimId(claimId: string): Promise { - const repository = AppDataSource.getRepository(Inventory); - - const single = await repository.findOne({ where: { ClaimId: claimId }}); - - return single; - } } \ No newline at end of file diff --git a/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts b/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts new file mode 100644 index 0000000..22fe74c --- /dev/null +++ b/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from "typeorm" +import MigrationHelper from "../../../../helpers/MigrationHelper" + +export class CreateClaim1694609771821 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise { + MigrationHelper.Up('1694609771821-CreateClaim', '0.1.5', [ + '01-CreateClaim', + '02-MoveToClaim', + '03-AlterInventory', + ], queryRunner); + } + + public async down(queryRunner: QueryRunner): Promise { + } + +} From 8ccd7c33d4819f94f0a1066e9e755e496fa1ee1a Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 13 Sep 2023 15:06:53 +0100 Subject: [PATCH 12/17] Prevent users from being able to claim the latest card unless you were the one to drop it --- src/buttonEvents/Claim.ts | 15 +++++---------- src/buttonEvents/Reroll.ts | 2 +- src/commands/drop.ts | 3 +-- src/database/entities/app/Claim.ts | 4 ++++ 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/buttonEvents/Claim.ts b/src/buttonEvents/Claim.ts index ce04803..6f9ae58 100644 --- a/src/buttonEvents/Claim.ts +++ b/src/buttonEvents/Claim.ts @@ -10,6 +10,7 @@ export default class Claim extends ButtonEvent { const cardNumber = interaction.customId.split(' ')[1]; const claimId = interaction.customId.split(' ')[2]; + const droppedBy = interaction.customId.split(' ')[3]; const userId = interaction.user.id; const claimed = await eClaim.FetchOneByClaimId(claimId); @@ -19,8 +20,8 @@ export default class Claim extends ButtonEvent { return; } - if (claimId != CoreClient.ClaimId) { - await interaction.reply('This card has expired'); + if (claimId == CoreClient.ClaimId && userId != droppedBy) { + await interaction.reply('The latest dropped card can only be claimed by the user who dropped it'); return; } @@ -35,16 +36,10 @@ export default class Claim extends ButtonEvent { await inventory.Save(Inventory, inventory); const claim = new eClaim(claimId); + claim.SetInventory(inventory); + await claim.Save(eClaim, claim); - inventory = await Inventory.FetchOneById(Inventory, inventory.Id, [ "Claims" ]); - - if (inventory) { - inventory.AddClaim(claim); - - await inventory.Save(Inventory, inventory); - } - await interaction.reply('Card claimed'); } } \ No newline at end of file diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts index c1a54ea..bc91c90 100644 --- a/src/buttonEvents/Reroll.ts +++ b/src/buttonEvents/Reroll.ts @@ -45,7 +45,7 @@ export default class Reroll extends ButtonEvent { row.addComponents( new ButtonBuilder() - .setCustomId(`claim ${randomCard.CardNumber} ${claimId}`) + .setCustomId(`claim ${randomCard.CardNumber} ${claimId} ${interaction.user.id}`) .setLabel("Claim") .setStyle(ButtonStyle.Primary), new ButtonBuilder() diff --git a/src/commands/drop.ts b/src/commands/drop.ts index 5770903..7503bf7 100644 --- a/src/commands/drop.ts +++ b/src/commands/drop.ts @@ -51,7 +51,7 @@ export default class Drop extends Command { row.addComponents( new ButtonBuilder() - .setCustomId(`claim ${randomCard.CardNumber} ${claimId}`) + .setCustomId(`claim ${randomCard.CardNumber} ${claimId} ${interaction.user.id}`) .setLabel("Claim") .setStyle(ButtonStyle.Primary), new ButtonBuilder() @@ -76,7 +76,6 @@ export default class Drop extends Command { } } - CoreClient.ClaimId = claimId; } } \ No newline at end of file diff --git a/src/database/entities/app/Claim.ts b/src/database/entities/app/Claim.ts index 7e1c4f9..b4cde5e 100644 --- a/src/database/entities/app/Claim.ts +++ b/src/database/entities/app/Claim.ts @@ -17,6 +17,10 @@ export default class Claim extends AppBaseEntity { @ManyToOne(() => Inventory, x => x.Claims) Inventory: Inventory; + public SetInventory(inventory: Inventory) { + this.Inventory = inventory; + } + public static async FetchOneByClaimId(claimId: string): Promise { const repository = AppDataSource.getRepository(Claim); From 9c408e07b0123d3d43595125ceddba872db62ce4 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 13 Sep 2023 18:51:14 +0100 Subject: [PATCH 13/17] v0.1.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 80f753a..505b116 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "card-drop", - "version": "0.1.4", + "version": "0.1.5", "main": "./dist/bot.js", "typings": "./dist", "scripts": { From 7f64065589bbe38c64f73375dd91800f163438b6 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 13 Sep 2023 18:57:20 +0100 Subject: [PATCH 14/17] Add dates to migration script --- .../0.1.5/1694609771821-CreateClaim/Up/02-MoveToClaim.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/database/0.1.5/1694609771821-CreateClaim/Up/02-MoveToClaim.sql b/database/0.1.5/1694609771821-CreateClaim/Up/02-MoveToClaim.sql index b73eb32..c95401a 100644 --- a/database/0.1.5/1694609771821-CreateClaim/Up/02-MoveToClaim.sql +++ b/database/0.1.5/1694609771821-CreateClaim/Up/02-MoveToClaim.sql @@ -1,10 +1,14 @@ INSERT INTO claim ( Id, + WhenCreated, + WhenUpdated, ClaimId, InventoryId ) SELECT UUID(), + NOW(), + NOW(), ClaimId, Id FROM inventory; \ No newline at end of file From aebc7999664fa9e796c6239cae3f1ee7e1a8ca67 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 13 Sep 2023 18:57:39 +0100 Subject: [PATCH 15/17] Revert to 0.1.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 505b116..80f753a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "card-drop", - "version": "0.1.5", + "version": "0.1.4", "main": "./dist/bot.js", "typings": "./dist", "scripts": { From 005a366883c4d7ce050904845ab1b97909fb6065 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 13 Sep 2023 18:57:45 +0100 Subject: [PATCH 16/17] v0.1.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 80f753a..505b116 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "card-drop", - "version": "0.1.4", + "version": "0.1.5", "main": "./dist/bot.js", "typings": "./dist", "scripts": { From 4b785096538541faefb79142df42f66c74267d77 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 28 Sep 2023 10:42:57 +0000 Subject: [PATCH 17/17] Update dependency @types/uuid to v9.0.4 --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index e5ab839..eda61a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -910,14 +910,14 @@ integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== "@types/uuid@^9.0.0": - version "9.0.2" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.2.tgz#ede1d1b1e451548d44919dc226253e32a6952c4b" - integrity sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ== + version "9.0.4" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.4.tgz#e884a59338da907bda8d2ed03e01c5c49d036f1c" + integrity sha512-zAuJWQflfx6dYJM62vna+Sn5aeSWhh3OB+wfUEACNcqUSc0AGc5JKl+ycL1vrH7frGTXhJchYjE1Hak8L819dA== "@types/ws@^8.5.5": - version "8.5.5" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" - integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== + version "8.5.6" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.6.tgz#e9ad51f0ab79b9110c50916c9fcbddc36d373065" + integrity sha512-8B5EO9jLVCy+B58PLHvLDuOD8DRVMgQzq8d55SjLCOn9kqGyqOvy27exVaTio1q1nX5zLu8/6N0n2ThSxOM6tg== dependencies: "@types/node" "*"