External/card-drop
5
0
Fork 0
Code Issues 46 Pull requests 1 Projects 1 Releases 29 Packages Wiki Activity Actions

Merge branch 'develop' into feature/380-use-effect

Browse source
This commit is contained in:
Ethan Lane 2025-01-22 17:49:40 +00:00
commit f726a613ea
10 changed files with 74 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env.example
View file

@ -7,7 +7,7 @@
# any secret values. # any secret values.
BOT_TOKEN= BOT_TOKEN=
BOT_VER=0.8.2 BOT_VER=0.8.3
BOT_AUTHOR=Vylpes BOT_AUTHOR=Vylpes
BOT_OWNERID=147392775707426816 BOT_OWNERID=147392775707426816
BOT_CLIENTID=682942374040961060 BOT_CLIENTID=682942374040961060

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "card-drop", "name": "card-drop",
"version": "0.8.2", "version": "0.8.3",
"main": "./dist/bot.js", "main": "./dist/bot.js",
"typings": "./dist", "typings": "./dist",
"scripts": { "scripts": {

11
src/buttonEvents/Reroll.ts
View file

@ -52,11 +52,18 @@ export default class Reroll extends ButtonEvent {
try { try {
AppLogger.LogVerbose("Button/Reroll", `Sending next drop: ${randomCard.card.id} (${randomCard.card.name})`); AppLogger.LogVerbose("Button/Reroll", `Sending next drop: ${randomCard.card.id} (${randomCard.card.name})`);
const files = [];
let imageFileName = "";
if (!(randomCard.card.path.startsWith("http://") || randomCard.card.path.startsWith("https://"))) {
const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path)); const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path));
const imageFileName = randomCard.card.path.split("/").pop()!; imageFileName = randomCard.card.path.split("/").pop()!;
const attachment = new AttachmentBuilder(image, { name: imageFileName }); const attachment = new AttachmentBuilder(image, { name: imageFileName });
files.push(attachment);
}
const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id); const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
const quantityClaimed = inventory ? inventory.Quantity : 0; const quantityClaimed = inventory ? inventory.Quantity : 0;
@ -68,7 +75,7 @@ export default class Reroll extends ButtonEvent {
await interaction.editReply({ await interaction.editReply({
embeds: [ embed ], embeds: [ embed ],
files: [ attachment ], files: files,
components: [ row ], components: [ row ],
}); });

2
src/buttonEvents/View.ts
View file

@ -19,7 +19,7 @@ export default class View extends ButtonEvent {
await interaction.editReply({ await interaction.editReply({
embeds: [ searchResult.embed ], embeds: [ searchResult.embed ],
components: [ searchResult.row ], components: [ searchResult.row ],
files: [ searchResult.attachment ], files: searchResult.attachments,
}); });
} }
} }

11
src/commands/drop.ts
View file

