Merge branch 'master' into fix-33

This commit is contained in:
Christer Warén
2021-09-03 05:27:59 +03:00
17 changed files with 136 additions and 110 deletions

View File

@ -1,8 +1,16 @@
import Discord from "discord.js";
const { REST } = require('@discordjs/rest');
const { Routes } = require('discord-api-types/v9');
const { token, version } = require('../../config.js');
module.exports = {
name: 'SIGINT',
async execute(client) {
client.user.setStatus('dnd');
console.log("\n");
client.funcs.logger("Bot", "Closing");
console.log("\n");
setTimeout(async function () {
let message = {};
@ -16,8 +24,8 @@ module.exports = {
currentRadio.guild = client.datastore.getEntry(radio.value).guild;
if (currentRadio) {
client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
client.funcs.saveState(client, currentRadio.guild, currentRadio);
await client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
await client.funcs.saveState(client, currentRadio.guild, currentRadio);
currentRadio.connection?.destroy();
currentRadio.audioPlayer?.stop();
currentRadio.message?.delete();
@ -27,11 +35,25 @@ module.exports = {
radio = currentRadios.next();
}
console.log("\n");
client.funcs.logger("Bot", "Closing");
console.log("\n");
const rest = new REST({ version: '9' }).setToken(token);
if(version.includes("-dev")){
await rest.put(
Routes.applicationCommands(client.user.id),
{ body: [] },
);
client.user.setStatus('dnd');
let guilds = await client.guilds.fetch();
guilds.forEach(async guild => {
try {
await rest.put(
Routes.applicationGuildCommands(client.user.id, guild.id),
{ body: [] },
);
} catch (DiscordAPIError) {
}
});
}
setInterval(() => {
if(radio.done){

View File

@ -1,9 +1,9 @@
import Discord from "discord.js";
module.exports = {
name: 'messageCreate',
async execute(client, msg) {
async execute(client, message) {
if (msg.author.bot || !msg.guild) return;
if (message.author.bot || !message.guild) return;
let prefix = "rx$";
if(client.user.username == "RadioX"){
prefix = "rx>";
@ -11,40 +11,41 @@ module.exports = {
prefix = "rx-";
} else if (client.user.username == "RadioX Dev"){
prefix = "rx$";
} else if(msg.mentions.members.first() && msg.mentions.members.first().user.id === client.user.id){
} else if(message.mentions.members.first() && message.mentions.members.first().user.id === client.user.id){
prefix = "<@!" + client.user.id + "> ";
} else {
return;
}
const args = msg.content.slice(prefix.length).split(' ');
if (!msg.content.startsWith(prefix)) return;
const args = message.content.slice(prefix.length).split(' ');
if (!message.content.startsWith(prefix)) return;
if (!args[0]) return;
const commandName = args[0].toLowerCase();
if (commandName === 'none') return;
const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)) || client.commandAliases.get(commandName);
if (!command && msg.content !== `${prefix}`) return;
const permissions = msg.channel.permissionsFor(msg.client.user);
if (!permissions.has('EMBED_LINKS')) return msg.channel.send(client.messages.noPermsEmbed);
if (!command && message.content !== `${prefix}`) return;
const permissions = message.channel.permissionsFor(message.client.user);
if (!permissions.has('EMBED_LINKS')) return message.channel.send(client.messages.noPermsEmbed);
try {
let message = {};
let newMessage = {};
message.messageCommandsDeprecatedTitle = client.messages.messageCommandsDeprecatedTitle.replace("%client.user.username%", client.user.username);
newMessage.messageCommandsDeprecatedTitle = client.messages.messageCommandsDeprecatedTitle.replace("%client.user.username%", client.user.username);
const embed = new Discord.MessageEmbed()
.setTitle(message.messageCommandsDeprecatedTitle)
.setTitle(newMessage.messageCommandsDeprecatedTitle)
.setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
.setColor(client.config.embedColor)
.setDescription(client.messages.messageCommandsDeprecatedDescription)
.setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
msg.channel.send({ embeds: [embed] });
let msg = await message.channel.send({ embeds: [embed] });
setTimeout(function() {
msg.delete();
}, 30000);
} catch (error) {
msg.reply({
message.reply({
content: client.messages.runningCommandFailed,
ephemeral: true
});

View File

@ -11,6 +11,14 @@ module.exports = {
client.funcs.logger('Datastore', 'Initialize');
client.datastore = new Datastore();
client.funcs.logger('Datastore');
client.datastore.map.forEach(datastore => {
console.log("- " + datastore.guild.id + " / " + datastore.guild.name);
});
console.log("\n");
client.funcs.logger('Datastore', 'Ready');
/*DEVELOPERS*/
client.funcs.logger('Developers');
@ -70,7 +78,7 @@ module.exports = {
client.funcs.logger('Guilds');
let guilds = await client.guilds.fetch();
guilds.forEach(guild => {
console.log("- " + guild.id + ": " + guild.name);
console.log("- " + guild.id + " / " + guild.name);
});
console.log("\n");