Compare commits

...

13 Commits

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
2026-05-31 21:18:13 +02:00
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
2026-04-29 20:09:05 +02:00
d546035bb7 Optimize database, implement automatic command deployment, and improve project-wide type safety
Some checks failed
Auto Build and Push Docker Image / build (push) Failing after 14s
2026-04-29 19:50:50 +02:00
b2c3f5731b Optimize Twitch polling with batching and implement database caching with WAL mode 2026-04-28 20:42:34 +02:00
21c3b01e64 Add Twitch identity auth and token validation to TwitchMonitor
All checks were successful
Auto Build and Push Docker Image / build (push) Successful in 8s
2026-04-23 11:37:58 +00:00
c2c009501f Update README with TwitchMonitor and rolesetup commands
All checks were successful
Auto Build and Push Docker Image / build (push) Successful in 4s
2026-04-19 18:00:06 +00:00
2fcb7cec66 Add TwitchMonitor IRC chat logging module
All checks were successful
Auto Build and Push Docker Image / build (push) Successful in 21s
2026-04-19 17:52:41 +00:00
b6caf4b3b3 Add 'Keine' option and toggle hint for role selection
All checks were successful
Auto Build and Push Docker Image / build (push) Successful in 6s
2026-04-03 06:55:12 +00:00
14781b8e52 Fix rolesetup: create without empty select menu
All checks were successful
Auto Build and Push Docker Image / build (push) Successful in 7s
2026-04-03 06:20:43 +00:00
ad988c9333 Add role selection system with select menus
All checks were successful
Auto Build and Push Docker Image / build (push) Successful in 7s
2026-04-02 10:55:43 +00:00
f90f0cb7ab Remove Kick monitoring module
All checks were successful
Auto Build and Push Docker Image / build (push) Successful in 13s
2026-04-02 07:55:42 +00:00
ed2919224b Update README with Kick monitoring module
All checks were successful
Auto Build and Push Docker Image / build (push) Successful in 7s
2026-03-31 09:57:07 +00:00
ec8e2f0a7b Rename kickstream command to kick 2026-03-31 09:55:27 +00:00
35 changed files with 1702 additions and 1055 deletions

View File

@@ -2,5 +2,9 @@ DISCORD_TOKEN=dein_bot_token
CLIENT_ID=deine_client_id
TWITCH_CLIENT_ID=deine_twitch_id
TWITCH_CLIENT_SECRET=dein_twitch_secret
KICK_CLIENT_ID=deine_kick_id
KICK_CLIENT_SECRET=dein_kick_secret
TWITCH_USERNAME=dein_twitch_username
TWITCH_OAUTH_TOKEN=oauth:xxxxxxxxxxxxxxxxxx
BOT_OWNER_ID=deine_discord_user_id
# Optional: Automatische Slash-Command Registrierung bei Bot-Start (default: true)
AUTO_DEPLOY=true

View File

