System-End/Discord-Bot
1
0
Fork 0
mirror of https://github.com/System-End/Discord-Bot.git synced 2026-04-19 16:28:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bugs, optimized webhook setting

Browse source
This commit is contained in:
CorwinDev 2022-12-19 13:29:50 +01:00
parent 6db4f5b80f
commit 367e7f3066
4 changed files with 17 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/bot.js
View file

@ -115,52 +115,15 @@ client.config = require('./config/bot');
client.changelogs = require('./config/changelogs');
client.emotes = require("./config/emojis.json");
client.webhooks = require("./config/webhooks.json");
const webHooksArray = ['startLogs', 'shardLogs', 'errorLogs', 'dmLogs', 'voiceLogs', 'serverLogs', 'serverLogs2', 'commandLogs', 'consoleLogs', 'warnLogs', 'voiceErrorLogs', 'creditLogs', 'evalLogs', 'interactionLogs'];
// Check if .env webhook_id and webhook_token are set
if (process.env.WEBHOOK_ID && process.env.WEBHOOK_TOKEN) {
client.webhooks.startLogs.id = process.env.WEBHOOK_ID;
client.webhooks.startLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.shardLogs.id = process.env.WEBHOOK_ID;
client.webhooks.shardLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.errorLogs.id = process.env.WEBHOOK_ID;
client.webhooks.errorLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.dmLogs.id = process.env.WEBHOOK_ID;
client.webhooks.dmLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.voiceLogs.id = process.env.WEBHOOK_ID;
client.webhooks.voiceLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.serverLogs.id = process.env.WEBHOOK_ID;
client.webhooks.serverLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.serverLogs2.id = process.env.WEBHOOK_ID;
client.webhooks.serverLogs2.token = process.env.WEBHOOK_TOKEN;
client.webhooks.commandLogs.id = process.env.WEBHOOK_ID;
client.webhooks.commandLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.consoleLogs.id = process.env.WEBHOOK_ID;
client.webhooks.consoleLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.warnLogs.id = process.env.WEBHOOK_ID;
client.webhooks.warnLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.voiceErrorLogs.id = process.env.WEBHOOK_ID;
client.webhooks.voiceErrorLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.creditLogs.id = process.env.WEBHOOK_ID;
client.webhooks.creditLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.evalLogs.id = process.env.WEBHOOK_ID;
client.webhooks.evalLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.interactionLogs.id = process.env.WEBHOOK_ID;
client.webhooks.interactionLogs.token = process.env.WEBHOOK_TOKEN;
client.webhooks.bugReportLogs.id = process.env.WEBHOOK_ID;
client.webhooks.bugReportLogs.token = process.env.WEBHOOK_TOKEN;
for (const webhookName of webHooksArray) {
client.webhooks[webhookName].id = process.env.WEBHOOK_ID;
client.webhooks[webhookName].token = process.env.WEBHOOK_TOKEN;
}
}
client.commands = new Discord.Collection();
client.playerManager = new Map();
client.triviaManager = new Map();

5
src/commands/music/play.js
View file

@ -179,9 +179,12 @@ module.exports = async (client, interaction, args) => {
i = await interaction.channel.awaitMessageComponent({ filter, max: 1, time: 30e3, componentType: Discord.ComponentType.Button, errors: ['time'] });
} catch (e) {
if (!player.queue.current) player.destroy();
row.components.forEach((button) => button.setDisabled(true));
row2.components.forEach((button) => button.setDisabled(true));
return client.errNormal({
error: `You didn't provide a selection`,
type: 'editreply'
type: 'editreply',
components: [row, row2]
}, interaction)
}

3
src/events/client/guildCreate.js
View file

@ -44,8 +44,7 @@ module.exports = async (client, guild) => {
let defaultChannel = "";
guild.channels.cache.forEach((channel) => {
if (channel.type == Discord.ChannelType.GuildText && defaultChannel == "") {
console.log(channel.permissionsFor(guild.me).has(Discord.PermissionFlagsBits.SendMessages))
if (channel.permissionsFor(guild.me).has()) {
if (channel.permissionsFor(guild.members.me).has(Discord.PermissionFlagsBits.SendMessages)) {
defaultChannel = channel;
}
}

46
src/index.js
View file

@ -15,49 +15,13 @@ axios.get('https://api.github.com/repos/CorwinDev/Discord-Bot/releases/latest').
const webhook = require("./config/webhooks.json");
const config = require("./config/bot.js");
const webHooksArray = ['startLogs', 'shardLogs', 'errorLogs', 'dmLogs', 'voiceLogs', 'serverLogs', 'serverLogs2', 'commandLogs', 'consoleLogs', 'warnLogs', 'voiceErrorLogs', 'creditLogs', 'evalLogs', 'interactionLogs'];
// Check if .env webhook_id and webhook_token are set
if (process.env.WEBHOOK_ID && process.env.WEBHOOK_TOKEN) {
webhook.startLogs.id = process.env.WEBHOOK_ID;
webhook.startLogs.token = process.env.WEBHOOK_TOKEN;
webhook.shardLogs.id = process.env.WEBHOOK_ID;
webhook.shardLogs.token = process.env.WEBHOOK_TOKEN;
webhook.errorLogs.id = process.env.WEBHOOK_ID;
webhook.errorLogs.token = process.env.WEBHOOK_TOKEN;
webhook.dmLogs.id = process.env.WEBHOOK_ID;
webhook.dmLogs.token = process.env.WEBHOOK_TOKEN;
webhook.voiceLogs.id = process.env.WEBHOOK_ID;
webhook.voiceLogs.token = process.env.WEBHOOK_TOKEN;
webhook.serverLogs.id = process.env.WEBHOOK_ID;
webhook.serverLogs.token = process.env.WEBHOOK_TOKEN;
webhook.serverLogs2.id = process.env.WEBHOOK_ID;
webhook.serverLogs2.token = process.env.WEBHOOK_TOKEN;
webhook.commandLogs.id = process.env.WEBHOOK_ID;
webhook.commandLogs.token = process.env.WEBHOOK_TOKEN;
webhook.consoleLogs.id = process.env.WEBHOOK_ID;
webhook.consoleLogs.token = process.env.WEBHOOK_TOKEN;
webhook.warnLogs.id = process.env.WEBHOOK_ID;
webhook.warnLogs.token = process.env.WEBHOOK_TOKEN;
webhook.voiceErrorLogs.id = process.env.WEBHOOK_ID;
webhook.voiceErrorLogs.token = process.env.WEBHOOK_TOKEN;
webhook.creditLogs.id = process.env.WEBHOOK_ID;
webhook.creditLogs.token = process.env.WEBHOOK_TOKEN;
webhook.evalLogs.id = process.env.WEBHOOK_ID;
webhook.evalLogs.token = process.env.WEBHOOK_TOKEN;
webhook.interactionLogs.id = process.env.WEBHOOK_ID;
webhook.interactionLogs.token = process.env.WEBHOOK_TOKEN;
for (const webhookName of webHooksArray) {
webhook[webhookName].id = process.env.WEBHOOK_ID;
webhook[webhookName].token = process.env.WEBHOOK_TOKEN;
}
}