sarah/pixelpoebel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sarah:d546035bb77772b854c071683d3d285476e5fead
Branches Tags
sarah:main
sarah:1.0
...
compare: sarah:main
Branches Tags
sarah:main
sarah:1.0

2 Commits
d546035bb7 ... main

Author SHA1 Message Date
sarah
0e1630f80b fix: resolve role selection limits, uncached message crashes, and optimize settings caching
All checks were successful
Auto Build and Push Docker Image / build (push) Successful in 19s
Details
2026-05-31 21:18:13 +02:00
coding
e2018be4c6 Fix TypeScript errors and refactor MessageFlags to use ephemeral flag
All checks were successful
Auto Build and Push Docker Image / build (push) Successful in 7s
Details
2026-04-29 20:09:05 +02:00
16 changed files with 168 additions and 164 deletions
Expand all files Collapse all files

3
AGENTS-BOT.md
View File

@@ -144,3 +144,6 @@ if (process.env.AUTO_DEPLOY !== 'false') {
2. **Foreign Keys:** Always enable `foreign_keys = ON` to maintain data integrity.
3. **Type Safety:** Use `ExtendedClient` instead of `any` for the client instance.
4. **Webhook Reuse:** Map `WebhookClient` instances to their monitor keys to prevent leaks.
5. **Partial Message Handling:** In `messageDelete` and `messageUpdate` events, always check for null `author` property to avoid runtime crashes on uncached partial messages.
6. **Centralized Settings Cache:** Always use `client.DB.getSettings(guildId)` instead of raw SQLite select queries for `guild_settings` to leverage central caching and automatic default generation.
7. **Category Role Selection Limits:** Do not count general guild roles when checking role selection limits; filter the user's role list using only the specific role IDs registered under that category.

64
src/commands/utility/admin.ts
View File

@@ -1,19 +1,19 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, GuildMember, MessageFlags } from 'discord.js';
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, GuildMember } from 'discord.js';
import { Command } from '../../structures/Command.js';
import { ExtendedClient } from '../../structures/ExtendedClient.js';
async function sendModerationLog(client: ExtendedClient, guildId: string, event: string, embed: EmbedBuilder) {
const DB = client.DB;
const settings: any = DB.get('SELECT log_events FROM guild_settings WHERE guild_id = ?', guildId);
const settings = DB.getSettings(guildId);
if (!settings) return;
if (!settings?.log_events) return;
if (!settings.log_events) return;
const activeEvents = settings.log_events.split(',').filter(Boolean);
if (!activeEvents.includes(event)) return;
const logSettings: any = DB.get('SELECT log_channel FROM guild_settings WHERE guild_id = ?', guildId);
if (!logSettings?.log_channel) return;
if (!settings.log_channel) return;
const channel = client.guilds.cache.get(guildId)?.channels.cache.get(logSettings.log_channel);
const channel = client.guilds.cache.get(guildId)?.channels.cache.get(settings.log_channel);
if (!channel || !channel.isTextBased()) return;
try {
@@ -222,28 +222,24 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
// Get or create guild settings
let settings: any = DB.get('SELECT * FROM guild_settings WHERE guild_id = ?', guildId);
if (!settings) {
DB.run('INSERT INTO guild_settings (guild_id) VALUES (?)', guildId);
settings = DB.get('SELECT * FROM guild_settings WHERE guild_id = ?', guildId);
}
const settings = DB.getSettings(guildId);
if (subcommand === 'kick') {
const target = interaction.options.getMember('target') as GuildMember;
const reason = interaction.options.getString('reason') ?? 'Kein Grund';
if (!target) {
await interaction.reply({ content: 'Nutzer nicht gefunden.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Nutzer nicht gefunden.', ephemeral: true });
return;
}
if (!target.kickable) {
await interaction.reply({ content: 'Ich kann diesen Nutzer nicht kicken.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Ich kann diesen Nutzer nicht kicken.', ephemeral: true });
return;
}
@@ -263,7 +259,7 @@ const command: Command = {
await sendModerationLog(interaction.client, guildId, 'kicks', embed);
} catch (error) {
console.error(error);
await interaction.reply({ content: '❌ Fehler beim Kicken.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Fehler beim Kicken.', ephemeral: true });
}
return;
}
@@ -273,7 +269,7 @@ const command: Command = {
const reason = interaction.options.getString('reason')!;
if (!target) {
await interaction.reply({ content: 'Nutzer nicht gefunden.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Nutzer nicht gefunden.', ephemeral: true });
return;
}
@@ -342,7 +338,7 @@ const command: Command = {
const target = interaction.options.getMember('target') as GuildMember;
if (!target) {
await interaction.reply({ content: 'Nutzer nicht gefunden.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Nutzer nicht gefunden.', ephemeral: true });
return;
}
@@ -354,7 +350,7 @@ const command: Command = {
);
if (!latestWarn) {
await interaction.reply({ content: 'Keine Warnung für diesen Nutzer gefunden.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Warnung für diesen Nutzer gefunden.', ephemeral: true });
return;
}
@@ -370,7 +366,7 @@ const command: Command = {
const reason = interaction.options.getString('reason') ?? 'Kein Grund';
if (!target) {
await interaction.reply({ content: 'Nutzer nicht gefunden.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Nutzer nicht gefunden.', ephemeral: true });
return;
}
@@ -394,7 +390,7 @@ const command: Command = {
const multiplier = unitSeconds[unit!];
if (!multiplier) {
await interaction.reply({ content: '❌ Ungültige Zeiteinheit.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Ungültige Zeiteinheit.', ephemeral: true });
return;
}
@@ -412,7 +408,7 @@ const command: Command = {
};
durationText = `${duration} ${unitNames[unit!]}`;
} else {
await interaction.reply({ content: '❌ Dauer oder Zeiteinheit angeben.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Dauer oder Zeiteinheit angeben.', ephemeral: true });
return;
}
@@ -433,7 +429,7 @@ const command: Command = {
await sendModerationLog(interaction.client, guildId, 'mutes', embed);
} catch (error) {
console.error(error);
await interaction.reply({ content: '❌ Fehler beim Muten.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Fehler beim Muten.', ephemeral: true });
}
return;
}
@@ -442,7 +438,7 @@ const command: Command = {
const target = interaction.options.getMember('target') as GuildMember;
if (!target) {
await interaction.reply({ content: 'Nutzer nicht gefunden.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Nutzer nicht gefunden.', ephemeral: true });
return;
}
@@ -451,7 +447,7 @@ const command: Command = {
await interaction.reply(`✅ Entmutet: ${target.user.tag}`);
} catch (error) {
console.error(error);
await interaction.reply({ content: '❌ Fehler beim Entmuten.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Fehler beim Entmuten.', ephemeral: true });
}
return;
}
@@ -462,12 +458,12 @@ const command: Command = {
const deleteDays = interaction.options.getInteger('delete_days') ?? 0;
if (!target) {
await interaction.reply({ content: 'Nutzer nicht gefunden.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Nutzer nicht gefunden.', ephemeral: true });
return;
}
if (!target.bannable) {
await interaction.reply({ content: 'Ich kann diesen Nutzer nicht bannen.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Ich kann diesen Nutzer nicht bannen.', ephemeral: true });
return;
}
@@ -488,7 +484,7 @@ const command: Command = {
await sendModerationLog(interaction.client, guildId, 'bans', embed);
} catch (error) {
console.error(error);
await interaction.reply({ content: '❌ Fehler beim Bannen.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Fehler beim Bannen.', ephemeral: true });
}
return;
}
@@ -505,7 +501,7 @@ const command: Command = {
await interaction.reply(`✅ Entbannt: ${targetId}`);
} catch (error: any) {
console.error(error);
await interaction.reply({ content: `❌ Fehler beim Entbannen: ${error.message}`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `❌ Fehler beim Entbannen: ${error.message}`, ephemeral: true });
}
return;
}
@@ -525,14 +521,14 @@ const command: Command = {
{ name: 'Mute-Dauer', value: `${(settings?.warn_mute_duration ?? 1800) / 60} Min`, inline: true }
);
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
if (setting === 'warn_threshold') {
const threshold = parseInt(value!);
if (isNaN(threshold) || threshold < 1) {
await interaction.reply({ content: '❌ Ungültiger Wert. Mindestens 1.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Ungültiger Wert. Mindestens 1.', ephemeral: true });
return;
}
DB.run('UPDATE guild_settings SET warn_threshold = ? WHERE guild_id = ?', threshold, guildId);
@@ -543,7 +539,7 @@ const command: Command = {
if (setting === 'warn_action') {
const validActions = ['none', 'kick', 'mute', 'ban'];
if (!validActions.includes(value!)) {
await interaction.reply({ content: `❌ Ungültige Aktion. Möglich: ${validActions.join(', ')}`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `❌ Ungültige Aktion. Möglich: ${validActions.join(', ')}`, ephemeral: true });
return;
}
DB.run('UPDATE guild_settings SET warn_action = ? WHERE guild_id = ?', value, guildId);
@@ -554,7 +550,7 @@ const command: Command = {
if (setting === 'warn_mute_duration') {
const duration = durationValue ?? 1800;
if (duration < 0) {
await interaction.reply({ content: '❌ Ungültige Dauer.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Ungültige Dauer.', ephemeral: true });
return;
}
DB.run('UPDATE guild_settings SET warn_mute_duration = ? WHERE guild_id = ?', duration, guildId);
@@ -570,12 +566,12 @@ const command: Command = {
const channel = interaction.channel;
if (!channel || !channel.isTextBased()) {
await interaction.reply({ content: '❌ Dieser Befehl kann nur in Text-Channels verwendet werden.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Dieser Befehl kann nur in Text-Channels verwendet werden.', ephemeral: true });
return;
}
// Defer reply since bulk delete can take time
await interaction.deferReply({ flags: [MessageFlags.Ephemeral] });
await interaction.deferReply({ ephemeral: true });
let deletedCount = 0;

4
src/commands/utility/help.ts
View File

@@ -1,4 +1,4 @@
import { SlashCommandBuilder, EmbedBuilder, PermissionFlagsBits, MessageFlags } from 'discord.js';
import { SlashCommandBuilder, EmbedBuilder, PermissionFlagsBits } from 'discord.js';
import { Command } from '../../structures/Command.js';
const command: Command = {
@@ -52,7 +52,7 @@ const command: Command = {
}
}
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
},
};

26
src/commands/utility/log.ts
View File

@@ -1,4 +1,4 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, MessageFlags } from 'discord.js';
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder } from 'discord.js';
import { Command } from '../../structures/Command.js';
const AVAILABLE_EVENTS = [
@@ -58,8 +58,6 @@ const command: Command = {
const isAdmin = interaction.memberPermissions?.has(PermissionFlagsBits.ModerateMembers);
const DB = interaction.client.DB;
// Ensure guild settings exist
DB.run('INSERT OR IGNORE INTO guild_settings (guild_id) VALUES (?)', guildId);
if (subcommand === 'help') {
const embed = new EmbedBuilder()
@@ -75,13 +73,13 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
// Admin only for all commands
if (!isAdmin) {
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -94,12 +92,12 @@ const command: Command = {
guildId
);
await interaction.reply({ content: `✅ Log-Kanal auf ${channel} gesetzt.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `✅ Log-Kanal auf ${channel} gesetzt.`, ephemeral: true });
return;
}
if (subcommand === 'list') {
const settings: any = DB.get('SELECT * FROM guild_settings WHERE guild_id = ?', guildId);
const settings = DB.getSettings(guildId);
const channel = settings?.log_channel
? `<#${settings.log_channel}>`
@@ -122,18 +120,18 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
if (subcommand === 'enable') {
const event = interaction.options.getString('event')!;
const settings: any = DB.get('SELECT log_events FROM guild_settings WHERE guild_id = ?', guildId);
const settings = DB.getSettings(guildId);
const currentEvents = (settings?.log_events || '').split(',').filter(Boolean);
if (currentEvents.includes(event)) {
await interaction.reply({ content: `ℹ️ Event **${event}** ist bereits aktiviert.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `ℹ️ Event **${event}** ist bereits aktiviert.`, ephemeral: true });
return;
}
@@ -145,18 +143,18 @@ const command: Command = {
guildId
);
await interaction.reply({ content: `✅ Event **${event}** aktiviert.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `✅ Event **${event}** aktiviert.`, ephemeral: true });
return;
}
if (subcommand === 'disable') {
const event = interaction.options.getString('event')!;
const settings: any = DB.get('SELECT log_events FROM guild_settings WHERE guild_id = ?', guildId);
const settings = DB.getSettings(guildId);
const currentEvents = (settings?.log_events || '').split(',').filter(Boolean);
if (!currentEvents.includes(event)) {
await interaction.reply({ content: `ℹ️ Event **${event}** ist nicht aktiviert.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `ℹ️ Event **${event}** ist nicht aktiviert.`, ephemeral: true });
return;
}
@@ -168,7 +166,7 @@ const command: Command = {
guildId
);
await interaction.reply({ content: `✅ Event **${event}** deaktiviert.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `✅ Event **${event}** deaktiviert.`, ephemeral: true });
}
},
};

14
src/commands/utility/owner.ts
View File

@@ -1,4 +1,4 @@
import { SlashCommandBuilder, EmbedBuilder, MessageFlags } from 'discord.js';
import { SlashCommandBuilder, EmbedBuilder } from 'discord.js';
import { Command } from '../../structures/Command.js';
import { Deployer } from '../../structures/Deployer.js';
@@ -28,7 +28,7 @@ const command: Command = {
if (!client.application?.owner) await client.application?.fetch();
if (interaction.user.id !== client.application?.owner?.id) {
await interaction.reply({ content: 'Keine Berechtigung.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Berechtigung.', ephemeral: true });
return;
}
@@ -46,12 +46,12 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
if (subcommand === 'deploy') {
await interaction.deferReply({ flags: [MessageFlags.Ephemeral] });
await interaction.deferReply({ ephemeral: true });
try {
const count = await Deployer.deploy(client.user!.id, client.token!);
@@ -64,7 +64,7 @@ const command: Command = {
}
if (subcommand === 'stats') {
await interaction.deferReply({ flags: [MessageFlags.Ephemeral] });
await interaction.deferReply({ ephemeral: true });
const uptime = process.uptime();
const days = Math.floor(uptime / 86400);
@@ -89,7 +89,7 @@ const command: Command = {
}
if (subcommand === 'servers') {
await interaction.deferReply({ flags: [MessageFlags.Ephemeral] });
await interaction.deferReply({ ephemeral: true });
const guilds = client.guilds.cache.map((guild: any) =>
`• **${guild.name}** \`(${guild.id})\` - ${guild.memberCount} Mitglieder`
@@ -117,7 +117,7 @@ const command: Command = {
const nextEmbed = new EmbedBuilder()
.setColor(0xf1c40f)
.setDescription(chunks[i].substring(0, 4000));
await interaction.followUp({ embeds: [nextEmbed], flags: [MessageFlags.Ephemeral] });
await interaction.followUp({ embeds: [nextEmbed], ephemeral: true });
}
return;
}

52
src/commands/utility/rolesetup.ts
View File

@@ -1,7 +1,7 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, MessageFlags, ChannelType, ComponentType, StringSelectMenuBuilder, StringSelectMenuOptionBuilder } from 'discord.js';
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, ChannelType, ComponentType, StringSelectMenuBuilder, StringSelectMenuOptionBuilder } from 'discord.js';
import { Command } from '../../structures/Command.js';
async function updateRoleMessage(client: any, category: any) {
export async function updateRoleMessage(client: any, category: any) {
try {
const channel = client.guilds.cache.get(category.guild_id)?.channels.cache.get(category.channel_id);
if (!channel) return;
@@ -156,7 +156,7 @@ const command: Command = {
const categories: any[] = DB.all('SELECT * FROM role_categories WHERE guild_id = ? ORDER BY category_name ASC', guildId);
if (categories.length === 0) {
await interaction.reply({ content: 'Keine Rollen-Kategorien konfiguriert.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Rollen-Kategorien konfiguriert.', ephemeral: true });
return;
}
@@ -180,13 +180,13 @@ const command: Command = {
});
}
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
if (subcommand === 'create') {
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -195,7 +195,7 @@ const command: Command = {
const existing = DB.get('SELECT * FROM role_categories WHERE guild_id = ? AND category_name = ?', guildId, categoryName);
if (existing) {
await interaction.reply({ content: `Kategorie "${categoryName}" existiert bereits.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Kategorie "${categoryName}" existiert bereits.`, ephemeral: true });
return;
}
@@ -211,13 +211,13 @@ const command: Command = {
categoryName
);
await interaction.reply({ content: `Kategorie "${categoryName}" erstellt in ${channel}.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Kategorie "${categoryName}" erstellt in ${channel}.`, ephemeral: true });
return;
}
if (subcommand === 'add') {
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -227,13 +227,13 @@ const command: Command = {
const category: any = DB.get('SELECT * FROM role_categories WHERE guild_id = ? AND category_name = ?', guildId, kategorie);
if (!category) {
await interaction.reply({ content: `Kategorie "${kategorie}" nicht gefunden.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Kategorie "${kategorie}" nicht gefunden.`, ephemeral: true });
return;
}
const existing = DB.get('SELECT * FROM role_options WHERE category_id = ? AND role_id = ?', category.id, role.id);
if (existing) {
await interaction.reply({ content: `Rolle ${role.name} ist bereits in "${kategorie}".`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Rolle ${role.name} ist bereits in "${kategorie}".`, ephemeral: true });
return;
}
@@ -248,13 +248,13 @@ const command: Command = {
);
await updateRoleMessage(interaction.client, category);
await interaction.reply({ content: `${role.name} zu "${kategorie}" hinzugefügt.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `${role.name} zu "${kategorie}" hinzugefügt.`, ephemeral: true });
return;
}
if (subcommand === 'edit') {
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -265,13 +265,13 @@ const command: Command = {
const category: any = DB.get('SELECT * FROM role_categories WHERE guild_id = ? AND category_name = ?', guildId, kategorie);
if (!category) {
await interaction.reply({ content: `Kategorie "${kategorie}" nicht gefunden.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Kategorie "${kategorie}" nicht gefunden.`, ephemeral: true });
return;
}
const option: any = DB.get('SELECT * FROM role_options WHERE category_id = ? AND role_id = ?', category.id, oldRole.id);
if (!option) {
await interaction.reply({ content: `Rolle ${oldRole.name} ist nicht in "${kategorie}".`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Rolle ${oldRole.name} ist nicht in "${kategorie}".`, ephemeral: true });
return;
}
@@ -288,13 +288,13 @@ const command: Command = {
);
await updateRoleMessage(interaction.client, category);
await interaction.reply({ content: `Option in "${kategorie}" aktualisiert.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Option in "${kategorie}" aktualisiert.`, ephemeral: true });
return;
}
if (subcommand === 'remove') {
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -303,13 +303,13 @@ const command: Command = {
const category: any = DB.get('SELECT * FROM role_categories WHERE guild_id = ? AND category_name = ?', guildId, kategorie);
if (!category) {
await interaction.reply({ content: `Kategorie "${kategorie}" nicht gefunden.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Kategorie "${kategorie}" nicht gefunden.`, ephemeral: true });
return;
}
const option: any = DB.get('SELECT * FROM role_options WHERE category_id = ? AND role_id = ?', category.id, role.id);
if (!option) {
await interaction.reply({ content: `Rolle ${role.name} ist nicht in "${kategorie}".`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Rolle ${role.name} ist nicht in "${kategorie}".`, ephemeral: true });
return;
}
@@ -326,13 +326,13 @@ const command: Command = {
DB.run('DELETE FROM role_options WHERE id = ?', option.id);
await updateRoleMessage(interaction.client, category);
await interaction.reply({ content: `${role.name} aus "${kategorie}" entfernt.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `${role.name} aus "${kategorie}" entfernt.`, ephemeral: true });
return;
}
if (subcommand === 'delete') {
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -340,7 +340,7 @@ const command: Command = {
const category: any = DB.get('SELECT * FROM role_categories WHERE guild_id = ? AND category_name = ?', guildId, kategorie);
if (!category) {
await interaction.reply({ content: `Kategorie "${kategorie}" nicht gefunden.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Kategorie "${kategorie}" nicht gefunden.`, ephemeral: true });
return;
}
@@ -368,13 +368,13 @@ const command: Command = {
DB.run('DELETE FROM role_categories WHERE id = ?', category.id);
await interaction.reply({ content: `Kategorie "${kategorie}" geloescht.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Kategorie "${kategorie}" geloescht.`, ephemeral: true });
return;
}
if (subcommand === 'config') {
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -385,7 +385,7 @@ const command: Command = {
const category: any = DB.get('SELECT * FROM role_categories WHERE guild_id = ? AND category_name = ?', guildId, kategorie);
if (!category) {
await interaction.reply({ content: `Kategorie "${kategorie}" nicht gefunden.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Kategorie "${kategorie}" nicht gefunden.`, ephemeral: true });
return;
}
@@ -404,11 +404,11 @@ const command: Command = {
}
if (updates.length === 0) {
await interaction.reply({ content: 'Keine Aenderungen angegeben.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Aenderungen angegeben.', ephemeral: true });
return;
}
await interaction.reply({ content: `Konfiguration aktualisiert: ${updates.join(', ')}`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `Konfiguration aktualisiert: ${updates.join(', ')}`, ephemeral: true });
}
}
};

28
src/commands/utility/timer.ts
View File

@@ -1,4 +1,4 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, MessageFlags } from 'discord.js';
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder } from 'discord.js';
import { Command } from '../../structures/Command.js';
// Parse time duration strings like "30s", "2h", "1d30m"
@@ -159,7 +159,7 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
@@ -182,7 +182,7 @@ const command: Command = {
if (!targetTime || targetTime <= now) {
await interaction.reply({
content: '❌ Ungültige Zeitangabe. Verwende z.B.: "30min", "2h30m", "25.12.2024 14:30" oder "morgen 15:00"',
flags: [MessageFlags.Ephemeral]
ephemeral: true
});
return;
}
@@ -209,14 +209,14 @@ const command: Command = {
await interaction.reply({
content: `✅ Erinnerung gesetzt (ID: ${result.lastInsertRowid}) für **${timeStr.trim()}**`,
flags: [MessageFlags.Ephemeral]
ephemeral: true
});
return;
}
if (subcommand === 'remove') {
if (!isAdmin) {
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -225,11 +225,11 @@ const command: Command = {
const result = DB.run('DELETE FROM reminders WHERE id = ? AND guild_id = ?', timerId, guildId);
if (result.changes === 0) {
await interaction.reply({ content: `❌ Timer mit ID ${timerId} nicht gefunden.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `❌ Timer mit ID ${timerId} nicht gefunden.`, ephemeral: true });
return;
}
await interaction.reply({ content: `✅ Timer mit ID ${timerId} entfernt.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `✅ Timer mit ID ${timerId} entfernt.`, ephemeral: true });
return;
}
@@ -241,7 +241,7 @@ const command: Command = {
);
if (reminders.length === 0) {
await interaction.reply({ content: 'Keine Timer in diesem Kanal.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Timer in diesem Kanal.', ephemeral: true });
return;
}
@@ -275,20 +275,20 @@ const command: Command = {
}
embed.setDescription(chunks[0]);
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
for (let i = 1; i < chunks.length; i++) {
const nextEmbed = new EmbedBuilder()
.setColor(0x3498db)
.setDescription(chunks[i]);
await interaction.followUp({ embeds: [nextEmbed], flags: [MessageFlags.Ephemeral] });
await interaction.followUp({ embeds: [nextEmbed], ephemeral: true });
}
return;
}
if (subcommand === 'listall') {
if (!isAdmin) {
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -298,7 +298,7 @@ const command: Command = {
);
if (reminders.length === 0) {
await interaction.reply({ content: 'Keine Timer auf dem Server.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Timer auf dem Server.', ephemeral: true });
return;
}
@@ -332,13 +332,13 @@ const command: Command = {
}
embed.setDescription(chunks[0]);
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
for (let i = 1; i < chunks.length; i++) {
const nextEmbed = new EmbedBuilder()
.setColor(0xe74c3c)
.setDescription(chunks[i]);
await interaction.followUp({ embeds: [nextEmbed], flags: [MessageFlags.Ephemeral] });
await interaction.followUp({ embeds: [nextEmbed], ephemeral: true });
}
}
},

18
src/commands/utility/trigger.ts
View File

@@ -1,4 +1,4 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, MessageFlags } from 'discord.js';
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder } from 'discord.js';
import { Command } from '../../structures/Command.js';
const command: Command = {
@@ -53,7 +53,7 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
@@ -61,7 +61,7 @@ const command: Command = {
const triggers: any[] = DB.all('SELECT * FROM auto_responses WHERE guild_id = ? ORDER BY trigger_word ASC', guildId);
if (triggers.length === 0) {
await interaction.reply({ content: 'Keine Trigger konfiguriert.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Trigger konfiguriert.', ephemeral: true });
return;
}
@@ -80,20 +80,20 @@ const command: Command = {
}
embed.setDescription(chunks[0]);
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
for (let i = 1; i < chunks.length; i++) {
const nextEmbed = new EmbedBuilder()
.setColor(0x3498db)
.setDescription(chunks[i]);
await interaction.followUp({ embeds: [nextEmbed], flags: [MessageFlags.Ephemeral] });
await interaction.followUp({ embeds: [nextEmbed], ephemeral: true });
}
return;
}
// Admin only for add/remove
if (!isAdmin) {
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -109,7 +109,7 @@ const command: Command = {
responseText
);
await interaction.reply({ content: `✅ Trigger **${triggerWord}** hinzugefügt/aktualisiert.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `✅ Trigger **${triggerWord}** hinzugefügt/aktualisiert.`, ephemeral: true });
return;
}
@@ -119,11 +119,11 @@ const command: Command = {
const result = DB.run('DELETE FROM auto_responses WHERE guild_id = ? AND trigger_word = ?', guildId, triggerWord);
if (result.changes === 0) {
await interaction.reply({ content: `❌ Trigger **${triggerWord}** nicht gefunden.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `❌ Trigger **${triggerWord}** nicht gefunden.`, ephemeral: true });
return;
}
await interaction.reply({ content: `✅ Trigger **${triggerWord}** entfernt.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `✅ Trigger **${triggerWord}** entfernt.`, ephemeral: true });
}
},
};

32
src/commands/utility/twitch.ts
View File

@@ -1,4 +1,4 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, MessageFlags } from 'discord.js';
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder } from 'discord.js';
import { Command } from '../../structures/Command.js';
import { TwitchManager } from '../../structures/TwitchManager.js';
import { ExtendedClient } from '../../structures/ExtendedClient.js';
@@ -69,7 +69,7 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
@@ -107,7 +107,7 @@ const command: Command = {
if (subcommand === 'list') {
const monitors: any[] = DB.all('SELECT * FROM twitch_monitors WHERE guild_id = ? AND discord_channel_id = ?', guildId, interaction.channelId);
if (monitors.length === 0) {
await interaction.reply({ content: 'Keine Twitch-Kanäle überwacht.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Twitch-Kanäle überwacht.', ephemeral: true });
return;
}
@@ -117,19 +117,19 @@ const command: Command = {
.setColor(0x6441a5)
.setDescription(list);
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
if (subcommand === 'listall') {
if (!isAdmin) {
await interaction.reply({ content: '❌ Keine Berechtigung.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Keine Berechtigung.', ephemeral: true });
return;
}
const monitors: any[] = DB.all('SELECT * FROM twitch_monitors WHERE guild_id = ? ORDER BY channel_name ASC', guildId);
if (monitors.length === 0) {
await interaction.reply({ content: 'Keine Twitch-Kanäle überwacht.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Twitch-Kanäle überwacht.', ephemeral: true });
return;
}
@@ -151,25 +151,24 @@ const command: Command = {
}
embed.setDescription(chunks[0]);
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
for (let i = 1; i < chunks.length; i++) {
const nextEmbed = new EmbedBuilder()
.setColor(0x6441a5)
.setDescription(chunks[i]);
await interaction.followUp({ embeds: [nextEmbed], flags: [MessageFlags.Ephemeral] });
await interaction.followUp({ embeds: [nextEmbed], ephemeral: true });
}
return;
}
// Admin only for add/remove
if (!isAdmin) {
await interaction.reply({ content: '❌ Keine Berechtigung.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Keine Berechtigung.', ephemeral: true });
return;
}
if (subcommand === 'add') {
const discordChannel = interaction.options.getChannel('channel');
const streamersInput = interaction.options.getString('streamers')!;
const message = interaction.options.getString('message');
const discordChannelId = interaction.channelId;
@@ -181,7 +180,7 @@ const command: Command = {
.filter((s: string) => s.length > 0);
if (streamers.length === 0) {
await interaction.reply({ content: '❌ Keine gültigen Streamer angegeben.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Keine gültigen Streamer angegeben.', ephemeral: true });
return;
}
@@ -191,10 +190,7 @@ const command: Command = {
for (const streamer of streamers) {
try {
// Check if stream exists
const stream = await TwitchManager.fetchStreamData(streamer);
if (!stream) {
// Streamer might be valid but offline - still add them
}
await TwitchManager.fetchStreamData(streamer);
// Check if already exists
const existing = DB.get('SELECT id FROM twitch_monitors WHERE guild_id = ? AND channel_name = ?', guildId, streamer);
@@ -220,7 +216,7 @@ const command: Command = {
if (results.updated > 0) reply += `\n🔄 Aktualisiert: ${results.updated}`;
if (results.errors > 0) reply += `\n❌ Fehler: ${results.errors} (${errors.join(', ')})`;
await interaction.reply({ content: reply, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: reply, ephemeral: true });
return;
}
@@ -232,7 +228,7 @@ const command: Command = {
.filter((s: string) => s.length > 0);
if (streamers.length === 0) {
await interaction.reply({ content: '❌ Keine gültigen Streamer angegeben.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Keine gültigen Streamer angegeben.', ephemeral: true });
return;
}
@@ -253,7 +249,7 @@ const command: Command = {
if (results.removed > 0) reply += `✅ ${results.removed} Streamer entfernt.`;
if (results.notFound > 0) reply += `\n❌ Nicht gefunden: ${notFound.join(', ')}`;
await interaction.reply({ content: reply, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: reply, ephemeral: true });
}
},
};

18
src/commands/utility/twitchmonitor.ts
View File

@@ -1,4 +1,4 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, MessageFlags, ChannelType } from 'discord.js';
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, ChannelType } from 'discord.js';
import { Command } from '../../structures/Command.js';
import { TwitchMonitor } from '../../structures/TwitchMonitor.js';
@@ -54,7 +54,7 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
@@ -62,7 +62,7 @@ const command: Command = {
const monitors: any[] = DB.all('SELECT * FROM twitch_monitor_channels WHERE guild_id = ? ORDER BY twitch_channel ASC', guildId);
if (monitors.length === 0) {
await interaction.reply({ content: 'Keine Twitch-Kanäle überwacht.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Twitch-Kanäle überwacht.', ephemeral: true });
return;
}
@@ -74,12 +74,12 @@ const command: Command = {
).join('\n'))
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -89,7 +89,7 @@ const command: Command = {
const existing = DB.get('SELECT * FROM twitch_monitor_channels WHERE guild_id = ? AND twitch_channel = ?', guildId, twitchChannel);
if (existing) {
await interaction.reply({ content: `${twitchChannel} wird bereits überwacht.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `${twitchChannel} wird bereits überwacht.`, ephemeral: true });
return;
}
@@ -115,7 +115,7 @@ const command: Command = {
const monitor = TwitchMonitor.getInstance();
await monitor.addMonitor(guildId, twitchChannel, discordChannel.id, webhook.url);
await interaction.reply({ content: `${twitchChannel} wird jetzt überwacht.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `${twitchChannel} wird jetzt überwacht.`, ephemeral: true });
return;
}
@@ -124,7 +124,7 @@ const command: Command = {
const monitor: any = DB.get('SELECT * FROM twitch_monitor_channels WHERE guild_id = ? AND twitch_channel = ?', guildId, twitchChannel);
if (!monitor) {
await interaction.reply({ content: `${twitchChannel} wird nicht überwacht.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `${twitchChannel} wird nicht überwacht.`, ephemeral: true });
return;
}
@@ -133,7 +133,7 @@ const command: Command = {
const twitchMonitor = TwitchMonitor.getInstance();
await twitchMonitor.removeMonitor(guildId, twitchChannel);
await interaction.reply({ content: `${twitchChannel} wurde entfernt.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `${twitchChannel} wurde entfernt.`, ephemeral: true });
}
},
};

18
src/commands/utility/welcome.ts
View File

@@ -1,4 +1,4 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, MessageFlags } from 'discord.js';
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder } from 'discord.js';
import { Command } from '../../structures/Command.js';
const command: Command = {
@@ -56,8 +56,6 @@ const command: Command = {
const isAdmin = interaction.memberPermissions?.has(PermissionFlagsBits.ModerateMembers);
const DB = interaction.client.DB;
// Ensure guild settings exist
DB.run('INSERT OR IGNORE INTO guild_settings (guild_id) VALUES (?)', guildId);
if (subcommand === 'help') {
const embed = new EmbedBuilder()
@@ -75,12 +73,12 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
if (subcommand === 'list') {
const settings: any = DB.get('SELECT * FROM guild_settings WHERE guild_id = ?', guildId);
const settings = DB.getSettings(guildId);
const channel = settings?.welcome_channel
? `<#${settings.welcome_channel}>`
@@ -100,13 +98,13 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
// Admin only for modify commands
if (!isAdmin) {
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
@@ -119,7 +117,7 @@ const command: Command = {
guildId
);
await interaction.reply({ content: `✅ Kanal für Willkommen/Abschied auf ${channel} gesetzt.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `✅ Kanal für Willkommen/Abschied auf ${channel} gesetzt.`, ephemeral: true });
return;
}
@@ -136,7 +134,7 @@ const command: Command = {
);
const label = type === 'welcome' ? 'Willkommensnachricht' : 'Abschiedsnachricht';
await interaction.reply({ content: `✅ ${label} gesetzt:\n\`\`\`\n${message}\n\`\`\``, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `✅ ${label} gesetzt:\n\`\`\`\n${message}\n\`\`\``, ephemeral: true });
return;
}
@@ -150,7 +148,7 @@ const command: Command = {
);
const label = type === 'welcome' ? 'Willkommensnachricht' : 'Abschiedsnachricht';
await interaction.reply({ content: `✅ ${label} entfernt.`, flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: `✅ ${label} entfernt.`, ephemeral: true });
}
},
};

35
src/events/interactionCreate.ts
View File

@@ -1,4 +1,4 @@
import { Events, MessageFlags, Interaction } from 'discord.js';
import { Events, Interaction, GuildMember } from 'discord.js';
import { ExtendedClient } from '../structures/ExtendedClient.js';
export default {
@@ -10,11 +10,11 @@ export default {
if (customId.startsWith('role_select_')) {
const categoryName = customId.replace('role_select_', '');
const selectedValue = interaction.values[0];
const member = interaction.member;
const guild = interaction.guild;
const member = interaction.member as GuildMember;
if (!guild || !member || !('roles' in member)) {
await interaction.reply({ content: 'Dieser Befehl kann nur auf Servern verwendet werden.', flags: [MessageFlags.Ephemeral] });
if (!guild || !member || !member.roles) {
await interaction.reply({ content: 'Dieser Befehl kann nur auf Servern verwendet werden.', ephemeral: true });
return;
}
@@ -25,7 +25,7 @@ export default {
);
if (!category) {
await interaction.reply({ content: 'Kategorie nicht gefunden.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Kategorie nicht gefunden.', ephemeral: true });
return;
}
@@ -41,12 +41,12 @@ export default {
if (removedCount > 0) {
await interaction.reply({
content: `Alle Rollen aus "${categoryName}" wurden entfernt.`,
flags: [MessageFlags.Ephemeral]
ephemeral: true
});
} else {
await interaction.reply({
content: `Du hast keine Rollen aus "${categoryName}".`,
flags: [MessageFlags.Ephemeral]
ephemeral: true
});
}
return;
@@ -59,13 +59,13 @@ export default {
);
if (!option) {
await interaction.reply({ content: 'Rolle nicht gefunden.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Rolle nicht gefunden.', ephemeral: true });
return;
}
const discordRole = guild.roles.cache.get(selectedValue);
if (!discordRole) {
await interaction.reply({ content: 'Diese Rolle existiert nicht mehr.', flags: [MessageFlags.Ephemeral] });
await interaction.reply({ content: 'Diese Rolle existiert nicht mehr.', ephemeral: true });
return;
}
@@ -76,7 +76,7 @@ export default {
await member.roles.remove(selectedValue);
await interaction.reply({
content: `Die Rolle ${option.emoji ? option.emoji + ' ' : ''}${discordRole.name} wurde entfernt.`,
flags: [MessageFlags.Ephemeral]
ephemeral: true
});
} else {
const options: any[] = client.DB.all('SELECT * FROM role_options WHERE category_id = ?', category.id);
@@ -88,7 +88,7 @@ export default {
await member.roles.add(selectedValue);
await interaction.reply({
content: `Du hast jetzt die Rolle ${option.emoji ? option.emoji + ' ' : ''}${discordRole.name}!`,
flags: [MessageFlags.Ephemeral]
ephemeral: true
});
}
} else {
@@ -96,21 +96,22 @@ export default {
await member.roles.remove(selectedValue);
await interaction.reply({
content: `Die Rolle ${option.emoji ? option.emoji + ' ' : ''}${discordRole.name} wurde entfernt.`,
flags: [MessageFlags.Ephemeral]
ephemeral: true
});
} else {
const userRoles = member.roles.cache.filter((r: any) => !r.managed && r.id !== guild.id).size;
if (category.max_roles > 0 && userRoles >= category.max_roles) {
const options: any[] = client.DB.all('SELECT * FROM role_options WHERE category_id = ?', category.id);
const userCategoryRoles = options.filter((opt: any) => member.roles.cache.has(opt.role_id)).length;
if (category.max_roles > 0 && userCategoryRoles >= category.max_roles) {
await interaction.reply({
content: `Du kannst maximal ${category.max_roles} Rollen aus dieser Kategorie haben.`,
flags: [MessageFlags.Ephemeral]
ephemeral: true
});
return;
}
await member.roles.add(selectedValue);
await interaction.reply({
content: `Du hast jetzt die Rolle ${option.emoji ? option.emoji + ' ' : ''}${discordRole.name}!`,
flags: [MessageFlags.Ephemeral]
ephemeral: true
});
}
}
@@ -136,7 +137,7 @@ export default {
`, interaction.commandName);
} catch (error) {
console.error(error);
const replyOptions = { content: 'There was an error while executing this command!', flags: [MessageFlags.Ephemeral] };
const replyOptions = { content: 'There was an error while executing this command!', ephemeral: true };
if (interaction.replied || interaction.deferred) {
await interaction.followUp(replyOptions);
} else {

2
src/events/messageDelete.ts
View File

@@ -20,7 +20,7 @@ async function sendLog(client: any, guildId: string, event: string, embed: Embed
export default {
name: Events.MessageDelete,
async execute(message: Message) {
if (!message.guild || message.author.bot) return;
if (!message.guild || !message.author || message.author.bot) return;
const embed = new EmbedBuilder()
.setTitle('🗑️ Nachricht gelöscht')

2
src/events/messageUpdate.ts
View File

@@ -20,7 +20,7 @@ async function sendLog(client: any, guildId: string, event: string, embed: Embed
export default {
name: Events.MessageUpdate,
async execute(oldMessage: Message, newMessage: Message) {
if (!newMessage.guild || newMessage.author?.bot) return;
if (!newMessage.guild || !newMessage.author || newMessage.author.bot) return;
if (!oldMessage.content || !newMessage.content) return;
if (oldMessage.content === newMessage.content) return;

8
src/events/ready.ts
View File

@@ -1,6 +1,7 @@
import { Events } from 'discord.js';
import { TwitchMonitor } from '../structures/TwitchMonitor.js';
import { ExtendedClient } from '../structures/ExtendedClient.js';
import { updateRoleMessage } from '../commands/utility/rolesetup.js';
async function validateRoles(client: ExtendedClient) {
const categories: any[] = client.DB.all('SELECT * FROM role_categories');
@@ -12,6 +13,7 @@ async function validateRoles(client: ExtendedClient) {
const options: any[] = client.DB.all('SELECT * FROM role_options WHERE category_id = ?', category.id);
const validOptions: any[] = [];
let categoryUpdated = false;
for (const option of options) {
const roleExists = guild.roles.cache.has(option.role_id);
@@ -24,10 +26,16 @@ async function validateRoles(client: ExtendedClient) {
await member.roles.remove(option.role_id).catch(() => null);
}
}
client.DB.run('DELETE FROM role_options WHERE id = ?', option.id);
categoryUpdated = true;
removedCount++;
}
}
if (categoryUpdated) {
await updateRoleMessage(client, category);
}
if (validOptions.length === 0 && options.length > 0) {
console.log(`[ROLESETUP] Category "${category.category_name}" has no valid roles left. Consider deleting it.`);
}

8
src/structures/Database.ts
View File

@@ -172,14 +172,18 @@ export class DB {
}
/**
* Optimized getter for guild settings with caching
* Optimized getter for guild settings with caching (automatically creates settings if missing)
*/
static getSettings(guildId: string): any {
if (this.settingsCache.has(guildId)) {
return this.settingsCache.get(guildId);
}
const settings = db.prepare('SELECT * FROM guild_settings WHERE guild_id = ?').get(guildId);
let settings = db.prepare('SELECT * FROM guild_settings WHERE guild_id = ?').get(guildId);
if (!settings) {
db.prepare('INSERT OR IGNORE INTO guild_settings (guild_id) VALUES (?)').run(guildId);
settings = db.prepare('SELECT * FROM guild_settings WHERE guild_id = ?').get(guildId);
}
if (settings) {
this.settingsCache.set(guildId, settings);
}