Merge pull request #11 from Fretuks/main

Implement small fixes
This commit is contained in:
2026-01-27 15:06:23 +01:00
committed by GitHub
15 changed files with 565 additions and 86 deletions
-2
View File
@@ -15,11 +15,9 @@ module.exports = {
const dbClient = await connectToDatabase();
const db = dbClient.db('discord');
const collection = db.collection('currency');
const target = interaction.options.getUser('user') ?? interaction.user;
const targetData = await collection.findOne({ userID: target.id });
const balance = targetData?.balance ?? 0;
return interaction.reply({
content: `${target.tag} has **${balance}** coins.`,
});
-6
View File
@@ -9,12 +9,10 @@ const formatDuration = (ms) => {
const hours = Math.floor(totalSeconds / 3600);
const minutes = Math.floor((totalSeconds % 3600) / 60);
const seconds = totalSeconds % 60;
const parts = [];
if (hours) parts.push(`${hours}h`);
if (minutes) parts.push(`${minutes}m`);
if (!hours && !minutes) parts.push(`${seconds}s`);
return parts.join(' ');
};
@@ -28,11 +26,9 @@ module.exports = {
const db = dbClient.db('discord');
const collection = db.collection('currency');
const now = new Date();
const userId = interaction.user.id;
const userData = await collection.findOne({ userID: userId });
const lastClaim = userData?.lastClaimedAt ? new Date(userData.lastClaimedAt) : null;
if (lastClaim) {
const elapsed = now - lastClaim;
if (elapsed < COOLDOWN_MS) {
@@ -43,7 +39,6 @@ module.exports = {
});
}
}
await collection.updateOne(
{ userID: userId },
{
@@ -52,7 +47,6 @@ module.exports = {
},
{ upsert: true }
);
return interaction.reply({
content: `You earned **${REWARD_AMOUNT}** coins! Come back tomorrow for more.`,
});
-4
View File
@@ -22,23 +22,19 @@ module.exports = {
const dbClient = await connectToDatabase();
const target = interaction.options.getUser('target');
const amount = interaction.options.getInteger('amount');
if (target.bot) {
return interaction.reply({
content: 'You cannot grant coins to bot accounts.',
ephemeral: true,
});
}
const db = dbClient.db('discord');
const collection = db.collection('currency');
await collection.updateOne(
{ userID: target.id },
{ $inc: { balance: amount } },
{ upsert: true }
);
return interaction.reply({
content: `You granted **${amount}** coins to ${target.tag}.`,
});
-6
View File
@@ -1,4 +1,3 @@
// exampleCommand.js
const { SlashCommandBuilder } = require('discord.js');
const { connectToDatabase } = require('../../db.js');
@@ -15,14 +14,9 @@ module.exports = {
async execute(interaction) {
const dbClient = await connectToDatabase();
const message = interaction.options.getString('message');
// Choose a DB + Collection
const db = dbClient.db('discord');
const collection = db.collection('test');
// Example: Insert something
await collection.insertOne({ userId: interaction.user.id, message: message });
await interaction.reply('Successfully inserted your data into MongoDB.');
},
};
-2
View File
@@ -30,7 +30,6 @@ module.exports = {
ephemeral: true,
});
}
await member.kick(reason);
await recordModerationAction({
guildId: interaction.guildId,
@@ -40,7 +39,6 @@ module.exports = {
reason,
metadata: {},
});
await interaction.reply(`Kicked ${user.tag} for: ${reason}`);
} catch (error) {
console.error(error);
+23 -7
View File
@@ -1,13 +1,10 @@
const crypto = require('node:crypto');
const fs = require('node:fs');
const path = require('node:path');
const axios = require('axios');
const express = require('express');
const {addWarning, getWarnings} = require('./services/warnings');
const {getGuildPermissions, updateGuildPermissions} = require('./services/permissions');
const DEFAULT_SESSION_TTL_MS = 24 * 60 * 60 * 1000;
const PERMISSION_BITS = {
ADMINISTRATOR: 0x8n,
@@ -50,6 +47,14 @@ const SESSION_TTL_MS = Number.parseInt(
10,
);
console.log('[oauth config]', {
DISCORD_CLIENT_ID_present: Boolean(DISCORD_CLIENT_ID && String(DISCORD_CLIENT_ID).trim()),
DISCORD_CLIENT_SECRET_present: Boolean(DISCORD_CLIENT_SECRET && String(DISCORD_CLIENT_SECRET).trim()),
DISCORD_REDIRECT_URI: DISCORD_REDIRECT_URI || null,
configFilePath: path.join(__dirname, 'config.json'),
configFileExists: fs.existsSync(path.join(__dirname, 'config.json')),
});
const DISCORD_API_BASE = 'https://discord.com/api';
const sessionStore = new Map();
@@ -260,6 +265,7 @@ const createDashboardApp = () => {
const app = express();
app.use(express.json());
app.use(express.static(path.join(__dirname, 'public')));
app.get('/auth/discord', (req, res) => {
if (!ensureOAuthConfig()) {
@@ -298,7 +304,6 @@ const createDashboardApp = () => {
tokenType: tokenData.token_type,
scope: tokenData.scope,
user,
expiresAt,
});
setCookie(res, 'dashboard_session', sessionId, {
@@ -313,9 +318,22 @@ const createDashboardApp = () => {
return res.redirect(DASHBOARD_CLIENT_URL);
}
if (req.accepts('html')) {
return res.redirect('/');
}
return res.status(200).json({user});
} catch (error) {
return res.status(502).json({ error: 'Failed to authenticate with Discord' });
console.error('Discord OAuth failed', {
message: error.message,
status: error.response?.status,
data: error.response?.data,
});
return res.status(502).json({
error: 'Failed to authenticate with Discord',
details: error.response?.data || error.message,
});
}
});
@@ -406,7 +424,6 @@ const createDashboardApp = () => {
if (!reason) {
return res.status(400).json({error: 'Reason is required'});
}
try {
const result = await addWarning({
guildId: req.params.guildId,
@@ -420,7 +437,6 @@ const createDashboardApp = () => {
}
},
);
return app;
};
-5
View File
@@ -5,7 +5,6 @@ let dbClient;
async function connectToDatabase() {
if (!dbClient) {
// Create a new MongoClient only once
dbClient = new MongoClient(mongodb, {
serverApi: {
version: ServerApiVersion.v1,
@@ -13,15 +12,11 @@ async function connectToDatabase() {
deprecationErrors: true,
}
});
await dbClient.connect();
console.log("Connected to MongoDB!");
await dbClient.db("admin").command({ping: 1});
console.log("Pinged your deployment. You successfully connected to MongoDB!");
}
// Return the existing connection if already connected
return dbClient;
}
+8 -7
View File
@@ -5,14 +5,11 @@ module.exports = {
name: Events.InteractionCreate,
async execute(interaction) {
if (!interaction.isChatInputCommand()) return;
const command = interaction.client.commands.get(interaction.commandName);
if (!command) {
console.error(`No command matching ${interaction.commandName} was found.`);
return;
}
try {
const allowed = await isCommandAllowed({
guildId: interaction.guildId,
@@ -21,7 +18,6 @@ module.exports = {
commandName: interaction.commandName,
permissionGroup: command.permissionGroup,
});
if (!allowed) {
await interaction.reply({
content: 'You do not have permission to use this command.',
@@ -29,14 +25,19 @@ module.exports = {
});
return;
}
await command.execute(interaction);
} catch (error) {
console.error(error);
if (interaction.replied || interaction.deferred) {
await interaction.followUp({ content: 'There was an error while executing this command!', flags: MessageFlags.Ephemeral });
await interaction.followUp({
content: 'There was an error while executing this command!',
flags: MessageFlags.Ephemeral
});
} else {
await interaction.reply({ content: 'There was an error while executing this command!', flags: MessageFlags.Ephemeral });
await interaction.reply({
content: 'There was an error while executing this command!',
flags: MessageFlags.Ephemeral
});
}
}
},
-3
View File
@@ -10,8 +10,6 @@ module.exports = {
const tempBanCollection = db.collection('tempban');
const scheduledBanIds = new Set();
let pollingInterval = null;
// 2) Define a function to schedule unbans
async function scheduleUnban(banData) {
const banId = banData?._id?.toString();
if (banId && scheduledBanIds.has(banId)) {
@@ -54,7 +52,6 @@ module.exports = {
if (pollingInterval) {
return;
}
console.warn('Change streams unavailable; falling back to polling for temp bans.');
pollingInterval = setInterval(() => {
loadAndScheduleBans().catch((err) => {
console.error('Error polling temp bans:', err);
+2 -7
View File
@@ -3,13 +3,12 @@ const { Client, Collection, GatewayIntentBits } = require('discord.js');
const { token } = require('./config.json');
const { loadCommandModules } = require('./loaders/commands');
const { loadEventModules } = require('./loaders/events');
const client = new Client({ intents: [GatewayIntentBits.Guilds] });
// Retrieves commands from the command folder
client.commands = new Collection();
const commandsPath = path.join(__dirname, 'commands');
const { commands, invalidCommands } = loadCommandModules(commandsPath);
const eventsPath = path.join(__dirname, 'events');
const eventModules = loadEventModules(eventsPath);
for (const command of commands) {
client.commands.set(command.data.name, command);
@@ -19,10 +18,6 @@ for (const filePath of invalidCommands) {
console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
}
// Retrieves events from the events folder
const eventsPath = path.join(__dirname, 'events');
const eventModules = loadEventModules(eventsPath);
for (const { event } of eventModules) {
if (event.once) {
client.once(event.name, (...args) => event.execute(...args));
-1
View File
@@ -11,7 +11,6 @@ const getEventFilePaths = (eventsPath) =>
const loadEventModules = (eventsPath) => {
const eventFiles = getEventFilePaths(eventsPath);
return eventFiles.map((filePath) => ({
filePath,
event: require(filePath),
+223
View File
@@ -0,0 +1,223 @@
const state = {
guilds: [],
selectedGuildId: null,
};
const elements = {
loginButton: document.getElementById('loginButton'),
logoutButton: document.getElementById('logoutButton'),
sessionStatus: document.getElementById('sessionStatus'),
guildCard: document.getElementById('guildCard'),
warningsCard: document.getElementById('warningsCard'),
guildSelect: document.getElementById('guildSelect'),
permissionsEditor: document.getElementById('permissionsEditor'),
updatePermissionsButton: document.getElementById('updatePermissionsButton'),
rolesList: document.getElementById('rolesList'),
warningUserId: document.getElementById('warningUserId'),
loadWarningsButton: document.getElementById('loadWarningsButton'),
warningsList: document.getElementById('warningsList'),
newWarningUserId: document.getElementById('newWarningUserId'),
warningReason: document.getElementById('warningReason'),
addWarningButton: document.getElementById('addWarningButton'),
warningResult: document.getElementById('warningResult'),
};
const setStatus = (message, isAuthed) => {
elements.sessionStatus.textContent = message;
elements.logoutButton.hidden = !isAuthed;
elements.guildCard.hidden = !isAuthed;
elements.warningsCard.hidden = !isAuthed;
};
const fetchJson = async (url, options) => {
const response = await fetch(url, {
credentials: 'include',
headers: {
'Content-Type': 'application/json',
},
...options,
});
if (!response.ok) {
const body = await response.json().catch(() => ({}));
const message = body.error || `Request failed with status ${response.status}`;
throw new Error(message);
}
return response.json().catch(() => ({}));
};
const loadGuilds = async () => {
const data = await fetchJson('/api/guilds');
state.guilds = data.guilds || [];
elements.guildSelect.innerHTML = '';
state.guilds.forEach((guild) => {
const option = document.createElement('option');
option.value = guild.id;
option.textContent = guild.name;
elements.guildSelect.appendChild(option);
});
if (state.guilds.length > 0) {
state.selectedGuildId = state.guilds[0].id;
elements.guildSelect.value = state.selectedGuildId;
await loadGuildDetails();
}
};
const renderRoles = (roles) => {
elements.rolesList.innerHTML = '';
roles.forEach((role) => {
const item = document.createElement('li');
item.textContent = `${role.name} (${role.id})`;
elements.rolesList.appendChild(item);
});
if (roles.length === 0) {
const item = document.createElement('li');
item.textContent = 'No roles returned.';
elements.rolesList.appendChild(item);
}
};
const loadGuildDetails = async () => {
if (!state.selectedGuildId) {
return;
}
const [permissionsData, rolesData] = await Promise.all([
fetchJson(`/api/guilds/${state.selectedGuildId}/permissions`),
fetchJson(`/api/guilds/${state.selectedGuildId}/roles`),
]);
elements.permissionsEditor.value = JSON.stringify(permissionsData.permissions || {}, null, 2);
renderRoles(rolesData.roles || []);
};
const updatePermissions = async () => {
if (!state.selectedGuildId) {
return;
}
const rawValue = elements.permissionsEditor.value.trim();
if (!rawValue) {
return;
}
let payload;
try {
payload = JSON.parse(rawValue);
} catch (error) {
elements.permissionsEditor.focus();
throw new Error('Permissions JSON is invalid.');
}
const data = await fetchJson(`/api/guilds/${state.selectedGuildId}/permissions`, {
method: 'PATCH',
body: JSON.stringify(payload),
});
elements.permissionsEditor.value = JSON.stringify(data.permissions || {}, null, 2);
};
const loadWarnings = async (userId) => {
if (!state.selectedGuildId || !userId) {
return;
}
const data = await fetchJson(`/api/guilds/${state.selectedGuildId}/warnings/${userId}`);
elements.warningsList.innerHTML = '';
const warnings = data.warnings || [];
if (warnings.length === 0) {
const item = document.createElement('li');
item.textContent = 'No warnings found.';
elements.warningsList.appendChild(item);
return;
}
warnings.forEach((warning) => {
const item = document.createElement('li');
const issuedAt = warning.createdAt ? new Date(warning.createdAt).toLocaleString() : 'Unknown date';
item.textContent = `${warning.reason} — ${issuedAt}`;
elements.warningsList.appendChild(item);
});
};
const addWarning = async () => {
if (!state.selectedGuildId) {
return;
}
const userId = elements.newWarningUserId.value.trim();
const reason = elements.warningReason.value.trim();
if (!userId || !reason) {
elements.warningResult.textContent = 'User ID and reason are required.';
return;
}
const data = await fetchJson(`/api/guilds/${state.selectedGuildId}/warnings/${userId}`, {
method: 'POST',
body: JSON.stringify({ reason }),
});
elements.warningResult.textContent = `Warning added: ${data.warning?.reason || reason}`;
elements.warningReason.value = '';
};
const showError = (message) => {
elements.warningResult.textContent = message;
};
const init = async () => {
elements.loginButton.addEventListener('click', () => {
window.location.href = '/auth/discord';
});
elements.logoutButton.addEventListener('click', async () => {
await fetch('/auth/logout', { method: 'POST', credentials: 'include' });
setStatus('Logged out. Sign in to manage guilds.', false);
});
elements.guildSelect.addEventListener('change', async (event) => {
state.selectedGuildId = event.target.value;
await loadGuildDetails();
});
elements.updatePermissionsButton.addEventListener('click', async () => {
elements.warningResult.textContent = '';
try {
await updatePermissions();
elements.warningResult.textContent = 'Permissions updated successfully.';
} catch (error) {
showError(error.message);
}
});
elements.loadWarningsButton.addEventListener('click', async () => {
try {
await loadWarnings(elements.warningUserId.value.trim());
} catch (error) {
showError(error.message);
}
});
elements.addWarningButton.addEventListener('click', async () => {
try {
await addWarning();
} catch (error) {
showError(error.message);
}
});
try {
await loadGuilds();
setStatus('Authenticated. Choose a guild to get started.', true);
} catch (error) {
setStatus('Sign in with Discord to manage your guilds.', false);
}
};
init();
+100
View File
@@ -0,0 +1,100 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Discord Bot Dashboard</title>
<link rel="stylesheet" href="styles.css" />
</head>
<body>
<div class="app">
<header class="app__header">
<div>
<p class="eyebrow">Discord Bot</p>
<h1>Moderation Dashboard</h1>
<p class="subhead">
Manage permissions, review roles, and track warnings without leaving your browser.
</p>
</div>
<button class="button button--primary" id="loginButton">Log in with Discord</button>
</header>
<section class="card" id="sessionCard">
<div>
<h2>Session</h2>
<p id="sessionStatus">Checking your session...</p>
</div>
<button class="button button--ghost" id="logoutButton" hidden>Log out</button>
</section>
<section class="card" id="guildCard" hidden>
<div class="card__header">
<div>
<h2>Your guilds</h2>
<p>Select a guild to manage permission overrides and warnings.</p>
</div>
<select id="guildSelect"></select>
</div>
<div class="card__content">
<div class="columns">
<div class="panel">
<h3>Permission overrides</h3>
<p class="muted">Update the JSON payload to configure command permissions.</p>
<textarea id="permissionsEditor" spellcheck="false"></textarea>
<button class="button button--primary" id="updatePermissionsButton">Save permissions</button>
</div>
<div class="panel">
<h3>Roles</h3>
<ul id="rolesList" class="list"></ul>
</div>
</div>
</div>
</section>
<section class="card" id="warningsCard" hidden>
<div class="card__header">
<div>
<h2>Warnings</h2>
<p>Review or add warnings for a specific user in the selected guild.</p>
</div>
</div>
<div class="card__content">
<div class="columns">
<div class="panel">
<h3>Lookup warnings</h3>
<label class="field">
<span>User ID</span>
<input id="warningUserId" type="text" placeholder="123456789" />
</label>
<button class="button" id="loadWarningsButton">Load warnings</button>
<ul id="warningsList" class="list"></ul>
</div>
<div class="panel">
<h3>Add warning</h3>
<label class="field">
<span>User ID</span>
<input id="newWarningUserId" type="text" placeholder="123456789" />
</label>
<label class="field">
<span>Reason</span>
<textarea id="warningReason" placeholder="Reason for warning"></textarea>
</label>
<button class="button button--primary" id="addWarningButton">Add warning</button>
<p class="muted" id="warningResult"></p>
</div>
</div>
</div>
</section>
<section class="card">
<h2>Need help?</h2>
<p>
The dashboard reads permissions from the MongoDB-backed overrides collection. Use it to grant
command access to trusted members in each server.
</p>
</section>
</div>
<script src="app.js"></script>
</body>
</html>
+176
View File
@@ -0,0 +1,176 @@
:root {
color-scheme: dark;
font-family: "Inter", system-ui, -apple-system, sans-serif;
line-height: 1.5;
background: #0e111b;
color: #eef2ff;
}
* {
box-sizing: border-box;
}
body {
margin: 0;
min-height: 100vh;
background: radial-gradient(circle at top, #1d2542 0%, #0e111b 55%);
}
.app {
max-width: 1100px;
margin: 0 auto;
padding: 48px 24px 64px;
display: flex;
flex-direction: column;
gap: 24px;
}
.app__header {
display: flex;
justify-content: space-between;
align-items: center;
gap: 24px;
padding: 32px;
border-radius: 20px;
background: rgba(17, 23, 40, 0.9);
border: 1px solid rgba(118, 135, 255, 0.2);
box-shadow: 0 20px 40px rgba(0, 0, 0, 0.3);
}
.eyebrow {
text-transform: uppercase;
font-size: 0.75rem;
letter-spacing: 0.2rem;
color: #8b9cff;
margin: 0 0 8px;
}
h1 {
font-size: 2.4rem;
margin: 0 0 12px;
}
.subhead {
margin: 0;
max-width: 520px;
color: #b7c0ff;
}
.card {
background: rgba(17, 23, 40, 0.95);
border-radius: 18px;
padding: 24px;
border: 1px solid rgba(118, 135, 255, 0.2);
display: flex;
flex-direction: column;
gap: 16px;
}
.card__header {
display: flex;
align-items: center;
justify-content: space-between;
gap: 16px;
}
.card__content {
display: flex;
flex-direction: column;
gap: 16px;
}
.columns {
display: grid;
gap: 16px;
grid-template-columns: repeat(auto-fit, minmax(260px, 1fr));
}
.panel {
background: rgba(12, 15, 26, 0.9);
border-radius: 14px;
padding: 16px;
border: 1px solid rgba(118, 135, 255, 0.15);
display: flex;
flex-direction: column;
gap: 12px;
}
.button {
padding: 10px 18px;
border-radius: 999px;
border: 1px solid rgba(118, 135, 255, 0.3);
background: rgba(16, 20, 35, 0.8);
color: #f5f7ff;
cursor: pointer;
font-weight: 600;
transition: transform 0.2s ease, box-shadow 0.2s ease;
}
.button:hover {
transform: translateY(-1px);
box-shadow: 0 8px 20px rgba(34, 44, 90, 0.4);
}
.button--primary {
background: linear-gradient(135deg, #5f6bff, #8a5bff);
border: none;
}
.button--ghost {
background: transparent;
}
select,
input,
textarea {
width: 100%;
padding: 10px 12px;
border-radius: 10px;
border: 1px solid rgba(118, 135, 255, 0.3);
background: rgba(6, 8, 16, 0.6);
color: #eef2ff;
}
textarea {
min-height: 140px;
resize: vertical;
}
.list {
list-style: none;
padding: 0;
margin: 0;
display: flex;
flex-direction: column;
gap: 8px;
}
.list li {
background: rgba(16, 20, 35, 0.6);
padding: 8px 12px;
border-radius: 10px;
border: 1px solid rgba(118, 135, 255, 0.15);
}
.field {
display: flex;
flex-direction: column;
gap: 6px;
font-size: 0.85rem;
}
.muted {
color: #9aa5e3;
margin: 0;
}
@media (max-width: 720px) {
.app__header {
flex-direction: column;
align-items: flex-start;
}
h1 {
font-size: 2rem;
}
}
-3
View File
@@ -15,7 +15,6 @@ const DEFAULT_GUILD_SETTINGS = {
const normalizeGuildSettings = (settings = {}) => {
const moderation = settings.moderation ?? {};
const strikeThresholds = moderation.strikeThresholds ?? {};
return {
...DEFAULT_GUILD_SETTINGS,
...settings,
@@ -34,12 +33,10 @@ const getGuildSettings = async (guildId) => {
if (!guildId) {
return normalizeGuildSettings();
}
const dbClient = await connectToDatabase();
const db = dbClient.db('discord');
const collection = db.collection('guild_settings');
const settings = await collection.findOne({ guildId });
return normalizeGuildSettings(settings);
};