@@ -4,59 +4,42 @@ This document is intended for AI agents to understand and recreate the `pixelpö
## 🏗 Architecture Overview
The bot uses a **Modular Command & Event Loading** pattern with **ESM (ECMAScript Modules)** and **TypeScript**.
The bot uses a **Modular Command & Event Loading** pattern with **ESM (ECMAScript Modules)** and **TypeScript**, emphasizing strict typing and performance.
### Key Design Patterns:
1. **Extended Client Pattern:** Extend `discord.js` `Client` class to hold global state.
1. **Extended Client Pattern:** Extend `discord.js` `Client` class to hold global state and a typed `DB` instance.
2. **Dynamic Discovery:** `index.ts` uses `readdirSync` and dynamic `import()` to register commands/events.
3. **Interface-Driven Commands:** All commands implement `Command` interface.
4. **SQLite Database:** Persistent data storage with `better-sqlite3`.
5. **Twitch Monitoring:** Periodic API polling with Stream ID tracking.
6. **Kick Monitoring:** Periodic API polling with `@nekiro/kick-api` library.
7. **Reminder System:** Periodic reminder checking with target_time tracking.
8. **Auto-Response System:** Trigger word detection for automatic replies.
9. **Welcome/Goodbye System:** Guild member add/remove events with customizable messages.
10. **Logging System:** Configurable event logging (messages, roles, moderation, etc.).
11. **Grouped Commands:** Admin/Owner/Trigger/Timer commands grouped under subcommands.
3. **Automatic Command Deployment:** Commands are automatically registered with Discord on startup via `Deployer.deployCommands()`, unless disabled via `AUTO_DEPLOY=false`.
4. **Interface-Driven Commands:** All commands implement the `Command` interface.
5. **Optimized SQLite Database:** Persistent storage with `better-sqlite3`, utilizing **WAL (Write-Ahead Logging)**, **Foreign Key support**, and **surgical In-Memory Caching** (clearing specific guild data on updates).
6. **Twitch Monitoring:** Periodic API polling using **Batch-Requests** (100 channels per request) with Stream ID tracking and **database transactions** for status updates.
7. **TwitchMonitor IRC:** TMI.js-based IRC chat monitoring for mod events, using **reusable WebhookClient instances** for efficiency.
8. **Reminder System:** Periodic reminder checking with `target_time` tracking.
9. **Auto-Response System:** Trigger word detection for automatic replies (cached).
10. **Welcome/Goodbye System:** Guild member add/remove events with customizable messages.
11. **Logging System:** Configurable event logging (messages, roles, moderation, etc.).
12. **Role Selection System:** Self-service role assignment via select menus with support for exclusive categories and max-role limits.
## 📁 Project Structure
```
pixelpoebel/
├── src/
│ ├── index.ts # Entry point, loads commands/events
│ ├── deploy-commands.ts # Deploy script for Discord
│ ├── index.ts # Entry point, loads commands/events/auto-deploy
│ ├── deploy-commands.ts # Manual deploy script for Discord
│ ├── commands/
│ │ └── utility/ # All commands grouped here
│ │ ├── ping.ts
│ │ ├── help.ts
│ │ ├── twitch.ts
│ │ ├── kickstream.ts # Kick streaming
│ │ ├── trigger.ts # Auto-responses
│ │ ├── timer.ts # Reminders
│ │ ├── welcome.ts # Welcome/Goodbye messages
│ │ ├── log.ts # Event logging
│ │ ├── admin.ts # All admin subcommands
│ │ └── owner.ts # All owner subcommands
│ ├── events/
│ │ ├── ready.ts
│ │ ├── interactionCreate.ts
│ │ ├── messageCreate.ts # Auto-response triggers
│ │ ├── messageDelete.ts # Deleted messages
│ │ ├── messageUpdate.ts # Edited messages
│ │ ├── guildMemberAdd.ts # Welcome messages
│ │ ├── guildMemberRemove.ts # Goodbye messages
│ │ ├── guildMemberUpdate.ts # Nickname/role changes
│ │ ├── channelCreate.ts # Channel create
│ │ └── channelDelete.ts # Channel delete
│ │ ├── ... # All Discord event handlers
│ └── structures/
│ ├── ExtendedClient.ts
│ ├── ExtendedClient.ts # Typed client with DB property
│ ├── Command.ts
│ ├── Database.ts
│ ├── TwitchManager.ts
│ ├── KickManager.ts
│ ├── Database.ts # Database with Transaction & Surgical Caching
│ ├── TwitchManager.ts # Batch Polling & Transaction logic
│ ├── TwitchMonitor.ts # IRC Monitoring & Webhook reuse
│ ├── TwitchCache.ts # IRC Message FIFO Cache
│ ├── ReminderManager.ts
│ └── Deployer.ts
│ └── Deployer.ts # Centralized deployment logic
├── data/ # SQLite database (volume mounted)
├── package.json
├── tsconfig.json
@@ -68,417 +51,99 @@ pixelpoebel/
## 📝 Implementation Steps
### 1. Project Setup
### 1. Database with Surgical Caching
```json
{
"type": "module",
"scripts": {
"build": "tsc",
"start": "node dist/index.js",
"dev": "nodemon --watch 'src/**/*.ts' --exec 'node --loader ts-node/esm' src/index.ts",
"deploy": "node --loader ts-node/esm src/deploy-commands.ts"
}
}
```
The database uses WAL mode and foreign keys. Caching is surgical (clears specific guild entries when possible).
```json
{
"compilerOptions": {
"target": "ES2022",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"outDir": "./dist",
"rootDir": "./src",
"strict": true
}
}
```
### 2. Database Structure
```sql
-- guild_settings
CREATE TABLE guild_settings (
guild_id TEXT PRIMARY KEY,
prefix TEXT DEFAULT '!',
mod_log_channel TEXT,
welcome_channel TEXT,
welcome_message TEXT,
goodbye_message TEXT,
log_channel TEXT,
log_events TEXT DEFAULT 'messages,roles,nicks,channels,warns,mutes,kicks,bans',
warn_threshold INTEGER DEFAULT 3,
warn_action TEXT DEFAULT 'ban',
warn_mute_duration INTEGER DEFAULT 1800
);
-- mod_logs
CREATE TABLE mod_logs (
id INTEGER PRIMARY KEY AUTOINCREMENT,
guild_id TEXT,
user_id TEXT,
moderator_id TEXT,
action TEXT,
reason TEXT,
timestamp DATETIME DEFAULT CURRENT_TIMESTAMP
);
-- command_stats
CREATE TABLE command_stats (
command_name TEXT PRIMARY KEY,
uses INTEGER DEFAULT 0
);
-- dm_users
CREATE TABLE dm_users (
user_id TEXT PRIMARY KEY,
username TEXT,
last_seen DATETIME DEFAULT CURRENT_TIMESTAMP
);
-- twitch_monitors
CREATE TABLE twitch_monitors (
id INTEGER PRIMARY KEY AUTOINCREMENT,
guild_id TEXT,
channel_name TEXT,
discord_channel_id TEXT,
custom_message TEXT,
last_status TEXT DEFAULT 'offline',
last_stream_id TEXT,
UNIQUE(guild_id, channel_name)
);
-- kick_monitors
CREATE TABLE kick_monitors (
id INTEGER PRIMARY KEY AUTOINCREMENT,
guild_id TEXT,
channel_name TEXT,
discord_channel_id TEXT,
custom_message TEXT,
last_status TEXT DEFAULT 'offline',
last_stream_id TEXT,
UNIQUE(guild_id, channel_name)
);
-- auto_responses
CREATE TABLE auto_responses (
id INTEGER PRIMARY KEY AUTOINCREMENT,
guild_id TEXT,
trigger_word TEXT,
response_text TEXT,
UNIQUE(guild_id, trigger_word)
);
-- reminders
CREATE TABLE reminders (
id INTEGER PRIMARY KEY AUTOINCREMENT,
guild_id TEXT,
channel_id TEXT,
user_id TEXT,
reminder_text TEXT,
target_time DATETIME,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
);
```
### 3. Key Components
**ExtendedClient.ts:**
```typescript
import { Client, Collection, GatewayIntentBits } from 'discord.js';
import { Command } from './Command.js';
// src/structures/Database.ts
export class DB {
private static settingsCache = new Map<string, any>();
export class ExtendedClient extends Client {
public commands: Collection<string, Command> = new Collection();
static init() {
db.pragma('journal_mode = WAL');
db.pragma('foreign_keys = ON');
// ... Table creation ...
}
constructor() {
super({
intents: [
GatewayIntentBits.Guilds,
GatewayIntentBits.GuildMessages,
GatewayIntentBits.MessageContent,
GatewayIntentBits.GuildMembers,
],
static run(query: string, ...params: any[]) {
const result = db.prepare(query).run(...params);
if (query.toLowerCase().includes('guild_settings')) {
const guildId = params.find(p => typeof p === 'string' && /^\d{17,20}$/.test(p));
if (guildId) this.settingsCache.delete(guildId);
else this.settingsCache.clear();
}
return result;
}
static transaction<T>(fn: () => T): T {
return db.transaction(fn)();
}
}
```
### 2. Twitch Batch Polling with Transactions
Updates are collected and saved in a single transaction to reduce disk I/O.
```typescript
// src/structures/TwitchManager.ts
static async checkStreams(client: ExtendedClient) {
// ... fetch streams ...
const updates = []; // collect updates here
if (updates.length > 0) {
client.DB.transaction(() => {
for (const update of updates) {
// ... client.DB.run update ...
}
});
}
}
```
**Command Interface:**
### 3. Webhook Reuse in TwitchMonitor
Avoid recreating `WebhookClient` instances for every message to improve performance.
```typescript
export interface Command {
data: any;
category: 'Owner' | 'Admin' | 'Public';
execute: (interaction: any, client: any) => Promise<void> | void;
cooldown?: number;
// src/structures/TwitchMonitor.ts
private async sendWebhook(webhookUrl: string, data: any, monitorKey?: string) {
let webhook = monitorKey ? this.webhookClients.get(monitorKey) : new WebhookClient({ url: webhookUrl });
await webhook.send({ embeds: [embed] });
}
```
### 4. Timer System
### 4. Automatic Deployment
Commands are loaded into an array and deployed during the `index.ts` startup sequence.
**Time Parsing:**
```typescript
// Duration parsing: "30s", "2h", "1d30m", "3wochen"
function parseDuration(input: string): number | null {
const unitMs: Record<string, number> = {
's': 1000, 'sec': 1000, 'sek': 1000, 'sekunden': 1000,
'm': 60000, 'min': 60000, 'minuten': 60000,
'h': 3600000, 'hour': 3600000, 'std': 3600000, 'stunden': 3600000,
'd': 86400000, 'day': 86400000, 't': 86400000, 'tage': 86400000,
'w': 604800000, 'week': 604800000, 'wochen': 604800000,
'mo': 2592000000, 'month': 2592000000, 'monat': 2592000000, 'monate': 2592000000,
'y': 31536000000, 'year': 31536000000, 'j': 31536000000, 'jahr': 31536000000, 'jahre': 31536000000
};
// Parse and calculate total milliseconds
}
// src/index.ts
const commandData = [];
// ... while loading commands ...
commandData.push(command.data.toJSON());
// Date parsing: "25.12.2024 14:30", "morgen 15:00"
function parseDateTime(input: string): Date | null {
// German date format, ISO format, or relative "tomorrow"
if (process.env.AUTO_DEPLOY !== 'false') {
await Deployer.deployCommands(process.env.CLIENT_ID, process.env.DISCORD_TOKEN, commandData);
}
```
**Reminder Polling:**
```typescript
export class ReminderManager {
static async checkReminders(client: any) {
const now = new Date().toISOString();
const dueReminders = DB.all('SELECT * FROM reminders WHERE target_time <= ?', now);
## 🚀 Performance Benchmarks (approx.)
for (const reminder of dueReminders) {
const guild = client.guilds.cache.get(reminder.guild_id);
const channel = guild.channels.cache.get(reminder.channel_id);
// Send notification and delete reminder
}
}
static startPolling(client: any) {
setInterval(() => this.checkReminders(client), 30 * 1000);
}
}
```
### 5. Welcome/Goodbye System
**Variables in messages:** `{user}`, `{username}`, `{server}`, `{membercount}`
**Auto-use Discord system channel if no custom channel set:**
```typescript
const channelId = settings?.welcome_channel || member.guild.systemChannelId;
```
### 6. Logging System
**Events that can be logged:**
- `messages` - Deleted and edited messages
- `roles` - Role changes
- `nicks` - Nickname changes
- `channels` - Channel create/delete
- `warns` - User warnings
- `mutes` - User mutes
- `kicks` - User kicks
- `bans` - User bans
**Log moderation action:**
```typescript
async function sendModerationLog(client: any, 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);
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;
const channel = client.guilds.cache.get(guildId)?.channels.cache.get(logSettings.log_channel);
if (!channel || !channel.isTextBased()) return;
await (channel as any).send({ embeds: [embed] });
}
```
### 7. Auto-Response (Trigger) System
**Event Handler (`messageCreate.ts`):**
```typescript
// Listens for messages and checks against auto_responses
// Ignores bots and DM messages
const triggers = DB.all('SELECT * FROM auto_responses WHERE guild_id = ?', guildId);
const contentLower = message.content.toLowerCase();
for (const trigger of triggers) {
if (contentLower.includes(trigger.trigger_word.toLowerCase())) {
await message.channel.send(trigger.response_text);
return;
}
}
```
**Command (`trigger.ts`):**
```typescript
// Add trigger (admin only)
DB.run('INSERT INTO auto_responses (guild_id, trigger_word, response_text) VALUES (?, ?, ?)',
guildId, triggerWord.toLowerCase(), responseText);
// List triggers (public)
DB.all('SELECT * FROM auto_responses WHERE guild_id = ? ORDER BY trigger_word ASC', guildId);
// Remove trigger (admin only)
DB.run('DELETE FROM auto_responses WHERE guild_id = ? AND trigger_word = ?', guildId, triggerWord);
```
### 8. Twitch Monitoring with Stream ID
```typescript
// Stream ID tracking prevents duplicate notifications
const isNewStream = monitor.last_stream_id !== stream.id;
const wasOffline = monitor.last_status === 'offline';
if (wasOffline || (monitor.last_status === 'online' && isNewStream)) {
// Send notification
DB.run('UPDATE twitch_monitors SET last_status = "online", last_stream_id = ? WHERE id = ?',
stream.id, monitor.id);
}
```
### 9. Kick Monitoring with @nekiro/kick-api
```typescript
// Uses @nekiro/kick-api library for OAuth 2.1 authentication
import { client as KickClient } from '@nekiro/kick-api';
const kickClient = new KickClient({
clientId: process.env.KICK_CLIENT_ID,
clientSecret: process.env.KICK_CLIENT_SECRET,
});
// Fetch channel and livestream data
const channels = await kickClient.channels.getChannels({ slug: [channelName] });
const livestreams = await kickClient.livestreams.getLivestreams({
broadcaster_user_id: [channel.user_id]
});
// Stream ID tracking prevents duplicate notifications
const streamId = livestream.session_id?.toString();
const isNewStream = monitor.last_stream_id !== streamId;
const wasOffline = monitor.last_status === 'offline';
if (wasOffline || (monitor.last_status === 'online' && isNewStream)) {
// Send notification to Discord channel
DB.run('UPDATE kick_monitors SET last_status = "online", last_stream_id = ? WHERE id = ?',
streamId, monitor.id);
}
```
**Required Environment Variables:**
- `KICK_CLIENT_ID` - Kick Developer App Client ID
- `KICK_CLIENT_SECRET` - Kick Developer App Client Secret
**Kick Developer App Setup:** https://docs.kick.com/getting-started/kick-apps-setup
### 10. Configurable Warn System
**Database Schema:**
- `warn_threshold`: Number of warns before action
- `warn_action`: 'none', 'kick', 'mute', 'ban'
- `warn_mute_duration`: Duration in seconds for mute
**Auto-Action Logic:**
```typescript
const warnCount = countResult?.count ?? 0;
const warnThreshold = settings?.warn_threshold ?? 3;
const warnAction = settings?.warn_action ?? 'ban';
if (warnCount >= warnThreshold) {
if (warnAction === 'kick') await target.kick(...);
else if (warnAction === 'mute') await target.timeout(duration, ...);
else if (warnAction === 'ban') await target.ban(...);
}
```
### 10. Mute with Multiple Time Units
```typescript
const unitSeconds: Record<string, number> = {
sec: 1,
min: 60,
hour: 60 * 60,
day: 60 * 60 * 24,
week: 60 * 60 * 24 * 7,
month: 60 * 60 * 24 * 30,
year: 60 * 60 * 24 * 365
};
if (unit === 'perm') {
durationMs = null; // Permanent
} else {
durationMs = duration * unitSeconds[unit!] * 1000;
}
```
### 11. Purge Command (Message Deletion)
**Subcommands:**
- `purge amount <1-100>` - Delete X messages
- `purge time <duration> <min|hour>` - Delete messages from last X time
- `purge user <user> <1-100>` - Delete X messages from specific user
- `purge all` - Delete all possible messages (max 100)
**Discord API Constraints:**
- Max 100 messages per bulk delete
- Messages older than 14 days cannot be bulk deleted
- Requires `ModerateMembers` permission
```typescript
// Filter messages older than 14 days (Discord API limit)
const twoWeeksAgo = Date.now() - 14 * 24 * 60 * 60 * 1000;
const filtered = messages.filter((m: any) => m.createdTimestamp > twoWeeksAgo);
await channel.bulkDelete(filtered, true);
```
**Logging:** Purge actions are logged to the moderation log channel with event type `messages`.
## 🚀 Build & Deploy
```bash
# Build
npm run build
# Deploy Commands
npm run deploy
# Run
npm start
# Docker
docker-compose up -d --build
```
| Metric | Old (Individual) | New (Batch/Cached/Transaction) |
|--------|------------------|-------------------------------|
| API Calls (500 channels) | 500 | 5 |
| DB Access (Polling) | Individual writes | Single Transaction |
| Webhook Overhead | New Connection | Connection Reuse |
| Notification Delay | ~5-7 min | ~2 min |
## ⚠️ Critical Constraints
1. **Environment Variables:** Always use `process.env`, never hardcode.
2. **Type Safety:** Use `any` for command `data` and `execute` parameters (compatibility).
3. **Interaction States:** Check `interaction.replied` before replying.
4. **Twitch API:** Max 100 channels per request, batch properly.
5. **Deploy:** Commands NOT auto-registered on start use `/owner deploy`.
6. **Ephemeral Replies:** Use `flags: [MessageFlags.Ephemeral]` instead of deprecated `ephemeral: true`.
7. **Line Endings:** Use `.gitattributes` to ensure LF line endings for consistency.
## 📋 Command Summary
| Command | Subcommands | Permission |
|---------|-------------|------------|
| `/ping` | | Public |
| `/help` | | Public |
| `/twitch` | online, add, remove, list, listall, help | Public/Admin |
| `/kickstream` | online, add, remove, list, help | Public/Admin |
| `/trigger` | add, remove, list, help | Public/Admin |
| `/timer` | add, remove, list, listall, help | Public/Admin |
| `/welcome` | setchannel, add, remove, list, help | Admin |
| `/log` | setchannel, enable, disable, list, help | Admin |
| `/admin` | kick, warn, unwarn, mute, unmute, ban, unban, purge, config, help | Admin |
| `/owner` | deploy, stats, servers, help | Owner |
1. **Transaction Safety:** Never call async functions (like `fetch` or `channel.send`) inside a synchronous `db.transaction()`.
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.

View File

@@ -15,9 +15,22 @@ Erstelle `.env` Datei:
DISCORD_TOKEN=dein_bot_token
CLIENT_ID=deine_client_id
TWITCH_CLIENT_ID=deine_twitch_id
TWITCH_CLIENT_SECRET=dein_twitch_secret
TWITCH_CLIENT_SECRET=deine_twitch_secret
TWITCH_USERNAME=dein_twitch_username
TWITCH_OAUTH_TOKEN=oauth:xxxxxxxxxxxxxxxxxx
BOT_OWNER_ID=deine_discord_user_id
# Optional: Automatische Slash-Command Registrierung bei Bot-Start (default: true)
AUTO_DEPLOY=true
```
### TwitchMonitor Setup
1. **Twitch OAuth Token holen:** https://chatterino.com/client_login
2. **Username:** Dein Twitch Username
3. **Bot Owner ID:** Deine Discord User ID (für Fehlerbenachrichtigungen)
> ⚠️ **Hinweis:** Der Twitch OAuth Token kann ungültig werden. In diesem Fall wirst du automatisch per Discord DM benachrichtigt.
## 🚀 Start
```bash
@@ -47,6 +60,9 @@ docker-compose up -d --build --force-recreate
## 📋 Commands registrieren
Befehle werden standardmäßig **automatisch bei jedem Bot-Start** registriert. Du kannst dies über `AUTO_DEPLOY=false` in der `.env` deaktivieren.
Für manuelle Updates oder im Notfall:
```bash
npm run deploy
```
@@ -85,6 +101,21 @@ npm run deploy
- `/twitch listall` Alle überwachten Streamer (Mod)
- `/twitch help` Twitch-Hilfe
### TwitchMonitor (IRC Chat Logging)
- `/twitchmonitor add <twitch> <discord>` Twitch-Kanal zum IRC-Monitoring hinzufügen (Mod)
- `/twitchmonitor remove <twitch>` Kanal vom Monitoring entfernen (Mod)
- `/twitchmonitor list` Alle überwachten Twitch-Kanäle
- `/twitchmonitor help` Hilfe anzeigen
### Rollen-Auswahl
- `/rolesetup create <#kanal> <name>` Rollen-Auswahl Message erstellen
- `/rolesetup add <kategorie> <@rolle> [emoji]` Rolle zur Auswahl hinzufügen
- `/rolesetup edit <kategorie> <rolle> [neues_emoji]` Emoji ändern
- `/rolesetup remove <kategorie> <rolle>` Rolle entfernen
- `/rolesetup delete <kategorie>` Kategorie löschen
- `/rolesetup config <kategorie> max:1 exclusive:true` Einstellungen
- `/rolesetup list` Alle Kategorien anzeigen
### Admin
- `/admin kick <user>` Nutzer kicken
- `/admin warn <user> <reason>` Nutzer verwarnen
@@ -106,16 +137,14 @@ npm run deploy
- `/owner servers` Alle Server
- `/owner help` Owner-Hilfe
## 📡 Features
## 📡 Features & Optimierungen
- ✅ Modular Architecture
-TypeScript
-SQLite Database
- ✅ Twitch Monitoring
-Moderation Tools
-Konfigurierbares Warn-System
-Auto-Antworten (Trigger)
-Timer & Erinnerungen
-Welcome/Goodbye Messages
- ✅ Event Logging
- ✅ Docker Support
-**Modular Architecture:** TypeScript-basiert, ESM-Unterstützung, strikte Typisierung.
-**High Performance Database:** SQLite mit **WAL-Modus**, **Fremdschlüssel-Unterstützung** und **chirurgischem In-Memory Caching** für Guild-Settings und Trigger.
-**Optimized Twitch Polling:** Nutzt **Batch-Requests** (100 Kanäle pro Request), Datenbank-Transaktionen und ein 2-Minuten-Intervall für zeitnahe Benachrichtigungen.
-**TwitchMonitor IRC:** Echtzeit IRC Chat-Logging (Mod-Events) via **wiederverwendbaren Webhooks** und FIFO-Cache.
-**Advanced Moderation:** Warn-System mit Auto-Actions, umfangreiches Purge-System.
-**Role Selection:** Self-Service Rollen-System über Discord Select Menus.
-**Reminders:** Intelligentes Zeit-Parsing (z.B. "morgen 15:00", "30min").
-**Event Logging:** Detaillierte Erfassung von Server-Ereignissen.
-**Docker Support:** Containerisiertes Deployment inklusive Volume-Mounts für Daten.

