feat: add trading system with dedicated modules and centralize embed creation for commands
This commit is contained in:
syntaxbullet
294
src/modules/trade/trade.interaction.ts
Normal file
294
src/modules/trade/trade.interaction.ts
Normal file
@@ -0,0 +1,294 @@
|
||||
import {
|
||||
ButtonInteraction,
|
||||
ModalSubmitInteraction,
|
||||
StringSelectMenuInteraction,
|
||||
type Interaction,
|
||||
EmbedBuilder,
|
||||
ActionRowBuilder,
|
||||
ButtonBuilder,
|
||||
ButtonStyle,
|
||||
StringSelectMenuBuilder,
|
||||
ModalBuilder,
|
||||
TextInputBuilder,
|
||||
TextInputStyle,
|
||||
ThreadChannel,
|
||||
TextChannel,
|
||||
Colors
|
||||
} from "discord.js";
|
||||
import { TradeService } from "./trade.service";
|
||||
import { inventoryService } from "@/modules/inventory/inventory.service";
|
||||
import { createErrorEmbed, createWarningEmbed } from "@lib/embeds";
|
||||
|
||||
const EMBED_COLOR = 0xFFD700; // Gold
|
||||
|
||||
export async function handleTradeInteraction(interaction: Interaction) {
|
||||
if (!interaction.isButton() && !interaction.isStringSelectMenu() && !interaction.isModalSubmit()) return;
|
||||
|
||||
const { customId } = interaction;
|
||||
const threadId = interaction.channelId;
|
||||
|
||||
if (!threadId) return;
|
||||
|
||||
try {
|
||||
if (customId === 'trade_cancel') {
|
||||
await handleCancel(interaction, threadId);
|
||||
} else if (customId === 'trade_lock') {
|
||||
await handleLock(interaction, threadId);
|
||||
} else if (customId === 'trade_confirm') {
|
||||
// Confirm logic is handled implicitly by both locking or explicitly if needed.
|
||||
// For now, locking both triggers execution, so no separate confirm handler is actively used
|
||||
// unless we re-introduce a specific button. keeping basic handler stub if needed.
|
||||
} else if (customId === 'trade_add_money') {
|
||||
await handleAddMoneyClick(interaction);
|
||||
} else if (customId === 'trade_money_modal') {
|
||||
await handleMoneySubmit(interaction as ModalSubmitInteraction, threadId);
|
||||
} else if (customId === 'trade_add_item') {
|
||||
await handleAddItemClick(interaction as ButtonInteraction, threadId);
|
||||
} else if (customId === 'trade_select_item') {
|
||||
await handleItemSelect(interaction as StringSelectMenuInteraction, threadId);
|
||||
} else if (customId === 'trade_remove_item') {
|
||||
await handleRemoveItemClick(interaction as ButtonInteraction, threadId);
|
||||
} else if (customId === 'trade_remove_item_select') {
|
||||
await handleRemoveItemSelect(interaction as StringSelectMenuInteraction, threadId);
|
||||
}
|
||||
} catch (error: any) {
|
||||
const errorEmbed = createErrorEmbed(error.message);
|
||||
if (interaction.replied || interaction.deferred) {
|
||||
await interaction.followUp({ embeds: [errorEmbed], ephemeral: true });
|
||||
} else {
|
||||
await interaction.reply({ embeds: [errorEmbed], ephemeral: true });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function handleCancel(interaction: ButtonInteraction | StringSelectMenuInteraction | ModalSubmitInteraction, threadId: string) {
|
||||
TradeService.endSession(threadId);
|
||||
await interaction.reply({ content: "🛑 Trade cancelled. Deleting thread in 5 seconds..." });
|
||||
setTimeout(async () => {
|
||||
try {
|
||||
await interaction.channel?.delete();
|
||||
} catch (e) {
|
||||
console.error("Failed to delete thread", e);
|
||||
}
|
||||
}, 5000);
|
||||
}
|
||||
|
||||
async function handleLock(interaction: ButtonInteraction | StringSelectMenuInteraction | ModalSubmitInteraction, threadId: string) {
|
||||
const isLocked = TradeService.toggleLock(threadId, interaction.user.id);
|
||||
await updateTradeDashboard(interaction, threadId);
|
||||
|
||||
// Check if trade executed (both locked)
|
||||
const session = TradeService.getSession(threadId);
|
||||
if (session && session.state === 'COMPLETED') {
|
||||
// Trade executed during updateTradeDashboard
|
||||
return;
|
||||
}
|
||||
|
||||
await interaction.followUp({ content: isLocked ? "🔒 You locked your offer." : "<22> You unlocked your offer.", ephemeral: true });
|
||||
}
|
||||
|
||||
async function handleAddMoneyClick(interaction: Interaction) {
|
||||
if (!interaction.isButton()) return;
|
||||
const modal = new ModalBuilder()
|
||||
.setCustomId('trade_money_modal')
|
||||
.setTitle('Add Money');
|
||||
|
||||
const input = new TextInputBuilder()
|
||||
.setCustomId('amount')
|
||||
.setLabel("Amount to trade")
|
||||
.setStyle(TextInputStyle.Short)
|
||||
.setPlaceholder("100")
|
||||
.setRequired(true);
|
||||
|
||||
const row = new ActionRowBuilder<TextInputBuilder>().addComponents(input);
|
||||
modal.addComponents(row);
|
||||
|
||||
await interaction.showModal(modal);
|
||||
}
|
||||
|
||||
async function handleMoneySubmit(interaction: ModalSubmitInteraction, threadId: string) {
|
||||
const amountStr = interaction.fields.getTextInputValue('amount');
|
||||
const amount = BigInt(amountStr);
|
||||
|
||||
if (amount < 0n) throw new Error("Amount must be positive");
|
||||
|
||||
TradeService.updateMoney(threadId, interaction.user.id, amount);
|
||||
await interaction.deferUpdate(); // Acknowledge modal
|
||||
await updateTradeDashboard(interaction, threadId);
|
||||
}
|
||||
|
||||
async function handleAddItemClick(interaction: ButtonInteraction, threadId: string) {
|
||||
const inventory = await inventoryService.getInventory(interaction.user.id);
|
||||
|
||||
if (inventory.length === 0) {
|
||||
await interaction.reply({ embeds: [createWarningEmbed("Your inventory is empty.")], ephemeral: true });
|
||||
return;
|
||||
}
|
||||
|
||||
// Slice top 25 for select menu
|
||||
const options = inventory.slice(0, 25).map(entry => ({
|
||||
label: `${entry.item.name} (${entry.quantity})`,
|
||||
value: entry.item.id.toString(),
|
||||
description: `Rarity: ${entry.item.rarity}`
|
||||
}));
|
||||
|
||||
const select = new StringSelectMenuBuilder()
|
||||
.setCustomId('trade_select_item')
|
||||
.setPlaceholder('Select an item to add')
|
||||
.addOptions(options);
|
||||
|
||||
const row = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(select);
|
||||
|
||||
await interaction.reply({ content: "Select an item to add:", components: [row], ephemeral: true });
|
||||
}
|
||||
|
||||
async function handleItemSelect(interaction: StringSelectMenuInteraction, threadId: string) {
|
||||
const value = interaction.values[0];
|
||||
if (!value) return;
|
||||
const itemId = parseInt(value);
|
||||
|
||||
// Assuming implementation implies adding 1 item for now
|
||||
const item = await inventoryService.getItem(itemId);
|
||||
if (!item) throw new Error("Item not found");
|
||||
|
||||
TradeService.addItem(threadId, interaction.user.id, { id: item.id, name: item.name }, 1n);
|
||||
|
||||
await interaction.update({ content: `Added ${item.name} x1`, components: [] });
|
||||
await updateTradeDashboard(interaction, threadId);
|
||||
}
|
||||
|
||||
async function handleRemoveItemClick(interaction: ButtonInteraction, threadId: string) {
|
||||
const session = TradeService.getSession(threadId);
|
||||
if (!session) return;
|
||||
|
||||
const participant = session.userA.id === interaction.user.id ? session.userA : session.userB;
|
||||
|
||||
if (participant.offer.items.length === 0) {
|
||||
await interaction.reply({ embeds: [createWarningEmbed("No items in offer to remove.")], ephemeral: true });
|
||||
return;
|
||||
}
|
||||
|
||||
const options = participant.offer.items.slice(0, 25).map(i => ({
|
||||
label: `${i.name} (${i.quantity})`,
|
||||
value: i.id.toString(),
|
||||
}));
|
||||
|
||||
const select = new StringSelectMenuBuilder()
|
||||
.setCustomId('trade_remove_item_select')
|
||||
.setPlaceholder('Select an item to remove')
|
||||
.addOptions(options);
|
||||
|
||||
const row = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(select);
|
||||
|
||||
await interaction.reply({ content: "Select an item to remove:", components: [row], ephemeral: true });
|
||||
}
|
||||
|
||||
async function handleRemoveItemSelect(interaction: StringSelectMenuInteraction, threadId: string) {
|
||||
const value = interaction.values[0];
|
||||
if (!value) return;
|
||||
const itemId = parseInt(value);
|
||||
TradeService.removeItem(threadId, interaction.user.id, itemId);
|
||||
|
||||
await interaction.update({ content: `Removed item.`, components: [] });
|
||||
await updateTradeDashboard(interaction, threadId);
|
||||
}
|
||||
|
||||
|
||||
// --- DASHBOARD UPDATER ---
|
||||
|
||||
export async function updateTradeDashboard(interaction: Interaction, threadId: string) {
|
||||
const session = TradeService.getSession(threadId);
|
||||
if (!session) return;
|
||||
|
||||
// Check Auto-Execute (If both locked)
|
||||
if (session.userA.locked && session.userB.locked) {
|
||||
// Execute Trade
|
||||
try {
|
||||
await TradeService.executeTrade(threadId);
|
||||
const embed = new EmbedBuilder()
|
||||
.setTitle("✅ Trade Completed")
|
||||
.setColor("Green")
|
||||
.addFields(
|
||||
{ name: session.userA.username, value: formatOffer(session.userA), inline: true },
|
||||
{ name: session.userB.username, value: formatOffer(session.userB), inline: true }
|
||||
)
|
||||
.setTimestamp();
|
||||
|
||||
await updateDashboardMessage(interaction, { embeds: [embed], components: [] });
|
||||
return;
|
||||
} catch (e: any) {
|
||||
const embed = createErrorEmbed(e.message, "Trade Failed");
|
||||
|
||||
if (interaction.channel && (interaction.channel.isThread() || interaction.channel instanceof TextChannel)) {
|
||||
await interaction.channel.send({ embeds: [embed] });
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Build Status Embed
|
||||
const embed = new EmbedBuilder()
|
||||
.setTitle("🤝 Trading Session")
|
||||
.setColor(EMBED_COLOR)
|
||||
.addFields(
|
||||
{
|
||||
name: `${session.userA.username} ${session.userA.locked ? '✅ (Ready)' : '✏️ (Editing)'}`,
|
||||
value: formatOffer(session.userA),
|
||||
inline: true
|
||||
},
|
||||
{
|
||||
name: `${session.userB.username} ${session.userB.locked ? '✅ (Ready)' : '✏️ (Editing)'}`,
|
||||
value: formatOffer(session.userB),
|
||||
inline: true
|
||||
}
|
||||
)
|
||||
.setFooter({ text: "Both parties must click Lock to confirm trade." });
|
||||
|
||||
const row = new ActionRowBuilder<ButtonBuilder>()
|
||||
.addComponents(
|
||||
new ButtonBuilder().setCustomId('trade_add_item').setLabel('Add Item').setStyle(ButtonStyle.Secondary),
|
||||
new ButtonBuilder().setCustomId('trade_add_money').setLabel('Add Money').setStyle(ButtonStyle.Success),
|
||||
new ButtonBuilder().setCustomId('trade_remove_item').setLabel('Remove Item').setStyle(ButtonStyle.Secondary),
|
||||
new ButtonBuilder().setCustomId('trade_lock').setLabel('Lock / Unlock').setStyle(ButtonStyle.Primary),
|
||||
new ButtonBuilder().setCustomId('trade_cancel').setLabel('Cancel').setStyle(ButtonStyle.Danger),
|
||||
);
|
||||
|
||||
await updateDashboardMessage(interaction, { embeds: [embed], components: [row] });
|
||||
}
|
||||
|
||||
async function updateDashboardMessage(interaction: Interaction, payload: any) {
|
||||
if (interaction.isButton() && interaction.message) {
|
||||
// If interaction came from the dashboard itself, we can edit directly
|
||||
try {
|
||||
await interaction.message.edit(payload);
|
||||
} catch (e) {
|
||||
console.error("Failed to edit message directly", e);
|
||||
}
|
||||
} else {
|
||||
// Find dashboard in channel
|
||||
const channel = interaction.channel as ThreadChannel;
|
||||
if (channel && channel.isThread()) {
|
||||
try {
|
||||
const messages = await channel.messages.fetch({ limit: 10 });
|
||||
const dashboardFn = messages.find(m => m.embeds[0]?.title === "🤝 Trading Session");
|
||||
if (dashboardFn) {
|
||||
await dashboardFn.edit(payload);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error("Failed to fetch/edit dashboard", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function formatOffer(participant: any) {
|
||||
let text = "";
|
||||
if (participant.offer.money > 0n) {
|
||||
text += `💰 ${participant.offer.money} 🪙\n`;
|
||||
}
|
||||
if (participant.offer.items.length > 0) {
|
||||
text += participant.offer.items.map((i: any) => `- ${i.name} (x${i.quantity})`).join("\n");
|
||||
}
|
||||
if (text === "") text = "*Empty Offer*";
|
||||
return text;
|
||||
}
|
||||
187
src/modules/trade/trade.service.ts
Normal file
187
src/modules/trade/trade.service.ts
Normal file
@@ -0,0 +1,187 @@
|
||||
import type { TradeSession, TradeParticipant, TradeState } from "./trade.types";
|
||||
import { DrizzleClient } from "@/lib/DrizzleClient";
|
||||
import { economyService } from "@/modules/economy/economy.service";
|
||||
import { inventoryService } from "@/modules/inventory/inventory.service";
|
||||
import { itemTransactions, transactions } from "@/db/schema";
|
||||
|
||||
export class TradeService {
|
||||
private static sessions = new Map<string, TradeSession>();
|
||||
|
||||
/**
|
||||
* Creates a new trade session
|
||||
*/
|
||||
static createSession(threadId: string, userA: { id: string, username: string }, userB: { id: string, username: string }): TradeSession {
|
||||
const session: TradeSession = {
|
||||
threadId,
|
||||
userA: {
|
||||
id: userA.id,
|
||||
username: userA.username,
|
||||
locked: false,
|
||||
offer: { money: 0n, items: [] }
|
||||
},
|
||||
userB: {
|
||||
id: userB.id,
|
||||
username: userB.username,
|
||||
locked: false,
|
||||
offer: { money: 0n, items: [] }
|
||||
},
|
||||
state: 'NEGOTIATING',
|
||||
lastInteraction: Date.now()
|
||||
};
|
||||
|
||||
this.sessions.set(threadId, session);
|
||||
return session;
|
||||
}
|
||||
|
||||
static getSession(threadId: string): TradeSession | undefined {
|
||||
return this.sessions.get(threadId);
|
||||
}
|
||||
|
||||
static endSession(threadId: string) {
|
||||
this.sessions.delete(threadId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates an offer. If allowed, validation checks should be done BEFORE calling this.
|
||||
* unlocking logic is handled here (if offer changes, unlock both).
|
||||
*/
|
||||
static updateMoney(threadId: string, userId: string, amount: bigint) {
|
||||
const session = this.getSession(threadId);
|
||||
if (!session) throw new Error("Session not found");
|
||||
if (session.state !== 'NEGOTIATING') throw new Error("Trade is not active");
|
||||
|
||||
const participant = session.userA.id === userId ? session.userA : session.userB.id === userId ? session.userB : null;
|
||||
if (!participant) throw new Error("User not in trade");
|
||||
|
||||
participant.offer.money = amount;
|
||||
this.unlockAll(session);
|
||||
session.lastInteraction = Date.now();
|
||||
}
|
||||
|
||||
static addItem(threadId: string, userId: string, item: { id: number, name: string }, quantity: bigint) {
|
||||
const session = this.getSession(threadId);
|
||||
if (!session) throw new Error("Session not found");
|
||||
if (session.state !== 'NEGOTIATING') throw new Error("Trade is not active");
|
||||
|
||||
const participant = session.userA.id === userId ? session.userA : session.userB.id === userId ? session.userB : null;
|
||||
if (!participant) throw new Error("User not in trade");
|
||||
|
||||
const existing = participant.offer.items.find(i => i.id === item.id);
|
||||
if (existing) {
|
||||
existing.quantity += quantity;
|
||||
} else {
|
||||
participant.offer.items.push({ id: item.id, name: item.name, quantity });
|
||||
}
|
||||
|
||||
this.unlockAll(session);
|
||||
session.lastInteraction = Date.now();
|
||||
}
|
||||
|
||||
static removeItem(threadId: string, userId: string, itemId: number) {
|
||||
const session = this.getSession(threadId);
|
||||
if (!session) throw new Error("Session not found");
|
||||
|
||||
const participant = session.userA.id === userId ? session.userA : session.userB.id === userId ? session.userB : null;
|
||||
if (!participant) throw new Error("User not in trade");
|
||||
|
||||
participant.offer.items = participant.offer.items.filter(i => i.id !== itemId);
|
||||
|
||||
this.unlockAll(session);
|
||||
session.lastInteraction = Date.now();
|
||||
}
|
||||
|
||||
static toggleLock(threadId: string, userId: string): boolean {
|
||||
const session = this.getSession(threadId);
|
||||
if (!session) throw new Error("Session not found");
|
||||
|
||||
const participant = session.userA.id === userId ? session.userA : session.userB.id === userId ? session.userB : null;
|
||||
if (!participant) throw new Error("User not in trade");
|
||||
|
||||
participant.locked = !participant.locked;
|
||||
session.lastInteraction = Date.now();
|
||||
|
||||
return participant.locked;
|
||||
}
|
||||
|
||||
private static unlockAll(session: TradeSession) {
|
||||
session.userA.locked = false;
|
||||
session.userB.locked = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes the trade atomically.
|
||||
* 1. Validates balances/inventory for both users.
|
||||
* 2. Swaps money.
|
||||
* 3. Swaps items.
|
||||
* 4. Logs transactions.
|
||||
*/
|
||||
static async executeTrade(threadId: string): Promise<void> {
|
||||
const session = this.getSession(threadId);
|
||||
if (!session) throw new Error("Session not found");
|
||||
|
||||
if (!session.userA.locked || !session.userB.locked) {
|
||||
throw new Error("Both players must accept the trade first.");
|
||||
}
|
||||
|
||||
session.state = 'COMPLETED'; // Prevent double execution
|
||||
|
||||
await DrizzleClient.transaction(async (tx) => {
|
||||
// -- Validate & Execute User A -> User B --
|
||||
await this.processTransfer(tx, session.userA, session.userB, session.threadId);
|
||||
|
||||
// -- Validate & Execute User B -> User A --
|
||||
await this.processTransfer(tx, session.userB, session.userA, session.threadId);
|
||||
});
|
||||
|
||||
this.endSession(threadId);
|
||||
}
|
||||
|
||||
private static async processTransfer(tx: any, from: TradeParticipant, to: TradeParticipant, threadId: string) {
|
||||
// 1. Money
|
||||
if (from.offer.money > 0n) {
|
||||
await economyService.modifyUserBalance(
|
||||
from.id,
|
||||
-from.offer.money,
|
||||
'TRADE_OUT',
|
||||
`Trade with ${to.username} (Thread: ${threadId})`,
|
||||
tx
|
||||
);
|
||||
await economyService.modifyUserBalance(
|
||||
to.id,
|
||||
from.offer.money,
|
||||
'TRADE_IN',
|
||||
`Trade with ${from.username} (Thread: ${threadId})`,
|
||||
tx
|
||||
);
|
||||
}
|
||||
|
||||
// 2. Items
|
||||
for (const item of from.offer.items) {
|
||||
// Remove from sender
|
||||
await inventoryService.removeItem(from.id, item.id, item.quantity, tx);
|
||||
|
||||
// Add to receiver
|
||||
await inventoryService.addItem(to.id, item.id, item.quantity, tx);
|
||||
|
||||
// Log Item Transaction (Sender)
|
||||
await tx.insert(itemTransactions).values({
|
||||
userId: BigInt(from.id),
|
||||
relatedUserId: BigInt(to.id),
|
||||
itemId: item.id,
|
||||
quantity: -item.quantity,
|
||||
type: 'TRADE_OUT',
|
||||
description: `Traded to ${to.username}`,
|
||||
});
|
||||
|
||||
// Log Item Transaction (Receiver)
|
||||
await tx.insert(itemTransactions).values({
|
||||
userId: BigInt(to.id),
|
||||
relatedUserId: BigInt(from.id),
|
||||
itemId: item.id,
|
||||
quantity: item.quantity,
|
||||
type: 'TRADE_IN',
|
||||
description: `Received from ${from.username}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
28
src/modules/trade/trade.types.ts
Normal file
28
src/modules/trade/trade.types.ts
Normal file
@@ -0,0 +1,28 @@
|
||||
|
||||
export interface TradeItem {
|
||||
id: number;
|
||||
name: string; // Cache name for UI display
|
||||
quantity: bigint;
|
||||
}
|
||||
|
||||
export interface TradeOffer {
|
||||
money: bigint;
|
||||
items: TradeItem[]; // easier to iterate for UI than Map
|
||||
}
|
||||
|
||||
export interface TradeParticipant {
|
||||
id: string;
|
||||
username: string;
|
||||
locked: boolean;
|
||||
offer: TradeOffer;
|
||||
}
|
||||
|
||||
export type TradeState = 'NEGOTIATING' | 'COMPLETED' | 'CANCELLED';
|
||||
|
||||
export interface TradeSession {
|
||||
threadId: string;
|
||||
userA: TradeParticipant;
|
||||
userB: TradeParticipant;
|
||||
state: TradeState;
|
||||
lastInteraction: number;
|
||||
}
|
||||
Reference in New Issue
Block a user