@ -70,11 +70,18 @@ export default class Drop extends Command {
await interaction.deferReply(); await interaction.deferReply();
try { try {
const files = [];
let imageFileName = "";
if (!(randomCard.card.path.startsWith("http://") || randomCard.card.path.startsWith("https://"))) {
const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path)); const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path));
const imageFileName = randomCard.card.path.split("/").pop()!; imageFileName = randomCard.card.path.split("/").pop()!;
const attachment = new AttachmentBuilder(image, { name: imageFileName }); const attachment = new AttachmentBuilder(image, { name: imageFileName });
files.push(attachment);
}
const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id); const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
const quantityClaimed = inventory ? inventory.Quantity : 0; const quantityClaimed = inventory ? inventory.Quantity : 0;
@ -86,7 +93,7 @@ export default class Drop extends Command {
await interaction.editReply({ await interaction.editReply({
embeds: [ embed ], embeds: [ embed ],
files: [ attachment ], files: files,
components: [ row ], components: [ row ],
}); });

20
src/commands/id.ts
View file

@ -43,22 +43,20 @@ export default class Id extends Command {
const series = CoreClient.Cards const series = CoreClient.Cards
.find(x => x.cards.includes(card))!; .find(x => x.cards.includes(card))!;
let image: Buffer; const files = [];
const imageFileName = card.path.split("/").pop()!; let imageFileName = "";
try { if (!(card.path.startsWith("http://") || card.path.startsWith("https://"))) {
image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path)); const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path));
} catch { imageFileName = card.path.split("/").pop()!;
AppLogger.LogError("Commands/View", `Unable to fetch image for card ${card.id}.`);
await interaction.reply(`Unable to fetch image for card ${card.id}.`); const attachment = new AttachmentBuilder(image, { name: imageFileName });
return;
files.push(attachment);
} }
await interaction.deferReply(); await interaction.deferReply();
const attachment = new AttachmentBuilder(image, { name: imageFileName });
const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.id); const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.id);
const quantityClaimed = inventory ? inventory.Quantity : 0; const quantityClaimed = inventory ? inventory.Quantity : 0;
@ -67,7 +65,7 @@ export default class Id extends Command {
try { try {
await interaction.editReply({ await interaction.editReply({
embeds: [ embed ], embeds: [ embed ],
files: [ attachment ], files: files,
}); });
} catch (e) { } catch (e) {
AppLogger.LogError("Commands/View", `Error sending view for card ${card.id}: ${e}`); AppLogger.LogError("Commands/View", `Error sending view for card ${card.id}: ${e}`);

20
src/commands/stage/dropnumber.ts
View file

@ -43,20 +43,20 @@ export default class Dropnumber extends Command {
const series = CoreClient.Cards const series = CoreClient.Cards
.find(x => x.cards.includes(card))!; .find(x => x.cards.includes(card))!;
let image: Buffer; const files = [];
const imageFileName = card.path.split("/").pop()!; let imageFileName = "";
try { if (!(card.path.startsWith("http://") || card.path.startsWith("https://"))) {
image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path)); const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path));
} catch { imageFileName = card.path.split("/").pop()!;
await interaction.reply(`Unable to fetch image for card ${card.id}`);
return; const attachment = new AttachmentBuilder(image, { name: imageFileName });
files.push(attachment);
} }
await interaction.deferReply(); await interaction.deferReply();
const attachment = new AttachmentBuilder(image, { name: imageFileName });
const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.id); const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.id);
const quantityClaimed = inventory ? inventory.Quantity : 0; const quantityClaimed = inventory ? inventory.Quantity : 0;
@ -69,7 +69,7 @@ export default class Dropnumber extends Command {
try { try {
await interaction.editReply({ await interaction.editReply({
embeds: [ embed ], embeds: [ embed ],
files: [ attachment ], files: files,
components: [ row ], components: [ row ],
}); });
} catch (e) { } catch (e) {

20
src/commands/stage/droprarity.ts
View file

@ -47,20 +47,18 @@ export default class Droprarity extends Command {
return; return;
} }
let image: Buffer; const files = [];
const imageFileName = card.card.path.split("/").pop()!; let imageFileName = "";
try { if (!(card.card.path.startsWith("http://") || card.card.path.startsWith("https://"))) {
image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path)); const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path));
} catch { imageFileName = card.card.path.split("/").pop()!;
await interaction.reply(`Unable to fetch image for card ${card.card.id}`);
return;
}
await interaction.deferReply();
const attachment = new AttachmentBuilder(image, { name: imageFileName }); const attachment = new AttachmentBuilder(image, { name: imageFileName });
files.push(attachment);
}
const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.card.id); const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.card.id);
const quantityClaimed = inventory ? inventory.Quantity : 0; const quantityClaimed = inventory ? inventory.Quantity : 0;
@ -73,7 +71,7 @@ export default class Droprarity extends Command {
try { try {
await interaction.editReply({ await interaction.editReply({
embeds: [ embed ], embeds: [ embed ],
files: [ attachment ], files: files,
components: [ row ], components: [ row ],
}); });
} catch (e) { } catch (e) {

2
src/commands/view.ts
View file

@ -34,7 +34,7 @@ export default class View extends Command {
await interaction.editReply({ await interaction.editReply({
embeds: [ searchResult.embed ], embeds: [ searchResult.embed ],
components: [ searchResult.row ], components: [ searchResult.row ],
files: [ searchResult.attachment ], files: searchResult.attachments,
}); });
} }
} }