67
package-lock.json generated
View File

@@ -9,15 +9,16 @@
"version": "1.0.0",
"license": "MIT",
"dependencies": {
"@nekiro/kick-api": "^2.1.2",
"better-sqlite3": "^12.8.0",
"discord.js": "^14.18.0",
"dotenv": "^16.4.7",
"tmi.js": "^1.8.5",
"typescript": "^5.8.2"
},
"devDependencies": {
"@types/better-sqlite3": "^7.6.13",
"@types/node": "^22.13.9",
"@types/tmi.js": "^1.8.6",
"nodemon": "^3.1.9",
"ts-node": "^10.9.2"
}
@@ -193,14 +194,6 @@
"@jridgewell/sourcemap-codec": "^1.4.10"
}
},
"node_modules/@nekiro/kick-api": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/@nekiro/kick-api/-/kick-api-2.1.2.tgz",
"integrity": "sha512-D2Yq+j3U7TBK4WNc48lM+fHYh3s+9b6+EGV66wVzh6QPTr0kcQ0ThgrXkyMbppkqv+nZwFYrIw+PxmECQ3BnfQ==",
"engines": {
"node": ">=20.0"
}
},
"node_modules/@sapphire/async-queue": {
"version": "1.5.5",
"resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.5.tgz",
@@ -281,6 +274,12 @@
"undici-types": "~6.21.0"
}
},
"node_modules/@types/tmi.js": {
"version": "1.8.6",
"resolved": "https://registry.npmjs.org/@types/tmi.js/-/tmi.js-1.8.6.tgz",
"integrity": "sha512-LVzNK7AxTMyh9qHLanAQR1o0I9XzfbIcXk85cx85igmCJHHO1Sm71sdhQ8Mj1WmRGzynPIoCXx6mVaFynWbsQw==",
"dev": true
},
"node_modules/@types/ws": {
"version": "8.18.1",
"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
@@ -892,6 +891,25 @@
"node": ">=10"
}
},
"node_modules/node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
"engines": {
"node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
}
},
"node_modules/nodemon": {
"version": "3.1.14",
"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.14.tgz",
@@ -1188,6 +1206,18 @@
"node": ">=6"
}
},
"node_modules/tmi.js": {
"version": "1.8.5",
"resolved": "https://registry.npmjs.org/tmi.js/-/tmi.js-1.8.5.tgz",
"integrity": "sha512-A9qrydfe1e0VWM9MViVhhxVgvLpnk7pFShVUWePsSTtoi+A1X+Zjdoa7OJd7/YsgHXGj3GkNEvnWop/1WwZuew==",
"dependencies": {
"node-fetch": "^2.6.1",
"ws": "^8.2.0"
},
"engines": {
"node": ">=10.0.0"
}
},
"node_modules/to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -1211,6 +1241,11 @@
"nodetouch": "bin/nodetouch.js"
}
},
"node_modules/tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"node_modules/ts-mixer": {
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.4.tgz",
@@ -1327,6 +1362,20 @@
"dev": true,
"license": "MIT"
},
"node_modules/webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"node_modules/whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"dependencies": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
},
"node_modules/wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",

View File

@@ -19,15 +19,16 @@
"author": "sarah",
"license": "MIT",
"dependencies": {
"@nekiro/kick-api": "^2.1.2",
"better-sqlite3": "^12.8.0",
"discord.js": "^14.18.0",
"dotenv": "^16.4.7",
"tmi.js": "^1.8.5",
"typescript": "^5.8.2"
},
"devDependencies": {
"@types/better-sqlite3": "^7.6.13",
"@types/node": "^22.13.9",
"@types/tmi.js": "^1.8.6",
"nodemon": "^3.1.9",
"ts-node": "^10.9.2"
}

View File

@@ -1,18 +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: any, guildId: string, event: string, embed: EmbedBuilder) {
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 {
@@ -193,8 +194,9 @@ const command: Command = {
.setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers),
category: 'Admin',
async execute(interaction: any) {
const client = interaction.client as ExtendedClient;
const subcommand = interaction.options.getSubcommand();
const DB = interaction.client.DB;
const DB = client.DB;
const guild = interaction.guild;
const guildId = interaction.guildId;
@@ -220,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;
}
@@ -261,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;
}
@@ -271,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;
}
@@ -340,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;
}
@@ -352,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;
}
@@ -368,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;
}
@@ -392,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;
}
@@ -410,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;
}
@@ -431,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;
}
@@ -440,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;
}
@@ -449,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;
}
@@ -460,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;
}
@@ -486,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;
}
@@ -503,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;
}
@@ -523,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);
@@ -541,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);
@@ -552,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);
@@ -568,24 +566,24 @@ 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;
try {
if (purgeSubcommand === 'amount') {
const count = interaction.options.getInteger('count')!;
const messages = await channel.messages.fetch({ limit: count + 1 }); // +1 for the command message
const messages = await channel.messages.fetch({ limit: count });
const twoWeeksAgo = Date.now() - 14 * 24 * 60 * 60 * 1000;
const filtered = messages.filter((m: any) => m.createdTimestamp > twoWeeksAgo);
await (channel as any).bulkDelete(filtered, true);
deletedCount = filtered.size - 1; // -1 for command message
deletedCount = filtered.size;
await interaction.editReply(`${deletedCount} Nachrichten gelöscht.`);
}

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 });
},
};

View File

@@ -1,170 +0,0 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, MessageFlags, ChannelType } from 'discord.js';
import { Command } from '../../structures/Command.js';
import { KickManager } from '../../structures/KickManager.js';
const command: Command = {
data: new SlashCommandBuilder()
.setName('kickstream')
.setDescription('Kick-Streamer Benachrichtigungen verwalten.')
.addSubcommand(subcommand =>
subcommand
.setName('add')
.setDescription('Fügt einen Kick-Streamer zum Monitoring hinzu.')
.addStringOption(option =>
option.setName('channel')
.setDescription('Der Kick-Channel-Name (Slug)')
.setRequired(true))
.addChannelOption(option =>
option.setName('discord_channel')
.setDescription('Der Discord-Kanal für Benachrichtigungen')
.addChannelTypes(ChannelType.GuildText)
.setRequired(true))
.addStringOption(option =>
option.setName('nachricht')
.setDescription('Optionale custom Nachricht')))
.addSubcommand(subcommand =>
subcommand
.setName('remove')
.setDescription('Entfernt einen Kick-Streamer vom Monitoring.')
.addStringOption(option =>
option.setName('channel')
.setDescription('Der Kick-Channel-Name')
.setRequired(true)))
.addSubcommand(subcommand =>
subcommand
.setName('list')
.setDescription('Listet alle überwachten Kick-Streamer auf.'))
.addSubcommand(subcommand =>
subcommand
.setName('online')
.setDescription('Prüft ob ein Kick-Streamer online ist.')
.addStringOption(option =>
option.setName('channel')
.setDescription('Der Kick-Channel-Name')
.setRequired(true)))
.addSubcommand(subcommand =>
subcommand
.setName('help')
.setDescription('Zeigt Hilfe zu den Kick-Befehlen an.')),
category: 'Admin',
async execute(interaction: any) {
const subcommand = interaction.options.getSubcommand();
const guildId = interaction.guildId;
const isAdmin = interaction.memberPermissions?.has(PermissionFlagsBits.ModerateMembers);
const DB = interaction.client.DB;
if (subcommand === 'help') {
const embed = new EmbedBuilder()
.setTitle('🟢 Kick Streaming Hilfe')
.setColor(0x53fc18)
.setDescription('Benachrichtigungen bei Kick-Streams.')
.addFields(
{ name: '`/kickstream add <channel> <discord_channel> [nachricht]`', value: 'Fügt einen Streamer hinzu (Mod).', inline: false },
{ name: '`/kickstream remove <channel>`', value: 'Entfernt einen Streamer (Mod).', inline: false },
{ name: '`/kickstream list`', value: 'Zeigt alle überwachten Streamer.', inline: false },
{ name: '`/kickstream online <channel>`', value: 'Prüft ob ein Streamer live ist.', inline: false },
{ name: 'Hinweis', value: 'Benötigt KICK_CLIENT_ID und KICK_CLIENT_SECRET in der .env', inline: false }
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
return;
}
if (subcommand === 'online') {
const channelName = interaction.options.getString('channel')!.toLowerCase().replace(/^@/, '');
await interaction.deferReply();
const { channel, livestream } = await KickManager.fetchChannelData(channelName);
if (!channel) {
await interaction.editReply({ content: `❌ Channel **${channelName}** nicht gefunden.` });
return;
}
const isLive = livestream !== null;
const embed = new EmbedBuilder()
.setTitle(isLive ? `🟢 ${channel.user.username} ist LIVE` : `${channel.user.username} ist offline`)
.setURL(`https://kick.com/${channel.slug}`)
.setColor(isLive ? 0x53fc18 : 0x5865F2);
if (isLive && livestream) {
embed.addFields(
{ name: 'Titel', value: livestream.stream_title || 'Kein Titel', inline: false },
{ name: 'Kategorie', value: livestream.category?.name || 'Unbekannt', inline: true },
{ name: 'Zuschauer', value: livestream.viewer_count.toString(), inline: true }
);
if (livestream.thumbnail) {
embed.setImage(livestream.thumbnail);
}
}
await interaction.editReply({ embeds: [embed] });
return;
}
if (subcommand === 'list') {
const monitors: any[] = DB.all('SELECT * FROM kick_monitors WHERE guild_id = ? ORDER BY channel_name ASC', guildId);
if (monitors.length === 0) {
await interaction.reply({ content: 'Keine Kick-Streamer überwacht.', flags: [MessageFlags.Ephemeral] });
return;
}
const embed = new EmbedBuilder()
.setTitle('🟢 Kick-Monitoring')
.setColor(0x53fc18)
.setDescription(monitors.map((m: any) =>
`• **${m.channel_name}** → <#${m.discord_channel_id}> ${m.last_status === 'online' ? '🔴' : '⚫'}`
).join('\n'))
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
return;
}
if (!isAdmin) {
await interaction.reply({ content: '❌ Keine Berechtigung. Moderatoren erforderlich.', flags: [MessageFlags.Ephemeral] });
return;
}
if (subcommand === 'add') {
const channelName = interaction.options.getString('channel')!.toLowerCase().replace(/^@/, '');
const discordChannel = interaction.options.getChannel('discord_channel');
const customMessage = interaction.options.getString('nachricht');
const { channel } = await KickManager.fetchChannelData(channelName);
if (!channel) {
await interaction.reply({ content: `❌ Kick-Channel **${channelName}** nicht gefunden.`, flags: [MessageFlags.Ephemeral] });
return;
}
DB.run(
'INSERT INTO kick_monitors (guild_id, channel_name, discord_channel_id, custom_message) VALUES (?, ?, ?, ?) ON CONFLICT(guild_id, channel_name) DO UPDATE SET discord_channel_id = ?, custom_message = ?',
guildId,
channelName,
discordChannel.id,
customMessage,
discordChannel.id,
customMessage
);
await interaction.reply({ content: `✅ **${channelName}** wird jetzt überwacht.`, flags: [MessageFlags.Ephemeral] });
return;
}
if (subcommand === 'remove') {
const channelName = interaction.options.getString('channel')!.toLowerCase().replace(/^@/, '');
const result = DB.run('DELETE FROM kick_monitors WHERE guild_id = ? AND channel_name = ?', guildId, channelName);
if (result.changes === 0) {
await interaction.reply({ content: `❌ **${channelName}** nicht gefunden.`, flags: [MessageFlags.Ephemeral] });
return;
}
await interaction.reply({ content: `✅ **${channelName}** entfernt.`, flags: [MessageFlags.Ephemeral] });
}
},
};
export default command;

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 });
}
},
};

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;
}

