chad/ECS-FullStack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: chad:8236c1e0e7885217c99744575a3ac961d80fba5b
Branches Tags
chad:main chad:dev chad:dev1
..
compare: chad:main
Branches Tags
chad:main chad:dev chad:dev1

1 Commits
8236c1e0e7 ... main

Author SHA1 Message Date
Dev EhChad
70979cdd27 Laptop push 2025-10-21 08:11:58 -04:00
13 changed files with 169 additions and 460 deletions
Expand all files Collapse all files

33
backend/index.js
View File

@@ -1049,36 +1049,7 @@ app.get('/api/servers/:guildId/invites', async (req, res) => {
app.post('/api/servers/:guildId/invites', async (req, res) => { app.post('/api/servers/:guildId/invites', async (req, res) => {
try { try {
const { guildId } = req.params; const { guildId } = req.params;
const { code, url, channelId, maxAge, maxUses, temporary, createdAt } = req.body || {}; const { channelId, maxAge, maxUses, temporary } = req.body || {};
// If code is provided, this is an existing invite to store (from Discord events)
if (code) {
const item = {
code,
url: url || `https://discord.gg/${code}`,
channelId: channelId || '',
createdAt: createdAt || new Date().toISOString(),
maxUses: maxUses || 0,
maxAge: maxAge || 0,
temporary: !!temporary,
};
await pgClient.addInvite({
code: item.code,
guildId,
url: item.url,
channelId: item.channelId,
createdAt: item.createdAt,
maxUses: item.maxUses,
maxAge: item.maxAge,
temporary: item.temporary
});
res.json({ success: true, invite: item });
return;
}
// Otherwise, create a new invite
const guild = bot.client.guilds.cache.get(guildId); const guild = bot.client.guilds.cache.get(guildId);
if (!guild) return res.status(404).json({ success: false, message: 'Guild not found' }); if (!guild) return res.status(404).json({ success: false, message: 'Guild not found' });
@@ -1118,7 +1089,7 @@ app.post('/api/servers/:guildId/invites', async (req, res) => {
res.json({ success: true, invite: item }); res.json({ success: true, invite: item });
} catch (error) { } catch (error) {
console.error('Error creating/storing invite:', error); console.error('Error creating invite:', error);
res.status(500).json({ success: false, message: 'Internal Server Error' }); res.status(500).json({ success: false, message: 'Internal Server Error' });
} }
}); });

18
checklist.md
View File

@@ -1,4 +1,4 @@
# Project Checklist (tidy & current) # Project Checklist (tidy & current)
Below are implemented features - [x] Front - [x] Live updates between bot and frontend using SSE events for real-time log synchronization (admin logs update immediately when moderation actions occur)nd UI for admin logs configuration in Server Settings Below are implemented features - [x] Front - [x] Live updates between bot and frontend using SSE events for real-time log synchronization (admin logs update immediately when moderation actions occur)nd UI for admin logs configuration in Server Settings
- [x] Database schema for storing moderation action logs - [x] Database schema for storing moderation action logs
@@ -51,12 +51,6 @@
- [x] Live Notifications: bot posts rich embed to channel when a watched Twitch user goes live (thumbnail, clickable title, bio/description, category/game, viewers, footer with "ehchadservices" and start datetime) - [x] Live Notifications: bot posts rich embed to channel when a watched Twitch user goes live (thumbnail, clickable title, bio/description, category/game, viewers, footer with "ehchadservices" and start datetime)
- [x] Live Notifications polling frequency set to 5 seconds (configurable via `TWITCH_POLL_INTERVAL_MS`) - [x] Live Notifications polling frequency set to 5 seconds (configurable via `TWITCH_POLL_INTERVAL_MS`)
- [x] On bot restart, sends messages for currently live watched users; then sends for new streams once per session - [x] On bot restart, sends messages for currently live watched users; then sends for new streams once per session
- [x] Twitch Watcher Debug Logging: comprehensive debug mode added (enable with `TWITCH_WATCHER_DEBUG=true`) to track guild checks, settings retrieval, stream fetching, channel permissions, and message sending for troubleshooting live notification issues
- [x] Twitch API Functions Export Fix: added missing `tryFetchTwitchStreams` and `_rawGetTwitchStreams` to api.js module exports to resolve "is not a function" errors
- [x] Twitch Streams Array Safety: added `Array.isArray()` checks in twitch-watcher.js to prevent "filter is not a function" errors when API returns unexpected data types
- [x] Twitch Commands Postgres Integration: updated all Discord bot Twitch commands (`/add-twitchuser`, `/remove-twitchuser`) to use api.js functions for consistent Postgres backend communication
- [x] Twitch Message Template Variables: added support for `{user}`, `{title}`, `{category}`, and `{viewers}` template variables in custom live notification messages for dynamic content insertion
- [x] Frontend JSX Syntax Fix: fixed React Fragment wrapping for admin logs map to resolve build compilation errors
- [x] Frontend: show "Watch Live" button next to watched user when they are live (links to Twitch) - [x] Frontend: show "Watch Live" button next to watched user when they are live (links to Twitch)
- [x] Bi-directional sync: backend POST/DELETE for twitch-users now also pushes new settings to bot process (when `BOT_PUSH_URL` configured) - [x] Bi-directional sync: backend POST/DELETE for twitch-users now also pushes new settings to bot process (when `BOT_PUSH_URL` configured)
- [x] Bot adds/removes users via backend endpoints ensuring single source of truth (Postgres) - [x] Bot adds/removes users via backend endpoints ensuring single source of truth (Postgres)
@@ -92,16 +86,7 @@
- [x] Frontend delete buttons for individual logs and delete all logs with confirm dialogs - [x] Frontend delete buttons for individual logs and delete all logs with confirm dialogs
- [x] Live updates between bot and frontend using SSE events for real-time log synchronization - [x] Live updates between bot and frontend using SSE events for real-time log synchronization
- [x] Admin logs properly display the username who called the command and the user they called it on for both bot slash commands and frontend moderation actions - [x] Admin logs properly display the username who called the command and the user they called it on for both bot slash commands and frontend moderation actions
- [x] Bot command username logging fixed: uses correct Discord user properties (username/global_name instead of deprecated tag)
- [x] Bot event handlers: added guildCreate and guildDelete events to publish SSE notifications for live dashboard updates - [x] Bot event handlers: added guildCreate and guildDelete events to publish SSE notifications for live dashboard updates
- [x] Invite synchronization: real-time sync between Discord server events and frontend
- [x] Discord event handlers for inviteCreate and inviteDelete events
- [x] Only bot-created invites are tracked and synchronized
- [x] Frontend SSE event listeners for inviteCreated and inviteDeleted events
- [x] Backend API updated to store existing invites from Discord events
- [x] Invite deletions from Discord server are immediately reflected in frontend
- [x] Offline reconciliation: bot detects and removes invites deleted while offline on startup
- [x] Automatic cleanup of stale invites from database and frontend when bot comes back online
## Database ## Database
- [x] Postgres support via `DATABASE_URL` (backend auto-creates `servers`, `invites`, `users`) - [x] Postgres support via `DATABASE_URL` (backend auto-creates `servers`, `invites`, `users`)
@@ -170,3 +155,4 @@
- [x] Fixed ESLint warnings: removed unused imports and handlers, added proper dependency management - [x] Fixed ESLint warnings: removed unused imports and handlers, added proper dependency management
- [x] Fixed compilation errors: added missing MUI imports and Snackbar component - [x] Fixed compilation errors: added missing MUI imports and Snackbar component
- [x] Navbar visibility: enhanced with solid background and stronger border for better visibility across all themes - [x] Navbar visibility: enhanced with solid background and stronger border for better visibility across all themes

58
discord-bot/api.js
View File

@@ -90,24 +90,10 @@ async function listInvites(guildId) {
async function addInvite(guildId, invite) { async function addInvite(guildId, invite) {
const path = `/api/servers/${guildId}/invites`; const path = `/api/servers/${guildId}/invites`;
try { try {
// If invite is an object with code property, it's already created - send full data
// If it's just channelId/maxAge/etc, it's for creation
const isExistingInvite = invite && typeof invite === 'object' && invite.code;
const body = isExistingInvite ? {
code: invite.code,
url: invite.url,
channelId: invite.channelId,
maxUses: invite.maxUses,
maxAge: invite.maxAge,
temporary: invite.temporary,
createdAt: invite.createdAt
} : invite;
const res = await tryFetch(path, { const res = await tryFetch(path, {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(body), body: JSON.stringify(invite),
}); });
return res && res.ok; return res && res.ok;
} catch (e) { } catch (e) {
@@ -222,44 +208,4 @@ async function getAutoroleSettings(guildId) {
return json || { enabled: false, roleId: '' }; return json || { enabled: false, roleId: '' };
} }
async function reconcileInvites(guildId, currentDiscordInvites) { module.exports = { getServerSettings, upsertServerSettings, getCommands, toggleCommand, listInvites, addInvite, deleteInvite, getTwitchUsers, addTwitchUser, deleteTwitchUser, getKickUsers, addKickUser, deleteKickUser, getWelcomeLeaveSettings, getAutoroleSettings };
try {
// Get invites from database
const dbInvites = await listInvites(guildId) || [];
// Find invites in database that no longer exist in Discord
const discordInviteCodes = new Set(currentDiscordInvites.map(inv => inv.code));
const deletedInvites = dbInvites.filter(dbInv => !discordInviteCodes.has(dbInv.code));
// Delete each invite that no longer exists
for (const invite of deletedInvites) {
console.log(`🗑️ Reconciling deleted invite ${invite.code} for guild ${guildId}`);
await deleteInvite(guildId, invite.code);
// Publish SSE event for frontend update
try {
await tryFetch('/api/events/publish', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
event: 'inviteDeleted',
data: { code: invite.code, guildId }
})
});
} catch (sseErr) {
console.error('Failed to publish SSE event for reconciled invite deletion:', sseErr);
}
}
if (deletedInvites.length > 0) {
console.log(`✅ Reconciled ${deletedInvites.length} deleted invites for guild ${guildId}`);
}
return deletedInvites.length;
} catch (e) {
console.error(`Failed to reconcile invites for guild ${guildId}:`, e && e.message ? e.message : e);
return 0;
}
}
module.exports = { getServerSettings, upsertServerSettings, getCommands, toggleCommand, listInvites, addInvite, deleteInvite, getTwitchUsers, addTwitchUser, deleteTwitchUser, tryFetchTwitchStreams, _rawGetTwitchStreams, getKickUsers, addKickUser, deleteKickUser, getWelcomeLeaveSettings, getAutoroleSettings, reconcileInvites };

18
discord-bot/commands/add-twitchuser.js
View File

@@ -1,5 +1,5 @@
const { SlashCommandBuilder, PermissionsBitField } = require('discord.js'); const { SlashCommandBuilder, PermissionsBitField } = require('discord.js');
const api = require('../api'); const fetch = require('node-fetch');
module.exports = { module.exports = {
name: 'add-twitchuser', name: 'add-twitchuser',
@@ -16,14 +16,20 @@ module.exports = {
} }
const username = interaction.options.getString('username').toLowerCase().trim(); const username = interaction.options.getString('username').toLowerCase().trim();
try { try {
const success = await api.addTwitchUser(interaction.guildId, username); const backendBase = process.env.BACKEND_BASE || `http://${process.env.HOST || '127.0.0.1'}:${process.env.PORT || 3002}`;
if (success) { const resp = await fetch(`${backendBase}/api/servers/${interaction.guildId}/twitch-users`, {
method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ username })
});
if (resp.ok) {
await interaction.reply({ content: `Added ${username} to watch list.`, flags: 64 }); await interaction.reply({ content: `Added ${username} to watch list.`, flags: 64 });
// Refresh cached settings from backend so watcher sees new user immediately // Refresh cached settings from backend so watcher sees new user immediately
try { try {
const settings = await api.getServerSettings(interaction.guildId); const settingsResp = await fetch(`${backendBase}/api/servers/${interaction.guildId}/settings`);
const bot = require('..'); if (settingsResp.ok) {
if (bot && bot.setGuildSettings) bot.setGuildSettings(interaction.guildId, settings); const json = await settingsResp.json();
const bot = require('..');
if (bot && bot.setGuildSettings) bot.setGuildSettings(interaction.guildId, json);
}
} catch (_) {} } catch (_) {}
} else { } else {
await interaction.reply({ content: 'Failed to add user via backend.', flags: 64 }); await interaction.reply({ content: 'Failed to add user via backend.', flags: 64 });

16
discord-bot/commands/remove-twitchuser.js
View File

@@ -1,5 +1,5 @@
const { SlashCommandBuilder, PermissionsBitField } = require('discord.js'); const { SlashCommandBuilder, PermissionsBitField } = require('discord.js');
const api = require('../api'); const fetch = require('node-fetch');
module.exports = { module.exports = {
name: 'remove-twitchuser', name: 'remove-twitchuser',
@@ -16,14 +16,18 @@ module.exports = {
} }
const username = interaction.options.getString('username').toLowerCase().trim(); const username = interaction.options.getString('username').toLowerCase().trim();
try { try {
const success = await api.deleteTwitchUser(interaction.guildId, username); const backendBase = process.env.BACKEND_BASE || `http://${process.env.HOST || '127.0.0.1'}:${process.env.PORT || 3002}`;
if (success) { const resp = await fetch(`${backendBase}/api/servers/${interaction.guildId}/twitch-users/${encodeURIComponent(username)}`, { method: 'DELETE' });
if (resp.ok) {
await interaction.reply({ content: `Removed ${username} from watch list.`, flags: 64 }); await interaction.reply({ content: `Removed ${username} from watch list.`, flags: 64 });
// Refresh cached settings from backend // Refresh cached settings from backend
try { try {
const settings = await api.getServerSettings(interaction.guildId); const settingsResp = await fetch(`${backendBase}/api/servers/${interaction.guildId}/settings`);
const bot = require('..'); if (settingsResp.ok) {
if (bot && bot.setGuildSettings) bot.setGuildSettings(interaction.guildId, settings); const json = await settingsResp.json();
const bot = require('..');
if (bot && bot.setGuildSettings) bot.setGuildSettings(interaction.guildId, json);
}
} catch (_) {} } catch (_) {}
} else { } else {
await interaction.reply({ content: 'Failed to remove user via backend.', flags: 64 }); await interaction.reply({ content: 'Failed to remove user via backend.', flags: 64 });

49
discord-bot/events/inviteCreate.js
View File

@@ -1,49 +0,0 @@
const api = require('../api');
module.exports = {
name: 'inviteCreate',
async execute(invite) {
try {
// Only track invites created by the bot or in channels the bot can access
const guildId = invite.guild.id;
// Check if this invite was created by our bot
const isBotCreated = invite.inviter && invite.inviter.id === invite.client.user.id;
if (isBotCreated) {
// Add to database if created by bot
const inviteData = {
code: invite.code,
guildId: guildId,
url: invite.url,
channelId: invite.channel.id,
createdAt: invite.createdAt ? invite.createdAt.toISOString() : new Date().toISOString(),
maxUses: invite.maxUses || 0,
maxAge: invite.maxAge || 0,
temporary: invite.temporary || false
};
// Use the API to add the invite to database
await api.addInvite(inviteData);
// Publish SSE event for real-time frontend updates
const bot = require('..');
if (bot && bot.publishEvent) {
bot.publishEvent(guildId, 'inviteCreated', {
code: invite.code,
url: invite.url,
channelId: invite.channel.id,
maxUses: invite.maxUses || 0,
maxAge: invite.maxAge || 0,
temporary: invite.temporary || false,
createdAt: invite.createdAt ? invite.createdAt.toISOString() : new Date().toISOString()
});
}
}
// Note: We don't automatically add invites created by other users to avoid spam
// Only bot-created invites are tracked for the web interface
} catch (error) {
console.error('Error handling inviteCreate:', error);
}
}
};

24
discord-bot/events/inviteDelete.js
View File

@@ -1,24 +0,0 @@
const api = require('../api');
module.exports = {
name: 'inviteDelete',
async execute(invite) {
try {
const guildId = invite.guild.id;
const code = invite.code;
// Remove from database
await api.deleteInvite(guildId, code);
// Publish SSE event for real-time frontend updates
const bot = require('..');
if (bot && bot.publishEvent) {
bot.publishEvent(guildId, 'inviteDeleted', {
code: code
});
}
} catch (error) {
console.error('Error handling inviteDelete:', error);
}
}
};

26
discord-bot/events/ready.js
View File

@@ -1,6 +1,5 @@
const { ActivityType } = require('discord.js'); const { ActivityType } = require('discord.js');
const deployCommands = require('../deploy-commands'); const deployCommands = require('../deploy-commands');
const api = require('../api');
module.exports = { module.exports = {
name: 'clientReady', name: 'clientReady',
@@ -17,31 +16,6 @@ module.exports = {
} }
} }
// Reconcile invites for all guilds to detect invites deleted while bot was offline
console.log('🔄 Reconciling invites for offline changes...');
let totalReconciled = 0;
for (const guildId of guildIds) {
try {
const guild = client.guilds.cache.get(guildId);
if (!guild) continue;
// Fetch current invites from Discord
const discordInvites = await guild.invites.fetch();
const currentInvites = Array.from(discordInvites.values());
// Reconcile with database
const reconciled = await api.reconcileInvites(guildId, currentInvites);
totalReconciled += reconciled;
} catch (e) {
console.error(`Failed to reconcile invites for guild ${guildId}:`, e && e.message ? e.message : e);
}
}
if (totalReconciled > 0) {
console.log(`✅ Invite reconciliation complete: removed ${totalReconciled} stale invites`);
} else {
console.log('✅ Invite reconciliation complete: no stale invites found');
}
const activities = [ const activities = [
{ name: 'Watch EhChad Live!', type: ActivityType.Streaming, url: 'https://twitch.tv/ehchad' }, { name: 'Watch EhChad Live!', type: ActivityType.Streaming, url: 'https://twitch.tv/ehchad' },
{ name: 'Follow EhChad!', type: ActivityType.Streaming, url: 'https://twitch.tv/ehchad' }, { name: 'Follow EhChad!', type: ActivityType.Streaming, url: 'https://twitch.tv/ehchad' },

154
discord-bot/twitch-watcher.js
View File

@@ -60,86 +60,41 @@ async function fetchUserInfo(login) {
let polling = false; let polling = false;
const pollIntervalMs = Number(process.env.TWITCH_POLL_INTERVAL_MS || 5000); // 5s default const pollIntervalMs = Number(process.env.TWITCH_POLL_INTERVAL_MS || 5000); // 5s default
const debugMode = false; // Debug logging disabled
// Keep track of which streams we've already announced per guild:user -> { started_at } // Keep track of which streams we've already announced per guild:user -> { started_at }
const announced = new Map(); // key: `${guildId}:${user}` -> { started_at } const announced = new Map(); // key: `${guildId}:${user}` -> { started_at }
async function checkGuild(client, guild) { async function checkGuild(client, guild) {
const guildId = guild.id;
const guildName = guild.name;
try { try {
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Checking guild ${guildName} (${guildId})`); // Intentionally quiet: per-guild checking logs are suppressed to avoid spam
const settings = await api.getServerSettings(guild.id) || {};
const settings = await api.getServerSettings(guildId) || {};
const liveSettings = settings.liveNotifications || {}; const liveSettings = settings.liveNotifications || {};
if (!liveSettings.enabled) return;
if (debugMode) {
console.log(`🔍 [DEBUG] TwitchWatcher: Guild ${guildName} settings:`, {
enabled: liveSettings.enabled,
channelId: liveSettings.channelId,
usersCount: (liveSettings.users || []).length,
hasCustomMessage: !!liveSettings.customMessage,
hasDefaultMessage: !!liveSettings.message
});
}
if (!liveSettings.enabled) {
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Live notifications disabled for ${guildName}`);
return;
}
const channelId = liveSettings.channelId; const channelId = liveSettings.channelId;
const users = (liveSettings.users || []).map(u => u.toLowerCase()).filter(Boolean); const users = (liveSettings.users || []).map(u => u.toLowerCase()).filter(Boolean);
if (!channelId || users.length === 0) return;
if (debugMode) {
console.log(`🔍 [DEBUG] TwitchWatcher: Guild ${guildName} - Channel: ${channelId}, Users: [${users.join(', ')}]`);
}
if (!channelId || users.length === 0) {
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Skipping ${guildName} - ${!channelId ? 'No channel configured' : 'No users configured'}`);
return;
}
// ask backend for current live streams // ask backend for current live streams
const query = users.join(','); const query = users.join(',');
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Fetching streams for query: ${query}`);
const streams = await api._rawGetTwitchStreams ? api._rawGetTwitchStreams(query) : null; const streams = await api._rawGetTwitchStreams ? api._rawGetTwitchStreams(query) : null;
// If the helper isn't available, try backend proxy // If the helper isn't available, try backend proxy
let live = []; let live = [];
if (streams && Array.isArray(streams)) { if (streams) live = streams.filter(s => s.is_live);
live = streams.filter(s => s.is_live); else {
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Found ${live.length} live streams via _rawGetTwitchStreams`);
} else {
if (debugMode && streams) {
console.log(`🔍 [DEBUG] TwitchWatcher: _rawGetTwitchStreams returned non-array:`, typeof streams, streams);
}
try { try {
const resp = await api.tryFetchTwitchStreams(query); const resp = await api.tryFetchTwitchStreams(query);
live = (Array.isArray(resp) ? resp : []).filter(s => s.is_live); live = (resp || []).filter(s => s.is_live);
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Found ${live.length} live streams via tryFetchTwitchStreams`);
} catch (e) { } catch (e) {
console.error(`❌ TwitchWatcher: Failed to fetch streams for ${guildName}:`, e && e.message ? e.message : e);
live = []; live = [];
} }
} }
if (debugMode && live.length > 0) {
console.log(`🔍 [DEBUG] TwitchWatcher: Live streams:`, live.map(s => `${s.user_login} (${s.viewer_count} viewers)`));
}
if (!live || live.length === 0) { if (!live || live.length === 0) {
// No live streams: ensure any announced keys for these users are cleared so they can be re-announced later // No live streams: ensure any announced keys for these users are cleared so they can be re-announced later
for (const u of users) { for (const u of users) {
const key = `${guildId}:${u}`; const key = `${guild.id}:${u}`;
if (announced.has(key)) { if (announced.has(key)) {
announced.delete(key); announced.delete(key);
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Cleared announcement for ${u} in ${guildName} (no longer live)`);
} }
} }
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: No live streams found for ${guildName}`);
return; return;
} }
@@ -148,28 +103,16 @@ async function checkGuild(client, guild) {
let channel = null; let channel = null;
try { try {
channel = await client.channels.fetch(channelId); channel = await client.channels.fetch(channelId);
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Successfully fetched channel ${channel.name} (${channelId}) in ${guildName}`);
if (channel.type !== 0) { // 0 is text channel if (channel.type !== 0) { // 0 is text channel
console.error(`❌ TwitchWatcher: Channel ${channelId} in ${guildName} is not a text channel (type: ${channel.type})`); console.error(`TwitchWatcher: channel ${channelId} is not a text channel (type: ${channel.type})`);
channel = null; channel = null;
} else {
// Check if bot has permission to send messages
const permissions = channel.permissionsFor(client.user);
if (!permissions || !permissions.has('SendMessages')) {
console.error(`❌ TwitchWatcher: Bot lacks SendMessages permission in channel ${channel.name} (${channelId}) for ${guildName}`);
channel = null;
} else if (debugMode) {
console.log(`🔍 [DEBUG] TwitchWatcher: Bot has SendMessages permission in ${channel.name}`);
}
} }
} catch (e) { } catch (e) {
console.error(`❌ TwitchWatcher: Failed to fetch channel ${channelId} for ${guildName}:`, e && e.message ? e.message : e); console.error(`TwitchWatcher: failed to fetch channel ${channelId}:`, e && e.message ? e.message : e);
channel = null; channel = null;
} }
if (!channel) { if (!channel) {
// Channel not found or inaccessible; skip // Channel not found or inaccessible; skip
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Skipping announcements for ${guildName} - channel unavailable`);
return; return;
} }
@@ -178,51 +121,40 @@ async function checkGuild(client, guild) {
// Clear announced entries for users that are no longer live // Clear announced entries for users that are no longer live
for (const u of users) { for (const u of users) {
const key = `${guildId}:${u}`; const key = `${guild.id}:${u}`;
if (!liveLogins.has(u) && announced.has(key)) { if (!liveLogins.has(u) && announced.has(key)) {
announced.delete(key); announced.delete(key);
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Cleared announcement for ${u} in ${guildName} (stream ended)`);
} }
} }
// Announce each live once per live session // Announce each live once per live session
for (const s of live) { for (const s of live) {
const login = (s.user_login || '').toLowerCase(); const login = (s.user_login || '').toLowerCase();
const key = `${guildId}:${login}`; const key = `${guild.id}:${login}`;
if (announced.has(key)) { if (announced.has(key)) continue; // already announced for this live session
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Skipping ${login} in ${guildName} - already announced`);
continue; // already announced for this live session
}
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Preparing announcement for ${login} in ${guildName}`);
// mark announced for this session // mark announced for this session
announced.set(key, { started_at: s.started_at || new Date().toISOString() }); announced.set(key, { started_at: s.started_at || new Date().toISOString() });
// Build and send embed (standardized layout) // Build and send embed (standardized layout)
try { try {
// Announce without per-guild log spam
const { EmbedBuilder } = require('discord.js'); const { EmbedBuilder } = require('discord.js');
// Attempt to enrich with user bio (description) if available // Attempt to enrich with user bio (description) if available
let bio = ''; let bio = '';
try { try {
const info = await fetchUserInfo(login); const info = await fetchUserInfo(login);
if (info && info.description) bio = info.description.slice(0, 200); if (info && info.description) bio = info.description.slice(0, 200);
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Fetched user info for ${login} - bio length: ${bio.length}`); } catch (_) {}
} catch (e) {
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Failed to fetch user info for ${login}:`, e && e.message ? e.message : e);
}
const embed = new EmbedBuilder() const embed = new EmbedBuilder()
.setColor('#6441A5') // Twitch purple .setColor(0x9146FF)
.setAuthor({ name: s.user_name, iconURL: s.profile_image_url || undefined, url: s.url })
.setTitle(s.title || `${s.user_name} is live`) .setTitle(s.title || `${s.user_name} is live`)
.setURL(s.url) .setURL(s.url)
.setThumbnail(s.profile_image_url || undefined) .setAuthor({ name: s.user_name, iconURL: s.profile_image_url || undefined, url: s.url })
.setThumbnail(s.thumbnail_url || s.profile_image_url || undefined)
.addFields( .addFields(
{ name: 'Category', value: s.game_name || 'Unknown', inline: true }, { name: 'Category', value: s.game_name || 'Unknown', inline: true },
{ name: 'Viewers', value: String(s.viewer_count || 0), inline: true } { name: 'Viewers', value: String(s.viewer_count || 0), inline: true }
) )
.setImage(s.thumbnail_url ? s.thumbnail_url.replace('{width}', '640').replace('{height}', '360') + `?t=${Date.now()}` : null)
.setDescription(bio || (s.description || '').slice(0, 200)) .setDescription(bio || (s.description || '').slice(0, 200))
.setFooter({ text: `ehchadservices • Started: ${s.started_at ? new Date(s.started_at).toLocaleString() : 'unknown'}` }); .setFooter({ text: `ehchadservices • Started: ${s.started_at ? new Date(s.started_at).toLocaleString() : 'unknown'}` });
@@ -235,75 +167,43 @@ async function checkGuild(client, guild) {
} else { } else {
prefixMsg = `🔴 ${s.user_name} is now live!`; prefixMsg = `🔴 ${s.user_name} is now live!`;
} }
// Replace template variables in custom messages
prefixMsg = prefixMsg
.replace(/\{user\}/g, s.user_name || login)
.replace(/\{title\}/g, s.title || 'Untitled Stream')
.replace(/\{category\}/g, s.game_name || 'Unknown')
.replace(/\{viewers\}/g, String(s.viewer_count || 0));
if (debugMode) {
console.log(`🔍 [DEBUG] TwitchWatcher: Sending announcement for ${login} in ${guildName} to #${channel.name}`);
console.log(`🔍 [DEBUG] TwitchWatcher: Message content: "${prefixMsg}"`);
}
// Ensure we always hyperlink the title via embed; prefix is optional add above embed // Ensure we always hyperlink the title via embed; prefix is optional add above embed
const payload = prefixMsg ? { content: prefixMsg, embeds: [embed] } : { embeds: [embed] }; const payload = prefixMsg ? { content: prefixMsg, embeds: [embed] } : { embeds: [embed] };
await channel.send(payload); await channel.send(payload);
console.log(`🔔 TwitchWatcher: Successfully announced ${login} in ${guildName} - "${(s.title || '').slice(0, 80)}"`); console.log(`🔔 Announced live: ${login} - ${(s.title || '').slice(0, 80)}`);
} catch (e) { } catch (e) {
console.error(`❌ TwitchWatcher: Failed to send announcement for ${login} in ${guildName}:`, e && e.message ? e.message : e); console.error(`TwitchWatcher: failed to send announcement for ${login}:`, e && e.message ? e.message : e);
// fallback // fallback
const msg = `🔴 ${s.user_name} is live: **${s.title}**\nWatch: ${s.url}`; const msg = `🔴 ${s.user_name} is live: **${s.title}**\nWatch: ${s.url}`;
try { try { await channel.send({ content: msg }); console.log('TwitchWatcher: fallback message sent'); } catch (err) { console.error('TwitchWatcher: fallback send failed:', err && err.message ? err.message : err); }
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Attempting fallback message for ${login} in ${guildName}`);
await channel.send({ content: msg });
console.log(`🔔 TwitchWatcher: Fallback message sent for ${login} in ${guildName}`);
} catch (err) {
console.error(`❌ TwitchWatcher: Fallback send failed for ${login} in ${guildName}:`, err && err.message ? err.message : err);
}
} }
} }
} catch (e) { } catch (e) {
console.error(`❌ TwitchWatcher: Error checking guild ${guildName} (${guildId}) for live streams:`, e && e.message ? e.message : e); console.error('Error checking guild for live streams:', e && e.message ? e.message : e);
} }
} }
async function poll(client) { async function poll(client) {
if (polling) return; if (polling) return;
polling = true; polling = true;
console.log(`🔁 TwitchWatcher started, polling every ${Math.round(pollIntervalMs/1000)}s${debugMode ? ' (DEBUG MODE ENABLED)' : ''}`); console.log(`🔁 TwitchWatcher started, polling every ${Math.round(pollIntervalMs/1000)}s`);
// Initial check on restart: send messages for currently live users // Initial check on restart: send messages for currently live users
try { try {
const guilds = Array.from(client.guilds.cache.values()); const guilds = Array.from(client.guilds.cache.values());
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Initial check for ${guilds.length} guilds`);
for (const g of guilds) { for (const g of guilds) {
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Initial check for guild ${g.name} (${g.id})`); await checkGuild(client, g).catch(err => { console.error('TwitchWatcher: initial checkGuild error', err && err.message ? err.message : err); });
await checkGuild(client, g).catch(err => {
console.error(`❌ TwitchWatcher: Initial checkGuild error for ${g.name}:`, err && err.message ? err.message : err);
});
} }
} catch (e) { } catch (e) {
console.error('❌ TwitchWatcher: Error during initial twitch check:', e && e.message ? e.message : e); console.error('Error during initial twitch check:', e && e.message ? e.message : e);
} }
while (polling) { while (polling) {
try { try {
const guilds = Array.from(client.guilds.cache.values()); const guilds = Array.from(client.guilds.cache.values());
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Polling cycle starting for ${guilds.length} guilds`);
for (const g of guilds) { for (const g of guilds) {
await checkGuild(client, g).catch(err => { await checkGuild(client, g).catch(err => { console.error('TwitchWatcher: checkGuild error', err && err.message ? err.message : err); });
console.error(`❌ TwitchWatcher: checkGuild error for ${g.name}:`, err && err.message ? err.message : err);
});
} }
if (debugMode) console.log(`🔍 [DEBUG] TwitchWatcher: Polling cycle completed, waiting ${Math.round(pollIntervalMs/1000)}s`);
} catch (e) { } catch (e) {
console.error('❌ TwitchWatcher: Error during twitch poll loop:', e && e.message ? e.message : e); console.error('Error during twitch poll loop:', e && e.message ? e.message : e);
} }
await new Promise(r => setTimeout(r, pollIntervalMs)); await new Promise(r => setTimeout(r, pollIntervalMs));
} }

149
frontend/package-lock.json generated
View File

@@ -3580,9 +3580,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@rushstack/eslint-patch": { "node_modules/@rushstack/eslint-patch": {
"version": "1.12.0", "version": "1.14.0",
"resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.12.0.tgz", "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.14.0.tgz",
"integrity": "sha512-5EwMtOqvJMMa3HbmxLlF74e+3/HhwBTMcvt3nqVJgGCozO6hzIPOBlwm8mGVNR9SN2IJpxSnlxczyDjcn7qIyw==", "integrity": "sha512-WJFej426qe4RWOm9MMtP4V3CV4AucXolQty+GRgAWLgQXmpCuwzs7hEpxxhSc/znXUSxum9d/P/32MW0FlAAlA==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/@sinclair/typebox": { "node_modules/@sinclair/typebox": {
@@ -4080,9 +4080,9 @@
} }
}, },
"node_modules/@types/express-serve-static-core": { "node_modules/@types/express-serve-static-core": {
"version": "5.0.7", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.7.tgz", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.0.tgz",
"integrity": "sha512-R+33OsgWw7rOhD1emjU7dzCDHucJrgJXMA5PYCzJxVil0dsyx5iBEPHqpPfiKNJQb7lZ1vxwoLR4Z87bBUpeGQ==", "integrity": "sha512-jnHMsrd0Mwa9Cf4IdOzbz543y4XJepXrbia2T4b6+spXC2We3t1y6K44D3mR8XMFSXMCf3/l7rCgddfx7UNVBA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@types/node": "*", "@types/node": "*",
@@ -4092,9 +4092,9 @@
} }
}, },
"node_modules/@types/express/node_modules/@types/express-serve-static-core": { "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
"version": "4.19.6", "version": "4.19.7",
"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.7.tgz",
"integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", "integrity": "sha512-FvPtiIf1LfhzsaIXhv/PHan/2FeQBbtBDtfX2QfvPxdUelMDEckK08SM6nqo1MIZY3RUlfA+HV8+hFUSio78qg==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@types/node": "*", "@types/node": "*",
@@ -4176,12 +4176,12 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "24.6.2", "version": "24.9.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.6.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.1.tgz",
"integrity": "sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==", "integrity": "sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"undici-types": "~7.13.0" "undici-types": "~7.16.0"
} }
}, },
"node_modules/@types/node-forge": { "node_modules/@types/node-forge": {
@@ -4270,12 +4270,11 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/send": { "node_modules/@types/send": {
"version": "0.17.5", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz", "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.0.tgz",
"integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==", "integrity": "sha512-zBF6vZJn1IaMpg3xUF25VK3gd3l8zwE0ZLRX7dsQyQi+jp4E8mMDJNGDYnYse+bQhYwWERTxVwHpi3dMOq7RKQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@types/mime": "^1",
"@types/node": "*" "@types/node": "*"
} }
}, },
@@ -4289,14 +4288,24 @@
} }
}, },
"node_modules/@types/serve-static": { "node_modules/@types/serve-static": {
"version": "1.15.8", "version": "1.15.9",
"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.9.tgz",
"integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==", "integrity": "sha512-dOTIuqpWLyl3BBXU3maNQsS4A3zuuoYRNIvYSxxhebPfXg2mzWQEPne/nlJ37yOse6uGgR386uTpdsx4D0QZWA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@types/http-errors": "*", "@types/http-errors": "*",
"@types/node": "*", "@types/node": "*",
"@types/send": "*" "@types/send": "<1"
}
},
"node_modules/@types/serve-static/node_modules/@types/send": {
"version": "0.17.5",
"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
"integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
"license": "MIT",
"dependencies": {
"@types/mime": "^1",
"@types/node": "*"
} }
}, },
"node_modules/@types/sockjs": { "node_modules/@types/sockjs": {
@@ -5330,9 +5339,9 @@
} }
}, },
"node_modules/axe-core": { "node_modules/axe-core": {
"version": "4.10.3", "version": "4.11.0",
"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.3.tgz", "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.0.tgz",
"integrity": "sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==", "integrity": "sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==",
"license": "MPL-2.0", "license": "MPL-2.0",
"engines": { "engines": {
"node": ">=4" "node": ">=4"
@@ -5635,9 +5644,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/baseline-browser-mapping": { "node_modules/baseline-browser-mapping": {
"version": "2.8.10", "version": "2.8.18",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.10.tgz", "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.18.tgz",
"integrity": "sha512-uLfgBi+7IBNay8ECBO2mVMGZAc1VgZWEChxm4lv+TobGdG82LnXMjuNGo/BSSZZL4UmkWhxEHP2f5ziLNwGWMA==", "integrity": "sha512-UYmTpOBwgPScZpS4A+YbapwWuBwasxvO/2IOHArSsAhL/+ZdmATBXTex3t+l2hXwLVYK382ibr/nKoY9GKe86w==",
"license": "Apache-2.0", "license": "Apache-2.0",
"bin": { "bin": {
"baseline-browser-mapping": "dist/cli.js" "baseline-browser-mapping": "dist/cli.js"
@@ -5956,9 +5965,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001746", "version": "1.0.30001751",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001746.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz",
"integrity": "sha512-eA7Ys/DGw+pnkWWSE/id29f2IcPHVoE8wxtvE5JdvD2V28VTDPy1yEeo11Guz0sJ4ZeGRcm3uaTcAqK1LXaphA==", "integrity": "sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==",
"funding": [ "funding": [
{ {
"type": "opencollective", "type": "opencollective",
@@ -6218,9 +6227,9 @@
} }
}, },
"node_modules/collect-v8-coverage": { "node_modules/collect-v8-coverage": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz",
"integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", "integrity": "sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/color-convert": { "node_modules/color-convert": {
@@ -6398,9 +6407,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/core-js": { "node_modules/core-js": {
"version": "3.45.1", "version": "3.46.0",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.45.1.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.46.0.tgz",
"integrity": "sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==", "integrity": "sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT", "license": "MIT",
"funding": { "funding": {
@@ -6409,12 +6418,12 @@
} }
}, },
"node_modules/core-js-compat": { "node_modules/core-js-compat": {
"version": "3.45.1", "version": "3.46.0",
"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.1.tgz", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.46.0.tgz",
"integrity": "sha512-tqTt5T4PzsMIZ430XGviK4vzYSoeNJ6CXODi6c/voxOT6IZqBht5/EKaSNnYiEjjRYxjVz7DQIsOsY0XNi8PIA==", "integrity": "sha512-p9hObIIEENxSV8xIu+V68JjSeARg6UVMG5mR+JEUguG3sI6MsiS1njz2jHmyJDvA+8jX/sytkBHup6kxhM9law==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"browserslist": "^4.25.3" "browserslist": "^4.26.3"
}, },
"funding": { "funding": {
"type": "opencollective", "type": "opencollective",
@@ -6422,9 +6431,9 @@
} }
}, },
"node_modules/core-js-pure": { "node_modules/core-js-pure": {
"version": "3.45.1", "version": "3.46.0",
"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.45.1.tgz", "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.46.0.tgz",
"integrity": "sha512-OHnWFKgTUshEU8MK+lOs1H8kC8GkTi9Z1tvNkxrCcw9wl3MJIO7q2ld77wjWn4/xuGrVu2X+nME1iIIPBSdyEQ==", "integrity": "sha512-NMCW30bHNofuhwLhYPt66OLOKTMbOhgTTatKVbaQC3KRHpTCiRIBYvtshr+NBYSnBxwAFhjW/RfJ0XbIjS16rw==",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT", "license": "MIT",
"funding": { "funding": {
@@ -7344,9 +7353,9 @@
} }
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.5.229", "version": "1.5.237",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.229.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.237.tgz",
"integrity": "sha512-cwhDcZKGcT/rEthLRJ9eBlMDkh1sorgsuk+6dpsehV0g9CABsIqBxU4rLRjG+d/U6pYU1s37A4lSKrVc5lSQYg==", "integrity": "sha512-icUt1NvfhGLar5lSWH3tHNzablaA5js3HVHacQimfP8ViEBOQv+L7DKEuHdbTZ0SKCO1ogTJTIL1Gwk9S6Qvcg==",
"license": "ISC" "license": "ISC"
}, },
"node_modules/emittery": { "node_modules/emittery": {
@@ -11648,12 +11657,16 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/loader-runner": { "node_modules/loader-runner": {
"version": "4.3.0", "version": "4.3.1",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=6.11.5" "node": ">=6.11.5"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/webpack"
} }
}, },
"node_modules/loader-utils": { "node_modules/loader-utils": {
@@ -12101,9 +12114,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/node-releases": { "node_modules/node-releases": {
"version": "2.0.21", "version": "2.0.26",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.26.tgz",
"integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==", "integrity": "sha512-S2M9YimhSjBSvYnlr5/+umAnPHE++ODwt5e2Ij6FoX45HA/s4vHdkDx1eax2pAPeAOqu4s9b7ppahsyEFdVqQA==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/normalize-path": { "node_modules/normalize-path": {
@@ -15197,9 +15210,9 @@
} }
}, },
"node_modules/semver": { "node_modules/semver": {
"version": "7.7.2", "version": "7.7.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
"license": "ISC", "license": "ISC",
"bin": { "bin": {
"semver": "bin/semver.js" "semver": "bin/semver.js"
@@ -16951,9 +16964,9 @@
} }
}, },
"node_modules/typescript": { "node_modules/typescript": {
"version": "4.9.5", "version": "5.9.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
"integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
"license": "Apache-2.0", "license": "Apache-2.0",
"peer": true, "peer": true,
"bin": { "bin": {
@@ -16961,7 +16974,7 @@
"tsserver": "bin/tsserver" "tsserver": "bin/tsserver"
}, },
"engines": { "engines": {
"node": ">=4.2.0" "node": ">=14.17"
} }
}, },
"node_modules/unbox-primitive": { "node_modules/unbox-primitive": {
@@ -16989,9 +17002,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/undici-types": { "node_modules/undici-types": {
"version": "7.13.0", "version": "7.16.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
"integrity": "sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==", "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/unicode-canonical-property-names-ecmascript": { "node_modules/unicode-canonical-property-names-ecmascript": {
@@ -17272,9 +17285,9 @@
} }
}, },
"node_modules/webpack": { "node_modules/webpack": {
"version": "5.102.0", "version": "5.102.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.102.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.102.1.tgz",
"integrity": "sha512-hUtqAR3ZLVEYDEABdBioQCIqSoguHbFn1K7WlPPWSuXmx0031BD73PSE35jKyftdSh4YLDoQNgK4pqBt5Q82MA==", "integrity": "sha512-7h/weGm9d/ywQ6qzJ+Xy+r9n/3qgp/thalBbpOi5i223dPXKi04IBtqPN9nTd+jBc7QKfvDbaBnFipYp4sJAUQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@types/eslint-scope": "^3.7.7", "@types/eslint-scope": "^3.7.7",
@@ -17285,7 +17298,7 @@
"@webassemblyjs/wasm-parser": "^1.14.1", "@webassemblyjs/wasm-parser": "^1.14.1",
"acorn": "^8.15.0", "acorn": "^8.15.0",
"acorn-import-phases": "^1.0.3", "acorn-import-phases": "^1.0.3",
"browserslist": "^4.24.5", "browserslist": "^4.26.3",
"chrome-trace-event": "^1.0.2", "chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.17.3", "enhanced-resolve": "^5.17.3",
"es-module-lexer": "^1.2.1", "es-module-lexer": "^1.2.1",
@@ -17297,8 +17310,8 @@
"loader-runner": "^4.2.0", "loader-runner": "^4.2.0",
"mime-types": "^2.1.27", "mime-types": "^2.1.27",
"neo-async": "^2.6.2", "neo-async": "^2.6.2",
"schema-utils": "^4.3.2", "schema-utils": "^4.3.3",
"tapable": "^2.2.3", "tapable": "^2.3.0",
"terser-webpack-plugin": "^5.3.11", "terser-webpack-plugin": "^5.3.11",
"watchpack": "^2.4.4", "watchpack": "^2.4.4",
"webpack-sources": "^3.3.3" "webpack-sources": "^3.3.3"

4
frontend/package.json
View File

@@ -14,8 +14,8 @@
"axios": "^1.12.2", "axios": "^1.12.2",
"react": "^19.2.0", "react": "^19.2.0",
"react-dom": "^19.2.0", "react-dom": "^19.2.0",
"react-router-dom": "^7.9.3", "react-router-dom": "^7.9.3",
"react-scripts": "5.0.1", "react-scripts": "5.0.1",
"web-vitals": "^2.1.4" "web-vitals": "^2.1.4"
}, },
"scripts": { "scripts": {

74
frontend/src/components/server/ServerSettings.js
View File

@@ -269,22 +269,6 @@ const ServerSettings = () => {
setAdminLogs([]); setAdminLogs([]);
}; };
const onInviteCreated = (e) => {
const data = e.detail || {};
if (!data) return;
if (data.guildId && data.guildId !== guildId) return;
// Add the new invite to the list
setInvites(prev => [...prev, data]);
};
const onInviteDeleted = (e) => {
const data = e.detail || {};
if (!data) return;
if (data.guildId && data.guildId !== guildId) return;
// Remove the deleted invite from the list
setInvites(prev => prev.filter(invite => invite.code !== data.code));
};
eventTarget.addEventListener('twitchUsersUpdate', onTwitchUsers); eventTarget.addEventListener('twitchUsersUpdate', onTwitchUsers);
eventTarget.addEventListener('kickUsersUpdate', onKickUsers); eventTarget.addEventListener('kickUsersUpdate', onKickUsers);
eventTarget.addEventListener('liveNotificationsUpdate', onLiveNotifications); eventTarget.addEventListener('liveNotificationsUpdate', onLiveNotifications);
@@ -292,8 +276,6 @@ const ServerSettings = () => {
eventTarget.addEventListener('adminLogAdded', onAdminLogAdded); eventTarget.addEventListener('adminLogAdded', onAdminLogAdded);
eventTarget.addEventListener('adminLogDeleted', onAdminLogDeleted); eventTarget.addEventListener('adminLogDeleted', onAdminLogDeleted);
eventTarget.addEventListener('adminLogsCleared', onAdminLogsCleared); eventTarget.addEventListener('adminLogsCleared', onAdminLogsCleared);
eventTarget.addEventListener('inviteCreated', onInviteCreated);
eventTarget.addEventListener('inviteDeleted', onInviteDeleted);
return () => { return () => {
try { try {
@@ -304,8 +286,6 @@ const ServerSettings = () => {
eventTarget.removeEventListener('adminLogAdded', onAdminLogAdded); eventTarget.removeEventListener('adminLogAdded', onAdminLogAdded);
eventTarget.removeEventListener('adminLogDeleted', onAdminLogDeleted); eventTarget.removeEventListener('adminLogDeleted', onAdminLogDeleted);
eventTarget.removeEventListener('adminLogsCleared', onAdminLogsCleared); eventTarget.removeEventListener('adminLogsCleared', onAdminLogsCleared);
eventTarget.removeEventListener('inviteCreated', onInviteCreated);
eventTarget.removeEventListener('inviteDeleted', onInviteDeleted);
} catch (err) {} } catch (err) {}
}; };
}, [eventTarget, guildId]); }, [eventTarget, guildId]);
@@ -689,9 +669,7 @@ const ServerSettings = () => {
<FormControl fullWidth> <FormControl fullWidth>
<Select value={inviteForm.channelId} onChange={(e) => setInviteForm(f => ({ ...f, channelId: e.target.value }))} displayEmpty> <Select value={inviteForm.channelId} onChange={(e) => setInviteForm(f => ({ ...f, channelId: e.target.value }))} displayEmpty>
<MenuItem value="">(Any channel)</MenuItem> <MenuItem value="">(Any channel)</MenuItem>
{channels.map((channel) => ( {channels.map(ch => (<MenuItem key={ch.id} value={ch.id}>{ch.name}</MenuItem>))}
<MenuItem key={channel.id} value={channel.id}>{channel.name}</MenuItem>
))}
</Select> </Select>
</FormControl> </FormControl>
</Box> </Box>
@@ -800,7 +778,7 @@ const ServerSettings = () => {
displayEmpty displayEmpty
> >
<MenuItem value="" disabled>Select a channel</MenuItem> <MenuItem value="" disabled>Select a channel</MenuItem>
{channels.map((channel) => ( {channels.map(channel => (
<MenuItem key={channel.id} value={channel.id}>{channel.name}</MenuItem> <MenuItem key={channel.id} value={channel.id}>{channel.name}</MenuItem>
))} ))}
</Select> </Select>
@@ -841,7 +819,7 @@ const ServerSettings = () => {
displayEmpty displayEmpty
> >
<MenuItem value="" disabled>Select a channel</MenuItem> <MenuItem value="" disabled>Select a channel</MenuItem>
{channels.map((channel) => ( {channels.map(channel => (
<MenuItem key={channel.id} value={channel.id}>{channel.name}</MenuItem> <MenuItem key={channel.id} value={channel.id}>{channel.name}</MenuItem>
))} ))}
</Select> </Select>
@@ -1173,32 +1151,30 @@ const ServerSettings = () => {
{adminLogs.length === 0 ? ( {adminLogs.length === 0 ? (
<Typography>No logs available.</Typography> <Typography>No logs available.</Typography>
) : ( ) : (
<React.Fragment> adminLogs.map(log => (
{adminLogs.map((log) => ( <Box key={log.id} sx={{ p: 1, border: '1px solid #eee', mb: 1, borderRadius: 1, bgcolor: 'background.paper' }}>
<Box key={log.id} sx={{ p: 1, border: '1px solid #eee', mb: 1, borderRadius: 1, bgcolor: 'background.paper' }}> <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start' }}>
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start' }}> <Box sx={{ flex: 1 }}>
<Box sx={{ flex: 1 }}> <Typography variant="body2" sx={{ fontWeight: 'bold' }}>
<Typography variant="body2" sx={{ fontWeight: 'bold' }}> {log.action.toUpperCase()} - {log.targetUsername || 'Unknown User'} by {log.moderatorUsername || 'Unknown User'}
{log.action.toUpperCase()} - {log.targetUsername || 'Unknown User'} by {log.moderatorUsername || 'Unknown User'} </Typography>
</Typography> <Typography variant="body2">Reason: {log.reason}</Typography>
<Typography variant="body2">Reason: {log.reason}</Typography> {log.duration && <Typography variant="body2">Duration: {log.duration}</Typography>}
{log.duration && <Typography variant="body2">Duration: {log.duration}</Typography>} <Typography variant="caption" color="text.secondary">
<Typography variant="caption" color="text.secondary"> {new Date(log.timestamp).toLocaleString()}
{new Date(log.timestamp).toLocaleString()} </Typography>
</Typography>
</Box>
<IconButton
size="small"
color="error"
onClick={() => setDeleteLogDialog({ open: true, logId: log.id, logAction: log.action })}
sx={{ ml: 1 }}
>
<DeleteIcon fontSize="small" />
</IconButton>
</Box> </Box>
<IconButton
size="small"
color="error"
onClick={() => setDeleteLogDialog({ open: true, logId: log.id, logAction: log.action })}
sx={{ ml: 1 }}
>
<DeleteIcon fontSize="small" />
</IconButton>
</Box> </Box>
))} </Box>
</React.Fragment> ))
)} )}
</Box> </Box>
</Box> </Box>

6
package-lock.json generated Normal file
View File

@@ -0,0 +1,6 @@
{
"name": "ECS-FullStack",
"lockfileVersion": 3,
"requires": true,
"packages": {}
}