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

Remove restriction that the last drop can only be claimed by the user who dropped it
Some checks failed
Test / build (push) Failing after 38s
Details

Browse source
This commit is contained in:
Ethan Lane 2025-04-04 19:03:54 +01:00
parent 2ab3ea1105
commit 673f0d0810
6 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/buttonEvents/Claim.ts
View file

@ -1,7 +1,6 @@
import { ButtonInteraction } from "discord.js"; import { ButtonInteraction } from "discord.js";
import { ButtonEvent } from "../type/buttonEvent"; import { ButtonEvent } from "../type/buttonEvent";
import Inventory from "../database/entities/app/Inventory"; import Inventory from "../database/entities/app/Inventory";
import { CoreClient } from "../client/client";
import { default as eClaim } from "../database/entities/app/Claim"; import { default as eClaim } from "../database/entities/app/Claim";
import AppLogger from "../client/appLogger"; import AppLogger from "../client/appLogger";
import User from "../database/entities/app/User"; import User from "../database/entities/app/User";
@ -43,11 +42,6 @@ export default class Claim extends ButtonEvent {
return; return;
} }
if (claimId == CoreClient.ClaimId && userId != droppedBy) {
await interaction.channel.send(`${interaction.user}, The latest dropped card can only be claimed by the user who dropped it!`);
return;
}
let inventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber); let inventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
if (!inventory) { if (!inventory) {

2
src/buttonEvents/Reroll.ts
View file

@ -80,8 +80,6 @@ export default class Reroll extends ButtonEvent {
files: files, files: files,
components: [ row ], components: [ row ],
}); });
CoreClient.ClaimId = claimId;
} catch (e) { } catch (e) {
AppLogger.LogError("Button/Reroll", `Error sending next drop for card ${randomCard.card.id}: ${e}`); AppLogger.LogError("Button/Reroll", `Error sending next drop for card ${randomCard.card.id}: ${e}`);

1
src/client/client.ts
View file

@ -31,7 +31,6 @@ export class CoreClient extends Client {
private _webhooks: Webhooks; private _webhooks: Webhooks;
private _timerHelper: TimerHelper; private _timerHelper: TimerHelper;
public static ClaimId: string;
public static Environment: Environment; public static Environment: Environment;
public static AllowDrops: boolean; public static AllowDrops: boolean;
public static Cards: SeriesMetadata[]; public static Cards: SeriesMetadata[];

2
src/commands/drop.ts
View file

@ -88,8 +88,6 @@ export default class Drop extends Command {
components: [ row ], components: [ row ],
}); });
CoreClient.ClaimId = claimId;
} catch (e) { } catch (e) {
AppLogger.LogError("Commands/Drop", `Error sending next drop for card ${randomCard.card.id}: ${e}`); AppLogger.LogError("Commands/Drop", `Error sending next drop for card ${randomCard.card.id}: ${e}`);

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

@ -81,7 +81,5 @@ export default class Dropnumber extends Command {
await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN"); await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN");
} }
} }
CoreClient.ClaimId = claimId;
} }
} }

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

@ -83,7 +83,5 @@ export default class Droprarity extends Command {
await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN"); await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN");
} }
} }
CoreClient.ClaimId = claimId;
} }
} }