View File

@@ -0,0 +1,416 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, ChannelType, ComponentType, StringSelectMenuBuilder, StringSelectMenuOptionBuilder } from 'discord.js';
import { Command } from '../../structures/Command.js';
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;
const message = await channel.messages.fetch(category.message_id);
if (!message) return;
const options: any[] = client.DB.all('SELECT * FROM role_options WHERE category_id = ?', category.id);
if (options.length === 0) {
await message.edit({
content: `**${category.category_name}**\nWähle unten eine Rolle aus:\n\n*Noch keine Rollen konfiguriert.*`,
components: []
});
return;
}
const roleOptions = options.map((opt: any) =>
new StringSelectMenuOptionBuilder()
.setLabel(opt.label.replace(/^[^\s]+\s/, ''))
.setValue(opt.role_id)
.setEmoji(opt.emoji || '')
);
roleOptions.push(
new StringSelectMenuOptionBuilder()
.setLabel('Keine')
.setValue(`remove_${category.id}`)
.setEmoji('❌')
);
const selectMenu = new StringSelectMenuBuilder()
.setCustomId(`role_select_${category.category_name}`)
.setPlaceholder('Wähle eine Rolle...')
.addOptions(roleOptions);
await message.edit({
content: `**${category.category_name}**\nWähle unten eine Rolle aus:\n*Klicke erneut auf eine Rolle um sie zu entfernen.*`,
components: [{ type: ComponentType.ActionRow, components: [selectMenu] }]
});
} catch (error) {
console.error('[ROLESETUP] Error updating message:', error);
}
}
const command: Command = {
data: new SlashCommandBuilder()
.setName('rolesetup')
.setDescription('Rollen-Auswahl konfigurieren')
.addSubcommand(subcommand =>
subcommand
.setName('create')
.setDescription('Erstellt eine neue Rollen-Auswahl Message')
.addChannelOption(option =>
option.setName('channel')
.setDescription('Der Kanal für die Rollen-Message')
.addChannelTypes(ChannelType.GuildText)
.setRequired(true))
.addStringOption(option =>
option.setName('name')
.setDescription('Name der Kategorie (z.B. "Farben", "Spiele")')
.setRequired(true)))
.addSubcommand(subcommand =>
subcommand
.setName('add')
.setDescription('Fügt eine neue Rolle zur Auswahl hinzu')
.addStringOption(option =>
option.setName('kategorie')
.setDescription('Der Name der Kategorie')
.setRequired(true))
.addRoleOption(option =>
option.setName('rolle')
.setDescription('Die Discord-Rolle')
.setRequired(true))
.addStringOption(option =>
option.setName('emoji')
.setDescription('Optional: Emoji für die Option')
.setRequired(false)))
.addSubcommand(subcommand =>
subcommand
.setName('edit')
.setDescription('Ändert eine bestehende Option')
.addStringOption(option =>
option.setName('kategorie')
.setDescription('Der Name der Kategorie')
.setRequired(true))
.addRoleOption(option =>
option.setName('rolle')
.setDescription('Die Discord-Rolle zum Ändern')
.setRequired(true))
.addStringOption(option =>
option.setName('neue_rolle')
.setDescription('Die neue Discord-Rolle')
.setRequired(false))
.addStringOption(option =>
option.setName('neues_emoji')
.setDescription('Das neue Emoji')
.setRequired(false)))
.addSubcommand(subcommand =>
subcommand
.setName('remove')
.setDescription('Entfernt eine Rolle von der Auswahl')
.addStringOption(option =>
option.setName('kategorie')
.setDescription('Der Name der Kategorie')
.setRequired(true))
.addRoleOption(option =>
option.setName('rolle')
.setDescription('Die Discord-Rolle zum Entfernen')
.setRequired(true)))
.addSubcommand(subcommand =>
subcommand
.setName('delete')
.setDescription('Löscht eine Kategorie und deren Message')
.addStringOption(option =>
option.setName('kategorie')
.setDescription('Der Name der Kategorie')
.setRequired(true)))
.addSubcommand(subcommand =>
subcommand
.setName('config')
.setDescription('Konfiguriert die Kategorie-Einstellungen')
.addStringOption(option =>
option.setName('kategorie')
.setDescription('Der Name der Kategorie')
.setRequired(true))
.addIntegerOption(option =>
option.setName('max_rollen')
.setDescription('Maximale Rollen pro User (0 = unbegrenzt)')
.setRequired(false)
.setMinValue(0))
.addBooleanOption(option =>
option.setName('exklusiv')
.setDescription('Nur eine Rolle pro User erlaubt')
.setRequired(false))
.addBooleanOption(option =>
option.setName('entfernen_bei_loeschung')
.setDescription('Rolle von Usern entfernen wenn gelöscht')
.setRequired(false)))
.addSubcommand(subcommand =>
subcommand
.setName('list')
.setDescription('Listet alle Rollen-Kategorien auf')),
category: 'Admin',
async execute(interaction: any) {
const subcommand = interaction.options.getSubcommand();
const guildId = interaction.guildId;
const isAdmin = interaction.memberPermissions?.has(PermissionFlagsBits.ModerateMembers);
const DB = interaction.client.DB;
if (subcommand === 'list') {
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.', ephemeral: true });
return;
}
const embed = new EmbedBuilder()
.setTitle('Rollen-Kategorien')
.setColor(0x3498db)
.setTimestamp();
for (const cat of categories) {
const options: any[] = DB.all('SELECT * FROM role_options WHERE category_id = ?', cat.id);
const channel = interaction.guild?.channels.cache.get(cat.channel_id);
const configStr = [];
if (cat.max_roles > 0) configStr.push(`Max: ${cat.max_roles}`);
if (cat.exclusive) configStr.push('Exklusiv');
if (cat.remove_on_delete) configStr.push('Auto-Entfernen');
embed.addFields({
name: `${cat.category_name} ${configStr.length > 0 ? `(${configStr.join(', ')})` : ''}`,
value: `Kanal: ${channel?.toString() || '#' + cat.channel_id}\nOptionen: ${options.length}\nNachricht: ${cat.message_id !== 'pending' ? '[✅]' : '[⏳]'}`,
inline: false
});
}
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
if (subcommand === 'create') {
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
const channel = interaction.options.getChannel('channel');
const categoryName = interaction.options.getString('name');
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.`, ephemeral: true });
return;
}
const sentMessage = await channel.send({
content: `**${categoryName}**\nWähle unten eine Rolle aus:\n\n*Noch keine Rollen konfiguriert. Füge Rollen mit "/rolesetup add" hinzu.*`
});
DB.run(
'INSERT INTO role_categories (guild_id, channel_id, message_id, category_name, max_roles, exclusive, remove_on_delete) VALUES (?, ?, ?, ?, 0, 0, 0)',
guildId,
channel.id,
sentMessage.id,
categoryName
);
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.', ephemeral: true });
return;
}
const kategorie = interaction.options.getString('kategorie');
const role = interaction.options.getRole('rolle');
const emoji = interaction.options.getString('emoji');
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.`, 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}".`, ephemeral: true });
return;
}
const label = emoji ? `${emoji} ${role.name}` : role.name;
DB.run(
'INSERT INTO role_options (category_id, label, emoji, role_id) VALUES (?, ?, ?, ?)',
category.id,
label,
emoji || null,
role.id
);
await updateRoleMessage(interaction.client, category);
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.', ephemeral: true });
return;
}
const kategorie = interaction.options.getString('kategorie');
const oldRole = interaction.options.getRole('rolle');
const newRole = interaction.options.getRole('neue_rolle');
const newEmoji = interaction.options.getString('neues_emoji');
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.`, 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}".`, ephemeral: true });
return;
}
const finalEmoji = newEmoji !== null ? newEmoji : option.emoji;
const finalRoleId = newRole ? newRole.id : oldRole.id;
const finalLabel = finalEmoji ? `${finalEmoji} ${newRole ? newRole.name : oldRole.name}` : (newRole ? newRole.name : oldRole.name);
DB.run(
'UPDATE role_options SET label = ?, emoji = ?, role_id = ? WHERE id = ?',
finalLabel,
finalEmoji,
finalRoleId,
option.id
);
await updateRoleMessage(interaction.client, category);
await interaction.reply({ content: `Option in "${kategorie}" aktualisiert.`, ephemeral: true });
return;
}
if (subcommand === 'remove') {
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
const kategorie = interaction.options.getString('kategorie');
const role = interaction.options.getRole('rolle');
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.`, 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}".`, ephemeral: true });
return;
}
if (category.remove_on_delete) {
const guild = interaction.guild;
const discordRole = guild.roles.cache.get(role.id);
if (discordRole) {
const members = guild.members.cache.filter((m: any) => m.roles.cache.has(role.id));
for (const member of members.values()) {
await member.roles.remove(role.id);
}
}
}
DB.run('DELETE FROM role_options WHERE id = ?', option.id);
await updateRoleMessage(interaction.client, category);
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.', ephemeral: true });
return;
}
const kategorie = interaction.options.getString('kategorie');
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.`, ephemeral: true });
return;
}
if (category.remove_on_delete) {
const options: any[] = DB.all('SELECT * FROM role_options WHERE category_id = ?', category.id);
const guild = interaction.guild;
for (const opt of options) {
const discordRole = guild.roles.cache.get(opt.role_id);
if (discordRole) {
const members = guild.members.cache.filter((m: any) => m.roles.cache.has(opt.role_id));
for (const member of members.values()) {
await member.roles.remove(opt.role_id);
}
}
}
}
try {
const channel = interaction.guild?.channels.cache.get(category.channel_id);
if (channel) {
const message = await channel.messages.fetch(category.message_id);
if (message) await message.delete();
}
} catch { }
DB.run('DELETE FROM role_categories WHERE id = ?', category.id);
await interaction.reply({ content: `Kategorie "${kategorie}" geloescht.`, ephemeral: true });
return;
}
if (subcommand === 'config') {
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
const kategorie = interaction.options.getString('kategorie');
const maxRollen = interaction.options.getInteger('max_rollen');
const exklusiv = interaction.options.getBoolean('exklusiv');
const entfernenBeiLoeschung = interaction.options.getBoolean('entfernen_bei_loeschung');
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.`, ephemeral: true });
return;
}
const updates: string[] = [];
if (maxRollen !== null) {
DB.run('UPDATE role_categories SET max_roles = ? WHERE id = ?', maxRollen, category.id);
updates.push(`Max-Rollen: ${maxRollen === 0 ? 'unbegrenzt' : maxRollen}`);
}
if (exklusiv !== null) {
DB.run('UPDATE role_categories SET exclusive = ? WHERE id = ?', exklusiv ? 1 : 0, category.id);
updates.push(`Exklusiv: ${exklusiv ? 'ja' : 'nein'}`);
}
if (entfernenBeiLoeschung !== null) {
DB.run('UPDATE role_categories SET remove_on_delete = ? WHERE id = ?', entfernenBeiLoeschung ? 1 : 0, category.id);
updates.push(`Auto-Entfernen: ${entfernenBeiLoeschung ? 'ja' : 'nein'}`);
}
if (updates.length === 0) {
await interaction.reply({ content: 'Keine Aenderungen angegeben.', ephemeral: true });
return;
}
await interaction.reply({ content: `Konfiguration aktualisiert: ${updates.join(', ')}`, ephemeral: true });
}
}
};
export default command;

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 });
}
}
},

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 });
}
},
};

View File

