From c921e5cf8862def58029bd1801074c51113f86ae Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 7 Mar 2025 17:22:21 -0500 Subject: More settings; Better error message; Database --- bot/src/events/ClientReady.js | 3 +-- bot/src/events/GuildBanAdd.js | 13 +++++++++++-- bot/src/events/GuildCreate.js | 3 +++ bot/src/events/GuildDelete.js | 16 ++++++---------- bot/src/events/GuildMemberRemove.js | 2 +- bot/src/events/InteractionCreate.js | 10 +++++++--- bot/src/events/MessageCreate.js | 10 +++++++--- bot/src/events/MessageUpdate.js | 18 +++++++++--------- 8 files changed, 45 insertions(+), 30 deletions(-) (limited to 'bot/src/events') diff --git a/bot/src/events/ClientReady.js b/bot/src/events/ClientReady.js index af03e25..ec22ba6 100644 --- a/bot/src/events/ClientReady.js +++ b/bot/src/events/ClientReady.js @@ -28,7 +28,7 @@ export default { console.log(`[i] Bot ID: ${client.user.id}`); console.log(`[i] Running version ${abVersion} | Serving in ${client.guilds.cache.size} guilds`); - botActivity(client); + await botActivity(client); if (readyMsg) { const readyEmbed = new EmbedBuilder() @@ -41,7 +41,6 @@ export default { ) .setColor(abEmbedColour); - let statusChannel = client.channels.cache.get(process.env.statusChannelID); if (!statusChannel) return console.error('The status channel does not exist! Skipping.'); await statusChannel.send({ embeds: [readyEmbed]}); diff --git a/bot/src/events/GuildBanAdd.js b/bot/src/events/GuildBanAdd.js index 1e52040..e68701d 100644 --- a/bot/src/events/GuildBanAdd.js +++ b/bot/src/events/GuildBanAdd.js @@ -1,9 +1,17 @@ -import { EmbedBuilder, Events } from 'discord.js'; +import { EmbedBuilder, Events, AuditLogEvent } from 'discord.js'; import { guildSettings } from '../models/guild-settings.js'; export default { name: Events.GuildBanAdd, async execute(guild, user) { + + const banLog = await guild.fetchAuditLogs({ + type: AuditLogEvent.MemberBanAdd, + limit: 1, + }); + + const banEntry = banLog.entries.first(); + const guildSetting = await guildSettings.findOne({ where: { guildID: guild.id } }); if (!guildSetting || !guildSetting.logChannelID) return; @@ -12,7 +20,8 @@ export default { .setDescription(`This user got banned from ${guild.name}`) .addFields( { name: 'User:', value: `${user.tag}` }, - { name: 'User ID:', value: `${user.id}`} + { name: 'User ID:', value: `${user.id}`}, + { name: 'Reason:', value: `${banEntry.reason || 'No reason provided'}` } ) .setColor('#ff021b') .setTimestamp(); diff --git a/bot/src/events/GuildCreate.js b/bot/src/events/GuildCreate.js index 7bcd0d1..4d73f08 100644 --- a/bot/src/events/GuildCreate.js +++ b/bot/src/events/GuildCreate.js @@ -1,5 +1,6 @@ import { EmbedBuilder, Events } from 'discord.js'; import { abEmbedColour } from '../storage/consts.js'; +import { guildSettings } from '../models/guild-settings.js'; export default { name: Events.GuildCreate, @@ -16,6 +17,8 @@ export default { .setColor(abEmbedColour) .setFooter({ text: `We now run on ${guild.client.guilds.cache.size} guilds.` }); + await guildSettings.create({ guildID: guild.id }); + let statusChannel = guild.client.channels.cache.get(process.env.statusChannelID); if (!statusChannel) return; await statusChannel.send({ embeds: [logEmbed]}); diff --git a/bot/src/events/GuildDelete.js b/bot/src/events/GuildDelete.js index 2dcba22..5ca1cbe 100644 --- a/bot/src/events/GuildDelete.js +++ b/bot/src/events/GuildDelete.js @@ -6,16 +6,6 @@ export default { name: Events.GuildDelete, async execute(guild) { console.log(`[i] I have been removed from: ${guild.name} (${guild.id})`); - - try { - const guildSetting = await guildSettings.findOne({ where: { guildID: guild.id } }); - if (guildSetting) { - await guildSettings.destroy({ where: { guildID: guild.id } }); - } - } catch (error) { - console.error(`Failed to remove guild settings for ${guild.id}:`, error); - } - const logEmbed = new EmbedBuilder() .setAuthor({ name: 'AleeBot', iconURL: guild.client.user.avatarURL() }) .setDescription('I got removed from a server...') @@ -26,6 +16,12 @@ export default { .setColor(abEmbedColour) .setFooter({ text: `We now run on ${guild.client.guilds.cache.size} guilds.` }); + const guildSetting = await guildSettings.findOne({ where: { guildID: guild.id } }); + + if (guildSetting) { + await guildSettings.destroy({ where: { guildID: guild.id } }); + } + let statusChannel = guild.client.channels.cache.get(process.env.statusChannelID); if (!statusChannel) return; await statusChannel.send({ embeds: [logEmbed]}); diff --git a/bot/src/events/GuildMemberRemove.js b/bot/src/events/GuildMemberRemove.js index 9bf5e9d..aa109b1 100644 --- a/bot/src/events/GuildMemberRemove.js +++ b/bot/src/events/GuildMemberRemove.js @@ -9,7 +9,7 @@ export default { const logEmbed = new EmbedBuilder() .setAuthor({ name: 'AleeBot Logging', iconURL: member.client.user.avatarURL() }) - .setDescription('A user has joined this server!') + .setDescription('A user has left this server!') .addFields( { name: 'Username: ', value: `${member.user.tag}`, inline: true }, { name: 'User ID: ', value: `${member.id}`, inline: true }, diff --git a/bot/src/events/InteractionCreate.js b/bot/src/events/InteractionCreate.js index eadef09..8f1e998 100644 --- a/bot/src/events/InteractionCreate.js +++ b/bot/src/events/InteractionCreate.js @@ -1,5 +1,9 @@ import { Events, MessageFlags } from 'discord.js'; +function error(e) { + return `Something went wrong. [Submit an issue at the AleeBot repository.]()\nMessage:\n\`\`\`${e.stack}\`\`\``; +} + export default { name: Events.InteractionCreate, async execute(interaction) { @@ -12,11 +16,11 @@ export default { try { await command.execute(interaction); } catch (e) { - console.log(e); + console.error(e); if (interaction.replied || interaction.deferred) { - await interaction.followUp({ content: `Something went wrong. The following error message:\n\`\`\`${e}\`\`\``, flags: MessageFlags.Ephemeral }); + await interaction.followUp({ content: error(e), flags: MessageFlags.Ephemeral }); } else { - await interaction.reply({ content: `Something went wrong. The following error message:\n\`\`\`${e}\`\`\``, flags: MessageFlags.Ephemeral }); + await interaction.reply({ content: error(e), flags: MessageFlags.Ephemeral }); } } } diff --git a/bot/src/events/MessageCreate.js b/bot/src/events/MessageCreate.js index 90b517d..e7af3a8 100644 --- a/bot/src/events/MessageCreate.js +++ b/bot/src/events/MessageCreate.js @@ -1,6 +1,7 @@ import { Events } from 'discord.js'; import { ollama } from '../utils/ollama.js'; -import { ollamaEnabled, ollamaModel } from '../storage/consts.js'; +import { ollamaGlobal, ollamaModel } from '../storage/consts.js'; +import { guildSettings } from '../models/guild-settings.js'; export default { name: Events.MessageCreate, @@ -9,10 +10,13 @@ export default { if (msg.author.bot) return; if (!msg.guild) return; + const guildSetting = await guildSettings.findOne({ where: { guildID: msg.guild.id } }); + const args = msg.content.slice(`<@${msg.client.user.id}>`.length).trim(); if (msg.mentions.has(msg.client.user)) { - if (!ollamaEnabled) return msg.reply('Sorry, this feature has been turned off.'); + if (!guildSetting.ollamaEnabled) return; + if (!ollamaGlobal) return msg.reply('Sorry, this feature has been turned off.'); if (!args) return msg.reply('Sorry? What was that?'); try { @@ -35,7 +39,7 @@ export default { } catch (err) { console.error(err); - await msg.reply('Something went wrong.'); + await msg.reply(`Something went wrong. [Submit an issue at the AleeBot repository.]()\nMessage:\n\`\`\`${err.stack}\`\`\``); } } } diff --git a/bot/src/events/MessageUpdate.js b/bot/src/events/MessageUpdate.js index 26f6ab3..118f51d 100644 --- a/bot/src/events/MessageUpdate.js +++ b/bot/src/events/MessageUpdate.js @@ -3,23 +3,23 @@ import { guildSettings } from '../models/guild-settings.js'; export default { name: Events.MessageUpdate, - async execute(oldmsg, newmsg) { - const guildSetting = await guildSettings.findOne({ where: { guildID: oldmsg.guild.id } }); - if (!oldmsg.guild || !guildSetting || !guildSetting.logChannelID) return; - if (oldmsg.content === newmsg.content) return; + async execute(msg, newmsg) { + const guildSetting = await guildSettings.findOne({ where: { guildID: msg.guild.id } }); + if (!msg.guild || !guildSetting || !guildSetting.logChannelID) return; + if (msg.content === newmsg.content) return; const logEmbed = new EmbedBuilder() - .setAuthor({ name: 'AleeBot Logging', iconURL: oldmsg.client.user.avatarURL() }) - .setDescription(`A message from ${oldmsg.author.username} was edited in <#${oldmsg.channel.id}>`) + .setAuthor({ name: 'AleeBot Logging', iconURL: msg.client.user.avatarURL() }) + .setDescription(`A message from ${msg.author.username} was edited in <#${msg.channel.id}>`) .addFields( - { name: 'Before: ', value: `\`\`\`${oldmsg.content}\`\`\`` }, + { name: 'Before: ', value: `\`\`\`${msg.content}\`\`\`` }, { name: 'After: ', value: `\`\`\`${newmsg.content}\`\`\`` } ) .setColor('#ffff1a') .setTimestamp() - .setFooter(`Author ID: ${oldmsg.author.id}`); + .setFooter(`Author ID: ${msg.author.id}`); - let editMessage = oldmsg.client.channels.cache.get(guildSetting.logChannelID); + let editMessage = msg.client.channels.cache.get(guildSetting.logChannelID); if (!editMessage) return; await editMessage.send({ embeds: [logEmbed]}); -- cgit v1.2.3