Merge branch 'develop' into feature/202-daily-command
All checks were successful
Test / build (push) Successful in 2m28s
All checks were successful
Test / build (push) Successful in 2m28s
This commit is contained in:
commit
ab1ca9b22c
14 changed files with 437 additions and 26 deletions
91
package-lock.json
generated
91
package-lock.json
generated
|
@ -16,6 +16,7 @@
|
||||||
"@types/uuid": "^9.0.0",
|
"@types/uuid": "^9.0.0",
|
||||||
"body-parser": "^1.20.2",
|
"body-parser": "^1.20.2",
|
||||||
"clone-deep": "^4.0.1",
|
"clone-deep": "^4.0.1",
|
||||||
|
"cron": "^3.1.7",
|
||||||
"discord.js": "^14.3.0",
|
"discord.js": "^14.3.0",
|
||||||
"dotenv": "^16.0.0",
|
"dotenv": "^16.0.0",
|
||||||
"express": "^4.18.2",
|
"express": "^4.18.2",
|
||||||
|
@ -747,10 +748,15 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@discordjs/collection": {
|
"node_modules/@discordjs/collection": {
|
||||||
"version": "2.0.0",
|
"version": "2.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.0.tgz",
|
||||||
|
"integrity": "sha512-mLcTACtXUuVgutoznkh6hS3UFqYirDYAg5Dc1m8xn6OvPjetnUlf/xjtqnnc47OwWdaoCQnHmHh9KofhD6uRqw==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/discordjs/discord.js?sponsor"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@discordjs/formatters": {
|
"node_modules/@discordjs/formatters": {
|
||||||
|
@ -764,28 +770,54 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@discordjs/rest": {
|
"node_modules/@discordjs/rest": {
|
||||||
"version": "2.2.0",
|
"version": "2.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.3.0.tgz",
|
||||||
|
"integrity": "sha512-C1kAJK8aSYRv3ZwMG8cvrrW4GN0g5eMdP8AuN8ODH5DyOCbHgJspze1my3xHOAgwLJdKUbWNVyAeJ9cEdduqIg==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@discordjs/collection": "^2.0.0",
|
"@discordjs/collection": "^2.1.0",
|
||||||
"@discordjs/util": "^1.0.2",
|
"@discordjs/util": "^1.1.0",
|
||||||
"@sapphire/async-queue": "^1.5.0",
|
"@sapphire/async-queue": "^1.5.2",
|
||||||
"@sapphire/snowflake": "^3.5.1",
|
"@sapphire/snowflake": "^3.5.3",
|
||||||
"@vladfrangu/async_event_emitter": "^2.2.2",
|
"@vladfrangu/async_event_emitter": "^2.2.4",
|
||||||
"discord-api-types": "0.37.61",
|
"discord-api-types": "0.37.83",
|
||||||
"magic-bytes.js": "^1.5.0",
|
"magic-bytes.js": "^1.10.0",
|
||||||
"tslib": "^2.6.2",
|
"tslib": "^2.6.2",
|
||||||
"undici": "5.27.2"
|
"undici": "6.13.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=16.11.0"
|
"node": ">=16.11.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/discordjs/discord.js?sponsor"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@discordjs/rest/node_modules/@sapphire/snowflake": {
|
||||||
|
"version": "3.5.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.3.tgz",
|
||||||
|
"integrity": "sha512-jjmJywLAFoWeBi1W7994zZyiNWPIiqRRNAmSERxyg93xRGzNYvGjlZ0gR6x0F4gPRi2+0O6S71kOZYyr3cxaIQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=v14.0.0",
|
||||||
|
"npm": ">=7.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@discordjs/rest/node_modules/discord-api-types": {
|
||||||
|
"version": "0.37.83",
|
||||||
|
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.83.tgz",
|
||||||
|
"integrity": "sha512-urGGYeWtWNYMKnYlZnOnDHm8fVRffQs3U0SpE8RHeiuLKb/u92APS8HoQnPTFbnXmY1vVnXjXO4dOxcAn3J+DA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/@discordjs/util": {
|
"node_modules/@discordjs/util": {
|
||||||
"version": "1.0.2",
|
"version": "1.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.1.0.tgz",
|
||||||
|
"integrity": "sha512-IndcI5hzlNZ7GS96RV3Xw1R2kaDuXEp7tRIy/KlhidpN/BQ1qh1NZt3377dMLTa44xDUNKT7hnXkA/oUAzD/lg==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=16.11.0"
|
"node": ">=16.11.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/discordjs/discord.js?sponsor"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@discordjs/ws": {
|
"node_modules/@discordjs/ws": {
|
||||||
|
@ -1673,7 +1705,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@sapphire/async-queue": {
|
"node_modules/@sapphire/async-queue": {
|
||||||
"version": "1.5.0",
|
"version": "1.5.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.2.tgz",
|
||||||
|
"integrity": "sha512-7X7FFAA4DngXUl95+hYbUF19bp1LGiffjJtu7ygrZrbdCSsdDDBaSjB7Akw0ZbOu6k0xpXyljnJ6/RZUvLfRdg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=v14.0.0",
|
"node": ">=v14.0.0",
|
||||||
|
@ -1895,14 +1929,20 @@
|
||||||
"@types/node": "*"
|
"@types/node": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/luxon": {
|
||||||
|
"version": "3.4.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
|
||||||
|
"integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA=="
|
||||||
|
},
|
||||||
"node_modules/@types/mime": {
|
"node_modules/@types/mime": {
|
||||||
"version": "3.0.4",
|
"version": "3.0.4",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "20.12.11",
|
"version": "20.12.12",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.11.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz",
|
||||||
"integrity": "sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==",
|
"integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==",
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"undici-types": "~5.26.4"
|
"undici-types": "~5.26.4"
|
||||||
}
|
}
|
||||||
|
@ -3841,6 +3881,15 @@
|
||||||
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
|
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/cron": {
|
||||||
|
"version": "3.1.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/cron/-/cron-3.1.7.tgz",
|
||||||
|
"integrity": "sha512-tlBg7ARsAMQLzgwqVxy8AZl/qlTc5nibqYwtNGoCrd+cV+ugI+tvZC1oT/8dFH8W455YrywGykx/KMmAqOr7Jw==",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/luxon": "~3.4.0",
|
||||||
|
"luxon": "~3.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/cross-spawn": {
|
"node_modules/cross-spawn": {
|
||||||
"version": "7.0.3",
|
"version": "7.0.3",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
@ -7700,8 +7749,18 @@
|
||||||
"node": ">=10"
|
"node": ">=10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/luxon": {
|
||||||
|
"version": "3.4.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
|
||||||
|
"integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=12"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/magic-bytes.js": {
|
"node_modules/magic-bytes.js": {
|
||||||
"version": "1.6.0",
|
"version": "1.10.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.10.0.tgz",
|
||||||
|
"integrity": "sha512-/k20Lg2q8LE5xiaaSkMXk4sfvI+9EGEykFS4b0CHHGWqDYU0bGUFSwchNOMA56D7TCs9GwVTkqe9als1/ns8UQ==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/make-dir": {
|
"node_modules/make-dir": {
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
"@types/uuid": "^9.0.0",
|
"@types/uuid": "^9.0.0",
|
||||||
"body-parser": "^1.20.2",
|
"body-parser": "^1.20.2",
|
||||||
"clone-deep": "^4.0.1",
|
"clone-deep": "^4.0.1",
|
||||||
|
"cron": "^3.1.7",
|
||||||
"discord.js": "^14.3.0",
|
"discord.js": "^14.3.0",
|
||||||
"dotenv": "^16.0.0",
|
"dotenv": "^16.0.0",
|
||||||
"express": "^4.18.2",
|
"express": "^4.18.2",
|
||||||
|
|
|
@ -37,7 +37,6 @@ const client = new CoreClient([
|
||||||
]);
|
]);
|
||||||
|
|
||||||
Registry.RegisterCommands();
|
Registry.RegisterCommands();
|
||||||
Registry.RegisterEvents();
|
|
||||||
Registry.RegisterButtonEvents();
|
Registry.RegisterButtonEvents();
|
||||||
|
|
||||||
if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == "true") {
|
if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == "true") {
|
||||||
|
|
147
src/buttonEvents/Sacrifice.ts
Normal file
147
src/buttonEvents/Sacrifice.ts
Normal file
|
@ -0,0 +1,147 @@
|
||||||
|
import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, EmbedBuilder } from "discord.js";
|
||||||
|
import { ButtonEvent } from "../type/buttonEvent";
|
||||||
|
import Inventory from "../database/entities/app/Inventory";
|
||||||
|
import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
|
||||||
|
import { CardRarityToString, GetSacrificeAmount } from "../constants/CardRarity";
|
||||||
|
import EmbedColours from "../constants/EmbedColours";
|
||||||
|
import User from "../database/entities/app/User";
|
||||||
|
|
||||||
|
export default class Sacrifice extends ButtonEvent {
|
||||||
|
public override async execute(interaction: ButtonInteraction) {
|
||||||
|
const subcommand = interaction.customId.split(" ")[1];
|
||||||
|
|
||||||
|
switch(subcommand) {
|
||||||
|
case "confirm":
|
||||||
|
await this.confirm(interaction);
|
||||||
|
break;
|
||||||
|
case "cancel":
|
||||||
|
await this.cancel(interaction);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async confirm(interaction: ButtonInteraction) {
|
||||||
|
const userId = interaction.customId.split(" ")[2];
|
||||||
|
const cardNumber = interaction.customId.split(" ")[3];
|
||||||
|
|
||||||
|
const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
|
||||||
|
|
||||||
|
if (!cardInInventory) {
|
||||||
|
await interaction.reply("Unable to find card in inventory.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const cardData = CardDropHelperMetadata.GetCardByCardNumber(cardNumber);
|
||||||
|
|
||||||
|
if (!cardData) {
|
||||||
|
await interaction.reply("Unable to find card in the database.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const user = await User.FetchOneById(User, userId);
|
||||||
|
|
||||||
|
if (!user) {
|
||||||
|
await interaction.reply("Unable to find user in database.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
cardInInventory.RemoveQuantity(1);
|
||||||
|
|
||||||
|
await cardInInventory.Save(Inventory, cardInInventory);
|
||||||
|
|
||||||
|
const cardValue = GetSacrificeAmount(cardData.card.type);
|
||||||
|
const cardRarityString = CardRarityToString(cardData.card.type);
|
||||||
|
|
||||||
|
user.AddCurrency(cardValue);
|
||||||
|
|
||||||
|
await user.Save(User, user);
|
||||||
|
|
||||||
|
const description = [
|
||||||
|
`Card: ${cardData.card.name}`,
|
||||||
|
`Series: ${cardData.series.name}`,
|
||||||
|
`Rarity: ${cardRarityString}`,
|
||||||
|
`Quantity Owned: ${cardInInventory.Quantity}`,
|
||||||
|
`Sacrifice Amount: ${cardValue}`,
|
||||||
|
];
|
||||||
|
|
||||||
|
const embed = new EmbedBuilder()
|
||||||
|
.setTitle("Card Sacrificed")
|
||||||
|
.setDescription(description.join("\n"))
|
||||||
|
.setColor(EmbedColours.Ok)
|
||||||
|
.setFooter({ text: `${interaction.user.username} · ${cardData.card.name}` });
|
||||||
|
|
||||||
|
const row = new ActionRowBuilder<ButtonBuilder>()
|
||||||
|
.addComponents([
|
||||||
|
new ButtonBuilder()
|
||||||
|
.setCustomId(`sacrifice confirm ${interaction.user.id} ${cardNumber}`)
|
||||||
|
.setLabel("Confirm")
|
||||||
|
.setStyle(ButtonStyle.Success)
|
||||||
|
.setDisabled(true),
|
||||||
|
new ButtonBuilder()
|
||||||
|
.setCustomId("sacrifice cancel")
|
||||||
|
.setLabel("Cancel")
|
||||||
|
.setStyle(ButtonStyle.Secondary)
|
||||||
|
.setDisabled(true),
|
||||||
|
]);
|
||||||
|
|
||||||
|
await interaction.update({
|
||||||
|
embeds: [ embed ],
|
||||||
|
components: [ row ],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private async cancel(interaction: ButtonInteraction) {
|
||||||
|
const userId = interaction.customId.split(" ")[2];
|
||||||
|
const cardNumber = interaction.customId.split(" ")[3];
|
||||||
|
|
||||||
|
const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
|
||||||
|
|
||||||
|
if (!cardInInventory) {
|
||||||
|
await interaction.reply("Unable to find card in inventory.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const cardData = CardDropHelperMetadata.GetCardByCardNumber(cardNumber);
|
||||||
|
|
||||||
|
if (!cardData) {
|
||||||
|
await interaction.reply("Unable to find card in the database.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const cardValue = GetSacrificeAmount(cardData.card.type);
|
||||||
|
const cardRarityString = CardRarityToString(cardData.card.type);
|
||||||
|
|
||||||
|
const description = [
|
||||||
|
`Card: ${cardData.card.name}`,
|
||||||
|
`Series: ${cardData.series.name}`,
|
||||||
|
`Rarity: ${cardRarityString}`,
|
||||||
|
`Quantity Owned: ${cardInInventory.Quantity}`,
|
||||||
|
`Sacrifice Amount: ${cardValue}`,
|
||||||
|
];
|
||||||
|
|
||||||
|
const embed = new EmbedBuilder()
|
||||||
|
.setTitle("Sacrifice Cancelled")
|
||||||
|
.setDescription(description.join("\n"))
|
||||||
|
.setColor(EmbedColours.Error)
|
||||||
|
.setFooter({ text: `${interaction.user.username} · ${cardData.card.name}` });
|
||||||
|
|
||||||
|
const row = new ActionRowBuilder<ButtonBuilder>()
|
||||||
|
.addComponents([
|
||||||
|
new ButtonBuilder()
|
||||||
|
.setCustomId(`sacrifice confirm ${interaction.user.id} ${cardNumber}`)
|
||||||
|
.setLabel("Confirm")
|
||||||
|
.setStyle(ButtonStyle.Success)
|
||||||
|
.setDisabled(true),
|
||||||
|
new ButtonBuilder()
|
||||||
|
.setCustomId("sacrifice cancel")
|
||||||
|
.setLabel("Cancel")
|
||||||
|
.setStyle(ButtonStyle.Secondary)
|
||||||
|
.setDisabled(true),
|
||||||
|
]);
|
||||||
|
|
||||||
|
await interaction.update({
|
||||||
|
embeds: [ embed ],
|
||||||
|
components: [ row ],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
|
@ -14,6 +14,8 @@ import Webhooks from "../webhooks";
|
||||||
import CardMetadataFunction from "../Functions/CardMetadataFunction";
|
import CardMetadataFunction from "../Functions/CardMetadataFunction";
|
||||||
import { SeriesMetadata } from "../contracts/SeriesMetadata";
|
import { SeriesMetadata } from "../contracts/SeriesMetadata";
|
||||||
import AppLogger from "./appLogger";
|
import AppLogger from "./appLogger";
|
||||||
|
import TimerHelper from "../helpers/TimerHelper";
|
||||||
|
import GiveCurrency from "../timers/GiveCurrency";
|
||||||
|
|
||||||
export class CoreClient extends Client {
|
export class CoreClient extends Client {
|
||||||
private static _commandItems: ICommandItem[];
|
private static _commandItems: ICommandItem[];
|
||||||
|
@ -23,6 +25,7 @@ export class CoreClient extends Client {
|
||||||
private _events: Events;
|
private _events: Events;
|
||||||
private _util: Util;
|
private _util: Util;
|
||||||
private _webhooks: Webhooks;
|
private _webhooks: Webhooks;
|
||||||
|
private _timerHelper: TimerHelper;
|
||||||
|
|
||||||
public static ClaimId: string;
|
public static ClaimId: string;
|
||||||
public static Environment: Environment;
|
public static Environment: Environment;
|
||||||
|
@ -59,6 +62,7 @@ export class CoreClient extends Client {
|
||||||
this._events = new Events();
|
this._events = new Events();
|
||||||
this._util = new Util();
|
this._util = new Util();
|
||||||
this._webhooks = new Webhooks();
|
this._webhooks = new Webhooks();
|
||||||
|
this._timerHelper = new TimerHelper();
|
||||||
|
|
||||||
AppLogger.LogInfo("Client", `Environment: ${CoreClient.Environment}`);
|
AppLogger.LogInfo("Client", `Environment: ${CoreClient.Environment}`);
|
||||||
|
|
||||||
|
@ -72,7 +76,12 @@ export class CoreClient extends Client {
|
||||||
}
|
}
|
||||||
|
|
||||||
await AppDataSource.initialize()
|
await AppDataSource.initialize()
|
||||||
.then(() => AppLogger.LogInfo("Client", "App Data Source Initialised"))
|
.then(() => {
|
||||||
|
AppLogger.LogInfo("Client", "App Data Source Initialised");
|
||||||
|
|
||||||
|
const timerId = this._timerHelper.AddTimer("*/30 * * * * *", "Europe/London", GiveCurrency, false);
|
||||||
|
this._timerHelper.StartTimer(timerId);
|
||||||
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
AppLogger.LogError("Client", "App Data Source Initialisation Failed");
|
AppLogger.LogError("Client", "App Data Source Initialisation Failed");
|
||||||
AppLogger.LogError("Client", err);
|
AppLogger.LogError("Client", err);
|
||||||
|
|
73
src/commands/sacrifice.ts
Normal file
73
src/commands/sacrifice.ts
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CacheType, CommandInteraction, EmbedBuilder, SlashCommandBuilder } from "discord.js";
|
||||||
|
import { Command } from "../type/command";
|
||||||
|
import Inventory from "../database/entities/app/Inventory";
|
||||||
|
import { CardRarityToString, GetSacrificeAmount } from "../constants/CardRarity";
|
||||||
|
import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
|
||||||
|
import EmbedColours from "../constants/EmbedColours";
|
||||||
|
|
||||||
|
export default class Sacrifice extends Command {
|
||||||
|
constructor() {
|
||||||
|
super();
|
||||||
|
|
||||||
|
this.CommandBuilder = new SlashCommandBuilder()
|
||||||
|
.setName("sacrifice")
|
||||||
|
.setDescription("Sacrifices a card for currency")
|
||||||
|
.addStringOption(x =>
|
||||||
|
x
|
||||||
|
.setName("cardnumber")
|
||||||
|
.setDescription("The card to sacrifice from your inventory")
|
||||||
|
.setRequired(true));
|
||||||
|
}
|
||||||
|
|
||||||
|
public override async execute(interaction: CommandInteraction<CacheType>): Promise<void> {
|
||||||
|
const cardnumber = interaction.options.get("cardnumber", true);
|
||||||
|
|
||||||
|
const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, cardnumber.value! as string);
|
||||||
|
|
||||||
|
if (!cardInInventory || cardInInventory.Quantity == 0) {
|
||||||
|
await interaction.reply("Unable to find card in your inventory.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const cardData = CardDropHelperMetadata.GetCardByCardNumber(cardnumber.value! as string);
|
||||||
|
|
||||||
|
if (!cardData) {
|
||||||
|
await interaction.reply("Unable to find card in the database.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const cardValue = GetSacrificeAmount(cardData.card.type);
|
||||||
|
const cardRarityString = CardRarityToString(cardData.card.type);
|
||||||
|
|
||||||
|
const description = [
|
||||||
|
`Card: ${cardData.card.name}`,
|
||||||
|
`Series: ${cardData.series.name}`,
|
||||||
|
`Rarity: ${cardRarityString}`,
|
||||||
|
`Quantity Owned: ${cardInInventory.Quantity}`,
|
||||||
|
`Sacrifice Amount: ${cardValue}`,
|
||||||
|
];
|
||||||
|
|
||||||
|
const embed = new EmbedBuilder()
|
||||||
|
.setTitle("Sacrifice")
|
||||||
|
.setDescription(description.join("\n"))
|
||||||
|
.setColor(EmbedColours.Grey)
|
||||||
|
.setFooter({ text: `${interaction.user.username} · ${cardData.card.name}` });
|
||||||
|
|
||||||
|
const row = new ActionRowBuilder<ButtonBuilder>()
|
||||||
|
.addComponents([
|
||||||
|
new ButtonBuilder()
|
||||||
|
.setCustomId(`sacrifice confirm ${interaction.user.id} ${cardnumber.value!}`)
|
||||||
|
.setLabel("Confirm")
|
||||||
|
.setStyle(ButtonStyle.Success),
|
||||||
|
new ButtonBuilder()
|
||||||
|
.setCustomId(`sacrifice cancel ${interaction.user.id} ${cardnumber.value!}`)
|
||||||
|
.setLabel("Cancel")
|
||||||
|
.setStyle(ButtonStyle.Secondary),
|
||||||
|
]);
|
||||||
|
|
||||||
|
await interaction.reply({
|
||||||
|
embeds: [ embed ],
|
||||||
|
components: [ row ],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
|
@ -58,4 +58,21 @@ export function CardRarityParse(rarity: string): CardRarity {
|
||||||
default:
|
default:
|
||||||
return CardRarity.Unknown;
|
return CardRarity.Unknown;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetSacrificeAmount(rarity: CardRarity): number {
|
||||||
|
switch (rarity) {
|
||||||
|
case CardRarity.Bronze:
|
||||||
|
return 5;
|
||||||
|
case CardRarity.Silver:
|
||||||
|
return 15;
|
||||||
|
case CardRarity.Gold:
|
||||||
|
return 30;
|
||||||
|
case CardRarity.Manga:
|
||||||
|
return 50;
|
||||||
|
case CardRarity.Legendary:
|
||||||
|
return 100;
|
||||||
|
default:
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -27,6 +27,12 @@ export default class AppBaseEntity {
|
||||||
await repository.save(entity);
|
await repository.save(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static async SaveAll<T extends AppBaseEntity>(target: EntityTarget<T>, entities: DeepPartial<T>[]): Promise<void> {
|
||||||
|
const repository = AppDataSource.getRepository<T>(target);
|
||||||
|
|
||||||
|
await repository.save(entities);
|
||||||
|
}
|
||||||
|
|
||||||
public static async Remove<T extends AppBaseEntity>(target: EntityTarget<T>, entity: T): Promise<void> {
|
public static async Remove<T extends AppBaseEntity>(target: EntityTarget<T>, entity: T): Promise<void> {
|
||||||
const repository = AppDataSource.getRepository<T>(target);
|
const repository = AppDataSource.getRepository<T>(target);
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,12 @@ export default class Inventory extends AppBaseEntity {
|
||||||
this.Quantity = quantity;
|
this.Quantity = quantity;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public RemoveQuantity(amount: number) {
|
||||||
|
if (this.Quantity < amount) return;
|
||||||
|
|
||||||
|
this.Quantity -= amount;
|
||||||
|
}
|
||||||
|
|
||||||
public AddClaim(claim: Claim) {
|
public AddClaim(claim: Claim) {
|
||||||
this.Claims.push(claim);
|
this.Claims.push(claim);
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,10 +16,6 @@ export default class User extends AppBaseEntity {
|
||||||
@Column()
|
@Column()
|
||||||
LastUsedDaily?: Date;
|
LastUsedDaily?: Date;
|
||||||
|
|
||||||
public UpdateCurrency(currency: number) {
|
|
||||||
this.Currency = currency;
|
|
||||||
}
|
|
||||||
|
|
||||||
public AddCurrency(amount: number) {
|
public AddCurrency(amount: number) {
|
||||||
this.Currency += amount;
|
this.Currency += amount;
|
||||||
}
|
}
|
||||||
|
|
81
src/helpers/TimerHelper.ts
Normal file
81
src/helpers/TimerHelper.ts
Normal file
|
@ -0,0 +1,81 @@
|
||||||
|
import { CronJob } from "cron";
|
||||||
|
import { v4 } from "uuid";
|
||||||
|
import { Primitive } from "../type/primitive";
|
||||||
|
|
||||||
|
interface Timer {
|
||||||
|
id: string;
|
||||||
|
job: CronJob;
|
||||||
|
context: Map<string, Primitive>;
|
||||||
|
onTick: ((context: Map<string, Primitive>) => void) | ((context: Map<string, Primitive>) => Promise<void>);
|
||||||
|
runOnStart: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default class TimerHelper {
|
||||||
|
private _timers: Timer[];
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this._timers = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
public AddTimer(
|
||||||
|
cronTime: string,
|
||||||
|
timeZone: string,
|
||||||
|
onTick: ((context: Map<string, Primitive>) => void) | ((context: Map<string, Primitive>) => Promise<void>),
|
||||||
|
runOnStart: boolean = false): string {
|
||||||
|
const context = new Map<string, Primitive>();
|
||||||
|
|
||||||
|
const job = new CronJob(
|
||||||
|
cronTime,
|
||||||
|
() => {
|
||||||
|
onTick(context);
|
||||||
|
},
|
||||||
|
null,
|
||||||
|
false,
|
||||||
|
timeZone,
|
||||||
|
);
|
||||||
|
|
||||||
|
const id = v4();
|
||||||
|
|
||||||
|
this._timers.push({
|
||||||
|
id,
|
||||||
|
job,
|
||||||
|
context,
|
||||||
|
onTick,
|
||||||
|
runOnStart,
|
||||||
|
});
|
||||||
|
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public StartAllTimers() {
|
||||||
|
this._timers.forEach(timer => this.StartJob(timer));
|
||||||
|
}
|
||||||
|
|
||||||
|
public StopAllTimers() {
|
||||||
|
this._timers.forEach(timer => timer.job.stop());
|
||||||
|
}
|
||||||
|
|
||||||
|
public StartTimer(id: string) {
|
||||||
|
const timer = this._timers.find(x => x.id == id);
|
||||||
|
|
||||||
|
if (!timer) return;
|
||||||
|
|
||||||
|
this.StartJob(timer);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StopTimer(id: string) {
|
||||||
|
const timer = this._timers.find(x => x.id == id);
|
||||||
|
|
||||||
|
if (!timer) return;
|
||||||
|
|
||||||
|
timer.job.stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
private StartJob(timer: Timer) {
|
||||||
|
timer.job.start();
|
||||||
|
|
||||||
|
if (timer.runOnStart) {
|
||||||
|
timer.onTick(timer.context);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -9,6 +9,7 @@ import Gdrivesync from "./commands/gdrivesync";
|
||||||
import Give from "./commands/give";
|
import Give from "./commands/give";
|
||||||
import Inventory from "./commands/inventory";
|
import Inventory from "./commands/inventory";
|
||||||
import Resync from "./commands/resync";
|
import Resync from "./commands/resync";
|
||||||
|
import Sacrifice from "./commands/sacrifice";
|
||||||
import Series from "./commands/series";
|
import Series from "./commands/series";
|
||||||
import Trade from "./commands/trade";
|
import Trade from "./commands/trade";
|
||||||
import View from "./commands/view";
|
import View from "./commands/view";
|
||||||
|
@ -21,6 +22,7 @@ import Droprarity from "./commands/stage/droprarity";
|
||||||
import Claim from "./buttonEvents/Claim";
|
import Claim from "./buttonEvents/Claim";
|
||||||
import InventoryButtonEvent from "./buttonEvents/Inventory";
|
import InventoryButtonEvent from "./buttonEvents/Inventory";
|
||||||
import Reroll from "./buttonEvents/Reroll";
|
import Reroll from "./buttonEvents/Reroll";
|
||||||
|
import SacrificeButtonEvent from "./buttonEvents/Sacrifice";
|
||||||
import SeriesEvent from "./buttonEvents/Series";
|
import SeriesEvent from "./buttonEvents/Series";
|
||||||
import TradeButtonEvent from "./buttonEvents/Trade";
|
import TradeButtonEvent from "./buttonEvents/Trade";
|
||||||
|
|
||||||
|
@ -34,6 +36,7 @@ export default class Registry {
|
||||||
CoreClient.RegisterCommand("give", new Give());
|
CoreClient.RegisterCommand("give", new Give());
|
||||||
CoreClient.RegisterCommand("inventory", new Inventory());
|
CoreClient.RegisterCommand("inventory", new Inventory());
|
||||||
CoreClient.RegisterCommand("resync", new Resync());
|
CoreClient.RegisterCommand("resync", new Resync());
|
||||||
|
CoreClient.RegisterCommand("sacrifice", new Sacrifice());
|
||||||
CoreClient.RegisterCommand("series", new Series());
|
CoreClient.RegisterCommand("series", new Series());
|
||||||
CoreClient.RegisterCommand("trade", new Trade());
|
CoreClient.RegisterCommand("trade", new Trade());
|
||||||
CoreClient.RegisterCommand("view", new View());
|
CoreClient.RegisterCommand("view", new View());
|
||||||
|
@ -43,14 +46,11 @@ export default class Registry {
|
||||||
CoreClient.RegisterCommand("droprarity", new Droprarity(), Environment.Test);
|
CoreClient.RegisterCommand("droprarity", new Droprarity(), Environment.Test);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RegisterEvents() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static RegisterButtonEvents() {
|
public static RegisterButtonEvents() {
|
||||||
CoreClient.RegisterButtonEvent("claim", new Claim());
|
CoreClient.RegisterButtonEvent("claim", new Claim());
|
||||||
CoreClient.RegisterButtonEvent("inventory", new InventoryButtonEvent());
|
CoreClient.RegisterButtonEvent("inventory", new InventoryButtonEvent());
|
||||||
CoreClient.RegisterButtonEvent("reroll", new Reroll());
|
CoreClient.RegisterButtonEvent("reroll", new Reroll());
|
||||||
|
CoreClient.RegisterButtonEvent("sacrifice", new SacrificeButtonEvent());
|
||||||
CoreClient.RegisterButtonEvent("series", new SeriesEvent());
|
CoreClient.RegisterButtonEvent("series", new SeriesEvent());
|
||||||
CoreClient.RegisterButtonEvent("trade", new TradeButtonEvent());
|
CoreClient.RegisterButtonEvent("trade", new TradeButtonEvent());
|
||||||
}
|
}
|
||||||
|
|
16
src/timers/GiveCurrency.ts
Normal file
16
src/timers/GiveCurrency.ts
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
import AppLogger from "../client/appLogger";
|
||||||
|
import User from "../database/entities/app/User";
|
||||||
|
|
||||||
|
export default async function GiveCurrency() {
|
||||||
|
AppLogger.LogInfo("Timers/GiveCurrency", "Giving currency to every known user");
|
||||||
|
|
||||||
|
const users = await User.FetchAll(User);
|
||||||
|
|
||||||
|
for (const user of users) {
|
||||||
|
user.AddCurrency(5);
|
||||||
|
}
|
||||||
|
|
||||||
|
User.SaveAll(User, users);
|
||||||
|
|
||||||
|
AppLogger.LogInfo("Timers/GiveCurrency", `Successfully gave +5 currency to ${users.length} users`);
|
||||||
|
}
|
1
src/type/primitive.ts
Normal file
1
src/type/primitive.ts
Normal file
|
@ -0,0 +1 @@
|
||||||
|
export type Primitive = string | number | boolean;
|
Loading…
Reference in a new issue