40
src/helpers/CardSearchHelper.ts
View file

@ -11,7 +11,7 @@ import DropEmbedHelper from "./DropHelpers/DropEmbedHelper.js";
interface ReturnedPage { interface ReturnedPage {
embed: EmbedBuilder, embed: EmbedBuilder,
row: ActionRowBuilder<ButtonBuilder>, row: ActionRowBuilder<ButtonBuilder>,
attachment: AttachmentBuilder, attachments: AttachmentBuilder[],
results: string[], results: string[],
} }
@ -37,19 +37,18 @@ export default class CardSearchHelper {
if (!card) return undefined; if (!card) return undefined;
let image: Buffer; const attachments = [];
const imageFileName = card.card.path.split("/").pop()!; let imageFileName = "";
try { if (!(card.card.path.startsWith("http://") || card.card.path.startsWith("https://"))) {
image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path)); const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path));
} catch { imageFileName = card.card.path.split("/").pop()!;
AppLogger.LogError("CardSearchHelper/GenerateSearchQuery", `Unable to fetch image for card ${card.card.id}.`);
return undefined;
}
const attachment = new AttachmentBuilder(image, { name: imageFileName }); const attachment = new AttachmentBuilder(image, { name: imageFileName });
attachments.push(attachment);
}
const inventory = await Inventory.FetchOneByCardNumberAndUserId(userid, card.card.id); const inventory = await Inventory.FetchOneByCardNumberAndUserId(userid, card.card.id);
const quantityClaimed = inventory?.Quantity ?? 0; const quantityClaimed = inventory?.Quantity ?? 0;
@ -68,7 +67,7 @@ export default class CardSearchHelper {
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
.setDisabled(pages == 1)); .setDisabled(pages == 1));
return { embed, row, attachment, results }; return { embed, row, attachments, results };
} }
public static async GenerateSearchPageFromQuery(results: string[], userid: string, page: number): Promise<ReturnedPage | undefined> { public static async GenerateSearchPageFromQuery(results: string[], userid: string, page: number): Promise<ReturnedPage | undefined> {
@ -82,19 +81,18 @@ export default class CardSearchHelper {
return undefined; return undefined;
} }
let image: Buffer; const attachments = [];
const imageFileName = card.card.path.split("/").pop()!; let imageFileName = "";
try { if (!(card.card.path.startsWith("http://") || card.card.path.startsWith("https://"))) {
image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path)); const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path));
} catch { imageFileName = card.card.path.split("/").pop()!;
AppLogger.LogError("CardSearchHelper/GenerateSearchPageFromQuery", `Unable to fetch image for card ${card.card.id}.`);
return undefined;
}
const attachment = new AttachmentBuilder(image, { name: imageFileName }); const attachment = new AttachmentBuilder(image, { name: imageFileName });
attachments.push(attachment);
}
const inventory = await Inventory.FetchOneByCardNumberAndUserId(userid, card.card.id); const inventory = await Inventory.FetchOneByCardNumberAndUserId(userid, card.card.id);
const quantityClaimed = inventory?.Quantity ?? 0; const quantityClaimed = inventory?.Quantity ?? 0;
@ -113,6 +111,6 @@ export default class CardSearchHelper {
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
.setDisabled(page == results.length)); .setDisabled(page == results.length));
return { embed, row, attachment, results }; return { embed, row, attachments, results };
} }
} }