@@ -1,6 +1,7 @@
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';
const command: Command = {
data: new SlashCommandBuilder()
@@ -47,10 +48,11 @@ const command: Command = {
.setDescription('Zeigt Hilfe zu den Twitch-Befehlen an.')),
category: 'Public',
async execute(interaction: any) {
const client = interaction.client as ExtendedClient;
const subcommand = interaction.options.getSubcommand();
const guildId = interaction.guildId;
const isAdmin = interaction.memberPermissions?.has(PermissionFlagsBits.ModerateMembers);
const DB = interaction.client.DB;
const DB = client.DB;
if (subcommand === 'help') {
const embed = new EmbedBuilder()
@@ -67,7 +69,7 @@ const command: Command = {
)
.setTimestamp();
await interaction.reply({ embeds: [embed], flags: [MessageFlags.Ephemeral] });
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
@@ -105,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;
}
@@ -115,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;
}
@@ -149,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;
@@ -179,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;
}
@@ -189,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);
@@ -218,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;
}
@@ -230,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;
}
@@ -251,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 });
}
},
};

View File

@@ -0,0 +1,141 @@
import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, ChannelType } from 'discord.js';
import { Command } from '../../structures/Command.js';
import { TwitchMonitor } from '../../structures/TwitchMonitor.js';
const command: Command = {
data: new SlashCommandBuilder()
.setName('twitchmonitor')
.setDescription('Twitch IRC Chat-Monitoring konfigurieren')
.addSubcommand(subcommand =>
subcommand
.setName('add')
.setDescription('Fügt einen Twitch-Kanal zum Monitoring hinzu')
.addStringOption(option =>
option.setName('twitch')
.setDescription('Twitch-Kanalname')
.setRequired(true))
.addChannelOption(option =>
option.setName('discord')
.setDescription('Discord-Kanal für Logs')
.addChannelTypes(ChannelType.GuildText)
.setRequired(true)))
.addSubcommand(subcommand =>
subcommand
.setName('remove')
.setDescription('Entfernt einen Twitch-Kanal vom Monitoring')
.addStringOption(option =>
option.setName('twitch')
.setDescription('Twitch-Kanalname')
.setRequired(true)))
.addSubcommand(subcommand =>
subcommand
.setName('list')
.setDescription('Listet alle überwachten Twitch-Kanäle auf'))
.addSubcommand(subcommand =>
subcommand
.setName('help')
.setDescription('Zeigt Hilfe zu den TwitchMonitor-Befehlen')),
category: 'Admin',
async execute(interaction: any) {
const subcommand = interaction.options.getSubcommand();
const guildId = interaction.guildId;
const isAdmin = interaction.memberPermissions?.has(PermissionFlagsBits.ModerateMembers);
const DB = interaction.client.DB;
if (subcommand === 'help') {
const embed = new EmbedBuilder()
.setTitle('TwitchMonitor Hilfe')
.setColor(0x9146ff)
.setDescription('Überwacht Twitch IRC-Chat für Moderations-Events.')
.addFields(
{ name: '/twitchmonitor add <twitch> <discord>', value: 'Kanal hinzufügen (Admin)', inline: false },
{ name: '/twitchmonitor remove <twitch>', value: 'Kanal entfernen (Admin)', inline: false },
{ name: '/twitchmonitor list', value: 'Alle überwachten Kanäle', inline: false }
)
.setTimestamp();
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
if (subcommand === 'list') {
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.', ephemeral: true });
return;
}
const embed = new EmbedBuilder()
.setTitle('TwitchMonitor Kanäle')
.setColor(0x9146ff)
.setDescription(monitors.map((m: any) =>
`• **${m.twitch_channel}** → <#${m.discord_channel_id}>`
).join('\n'))
.setTimestamp();
await interaction.reply({ embeds: [embed], ephemeral: true });
return;
}
if (!isAdmin) {
await interaction.reply({ content: 'Keine Berechtigung. Moderatoren erforderlich.', ephemeral: true });
return;
}
if (subcommand === 'add') {
const twitchChannel = interaction.options.getString('twitch').toLowerCase().replace(/^@/, '');
const discordChannel = interaction.options.getChannel('discord');
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.`, ephemeral: true });
return;
}
const webhook = await discordChannel.createWebhook({
name: `${twitchChannel} | Mod-Log`,
avatar: undefined,
}).catch(async () => {
const existing_webhook = await discordChannel.fetchWebhooks().then((webhooks: any) =>
webhooks.find((w: any) => w.name?.includes(twitchChannel))
);
if (existing_webhook) return existing_webhook;
throw new Error('Could not create webhook');
});
DB.run(
'INSERT INTO twitch_monitor_channels (guild_id, twitch_channel, discord_channel_id, webhook_url) VALUES (?, ?, ?, ?)',
guildId,
twitchChannel,
discordChannel.id,
webhook.url
);
const monitor = TwitchMonitor.getInstance();
await monitor.addMonitor(guildId, twitchChannel, discordChannel.id, webhook.url);
await interaction.reply({ content: `${twitchChannel} wird jetzt überwacht.`, ephemeral: true });
return;
}
if (subcommand === 'remove') {
const twitchChannel = interaction.options.getString('twitch').toLowerCase().replace(/^@/, '');
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.`, ephemeral: true });
return;
}
DB.run('DELETE FROM twitch_monitor_channels WHERE guild_id = ? AND twitch_channel = ?', guildId, twitchChannel);
const twitchMonitor = TwitchMonitor.getInstance();
await twitchMonitor.removeMonitor(guildId, twitchChannel);
await interaction.reply({ content: `${twitchChannel} wurde entfernt.`, ephemeral: true });
}
},
};
export default command;

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 });
}
},
};

View File

