Skip to content

Commit 1ffe6d3

Browse files
committed
chore: rename battleLockManager to lockManager
1 parent 7e3d43a commit 1ffe6d3

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

src/commands/battle.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { createCanvas, loadImage } from "canvas";
1414
import path from "path";
1515
import { generateFighter, Fighter } from "../utils/fighterGenerator.js";
1616
import { BattleStatsManager } from "../utils/battleStatsManager.js";
17-
import { BattleLockManager } from "../utils/battleLockManager.js";
17+
import { LockManager } from "../utils/lockManager.js";
1818

1919
export const data = new SlashCommandBuilder()
2020
.setName("battle")
@@ -693,7 +693,7 @@ export async function execute(
693693
return;
694694
}
695695

696-
if (BattleLockManager.isLocked(interaction.guildId!, "battle")) {
696+
if (LockManager.isLocked(interaction.guildId!, "battle")) {
697697
console.log(
698698
`[DEATHBATTLE] Battle already active in guild ${interaction.guildId}, rejecting new battle`,
699699
);
@@ -706,8 +706,8 @@ export async function execute(
706706
}
707707

708708
if (
709-
BattleLockManager.isUserBusy(fighter1User.id) ||
710-
BattleLockManager.isUserBusy(fighter2User.id)
709+
LockManager.isUserBusy(fighter1User.id) ||
710+
LockManager.isUserBusy(fighter2User.id)
711711
) {
712712
console.log(
713713
`[DEATHBATTLE] One of the fighters is already in a battle elsewhere`,
@@ -720,11 +720,10 @@ export async function execute(
720720
return;
721721
}
722722

723-
const lockAcquired = BattleLockManager.acquireLock(
724-
interaction.guildId!,
725-
"battle",
726-
[fighter1User.id, fighter2User.id],
727-
);
723+
const lockAcquired = LockManager.acquireLock(interaction.guildId!, "battle", [
724+
fighter1User.id,
725+
fighter2User.id,
726+
]);
728727

729728
if (!lockAcquired) {
730729
// This is a fallback, should never happen as it should be caught by the checks above
@@ -973,7 +972,7 @@ export async function execute(
973972
components: [],
974973
});
975974
} finally {
976-
BattleLockManager.releaseLock(interaction.guildId!, "battle");
975+
LockManager.releaseLock(interaction.guildId!, "battle");
977976
console.log(
978977
`[DEATHBATTLE] Released battle lock for guild ${interaction.guildId}`,
979978
);

src/commands/russian.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
import { createCanvas, loadImage } from "canvas";
1414
import path from "path";
1515
import { RussianStatsManager } from "../utils/russianStatsManager.js";
16-
import { BattleLockManager } from "../utils/battleLockManager.js";
16+
import { LockManager } from "../utils/lockManager.js";
1717

1818
export const data = new SlashCommandBuilder()
1919
.setName("russian")
@@ -226,7 +226,7 @@ export async function execute(
226226
return;
227227
}
228228

229-
if (BattleLockManager.isLocked(interaction.guildId!, "russian")) {
229+
if (LockManager.isLocked(interaction.guildId!, "russian")) {
230230
await interaction.reply({
231231
content:
232232
"**A game of Russian Roulette is already in progress in this server!**",
@@ -236,8 +236,8 @@ export async function execute(
236236
}
237237

238238
if (
239-
BattleLockManager.isUserBusy(inviterUser.id) ||
240-
BattleLockManager.isUserBusy(targetUser.id)
239+
LockManager.isUserBusy(inviterUser.id) ||
240+
LockManager.isUserBusy(targetUser.id)
241241
) {
242242
await interaction.reply({
243243
content: "**One of the players is already in a game!**",
@@ -246,7 +246,7 @@ export async function execute(
246246
return;
247247
}
248248

249-
const lockAcquired = BattleLockManager.acquireLock(
249+
const lockAcquired = LockManager.acquireLock(
250250
interaction.guildId!,
251251
"russian",
252252
[inviterUser.id, targetUser.id],
@@ -267,7 +267,7 @@ export async function execute(
267267
);
268268

269269
if (!consentGiven) {
270-
BattleLockManager.releaseLock(interaction.guildId!, "russian");
270+
LockManager.releaseLock(interaction.guildId!, "russian");
271271
await interaction.editReply({
272272
content: "**Game cancelled! One or both players did not accept.**",
273273
embeds: [],
@@ -498,7 +498,7 @@ export async function execute(
498498
});
499499

500500
collector.on("end", (collected, reason) => {
501-
BattleLockManager.releaseLock(interaction.guildId!, "russian");
501+
LockManager.releaseLock(interaction.guildId!, "russian");
502502
if (turnTimer) clearTimeout(turnTimer);
503503
if (reason === "time") {
504504
interaction.editReply({

src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
handleReactionAdd,
2020
handleReactionRemove,
2121
} from "./utils/eventHandlers.js";
22-
import { BattleLockManager } from "./utils/battleLockManager.js";
22+
import { LockManager } from "./utils/lockManager.js";
2323

2424
class AltershaperBot {
2525
private client: Client;
@@ -289,7 +289,7 @@ class AltershaperBot {
289289
console.log("🔒 Active Battle Locks:");
290290
console.log("================================");
291291

292-
const allLocks = BattleLockManager.getAllLocks();
292+
const allLocks = LockManager.getAllLocks();
293293

294294
if (allLocks.size === 0) {
295295
console.log("No active battle locks\n");
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ interface GameLock {
99

1010
const activeLocks = new Map<string, Map<GameType, GameLock>>();
1111

12-
export class BattleLockManager {
12+
export class LockManager {
1313
private static readonly TIMEOUT = 1000 * 60 * 5; // 5 minutes
1414

1515
// Checks if a specific game type is active in a server

0 commit comments

Comments
 (0)