Compare commits
3 Commits
2e4147abec
...
e5933aacc2
| Author | SHA1 | Date | |
|---|---|---|---|
| e5933aacc2 | |||
| 333f3d94bf | |||
| 00210a03cf |
52
commands/utility/receiptCommands.js
Normal file
52
commands/utility/receiptCommands.js
Normal file
@@ -0,0 +1,52 @@
|
||||
const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
|
||||
|
||||
module.exports = {
|
||||
category: 'utility',
|
||||
global: true,
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('budget')
|
||||
.setDescription('The thing')
|
||||
.addSubcommand(subcommand =>
|
||||
subcommand
|
||||
.setName('set')
|
||||
.setDescription('Set weekly budget')
|
||||
.addIntegerOption(option =>
|
||||
option.setName('amount')
|
||||
.setRequired(true)
|
||||
.setDescription('Amount as int'))
|
||||
)
|
||||
.addSubcommand(subcommand =>
|
||||
subcommand
|
||||
.setName('show')
|
||||
.setDescription('not implemented')
|
||||
),
|
||||
async execute(interaction) {
|
||||
console.log('budget command entrypoint');
|
||||
let db = await interaction.client.localDB;
|
||||
let discordId = interaction.member.id;
|
||||
console.log(db, discordId);
|
||||
let allowed = ['372115788498468864', '222457277708369928'].includes(discordId);
|
||||
console.log(allowed);
|
||||
if (!allowed) {
|
||||
console.log('budget command denied');
|
||||
await interaction.reply('This command may only be invoked by Miffy!');
|
||||
return;
|
||||
}
|
||||
console.log(`Switcching on sub ${interaction.options.getSubcommand()}`);
|
||||
switch (interaction.options.getSubcommand()) {
|
||||
case 'set':
|
||||
console.log('budget command set');
|
||||
let budget = interaction.options.get('amount').value
|
||||
db.prepare(`INSERT OR REPLACE INTO bot_config (id, weekly_budget) VALUES (1, ?)`).run(budget);
|
||||
await interaction.reply(`Budget set to ${budget}`);
|
||||
break;
|
||||
case 'show':
|
||||
console.log('budget command show');
|
||||
await interaction.reply('Not implemented');
|
||||
break
|
||||
default:
|
||||
await interaction.reply(`Sub mismatch. Switching on ${interaction.options.getSubcommand()}`);
|
||||
break;
|
||||
}
|
||||
},
|
||||
};
|
||||
47
core/db.js
47
core/db.js
@@ -1,20 +1,21 @@
|
||||
const fs = require("fs");
|
||||
const sqlite3 = require("sqlite3").verbose();
|
||||
const Database = require("better-sqlite3");
|
||||
const path = require("path");
|
||||
const { open } = require('sqlite');
|
||||
const filepath = "./data/minzbot.db";
|
||||
|
||||
async function createDbConnection() {
|
||||
if (fs.existsSync(filepath)) {
|
||||
//new sqlite3.Database(filepath);
|
||||
const db = await open({filename: filepath, driver: sqlite3.Database});
|
||||
await initDB(db);
|
||||
return db;
|
||||
} else {
|
||||
const db = await open({filename: filepath, driver: sqlite3.Database});
|
||||
await initDB(db);
|
||||
console.log("[DATABASE] Connection with SQLite has been established");
|
||||
return db;
|
||||
const dir = path.dirname(filepath);
|
||||
if (!fs.existsSync(dir)) {
|
||||
fs.mkdirSync(dir, { recursive: true });
|
||||
}
|
||||
|
||||
const db = new Database(filepath, { verbose: console.log });
|
||||
|
||||
initDB(db);
|
||||
|
||||
console.log("[DATABASE] Connection with better-sqlite3 established");
|
||||
return db;
|
||||
}
|
||||
|
||||
async function initDB(db) {
|
||||
@@ -33,7 +34,29 @@ async function initDB(db) {
|
||||
lastfm_name TEXT
|
||||
);
|
||||
`);
|
||||
await db.exec(`
|
||||
CREATE TABLE IF NOT EXISTS bot_config (
|
||||
id INTEGER PRIMARY KEY CHECK (id = 1),
|
||||
weekly_budget REAL DEFAULT 0,
|
||||
exchange_rate_eur_kr REAL DEFAULT 0,
|
||||
last_budget_notification_date TEXT
|
||||
);
|
||||
`);
|
||||
await db.exec(`
|
||||
CREATE TABLE IF NOT EXISTS grocery_budgets (
|
||||
ID INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
discord_id VARCHAR(50) NOT NULL,
|
||||
budget_spent REAL,
|
||||
total_spent REAL
|
||||
);
|
||||
`);
|
||||
|
||||
// Optional: Initialize the row if it doesn't exist yet
|
||||
await db.exec(`
|
||||
INSERT OR IGNORE INTO bot_config (id, weekly_budget, last_budget_notification_date)
|
||||
VALUES (1, 0, NULL);
|
||||
`);
|
||||
console.log('[DATABASE] Created new DB table');
|
||||
}
|
||||
|
||||
module.exports = createDbConnection();
|
||||
module.exports = createDbConnection;
|
||||
@@ -36,14 +36,14 @@ const rest = new REST().setToken(token);
|
||||
// and deploy your commands!
|
||||
(async () => {
|
||||
try {
|
||||
console.log(`[GUILD] Started refreshing ${guildCommands.length} application (/) commands.`);
|
||||
console.log(`[GUILD] Started refreshing ${guildCommands.length} Guild (/) commands.`);
|
||||
|
||||
let data = await rest.put(
|
||||
Routes.applicationGuildCommands(clientId, guildId),
|
||||
{ body: guildCommands },
|
||||
);
|
||||
|
||||
console.log(`[GUILD] Successfully reloaded ${data.length} application (/) commands.`);
|
||||
console.log(`[GUILD] Successfully reloaded ${data.length} Guild (/) commands.`);
|
||||
|
||||
console.log(`[GLOBAL] Started refreshing ${globalCommands.length} application (/) commands.`);
|
||||
|
||||
|
||||
46
events/receiptsMessageCreate.js
Normal file
46
events/receiptsMessageCreate.js
Normal file
@@ -0,0 +1,46 @@
|
||||
const { Events, channelLink, discordSort } = require('discord.js');
|
||||
|
||||
module.exports = {
|
||||
name: Events.MessageCreate,
|
||||
async execute(message) {
|
||||
if (message.author.bot) return;
|
||||
|
||||
if(message.channel.id === '1462060674766344370') {
|
||||
|
||||
let reply = "";
|
||||
let db = await message.client.localDB;
|
||||
const receiptsChannel = message.channel;
|
||||
const authorId = message.author.id;
|
||||
|
||||
let budgets = await db.prepare(`SELECT * FROM grocery_budgets WHERE discord_id = ?`).get(authorId);
|
||||
let weeklyBudget = await (await db.prepare(`SELECT weekly_budget FROM bot_config`).get()).weekly_budget;
|
||||
|
||||
console.log(weeklyBudget, budgets);
|
||||
if (budgets === undefined) {
|
||||
console.log(`No budget row in db for ${authorId}`);
|
||||
db.prepare(`INSERT OR REPLACE INTO grocery_budgets (discord_id, budget_spent, total_spent) VALUES (?,0,0)`).run(authorId);
|
||||
}
|
||||
|
||||
let matches = [];
|
||||
let lines = message.content.split("\n");
|
||||
let additionalSpent = 0.0;
|
||||
lines.forEach(line => {0
|
||||
if (line.startsWith('-')) {
|
||||
console.log(`Matching on line ${line}`);
|
||||
const regex = /-(?=[0-9])([0-9]*,?[0-9]*)/m;
|
||||
let match = regex.exec(line)
|
||||
console.log(match);
|
||||
additionalSpent = additionalSpent + parseFloat(match[1]);
|
||||
}
|
||||
});
|
||||
|
||||
if (additionalSpent > 0) {
|
||||
db.prepare(`UPDATE grocery_budgets SET budget_spent = ?, total_spent = ? WHERE discord_id = ?`).run(budgets.budget_spent + additionalSpent, budgets.total_spent + additionalSpent, authorId);
|
||||
let remainingBudget = weeklyBudget - (budgets.budget_spent + additionalSpent);
|
||||
|
||||
reply = `${message.author.globalName} spent ${additionalSpent} of their budget.\nThey have ${remainingBudget} remaining.`;
|
||||
await receiptsChannel.send(reply);
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
38
main.js
38
main.js
@@ -2,24 +2,27 @@ const fs = require('node:fs');
|
||||
const path = require('node:path');
|
||||
const { Client, Collection, Events, GatewayIntentBits, Options, Partials } = require('discord.js');
|
||||
const { token } = require('./config.json');
|
||||
const createDbConnection = require('./core/db.js');
|
||||
|
||||
const localDB = require('./core/db');
|
||||
|
||||
const client = new Client({
|
||||
async function entrypoint() {
|
||||
const localDB = await createDbConnection();
|
||||
|
||||
const client = new Client({
|
||||
intents: [GatewayIntentBits.Guilds, GatewayIntentBits.MessageContent, GatewayIntentBits.GuildMessages, GatewayIntentBits.GuildMembers, GatewayIntentBits.GuildPresences, GatewayIntentBits.GuildMessageReactions],
|
||||
partials: [Partials.Message, Partials.Channel, Partials.Reaction],
|
||||
sweepers: {
|
||||
...Options.DefaultSweeperSettings,
|
||||
reactions: { interval: 300, filter: () => () => { return true } }
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
client.localDB = localDB;
|
||||
client.commands = new Collection();
|
||||
const foldersPath = path.join(__dirname, 'commands');
|
||||
const commandFolders = fs.readdirSync(foldersPath);
|
||||
client.localDB = localDB;
|
||||
client.commands = new Collection();
|
||||
const foldersPath = path.join(__dirname, 'commands');
|
||||
const commandFolders = fs.readdirSync(foldersPath);
|
||||
|
||||
for (const folder of commandFolders) {
|
||||
for (const folder of commandFolders) {
|
||||
const commandsPath = path.join(foldersPath, folder);
|
||||
const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
|
||||
for (const file of commandFiles) {
|
||||
@@ -31,12 +34,12 @@ for (const folder of commandFolders) {
|
||||
console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const eventsPath = path.join(__dirname, 'events');
|
||||
const eventFiles = fs.readdirSync(eventsPath).filter(file => file.endsWith('.js'));
|
||||
const eventsPath = path.join(__dirname, 'events');
|
||||
const eventFiles = fs.readdirSync(eventsPath).filter(file => file.endsWith('.js'));
|
||||
|
||||
for (const file of eventFiles) {
|
||||
for (const file of eventFiles) {
|
||||
const filePath = path.join(eventsPath, file);
|
||||
const event = require(filePath);
|
||||
if (event.once) {
|
||||
@@ -45,9 +48,9 @@ for (const file of eventFiles) {
|
||||
console.log(`Registered event ${event.name} ${file}`);
|
||||
client.on(event.name, (...args) => event.execute(...args));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
client.on(Events.ClientReady, () => {
|
||||
client.on(Events.ClientReady, () => {
|
||||
//setup timers
|
||||
const timersPath = path.join(__dirname, 'timers');
|
||||
const timerFiles = fs.readdirSync(timersPath).filter(file => file.endsWith('.js'));
|
||||
@@ -61,6 +64,9 @@ client.on(Events.ClientReady, () => {
|
||||
timer.instance = timerInstance;
|
||||
if (timer.immediate) { timer.tick(client, timer) }
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
client.login(token);
|
||||
client.login(token);
|
||||
};
|
||||
|
||||
entrypoint();
|
||||
|
||||
1007
package-lock.json
generated
1007
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"axios": "^1.6.8",
|
||||
"better-sqlite3": "^12.6.2",
|
||||
"discord.js": "^14.13.0",
|
||||
"dotenv": "^16.3.1",
|
||||
"spotify-web-api-node": "^5.0.2",
|
||||
"sqlite": "^5.1.1",
|
||||
"sqlite3": "^5.1.7"
|
||||
"sqlite": "^5.1.1"
|
||||
},
|
||||
"name": "minzbot",
|
||||
"description": "Successor of the Discord.py implementation",
|
||||
|
||||
@@ -13,8 +13,8 @@ module.exports = {
|
||||
{ channelId: '1101703550070947920', keepTimeMinutes: 2880, keepAttachment: true }, //cotr/Memes
|
||||
];
|
||||
function isMessageLocked(message) {
|
||||
for(const [id, reaction] of message.reactions.cache) {
|
||||
if(id === keepMessageEmoteId) {
|
||||
for (const [id, reaction] of message.reactions.cache) {
|
||||
if (id === keepMessageEmoteId) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -22,26 +22,28 @@ module.exports = {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
for (let i = 0; i < channelConfigs.length; i++) {
|
||||
try {
|
||||
const config = channelConfigs[i];
|
||||
const channel = await client.channels.fetch(config.channelId);
|
||||
|
||||
console.log(`[TIMER] Running cleanup task for ${channel.guild.name}/${channel.name}`);
|
||||
channel.messages.fetch({ limit: 100 }).then(messages => {
|
||||
messages.forEach(message => {
|
||||
if(isMessageLocked(message)) {
|
||||
if (isMessageLocked(message)) {
|
||||
//skip if message has mnzboKeepMessage reaction
|
||||
console.log(`[LOCKED] [${message.guild.name}/${message.channel.name}] | ${message.author.globalName}: ${message.content}`);
|
||||
return;
|
||||
}
|
||||
|
||||
if(message.attachments.size > 0 && config.keepAttachment) {
|
||||
if (message.attachments.size > 0 && config.keepAttachment) {
|
||||
//Skip messages with attachment
|
||||
return;
|
||||
}
|
||||
|
||||
let ageInMinutes = Math.ceil((Date.now() - message.createdTimestamp) / 1000 / 60);
|
||||
if(ageInMinutes < config.keepTimeMinutes) {
|
||||
if (ageInMinutes < config.keepTimeMinutes) {
|
||||
//Skip messages posted within last 48 Hours
|
||||
return;
|
||||
}
|
||||
@@ -50,6 +52,9 @@ module.exports = {
|
||||
message.delete();
|
||||
});
|
||||
});
|
||||
} catch (error) {
|
||||
console.log(`[CLEANUP] Failed for ${channelConfigs[i].channelId}`);
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
@@ -17,17 +17,29 @@ module.exports = {
|
||||
year: 'numeric'
|
||||
});
|
||||
const channel = await client.channels.fetch(timer.data.channelId);
|
||||
if (channel) await channel.send(`Today is ${currentDate}`);
|
||||
await channel.send(`${currentDate}`);
|
||||
if (currentDate.startsWith('Sunday')) {
|
||||
const response = await fetch(`https://api.frankfurter.dev/v1/latest?amount=1&from=EUR&to=SEK`);
|
||||
|
||||
if (!response.ok) await channel.send(`Failed to fetch exchange rate:\n${response.statusText}`);
|
||||
let db = await client.localDB;
|
||||
const data = await response.json();
|
||||
db.prepare(`UPDATE bot_config SET exchange_rate_eur_kr = ? WHERE id = 1`).run(data.rates.SEK);
|
||||
let weeklyBudget = await (await db.prepare(`SELECT weekly_budget FROM bot_config`).get()).weekly_budget;
|
||||
await channel.send(`Fetched new exchange rate:\n${JSON.stringify(data)}`);
|
||||
db.prepare(`UPDATE grocery_budgets SET budget_spent = 0`).run();
|
||||
await channel.send(`Reset weekly budget to ${weeklyBudget}EUR / ${weeklyBudget*data.rates.SEK}SEK`);
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('[TIMER] Error:', error);
|
||||
} finally {
|
||||
// 2. Schedule the NEXT tick manually
|
||||
this.scheduleNext(client, timer);
|
||||
await this.scheduleNext(client, timer);
|
||||
}
|
||||
},
|
||||
|
||||
scheduleNext(client, timer) {
|
||||
async scheduleNext(client, timer) {
|
||||
const now = new Date();
|
||||
const next = new Date();
|
||||
|
||||
@@ -45,6 +57,8 @@ module.exports = {
|
||||
this.tick(client, timer);
|
||||
}, delay);
|
||||
|
||||
const channel = await client.channels.fetch(timer.data.channelId);
|
||||
if (channel) await channel.send(`Next message scheduled for: ${next.toLocaleString()} with ms delta of ${delay} / ${delay/3600000}`);
|
||||
console.log(`[TIMER] Next message scheduled for: ${next.toLocaleString()}`);
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user