@@ -1,17 +1,13 @@
import { Events, GuildChannel, EmbedBuilder } from 'discord.js';
async function sendLog(client: any, 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 = client.DB.getSettings(guildId);
if (!settings?.log_events || !settings?.log_channel) 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;
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 {
@@ -24,6 +20,8 @@ async function sendLog(client: any, guildId: string, event: string, embed: Embed
export default {
name: Events.ChannelCreate,
async execute(channel: GuildChannel) {
if (!channel.guild) return;
const embed = new EmbedBuilder()
.setTitle('📁 Channel erstellt')
.setColor(0x27ae60)
@@ -33,6 +31,6 @@ export default {
)
.setTimestamp();
await sendLog(channel.client, channel.guild!.id, 'channels', embed);
await sendLog(channel.client, channel.guild.id, 'channels', embed);
},
};

View File

@@ -1,17 +1,13 @@
import { Events, GuildChannel, EmbedBuilder } from 'discord.js';
async function sendLog(client: any, 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 = client.DB.getSettings(guildId);
if (!settings?.log_events || !settings?.log_channel) 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;
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 {
@@ -24,6 +20,8 @@ async function sendLog(client: any, guildId: string, event: string, embed: Embed
export default {
name: Events.ChannelDelete,
async execute(channel: GuildChannel) {
if (!channel.guild) return;
const embed = new EmbedBuilder()
.setTitle('📁 Channel gelöscht')
.setColor(0xe74c3c)
@@ -33,6 +31,6 @@ export default {
)
.setTimestamp();
await sendLog(channel.client, channel.guild!.id, 'channels', embed);
await sendLog(channel.client, channel.guild.id, 'channels', embed);
},
};

View File

@@ -6,7 +6,7 @@ export default {
const DB = (member.client as any).DB;
const guildId = member.guild.id;
const settings: any = DB.get('SELECT * FROM guild_settings WHERE guild_id = ?', guildId);
const settings = DB.getSettings(guildId);
// Use custom channel or fall back to Discord's system channel
const channelId = settings?.welcome_channel || member.guild.systemChannelId;

View File

@@ -2,16 +2,15 @@ import { Events, GuildMember, TextChannel, EmbedBuilder } from 'discord.js';
async function sendLog(client: any, 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?.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 {
@@ -40,7 +39,7 @@ export default {
await sendLog(member.client, guildId, 'leaves', embed);
// Send goodbye message if configured
const settings: any = DB.get('SELECT * FROM guild_settings WHERE guild_id = ?', guildId);
const settings = DB.getSettings(guildId);
const channelId = settings?.welcome_channel || member.guild.systemChannelId;
if (!channelId || !settings?.goodbye_message) {

View File

@@ -1,17 +1,13 @@
import { Events, GuildMember, EmbedBuilder } from 'discord.js';
async function sendLog(client: any, 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 = client.DB.getSettings(guildId);
if (!settings?.log_events || !settings?.log_channel) 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;
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 {
@@ -21,7 +17,6 @@ async function sendLog(client: any, guildId: string, event: string, embed: Embed
}
}
// Guild Member Update (nickname + roles)
export default {
name: Events.GuildMemberUpdate,
async execute(oldMember: GuildMember, newMember: GuildMember) {

View File

@@ -1,8 +1,124 @@
import { Events, MessageFlags } from 'discord.js';
import { Events, Interaction, GuildMember } from 'discord.js';
import { ExtendedClient } from '../structures/ExtendedClient.js';
export default {
name: Events.InteractionCreate,
async execute(interaction: any, client: any) {
async execute(interaction: Interaction, client: ExtendedClient) {
if (interaction.isStringSelectMenu()) {
const customId = interaction.customId;
if (customId.startsWith('role_select_')) {
const categoryName = customId.replace('role_select_', '');
const selectedValue = interaction.values[0];
const guild = interaction.guild;
const member = interaction.member as GuildMember;
if (!guild || !member || !member.roles) {
await interaction.reply({ content: 'Dieser Befehl kann nur auf Servern verwendet werden.', ephemeral: true });
return;
}
const category: any = client.DB.get(
'SELECT * FROM role_categories WHERE guild_id = ? AND category_name = ?',
guild.id,
categoryName
);
if (!category) {
await interaction.reply({ content: 'Kategorie nicht gefunden.', ephemeral: true });
return;
}
if (selectedValue.startsWith('remove_')) {
const options: any[] = client.DB.all('SELECT * FROM role_options WHERE category_id = ?', category.id);
let removedCount = 0;
for (const opt of options) {
if (member.roles.cache.has(opt.role_id)) {
await member.roles.remove(opt.role_id);
removedCount++;
}
}
if (removedCount > 0) {
await interaction.reply({
content: `Alle Rollen aus "${categoryName}" wurden entfernt.`,
ephemeral: true
});
} else {
await interaction.reply({
content: `Du hast keine Rollen aus "${categoryName}".`,
ephemeral: true
});
}
return;
}
const option: any = client.DB.get(
'SELECT * FROM role_options WHERE category_id = ? AND role_id = ?',
category.id,
selectedValue
);
if (!option) {
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.', ephemeral: true });
return;
}
const hasRole = member.roles.cache.has(selectedValue);
if (category.exclusive) {
if (hasRole) {
await member.roles.remove(selectedValue);
await interaction.reply({
content: `Die Rolle ${option.emoji ? option.emoji + ' ' : ''}${discordRole.name} wurde entfernt.`,
ephemeral: true
});
} else {
const options: any[] = client.DB.all('SELECT * FROM role_options WHERE category_id = ?', category.id);
for (const opt of options) {
if (opt.role_id !== selectedValue && member.roles.cache.has(opt.role_id)) {
await member.roles.remove(opt.role_id);
}
}
await member.roles.add(selectedValue);
await interaction.reply({
content: `Du hast jetzt die Rolle ${option.emoji ? option.emoji + ' ' : ''}${discordRole.name}!`,
ephemeral: true
});
}
} else {
if (hasRole) {
await member.roles.remove(selectedValue);
await interaction.reply({
content: `Die Rolle ${option.emoji ? option.emoji + ' ' : ''}${discordRole.name} wurde entfernt.`,
ephemeral: true
});
} else {
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.`,
ephemeral: true
});
return;
}
await member.roles.add(selectedValue);
await interaction.reply({
content: `Du hast jetzt die Rolle ${option.emoji ? option.emoji + ' ' : ''}${discordRole.name}!`,
ephemeral: true
});
}
}
return;
}
}
if (!interaction.isChatInputCommand()) return;
const command = client.commands.get(interaction.commandName);
@@ -21,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 {

View File

@@ -6,10 +6,9 @@ export default {
if (message.author.bot) return;
if (!message.guildId) return;
const triggers: any[] = client.DB.all(
'SELECT * FROM auto_responses WHERE guild_id = ?',
message.guildId
);
const triggers = client.DB.getTriggers(message.guildId);
if (triggers.length === 0) return;
const contentLower = message.content.toLowerCase();

View File

@@ -1,55 +1,26 @@
import { Events, Message, TextChannel, GuildChannel, AuditLogEvent, EmbedBuilder } from 'discord.js';
function getLogChannel(client: any, guildId: string): TextChannel | null {
const DB = client.DB;
const settings: any = DB.get('SELECT * FROM guild_settings WHERE guild_id = ?', guildId);
if (!settings?.log_channel) {
return null;
}
const channel = client.guilds.cache.get(guildId)?.channels.cache.get(settings.log_channel);
if (!channel || !channel.isTextBased()) {
return null;
}
return channel as TextChannel;
}
function isEventEnabled(client: any, guildId: string, event: string): boolean {
const DB = client.DB;
const settings: any = DB.get('SELECT log_events FROM guild_settings WHERE guild_id = ?', guildId);
if (!settings?.log_events) {
return false;
}
const activeEvents = settings.log_events.split(',').filter(Boolean);
return activeEvents.includes(event);
}
import { Events, Message, TextChannel, EmbedBuilder } from 'discord.js';
async function sendLog(client: any, guildId: string, event: string, embed: EmbedBuilder) {
if (!isEventEnabled(client, guildId, event)) {
return;
}
const settings = client.DB.getSettings(guildId);
if (!settings?.log_events || !settings?.log_channel) return;
const channel = getLogChannel(client, guildId);
if (!channel) {
return;
}
const activeEvents = settings.log_events.split(',').filter(Boolean);
if (!activeEvents.includes(event)) return;
const channel = client.guilds.cache.get(guildId)?.channels.cache.get(settings.log_channel);
if (!channel || !channel.isTextBased()) return;
try {
await channel.send({ embeds: [embed] });
await (channel as any).send({ embeds: [embed] });
} catch (error) {
console.error(`[LOG] Error sending log (${event}):`, error);
}
}
// Message Delete
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')

View File

@@ -1,17 +1,13 @@
import { Events, Message, EmbedBuilder } from 'discord.js';
async function sendLog(client: any, 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 = client.DB.getSettings(guildId);
if (!settings?.log_events || !settings?.log_channel) 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;
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 {
@@ -21,11 +17,10 @@ async function sendLog(client: any, guildId: string, event: string, embed: Embed
}
}
// Message Update (Edit)
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;

View File

@@ -1,10 +1,85 @@
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');
let removedCount = 0;
for (const category of categories) {
const guild = client.guilds.cache.get(category.guild_id);
if (!guild) continue;
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);
if (roleExists) {
validOptions.push(option);
} else {
if (category.remove_on_delete) {
const members = guild.members.cache.filter((m: any) => m.roles.cache.has(option.role_id));
for (const member of members.values()) {
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.`);
}
}
if (removedCount > 0) {
console.log(`[ROLESETUP] Removed ${removedCount} invalid role options from database.`);
}
}
async function initTwitchMonitor(client: ExtendedClient) {
if (!process.env.TWITCH_OAUTH_TOKEN || !process.env.TWITCH_USERNAME) {
console.warn('[TWITCH] Missing TWITCH_OAUTH_TOKEN or TWITCH_USERNAME - moderation events will not be received');
return;
}
const monitors: any[] = client.DB.all('SELECT * FROM twitch_monitor_channels');
if (monitors.length === 0) {
console.log('[TWITCH] No channels to monitor.');
return;
}
const monitor = TwitchMonitor.getInstance();
monitor.setDiscordClient(client);
for (const m of monitors) {
const webhookExists = m.webhook_url && m.webhook_url.length > 0;
if (webhookExists) {
await monitor.addMonitor(m.guild_id, m.twitch_channel, m.discord_channel_id, m.webhook_url);
}
}
await monitor.connect();
}
export default {
name: Events.ClientReady,
once: true,
execute(client: any) {
console.log(`[READY] Logged in as ${client.user.tag}`);
async execute(client: ExtendedClient) {
console.log(`[READY] Logged in as ${client.user?.tag}`);
console.log(`[READY] Serving ${client.guilds.cache.size} servers`);
await validateRoles(client);
await initTwitchMonitor(client);
},
};

View File

@@ -6,8 +6,8 @@ import { dirname, join } from 'node:path';
import { Command } from './structures/Command.js';
import { DB } from './structures/Database.js';
import { TwitchManager } from './structures/TwitchManager.js';
import { KickManager } from './structures/KickManager.js';
import { ReminderManager } from './structures/ReminderManager.js';
import { Deployer } from './structures/Deployer.js';
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
@@ -16,12 +16,11 @@ const __dirname = dirname(__filename);
DB.init();
const client = new ExtendedClient();
// Make DB available on client
(client as any).DB = DB;
// Load Commands
const commandsPath = join(__dirname, 'commands');
const commandFolders = readdirSync(commandsPath);
const commandData: any[] = [];
for (const folder of commandFolders) {
const folderPath = join(commandsPath, folder);
@@ -34,6 +33,7 @@ for (const folder of commandFolders) {
if (command && 'data' in command && 'execute' in command) {
client.commands.set(command.data.name, command);
commandData.push(command.data.toJSON());
console.log(`[COMMAND] Loaded: ${command.data.name}`);
} else {
console.warn(`[COMMAND] The command at ${filePath} is missing a required "data" or "execute" property.`);
@@ -41,6 +41,11 @@ for (const folder of commandFolders) {
}
}
// Auto-deploy commands if configured (default: true)
if (process.env.AUTO_DEPLOY !== 'false' && process.env.CLIENT_ID && process.env.DISCORD_TOKEN) {
await Deployer.deployCommands(process.env.CLIENT_ID, process.env.DISCORD_TOKEN, commandData);
}
// Load Events
const eventsPath = join(__dirname, 'events');
const eventFiles = readdirSync(eventsPath).filter(file => file.endsWith('.ts') || file.endsWith('.js'));
@@ -61,9 +66,6 @@ for (const file of eventFiles) {
// Start Twitch Polling
TwitchManager.startPolling(client);
// Start Kick Polling
KickManager.startPolling(client);
// Start Reminder Polling
ReminderManager.startPolling(client);

View File

@@ -15,9 +15,17 @@ const dbPath = join(dataDir, 'database.sqlite');
const db = new Database(dbPath);
export class DB {
private static settingsCache = new Map<string, any>();
private static triggersCache = new Map<string, any[]>();
static init() {
console.log(`[DATABASE] Initializing at ${dbPath}...`);
// Enable WAL mode for better performance
db.pragma('journal_mode = WAL');
// Enable foreign key support
db.pragma('foreign_keys = ON');
// Guild Settings
db.prepare(`
CREATE TABLE IF NOT EXISTS guild_settings (
@@ -28,7 +36,7 @@ export class DB {
welcome_message TEXT,
goodbye_message TEXT,
log_channel TEXT,
log_events TEXT DEFAULT 'messages,roles,nicks,channels,moderation',
log_events TEXT DEFAULT 'messages,roles,nicks,channels,leaves,warns,mutes,kicks,bans',
warn_threshold INTEGER DEFAULT 3,
warn_action TEXT DEFAULT 'ban',
warn_mute_duration INTEGER DEFAULT 1800
@@ -65,7 +73,7 @@ export class DB {
)
`).run();
// Twitch Monitors
// Twitch Monitors (Stream notifications)
db.prepare(`
CREATE TABLE IF NOT EXISTS twitch_monitors (
id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -79,17 +87,15 @@ export class DB {
)
`).run();
// Kick Monitors
// Twitch Monitor Channels (IRC chat logging)
db.prepare(`
CREATE TABLE IF NOT EXISTS kick_monitors (
CREATE TABLE IF NOT EXISTS twitch_monitor_channels (
id INTEGER PRIMARY KEY AUTOINCREMENT,
guild_id TEXT,
channel_name TEXT,
discord_channel_id TEXT,
custom_message TEXT,
last_status TEXT DEFAULT 'offline',
last_stream_id TEXT,
UNIQUE(guild_id, channel_name)
guild_id TEXT NOT NULL,
twitch_channel TEXT NOT NULL,
discord_channel_id TEXT NOT NULL,
webhook_url TEXT,
UNIQUE(guild_id, twitch_channel)
)
`).run();
@@ -117,7 +123,35 @@ export class DB {
)
`).run();
// Migration: Add missing columns to existing guild_settings
// Role Categories
db.prepare(`
CREATE TABLE IF NOT EXISTS role_categories (
id INTEGER PRIMARY KEY AUTOINCREMENT,
guild_id TEXT NOT NULL,
channel_id TEXT NOT NULL,
message_id TEXT NOT NULL,
category_name TEXT NOT NULL,
max_roles INTEGER DEFAULT 0,
exclusive BOOLEAN DEFAULT 0,
remove_on_delete BOOLEAN DEFAULT 0,
UNIQUE(guild_id, category_name)
)
`).run();
// Role Options
db.prepare(`
CREATE TABLE IF NOT EXISTS role_options (
id INTEGER PRIMARY KEY AUTOINCREMENT,
category_id INTEGER NOT NULL,
label TEXT NOT NULL,
emoji TEXT,
role_id TEXT NOT NULL,
UNIQUE(category_id, role_id),
FOREIGN KEY (category_id) REFERENCES role_categories(id) ON DELETE CASCADE
)
`).run();
// Migration logic
const columns = db.prepare("PRAGMA table_info(guild_settings)").all() as any[];
const columnNames = columns.map((c: any) => c.name);
@@ -137,6 +171,51 @@ export class DB {
console.log('[DATABASE] Initialization complete.');
}
/**
* 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);
}
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);
}
return settings;
}
/**
* Optimized getter for auto responses with caching
*/
static getTriggers(guildId: string): any[] {
if (this.triggersCache.has(guildId)) {
return this.triggersCache.get(guildId)!;
}
const triggers = db.prepare('SELECT * FROM auto_responses WHERE guild_id = ?').all(guildId);
this.triggersCache.set(guildId, triggers);
return triggers;
}
/**
* Clear cache for a specific guild or all
*/
static clearCache(guildId?: string) {
if (guildId) {
this.settingsCache.delete(guildId);
this.triggersCache.delete(guildId);
} else {
this.settingsCache.clear();
this.triggersCache.clear();
}
}
static get(query: string, ...params: any[]) {
return db.prepare(query).get(...params);
}
@@ -145,7 +224,34 @@ export class DB {
return db.prepare(query).all(...params);
}
/**
* Executes a function within a database transaction
*/
static transaction<T>(fn: () => T): T {
return db.transaction(fn)();
}
/**
* Extended run method that automatically clears relevant caches on write
*/
static run(query: string, ...params: any[]) {
return db.prepare(query).run(...params);
const result = db.prepare(query).run(...params);
// Simple heuristic to clear cache on updates to settings or triggers
const lowerQuery = query.toLowerCase();
const isSettings = lowerQuery.includes('guild_settings');
const isTriggers = lowerQuery.includes('auto_responses');
if (isSettings || isTriggers) {
// Try to find guild_id in params to be surgical
const guildId = params.find(p => typeof p === 'string' && /^\d{17,20}$/.test(p));
if (guildId) {
this.clearCache(guildId);
} else {
this.clearCache();
}
}
return result;
}
}

View File

@@ -7,6 +7,23 @@ const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
export class Deployer {
static async deployCommands(clientId: string, token: string, commandData: any[]) {
const rest = new REST().setToken(token);
console.log(`[DEPLOYER] Refreshing ${commandData.length} application (/) commands.`);
try {
const data: any = await rest.put(
Routes.applicationCommands(clientId),
{ body: commandData },
);
console.log(`[DEPLOYER] Successfully reloaded ${data.length} application (/) commands.`);
return data.length;
} catch (error) {
console.error('[DEPLOYER] Error deploying commands:', error);
return 0;
}
}
static async deploy(clientId: string, token: string) {
const commands = [];
const rootDir = join(__dirname, '..');
@@ -15,7 +32,7 @@ export class Deployer {
for (const folder of commandFolders) {
const folderPath = join(commandsPath, folder);
const commandFiles = readdirSync(folderPath).filter(file => file.endsWith('.ts'));
const commandFiles = readdirSync(folderPath).filter(file => file.endsWith('.ts') || file.endsWith('.js'));
for (const file of commandFiles) {
const filePath = join(folderPath, file);
@@ -28,17 +45,7 @@ export class Deployer {
}
}
const rest = new REST().setToken(token);
console.log(`[DEPLOYER] Refreshing ${commands.length} application (/) commands.`);
const data: any = await rest.put(
Routes.applicationCommands(clientId),
{ body: commands },
);
console.log(`[DEPLOYER] Successfully reloaded ${data.length} application (/) commands.`);
return data.length;
return this.deployCommands(clientId, token, commands);
}
static async deployIfMissing(clientId: string, token: string) {

View File

@@ -1,8 +1,10 @@
import { Client, Collection, GatewayIntentBits } from 'discord.js';
import { Command } from './Command.js';
import { DB } from './Database.js';
export class ExtendedClient extends Client {
public commands: Collection<string, Command> = new Collection();
public DB = DB;
constructor() {
super({

View File

@@ -1,142 +0,0 @@
import { EmbedBuilder, TextChannel } from 'discord.js';
import { client as KickClient } from '@nekiro/kick-api';
interface KickChannel {
id: number;
user_id: number;
slug: string;
user: { username: string };
category?: { id: number; name: string };
followers_count: number;
}
interface KickLivestream {
broadcaster_user_id: number;
category: { id: number; name: string };
channel_id: number;
slug: string;
started_at: string;
stream_title: string;
thumbnail: string;
viewer_count: number;
session_id?: string;
}
export class KickManager {
private static kickClient: InstanceType<typeof KickClient> | null = null;
private static channelLivestreamMap: Map<string, KickLivestream> = new Map();
private static initClient() {
if (this.kickClient) return this.kickClient;
const clientId = process.env.KICK_CLIENT_ID;
const clientSecret = process.env.KICK_CLIENT_SECRET;
if (!clientId || !clientSecret) {
console.error('[KICK] Missing KICK_CLIENT_ID or KICK_CLIENT_SECRET in .env');
return null;
}
this.kickClient = new KickClient({
clientId,
clientSecret,
});
return this.kickClient;
}
static async fetchChannelData(channelName: string): Promise<{ channel: KickChannel | null; livestream: KickLivestream | null }> {
const client = this.initClient();
if (!client) return { channel: null, livestream: null };
try {
const channels = await client.channels.getChannels({ slug: [channelName] }) as KickChannel[];
const channel = channels?.[0] || null;
if (!channel) return { channel: null, livestream: null };
const livestreams = await client.livestreams.getLivestreams({
broadcaster_user_id: [channel.user_id]
}) as KickLivestream[];
const livestream = livestreams?.[0] || null;
return { channel, livestream };
} catch (error) {
console.error(`[KICK] Error fetching data for ${channelName}:`, error);
return { channel: null, livestream: null };
}
}
static async checkStreams(client: any) {
if (!this.initClient()) return;
const monitors: any[] = (client as any).DB?.all('SELECT * FROM kick_monitors') || [];
if (monitors.length === 0) return;
for (const monitor of monitors) {
try {
const { channel, livestream } = await this.fetchChannelData(monitor.channel_name);
if (channel && livestream) {
const streamId = livestream.session_id?.toString() || livestream.broadcaster_user_id.toString();
const isNewStream = monitor.last_stream_id !== streamId;
const wasOffline = monitor.last_status === 'offline';
if (wasOffline || (monitor.last_status === 'online' && isNewStream)) {
await this.sendNotification(client, monitor, channel, livestream);
(client as any).DB?.run(
"UPDATE kick_monitors SET last_status = 'online', last_stream_id = ? WHERE id = ?",
streamId,
monitor.id
);
}
} else {
if (monitor.last_status === 'online') {
(client as any).DB?.run("UPDATE kick_monitors SET last_status = 'offline', last_stream_id = NULL WHERE id = ?", monitor.id);
}
}
} catch (error) {
console.error(`[KICK] Error checking stream ${monitor.channel_name}:`, error);
}
}
}
private static async sendNotification(client: any, monitor: any, channel: KickChannel, livestream: KickLivestream) {
const guild = client.guilds.cache.get(monitor.guild_id);
if (!guild || !monitor.discord_channel_id) return;
const discordChannel = guild.channels.cache.get(monitor.discord_channel_id) as TextChannel;
if (!discordChannel) return;
const thumbnailUrl = livestream.thumbnail || `https://kick.com/img/channel-thumbnails/${channel.id}?t=${Date.now()}`;
const embed = new EmbedBuilder()
.setTitle(`${channel.user.username} ist jetzt LIVE auf Kick!`)
.setURL(`https://kick.com/${channel.slug}`)
.setColor(0x53fc18)
.setImage(thumbnailUrl)
.addFields(
{ name: 'Titel', value: livestream.stream_title || 'Kein Titel', inline: false },
{ name: 'Kategorie', value: livestream.category?.name || 'Unbekannt', inline: true },
{ name: 'Zuschauer', value: livestream.viewer_count.toString(), inline: true }
)
.setTimestamp();
let content = `📢 **${channel.user.username}** ist jetzt auf Kick online!`;
if (monitor.custom_message) {
content += `\n\n${monitor.custom_message}`;
}
await discordChannel.send({ content, embeds: [embed] });
}
static startPolling(client: any) {
if (!process.env.KICK_CLIENT_ID || !process.env.KICK_CLIENT_SECRET) {
console.log('[KICK] Skipping polling - missing credentials.');
return;
}
setInterval(() => this.checkStreams(client), 5 * 60 * 1000);
console.log('[KICK] Polling started (5m interval).');
}
}

View File

@@ -1,11 +1,12 @@
import { TextChannel, EmbedBuilder } from 'discord.js';
import { ExtendedClient } from './ExtendedClient.js';
export class ReminderManager {
static async checkReminders(client: any) {
static async checkReminders(client: ExtendedClient) {
const now = new Date().toISOString();
// Get all due reminders
const dueReminders: any[] = (client as any).DB?.all(
const dueReminders: any[] = client.DB?.all(
'SELECT * FROM reminders WHERE target_time <= ?',
now
) || [];
@@ -17,14 +18,14 @@ export class ReminderManager {
const guild = client.guilds.cache.get(reminder.guild_id);
if (!guild) {
// Remove reminder if guild doesn't exist
(client as any).DB?.run('DELETE FROM reminders WHERE id = ?', reminder.id);
client.DB?.run('DELETE FROM reminders WHERE id = ?', reminder.id);
continue;
}
const channel = guild.channels.cache.get(reminder.channel_id) as TextChannel;
if (!channel || !channel.isTextBased()) {
// Remove reminder if channel doesn't exist or is not text-based
(client as any).DB?.run('DELETE FROM reminders WHERE id = ?', reminder.id);
client.DB?.run('DELETE FROM reminders WHERE id = ?', reminder.id);
continue;
}
@@ -45,7 +46,7 @@ export class ReminderManager {
await channel.send({ content: `${userMention} deine Erinnerung:`, embeds: [embed] });
// Delete the reminder after sending
(client as any).DB?.run('DELETE FROM reminders WHERE id = ?', reminder.id);
client.DB?.run('DELETE FROM reminders WHERE id = ?', reminder.id);
console.log(`[REMINDER] Sent reminder ID ${reminder.id} in ${guild.name}`);
} catch (error) {
@@ -54,7 +55,7 @@ export class ReminderManager {
}
}
static startPolling(client: any) {
static startPolling(client: ExtendedClient) {
// Check every 30 seconds
setInterval(() => this.checkReminders(client), 30 * 1000);
console.log('[REMINDER] Polling started (30s interval).');

View File

@@ -0,0 +1,41 @@
export interface ChatMessage {
channel: string;
user: string;
text: string;
timestamp: number;
msgId: string;
}
export class TwitchCache {
private buffer: ChatMessage[] = [];
private maxSize: number;
constructor(maxSize: number = 1000) {
this.maxSize = maxSize;
}
push(msg: ChatMessage): void {
if (this.buffer.length >= this.maxSize) {
this.buffer.shift();
}
this.buffer.push(msg);
}
getLastN(user: string, channel: string, n: number): ChatMessage[] {
return this.buffer
.filter(m => m.user.toLowerCase() === user.toLowerCase() && m.channel === channel)
.slice(-n);
}
getByMsgId(msgId: string): ChatMessage | undefined {
return this.buffer.find(m => m.msgId === msgId);
}
clear(): void {
this.buffer = [];
}
get size(): number {
return this.buffer.length;
}
}

View File

@@ -1,4 +1,5 @@
import { EmbedBuilder, TextChannel } from 'discord.js';
import { ExtendedClient } from './ExtendedClient.js';
export class TwitchManager {
private static accessToken: string | null = null;
@@ -29,92 +30,133 @@ export class TwitchManager {
}
}
static async fetchStreamData(channelName: string) {
/**
* Fetches stream data for multiple channels in a single batch (max 100).
*/
private static async fetchStreamsBatch(channelNames: string[]) {
const token = await this.getAccessToken();
if (!token) return null;
if (!token || channelNames.length === 0) return [];
// Twitch API allows up to 100 user_login parameters
const query = channelNames.map(name => `user_login=${encodeURIComponent(name)}`).join('&');
try {
const response = await fetch(`https://api.twitch.tv/helix/streams?user_login=${channelName}`, {
const response = await fetch(`https://api.twitch.tv/helix/streams?${query}`, {
headers: {
'Client-ID': process.env.TWITCH_CLIENT_ID!,
'Authorization': `Bearer ${token}`
}
});
const data: any = await response.json();
return data.data?.[0] || null;
return data.data || [];
} catch (error) {
console.error(`[TWITCH] Error fetching stream data for ${channelName}:`, error);
return null;
console.error(`[TWITCH] Error fetching batch (${channelNames.length} channels):`, error);
return [];
}
}
static async checkStreams(client: any) {
const token = await this.getAccessToken();
if (!token) return;
/**
* Legacy helper for single channel fetch (e.g. for commands)
*/
static async fetchStreamData(channelName: string) {
const streams = await this.fetchStreamsBatch([channelName]);
return streams[0] || null;
}
const monitors: any[] = (client as any).DB?.all('SELECT * FROM twitch_monitors') || [];
static async checkStreams(client: ExtendedClient) {
const monitors: any[] = client.DB?.all('SELECT * FROM twitch_monitors') || [];
if (monitors.length === 0) return;
const uniqueChannels = [...new Set(monitors.map(m => m.channel_name.toLowerCase()))];
const onlineStreamsMap = new Map<string, any>();
// Process in chunks of 100 (Twitch API limit)
for (let i = 0; i < uniqueChannels.length; i += 100) {
const chunk = uniqueChannels.slice(i, i + 100);
const streams = await this.fetchStreamsBatch(chunk);
for (const stream of streams) {
onlineStreamsMap.set(stream.user_login.toLowerCase(), stream);
}
}
const updates: { id: number, status: 'online' | 'offline', streamId?: string }[] = [];
for (const monitor of monitors) {
try {
const stream = await this.fetchStreamData(monitor.channel_name);
const stream = onlineStreamsMap.get(monitor.channel_name.toLowerCase());
if (stream) {
const isNewStream = monitor.last_stream_id !== stream.id;
const wasOffline = monitor.last_status === 'offline';
if (stream) {
const isNewStream = monitor.last_stream_id !== stream.id;
const wasOffline = monitor.last_status === 'offline';
if (wasOffline || (monitor.last_status === 'online' && isNewStream)) {
await this.sendNotification(client, monitor, stream);
(client as any).DB?.run(
if (wasOffline || (monitor.last_status === 'online' && isNewStream)) {
await this.sendNotification(client, monitor, stream);
updates.push({ id: monitor.id, status: 'online', streamId: stream.id });
}
} else {
if (monitor.last_status === 'online') {
updates.push({ id: monitor.id, status: 'offline' });
}
}
}
if (updates.length > 0) {
client.DB?.transaction(() => {
for (const update of updates) {
if (update.status === 'online') {
client.DB?.run(
"UPDATE twitch_monitors SET last_status = 'online', last_stream_id = ? WHERE id = ?",
stream.id,
monitor.id
update.streamId,
update.id
);
} else {
client.DB?.run(
"UPDATE twitch_monitors SET last_status = 'offline', last_stream_id = NULL WHERE id = ?",
update.id
);
}
} else {
if (monitor.last_status === 'online') {
(client as any).DB?.run("UPDATE twitch_monitors SET last_status = 'offline', last_stream_id = NULL WHERE id = ?", monitor.id);
}
}
} catch (error) {
console.error(`[TWITCH] Error checking stream ${monitor.channel_name}:`, error);
}
});
}
}
private static async sendNotification(client: any, monitor: any, stream: any) {
const guild = client.guilds.cache.get(monitor.guild_id);
if (!guild || !monitor.discord_channel_id) return;
private static async sendNotification(client: ExtendedClient, monitor: any, stream: any) {
try {
const guild = client.guilds.cache.get(monitor.guild_id);
if (!guild || !monitor.discord_channel_id) return;
const channel = guild.channels.cache.get(monitor.discord_channel_id) as TextChannel;
if (!channel) return;
const channel = guild.channels.cache.get(monitor.discord_channel_id) as TextChannel;
if (!channel) return;
const thumbnailUrl = stream.thumbnail_url
.replace('{width}', '1280')
.replace('{height}', '720') + `?t=${Date.now()}`;
const thumbnailUrl = stream.thumbnail_url
.replace('{width}', '1280')
.replace('{height}', '720') + `?t=${Date.now()}`;
const embed = new EmbedBuilder()
.setTitle(`${stream.user_name} ist jetzt LIVE auf Twitch!`)
.setURL(`https://twitch.tv/${stream.user_login}`)
.setColor(0x6441a5)
.setImage(thumbnailUrl)
.addFields(
{ name: 'Titel', value: stream.title || 'Kein Titel', inline: false },
{ name: 'Kategorie', value: stream.game_name || 'Unbekannt', inline: true },
{ name: 'Zuschauer', value: stream.viewer_count.toString(), inline: true }
)
.setTimestamp();
const embed = new EmbedBuilder()
.setTitle(`${stream.user_name} ist jetzt LIVE auf Twitch!`)
.setURL(`https://twitch.tv/${stream.user_login}`)
.setColor(0x6441a5)
.setImage(thumbnailUrl)
.addFields(
{ name: 'Titel', value: stream.title || 'Kein Titel', inline: false },
{ name: 'Kategorie', value: stream.game_name || 'Unbekannt', inline: true },
{ name: 'Zuschauer', value: stream.viewer_count.toString(), inline: true }
)
.setTimestamp();
let content = `📢 **${stream.user_name}** ist online!`;
if (monitor.custom_message) {
content += `\n\n${monitor.custom_message}`;
let content = `📢 **${stream.user_name}** ist online!`;
if (monitor.custom_message) {
content += `\n\n${monitor.custom_message}`;
}
await channel.send({ content, embeds: [embed] });
} catch (error) {
console.error(`[TWITCH] Failed to send notification for ${monitor.channel_name}:`, error);
}
await channel.send({ content, embeds: [embed] });
}
static startPolling(client: any) {
setInterval(() => this.checkStreams(client), 5 * 60 * 1000);
console.log('[TWITCH] Polling started (5m interval).');
// Polling every 2 minutes for faster notifications
setInterval(() => this.checkStreams(client), 2 * 60 * 1000);
console.log('[TWITCH] Batch-Polling started (2m interval).');
}
}

View File

@@ -0,0 +1,315 @@
import tmi, { Client, ChatUserstate, DeleteUserstate, SubMethods, SubUserstate } from 'tmi.js';
import { EmbedBuilder, WebhookClient } from 'discord.js';
import { TwitchCache, ChatMessage } from './TwitchCache.js';
const MOD_ICON = 'https://static-cdn.jtvnw.net/jtv_user_pictures/a736384e-8a1d-40ed-8a7a-808a23a15476-profile_image-300x300.png';
const TOKEN_CHECK_INTERVAL = 5 * 60 * 1000;
const TOKEN_CHECK_MAX_FAILURES = 3;
const TOKEN_CHECK_RETRY_DELAY = 30 * 1000;
interface MonitorChannel {
guildId: string;
twitchChannel: string;
discordChannelId: string;
webhookUrl: string;
}
export class TwitchMonitor {
private static instance: TwitchMonitor | null = null;
private client: Client | null = null;
private cache: TwitchCache;
private monitors: Map<string, MonitorChannel> = new Map();
private webhookClients: Map<string, WebhookClient> = new Map();
private tokenFailureCount = 0;
private tokenCheckInterval: NodeJS.Timeout | null = null;
private isTokenInvalid = false;
private constructor() {
this.cache = new TwitchCache(1000);
}
static getInstance(): TwitchMonitor {
if (!TwitchMonitor.instance) {
TwitchMonitor.instance = new TwitchMonitor();
}
return TwitchMonitor.instance;
}
private getOAuthToken(): string {
const token = process.env.TWITCH_OAUTH_TOKEN || '';
return token.startsWith('oauth:') ? token : 'oauth:' + token;
}
private async notifyOwner(message: string): Promise<void> {
const ownerId = process.env.BOT_OWNER_ID;
if (!ownerId) return;
try {
const { Client: DiscordClient } = await import('discord.js');
const client = TwitchMonitor.getInstance();
const discordClient = (client as any).discordClient;
if (!discordClient) return;
const owner = await discordClient.users.fetch(ownerId).catch(() => null);
if (owner) {
await owner.send(`⚠️ **TwitchMonitor Warning**\n${message}`);
}
} catch (error) {
console.error('[TWITCH] Failed to notify owner:', error);
}
}
private startTokenValidation(): void {
this.tokenCheckInterval = setInterval(async () => {
if (this.isTokenInvalid) return;
const isConnected = this.client?.readyState() === 'OPEN';
if (!isConnected) {
this.tokenFailureCount++;
console.warn(`[TWITCH] Connection check failed (${this.tokenFailureCount}/${TOKEN_CHECK_MAX_FAILURES})`);
if (this.tokenFailureCount >= TOKEN_CHECK_MAX_FAILURES) {
this.isTokenInvalid = true;
console.error('[TWITCH] Token validation failed - stopping monitoring');
this.notifyOwner('TwitchMonitor Token ungültig. Bitte neuen Token holen: https://chatterino.com/client_login');
this.stopTokenValidation();
this.disconnect();
} else {
await new Promise(resolve => setTimeout(resolve, TOKEN_CHECK_RETRY_DELAY));
}
} else {
this.tokenFailureCount = 0;
}
}, TOKEN_CHECK_INTERVAL);
}
private stopTokenValidation(): void {
if (this.tokenCheckInterval) {
clearInterval(this.tokenCheckInterval);
this.tokenCheckInterval = null;
}
}
async connect(): Promise<void> {
if (this.client) return;
const channels = Array.from(this.monitors.values()).map(m => m.twitchChannel);
this.client = new Client({
options: {
debug: false,
},
identity: {
username: process.env.TWITCH_USERNAME,
password: this.getOAuthToken(),
},
channels: channels,
});
this.client.on('message', (channel: string, userstate: ChatUserstate, text: string, self: boolean) => {
if (self) return;
this.cache.push({
channel,
user: userstate['display-name'] || userstate.username || 'unknown',
text,
timestamp: Date.now(),
msgId: userstate.id || '',
});
});
this.client.on('messagedeleted', (channel: string, username: string, deletedMessage: string, userstate: DeleteUserstate) => {
const msgId = userstate['target-msg-id'] || '';
const cached = this.cache.getByMsgId(msgId);
const result = this.findMonitor(channel);
if (!result) return;
this.sendWebhook(result.monitor.webhookUrl, {
title: '🗑️ Nachricht gelöscht',
description: `**${username}** hat eine Nachricht gelöscht.\n\n${cached ? `~~${cached.text}~~` : `(Nachricht nicht im Cache)`}`,
color: 0xff0000,
}, result.key);
});
this.client.on('ban', (channel: string, username: string, reason: string) => {
const result = this.findMonitor(channel);
if (!result) return;
const lastMessages = this.cache.getLastN(username, channel, 5);
const context = lastMessages.length > 0
? `\n\n**Letzte Nachrichten:**\n${lastMessages.map(m => `${m.text}`).join('\n')}`
: '';
this.sendWebhook(result.monitor.webhookUrl, {
title: '🔨 User gebannt',
description: `**${username}** wurde gebannt.\n${reason ? `Grund: *${reason}*` : ''}${context}`,
color: 0x8b0000,
}, result.key);
});
this.client.on('timeout', (channel: string, username: string, reason: string) => {
const result = this.findMonitor(channel);
if (!result) return;
this.sendWebhook(result.monitor.webhookUrl, {
title: '⏱️ User getimeouted',
description: `**${username}** wurde getimeouted.\n${reason ? `Grund: *${reason}*` : ''}`,
color: 0xffa500,
}, result.key);
});
this.client.on('clearchat', (channel: string) => {
const result = this.findMonitor(channel);
if (!result) return;
this.sendWebhook(result.monitor.webhookUrl, {
title: '🧹 Chat geleert',
description: `Der Chat in **${channel}** wurde geleert.`,
color: 0xffa500,
}, result.key);
});
this.client.on('cheer', (channel: string, userstate: ChatUserstate, message: string) => {
const result = this.findMonitor(channel);
if (!result) return;
const amount = userstate.bits || 0;
this.sendWebhook(result.monitor.webhookUrl, {
title: '💰 Bit-Cheer',
description: `**${userstate['display-name'] || userstate.username}** hat ${amount} Bits gespendet!\n${message || ''}`,
color: 0x9b59b6,
}, result.key);
});
this.client.on('subscription', (channel: string, username: string, methods: SubMethods, message: string, userstate: SubUserstate) => {
const result = this.findMonitor(channel);
if (!result) return;
this.sendWebhook(result.monitor.webhookUrl, {
title: '🅿️ Subscription',
description: `**${username}** hat subscribed!${methods?.prime ? ' (Prime)' : ''}${message ? `\nNachricht: ${message}` : ''}`,
color: 0x9146ff,
}, result.key);
});
this.client.on('resub', (channel: string, username: string, months: number, message: string, userstate: SubUserstate, methods: SubMethods) => {
const result = this.findMonitor(channel);
if (!result) return;
this.sendWebhook(result.monitor.webhookUrl, {
title: '🅿️ Resubscription',
description: `**${username}** resubbed für ${months} Monate!${methods?.prime ? ' (Prime)' : ''}\n${message || ''}`,
color: 0x9146ff,
}, result.key);
});
this.client.on('disconnected', async () => {
console.warn('[TWITCH] Disconnected from IRC');
if (!this.isTokenInvalid) {
this.tokenFailureCount++;
}
});
this.client.on('reconnect', () => {
console.log('[TWITCH] Attempting to reconnect...');
});
try {
await this.client.connect();
console.log('[TWITCH] Monitor connected to IRC');
this.tokenFailureCount = 0;
this.startTokenValidation();
} catch (error) {
console.error('[TWITCH] Failed to connect:', error);
this.isTokenInvalid = true;
this.notifyOwner('TwitchMonitor: Verbindung fehlgeschlagen. Token prüfen.');
}
}
setDiscordClient(discordClient: any): void {
(this as any).discordClient = discordClient;
}
private findMonitor(channel: string): { monitor: MonitorChannel; key: string } | undefined {
const normalizedChannel = channel.startsWith('#') ? channel : `#${channel}`;
const entry = Array.from(this.monitors.entries()).find(
([_, m]) => m.twitchChannel.toLowerCase() === normalizedChannel.toLowerCase() ||
m.twitchChannel.toLowerCase() === channel.toLowerCase()
);
return entry ? { key: entry[0], monitor: entry[1] } : undefined;
}
async addMonitor(guildId: string, twitchChannel: string, discordChannelId: string, webhookUrl: string): Promise<void> {
const normalizedChannel = twitchChannel.startsWith('#') ? twitchChannel : `#${twitchChannel}`;
const key = `${guildId}:${normalizedChannel}`;
this.monitors.set(key, {
guildId,
twitchChannel: normalizedChannel,
discordChannelId,
webhookUrl,
});
this.webhookClients.set(key, new WebhookClient({ url: webhookUrl }));
if (this.client) {
await this.client.join(normalizedChannel);
}
}
async removeMonitor(guildId: string, twitchChannel: string): Promise<void> {
const normalizedChannel = twitchChannel.startsWith('#') ? twitchChannel : `#${twitchChannel}`;
const key = `${guildId}:${normalizedChannel}`;
const monitor = this.monitors.get(key);
if (monitor && this.client) {
await this.client.part(normalizedChannel);
}
this.monitors.delete(key);
this.webhookClients.delete(key);
}
getMonitors(guildId?: string): MonitorChannel[] {
if (guildId) {
return Array.from(this.monitors.values()).filter(m => m.guildId === guildId);
}
return Array.from(this.monitors.values());
}
private async sendWebhook(webhookUrl: string, data: { title: string; description: string; color: number }, monitorKey?: string): Promise<void> {
try {
let webhook: WebhookClient;
if (monitorKey && this.webhookClients.has(monitorKey)) {
webhook = this.webhookClients.get(monitorKey)!;
} else {
webhook = new WebhookClient({ url: webhookUrl });
}
const embed = new EmbedBuilder()
.setTitle(data.title)
.setDescription(data.description)
.setColor(data.color)
.setThumbnail(MOD_ICON)
.setTimestamp();
await webhook.send({ embeds: [embed] });
} catch (error) {
console.error(`[TWITCH] Webhook send error${monitorKey ? ` for ${monitorKey}` : ''}:`, error);
}
}
disconnect(): void {
this.stopTokenValidation();
if (this.client) {
this.client.disconnect();
this.client = null;
}
this.monitors.clear();
this.webhookClients.clear();
this.tokenFailureCount = 0;
this.isTokenInvalid = false;
}
}