joan/Haha-Yes
1
0
Fork 0
forked from Supositware/Haha-Yes
Code Pull requests Activity

Compare commits

base: joan:5b2fa020d18bc560a7cdd9d7d78c4e4a6be68eeb
Branches Tags
joan:Slash-V14
joan:slash
joan:akairo
joan:Commando
Supositware:Slash-V14
Supositware:slash
Supositware:akairo
Supositware:Commando
..
compare: joan:f8c958af91d7f7f5d0f1facf442b7622649922ba
Branches Tags
joan:Slash-V14
joan:slash
joan:akairo
joan:Commando
Supositware:Slash-V14
Supositware:slash
Supositware:akairo
Supositware:Commando

3 commits
5b2fa020d1 ... f8c958af91

Author SHA1 Message Date
Supositware
f8c958af91 Fix permission check and remove useless piece of old code 2023-04-04 22:46:13 +00:00
Supositware
132d387e49 Merge pull request 'Async loading of commands and events' (#1) from joan/Haha-Yes:jmr/import-then into Slash-V14 
Reviewed-on: Supositware/Haha-Yes#1
 2023-04-05 00:38:14 +02:00
Joan Marin
fa95596906
Async loading of commands and events 2023-04-04 18:21:12 -04:00
2 changed files with 21 additions and 153 deletions
Show stats Expand all files Collapse all files

143
commands/admin/tag.js
View file

@ -30,6 +30,7 @@ export default {
userPermissions: [PermissionFlagsBits.ManageChannels],
async execute(interaction, args, client) {
await interaction.deferReply();
if (args.list) {
let tagList = await db.Tag.findAll({ attributes: ['trigger', 'response', 'ownerID'], where: { serverID: interaction.guild.id } });
@ -50,7 +51,7 @@ export default {
if (args.remove) {
if (tag) {
if (tag.get('ownerID') == interaction.user.id || interaction.member.hasPermission('ADMINISTRATOR') || interaction.user.id == ownerId) {
if (tag.get('ownerID') == interaction.user.id || interaction.member.permissionsIn(interaction.channel).has('ADMINISTRATOR') || interaction.user.id == ownerId) {
db.Tag.destroy({ where: { trigger: args.trigger, serverID: interaction.guild.id } });
return interaction.editReply('successfully deleted the following tag: ' + args.trigger);
}
@ -71,7 +72,7 @@ export default {
await db.Tag.create(body);
return interaction.editReply(`tag have been set to ${args.trigger} : ${args.response}`);
}
else if (tag.get('ownerID') == interaction.user.id || interaction.member.hasPermission('ADMINISTRATOR') || interaction.user.id == ownerId) {
else if (tag.get('ownerID') == interaction.user.id || interaction.member.permissionsIn(interaction.channel).has('ADMINISTRATOR') || interaction.user.id == ownerId) {
const row = new ActionRowBuilder()
.addComponents(
@ -112,26 +113,6 @@ export default {
return interaction.editReply({ content: 'Nothing has been changed.', ephemeral: true });
}
});
/*
const filter = m => m.content && m.author.id == interaction.user.id;
message.channel.awaitMessages(filter, { time: 5000, max: 1, errors: ['time'] })
.then(async messages => {
let messageContent = messages.map(messages => messages.content.toLowerCase());
if (messageContent[0] === 'y' || messageContent[0] === 'yes') {
const body = { trigger: args.trigger, response: args.response, ownerID: interaction.user.id, serverID: message.guild.id };
await Tag.update(body, { where: { trigger: args.trigger, serverID: message.guild.id } });
return interaction.editReply(`tag have been set to ${args.trigger} : ${args.response}`);
}
else {
return interaction.editReply('Not updating.');
}
})
.catch(err => {
console.error(err);
return interaction.editReply('Took too long to answer. didin\'t update anything.');
});
*/
}
else {
return interaction.editReply(`You are not the owner of this tag, if you think it is problematic ask an admin to remove it by doing ${this.client.commandHandler.prefix[0]}tag ${args.trigger} --remove`);
@ -149,121 +130,3 @@ export default {
}
},
};
/*
const { Command } = require('discord-akairo');
const Tag = require('../../models').Tag;
class TagCommand extends Command {
constructor() {
super('tag', {
aliases: ['tag'],
category: 'admin',
userPermissions: ['MANAGE_MESSAGES'],
args: [
{
id: 'trigger',
type: 'string',
},
{
id: 'remove',
match: 'flag',
flag: '--remove'
},
{
id: 'reset',
match: 'flag',
flag: '--reset'
},
{
id: 'response',
type: 'string',
match: 'rest',
}
],
channel: 'guild',
description: {
content: 'Create custom autoresponse (--remove to delete a tag, --reset to delete EVERY tag on the server) [Click here to see the complete list of "tag"](https://cdn.discordapp.com/attachments/502198809355354133/561043193949585418/unknown.png) (Need "" if the trigger contains spaces)',
usage: '[trigger] [response]',
examples: ['"do you know da wea" Fuck off dead meme', 'hello Hello [author], how are you today?', 'hello --remove']
}
});
}
async exec(message, args) {
const tag = await Tag.findOne({where: {trigger: args.trigger, serverID: message.guild.id}});
const ownerID = this.client.ownerID;
if (args.reset) {
if (message.member.hasPermission('ADMINISTRATOR')) {
interaction.editReply('Are you sure you want to delete EVERY tag? There is no way to recover them. y/n');
const filter = m => m.content && m.author.id == interaction.user.id;
return message.channel.awaitMessages(filter, {time: 5000, max: 1, errors: ['time'] })
.then(async messages => {
let messageContent = messages.map(messages => messages.content.toLowerCase());
if (messageContent[0] === 'y' || messageContent[0] === 'yes') {
Tag.destroy({where: {serverID: message.guild.id}});
return interaction.editReply('Tags have been reset.');
} else {
return interaction.editReply('Not reseting.');
}
})
.catch(err => {
console.error(err);
return interaction.editReply('Took too long to answer. didin\'t update anything.');
});
} else {
return interaction.editReply('Only person with the `ADMINISTRATOR` rank can reset tags.');
}
}
if (args.remove) {
if (tag) {
if (tag.get('ownerID') == interaction.user.id || message.member.hasPermission('ADMINISTRATOR') || interaction.user.id == ownerID) {
Tag.destroy({where: {trigger: args.trigger, serverID: message.guild.id}});
return interaction.editReply('successfully deleted the following tag: ' + args.trigger);
} else {
return interaction.editReply(`You are not the owner of this tag, if you think it is problematic ask an admin to remove it by doing ${this.client.commandHandler.prefix[0]}tag ${args.trigger} --remove`);
}
} else {
return interaction.editReply('Did not find the specified tag, are you sure it exist?');
}
}
if (!args.trigger) return interaction.editReply('Please provide a trigger in order to create a tag.');
if (!args.response) return interaction.editReply('Please provide the response for that tag');
if (!tag) {
const body = {trigger: args.trigger, response: args.response, ownerID: interaction.user.id, serverID: message.guild.id};
await Tag.create(body);
return interaction.editReply(`tag have been set to ${args.trigger} : ${args.response}`);
} else if (tag.get('ownerID') == interaction.user.id || message.member.hasPermission('ADMINISTRATOR') || interaction.user.id == ownerID) {
interaction.editReply('This tag already exist, do you want to update it? y/n');
const filter = m => m.content && m.author.id == interaction.user.id;
message.channel.awaitMessages(filter, {time: 5000, max: 1, errors: ['time'] })
.then(async messages => {
let messageContent = messages.map(messages => messages.content.toLowerCase());
if (messageContent[0] === 'y' || messageContent[0] === 'yes') {
const body = {trigger: args.trigger, response: args.response, ownerID: interaction.user.id, serverID: message.guild.id};
await Tag.update(body, {where: {trigger: args.trigger, serverID: message.guild.id}});
return interaction.editReply(`tag have been set to ${args.trigger} : ${args.response}`);
} else {
return interaction.editReply('Not updating.');
}
})
.catch(err => {
console.error(err);
return interaction.editReply('Took too long to answer. didin\'t update anything.');
});
} else {
return interaction.editReply(`You are not the owner of this tag, if you think it is problematic ask an admin to remove it by doing ${this.client.commandHandler.prefix[0]}tag ${args.trigger} --remove`);
}
}
}
module.exports = TagCommand;
*/

15
index.js
View file

@ -41,11 +41,13 @@ async function loadCommandFromDir(dir) {
for (const file of commandFiles) {
const filePath = path.join(commandsPath, file);
let command = await import(filePath);
command = command.default;
import(filePath)
.then(importedCommand => {
const command = importedCommand.default;
client.commands.set(command.data.name, command);
console.log(`Successfully loaded command \x1b[32m${command.category}/${command.data.name}\x1b[0m`);
})
.catch(error => console.error(`Failed to load command for path: ${filePath}`, error));
}
}
@ -55,13 +57,16 @@ async function loadEventFromDir(dir, listener) {
for (const file of eventFiles) {
const filePath = path.join(eventsPath, file);
let event = await import(filePath);
event = event.default;
import(filePath)
.then(importedEvent => {
const event = importedEvent.default;
if (event.once) {
listener.once(event.name, (...args) => event.execute(...args, client));
}
else {
listener.on(event.name, (...args) => event.execute(...args, client));
}
})
.catch(error => console.error(`Failed to load event for path: ${filePath}`, error));
}
}