dont merge - i was having conflicts #2
@@ -12,12 +12,12 @@
|
||||
"typescript": "^5"
|
||||
},
|
||||
"scripts": {
|
||||
"generate": "drizzle-kit generate",
|
||||
"migrate": "drizzle-kit migrate",
|
||||
"db:push": "drizzle-kit push",
|
||||
"generate": "docker compose run --rm app bun drizzle-kit generate",
|
||||
"migrate": "docker compose run --rm app bun drizzle-kit migrate",
|
||||
"db:push": "docker compose run --rm app bun drizzle-kit push",
|
||||
"deploy": "docker compose run --rm app bun src/scripts/deploy.ts",
|
||||
"dev": "bun --watch src/index.ts",
|
||||
"db:studio": "drizzle-kit studio"
|
||||
"db:studio": "docker compose run --rm -p 8080:8080 app bun drizzle-kit studio --host 127.0.0.1 --port 8080"
|
||||
},
|
||||
"dependencies": {
|
||||
"discord.js": "^14.25.1",
|
||||
|
||||
@@ -6,30 +6,21 @@ import { SlashCommandBuilder, EmbedBuilder, PermissionFlagsBits } from "discord.
|
||||
export const balance = createCommand({
|
||||
data: new SlashCommandBuilder()
|
||||
.setName("balance")
|
||||
.setDescription("Check your balance or another user's balance (admins only)")
|
||||
.addUserOption(option =>
|
||||
option
|
||||
.setName("user")
|
||||
.setDescription("User to view balance of (admin only)")
|
||||
.setRequired(false)
|
||||
),
|
||||
|
||||
execute: async (interaction) => {
|
||||
const isAdmin = interaction.memberPermissions?.has(PermissionFlagsBits.Administrator) || false;
|
||||
|
||||
const target = interaction.options.getUser("user");
|
||||
const finalTarget = (!isAdmin || !target) ? interaction.user : target;
|
||||
.setDescription("Check your balance")
|
||||
|
||||
|
||||
,execute: async (interaction) => {
|
||||
const user = interaction.user;
|
||||
// Ensure user exists in DB
|
||||
let dbUser = await getUserById(finalTarget.id);
|
||||
let dbUser = await getUserById(user.id);
|
||||
if (!dbUser) {
|
||||
await createUser(finalTarget.id);
|
||||
await createUser(user.id);
|
||||
}
|
||||
|
||||
const balance = await getUserBalance(finalTarget.id);
|
||||
const balance = await getUserBalance(user.id);
|
||||
|
||||
const embed = new EmbedBuilder()
|
||||
.setTitle(`${finalTarget.username}'s Balance`)
|
||||
.setTitle(`${user.username}'s Balance`)
|
||||
.setDescription(`💰 **${balance} coins**`)
|
||||
.setColor("Green");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user