masterhc
/
Remchanv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove buttons when timer ends. Since the interaction would fail anyway.

Browse Source
master
masterhc 1 year ago
parent 736f384457
commit 5486c91aca
15 changed files with 167 additions and 105 deletions
Show Stats Download Patch File Download Diff File

6
commands/admin/activateStrikes.js
Unescape View File

@ -42,7 +42,7 @@ module.exports = class leave extends Command
.setLabel('Remove this.') .setLabel('Remove this.')
.setStyle(ButtonStyle.Primary), .setStyle(ButtonStyle.Primary),
); );
await message.channel.send({ephemeral: true, embeds: [embed], components: [row] }); const Message = await message.channel.send({ephemeral: true, embeds: [embed], components: [row] });
const filter = i => i.customId === randomID; const filter = i => i.customId === randomID;
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
@ -52,6 +52,10 @@ module.exports = class leave extends Command
message.delete(); message.delete();
m.message.delete(); m.message.delete();
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
} }
} }

7
commands/admin/createchannel.js
Unescape View File

@ -49,7 +49,7 @@ const {EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ChannelType,
.setLabel('Remove this.') .setLabel('Remove this.')
.setStyle(ButtonStyle.Primary), .setStyle(ButtonStyle.Primary),
); );
await message.channel.send({ephemeral: true, embeds: [embed], components: [row] }); const Message = await message.channel.send({ephemeral: true, embeds: [embed], components: [row] });
const filter = i => i.customId === randomID; const filter = i => i.customId === randomID;
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
@ -60,7 +60,10 @@ const {EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ChannelType,
m.message.delete(); m.message.delete();
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
} }
}module.exports = createchannel; }module.exports = createchannel;

6
commands/admin/createvoicechannel.js
Unescape View File

@ -60,7 +60,7 @@ const {EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ChannelType,
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
); );
await message.channel.send({ const Message = await message.channel.send({
ephemeral: true, ephemeral: true,
embeds: [embed], embeds: [embed],
components: [row] components: [row]
@ -77,6 +77,10 @@ const {EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ChannelType,
message.delete(); message.delete();
m.message.delete(); m.message.delete();
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
} }

7
commands/admin/guilds.js
Unescape View File

@ -42,7 +42,7 @@ class Guilds extends Command
.setLabel('Remove this.') .setLabel('Remove this.')
.setStyle(ButtonStyle.Primary), .setStyle(ButtonStyle.Primary),
); );
await message.channel.send({ephemeral: true, embeds: payload.embeds, components: [row] }); const Mesage = await message.channel.send({ephemeral: true, embeds: payload.embeds, components: [row] });
const filter = i => i.customId === costumID; const filter = i => i.customId === costumID;
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
@ -52,7 +52,10 @@ class Guilds extends Command
message.delete(); message.delete();
m.message.delete(); m.message.delete();
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }

6
commands/admin/purge.js
Unescape View File

@ -66,7 +66,7 @@ const {Command} = require('../../lib.js')
.setLabel('Remove this.') .setLabel('Remove this.')
.setStyle(ButtonStyle.Primary), .setStyle(ButtonStyle.Primary),
); );
await message.channel.send({ephemeral: true, embeds: [embed], components: [row] }); const Message = await message.channel.send({ephemeral: true, embeds: [embed], components: [row] });
const filter = i => i.customId === costumID; const filter = i => i.customId === costumID;
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
@ -76,5 +76,9 @@ const {Command} = require('../../lib.js')
message.delete(); message.delete();
m.message.delete(); m.message.delete();
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
}module.exports = purge; }module.exports = purge;

6
commands/admin/removerustcommitschannel.js
Unescape View File

@ -56,7 +56,7 @@ const {Command, } = require('../../lib.js');
.setStyle(ButtonStyle.Primary), .setStyle(ButtonStyle.Primary),
); );
embed.addFields({name:success?'Removed':'Error', value:success?'Successfully removed from the list.':error}) embed.addFields({name:success?'Removed':'Error', value:success?'Successfully removed from the list.':error})
await message.channel.send({ephemeral: true, embeds: [embed], components: [row] }); const Message = await message.channel.send({ephemeral: true, embeds: [embed], components: [row] });
const filter = i => i.customId === 'RemoveUnsetRustCommitsChannel'; const filter = i => i.customId === 'RemoveUnsetRustCommitsChannel';
@ -67,6 +67,10 @@ const {Command, } = require('../../lib.js');
message.delete(); message.delete();
m.message.delete() m.message.delete()
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
} }

6
commands/admin/setFreeGamesChannel.js
Unescape View File

@ -64,13 +64,17 @@ class setfreegameschannel extends Command{
); );
const filter = i => i.customId === 'RemoveRustCommitsNewChannelMessage'; const filter = i => i.customId === 'RemoveRustCommitsNewChannelMessage';
await message.channel.send({ephemeral: true, embeds: [embed], components: [row] }); const Message = await message.channel.send({ephemeral: true, embeds: [embed], components: [row] });
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
collector.on('collect', async m => collector.on('collect', async m =>
{ {
message.delete(); message.delete();
m.message.delete() m.message.delete()
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
function addChannel(id, name) function addChannel(id, name)
{ {

6
commands/admin/setrustcommitschannel.js
Unescape View File

@ -39,13 +39,17 @@ class setrustcommitschannel extends Command{
); );
const filter = i => i.customId === 'RemoveRustCommitsNewChannelMessage'; const filter = i => i.customId === 'RemoveRustCommitsNewChannelMessage';
await message.channel.send({ephemeral: true, embeds: [embed], components: [row] }); const Mesage = await message.channel.send({ephemeral: true, embeds: [embed], components: [row] });
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
collector.on('collect', async m => collector.on('collect', async m =>
{ {
message.delete(); message.delete();
m.message.delete() m.message.delete()
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
function addChannel(id, name) function addChannel(id, name)
{ {

6
commands/admin/strike.js
Unescape View File

@ -55,7 +55,7 @@ const strikeM = require('../../models/strikes');
); );
const filter = i => i.customId === 'RemoveStrikeMessage'; const filter = i => i.customId === 'RemoveStrikeMessage';
await this.message.channel.send({ephemeral: true, embeds: [embed], components: [row] }); const Message = await this.message.channel.send({ephemeral: true, embeds: [embed], components: [row] });
const collector = this.message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = this.message.channel.createMessageComponentCollector({ filter, time: 60000 });
collector.on('collect', async m => collector.on('collect', async m =>
{ {
@ -69,6 +69,10 @@ const strikeM = require('../../models/strikes');
// console.log('Strikes: Embed Message: failed to delete.'); // console.log('Strikes: Embed Message: failed to delete.');
}) })
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
async confirmArgs(message,args) async confirmArgs(message,args)
{ {

6
commands/music/activateMusic.js
Unescape View File

@ -43,7 +43,7 @@ module.exports = class leave extends Command
.setLabel('Remove this.') .setLabel('Remove this.')
.setStyle(ButtonStyle.Primary), .setStyle(ButtonStyle.Primary),
); );
await message.channel.send({ephemeral: true, embeds: [embed], components: [row] }); const Message = await message.channel.send({ephemeral: true, embeds: [embed], components: [row] });
const filter = i => i.customId === randomID; const filter = i => i.customId === randomID;
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
@ -53,6 +53,10 @@ module.exports = class leave extends Command
message.delete(); message.delete();
m.message.delete(); m.message.delete();
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
} }
} }

6
commands/music/play.js
Unescape View File

@ -113,7 +113,7 @@ module.exports = class play extends Command
.setLabel(` X `) .setLabel(` X `)
.setStyle(ButtonStyle.Danger), .setStyle(ButtonStyle.Danger),
); );
await message.channel.send({ephemeral: true, embeds: [embed], components: [row] }); const Message = await message.channel.send({ephemeral: true, embeds: [embed], components: [row] });
const filter = i => i.customId.startsWith(`${randomID}PlayUserChoice`); const filter = i => i.customId.startsWith(`${randomID}PlayUserChoice`);
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
@ -127,6 +127,10 @@ module.exports = class play extends Command
addToQ(videos[parseInt(m.customId.split(`${randomID}PlayUserChoice`)[1])]) addToQ(videos[parseInt(m.customId.split(`${randomID}PlayUserChoice`)[1])])
} }
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
} }

16
commands/search/searchAnime.js
Unescape View File

@ -15,7 +15,7 @@ class anime extends Command{
}) })
} }
async run(message, args){ async run(message, args){
if(!args[0]) return new ErrorMessage(this.client).send(ErrorType.Arguments, message) if(!args[0]) return new ErrorMessage(this.client).send(ErrorType.NoArguments, message)
const data = await new Anilist().searchAnime(args.join(' ')); const data = await new Anilist().searchAnime(args.join(' '));
if(data=='Error') return new ErrorMessage(this.client).send(ErrorType.Arguments, message, [`Couldn't find any anime with the search argument you provided.`]) if(data=='Error') return new ErrorMessage(this.client).send(ErrorType.Arguments, message, [`Couldn't find any anime with the search argument you provided.`])
// console.log('SearchAnime: Data:', data[1].title.romaji, data.length); // console.log('SearchAnime: Data:', data[1].title.romaji, data.length);
@ -50,18 +50,22 @@ class anime extends Command{
.setTimestamp() .setTimestamp()
.addFields(fieldPayload); .addFields(fieldPayload);
const filter = i => i.customId.slice(0,-1) === randomID; const filter = i => i.customId.slice(0,-1) === randomID;
await message.channel.send({ephemeral: true, embeds, components: [row] }); const Message = await message.channel.send({ephemeral: true, embeds, components: [row] });
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
collector.on('collect', async m => collector.on('collect', async m =>
{ {
message.delete(); message.delete();
m.message.delete(); m.message.delete();
if(m.customId[m.customId.length-1]!=4) sendMessage(data[m.customId[m.customId.length-1]].id); if(m.customId[m.customId.length-1]!=4) sendMessage(data[m.customId[m.customId.length-1]].id, this.client);
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
/** /**
* @param {Number} id * @param {Number} id
*/ */
async function sendMessage(id) async function sendMessage(id, client)
{ {
const data = await new Anilist().getAnimeInfo(id); const data = await new Anilist().getAnimeInfo(id);
// console.log('Command: SearchChar: SendMessage: Data', data) // console.log('Command: SearchChar: SendMessage: Data', data)
@ -106,6 +110,10 @@ class anime extends Command{
{ {
m.message.delete(); m.message.delete();
}); });
collector.on('end', async ()=>
{
client.guilds.cache.get(sentMessage.guildId).channels.cache.get(sentMessage.channelId).messages.cache.get(sentMessage.id).edit({ components: [] });
})
} }
} }

31
commands/search/searchChar.js
Unescape View File

@ -15,7 +15,7 @@ class char extends Command{
} }
async run(message, args) async run(message, args)
{ {
if(!args[0]) return new ErrorMessage(this.client).send(ErrorType.Arguments, message) if(!args[0]) return new ErrorMessage(this.client).send(ErrorType.NoArguments, message)
const data = await new Anilist().searchChar(args.join(' ')); const data = await new Anilist().searchChar(args.join(' '));
if(data=='Error') return new ErrorMessage(this.client).send(ErrorType.Arguments, message, [`Couldn't find any character with the search argument you provided.`]) if(data=='Error') return new ErrorMessage(this.client).send(ErrorType.Arguments, message, [`Couldn't find any character with the search argument you provided.`])
const embed = new EmbedBuilder(); const embed = new EmbedBuilder();
@ -51,18 +51,22 @@ class char extends Command{
// console.log(data.length, embeds.length, embeds) // console.log(data.length, embeds.length, embeds)
const filter = i => i.customId.slice(0,-1) === randomID; const filter = i => i.customId.slice(0,-1) === randomID;
await message.channel.send({ephemeral: true, embeds, components: [row] }); const sentMessage = await message.channel.send({ephemeral: true, embeds, components: [row] });
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
collector.on('collect', async m => collector.on('collect', async m =>
{ {
message.delete(); message.delete();
m.message.delete(); m.message.delete();
if(m.customId[m.customId.length-1]!=4) sendMessage(data[m.customId[m.customId.length-1]].id); if(m.customId[m.customId.length-1]!=4) sendMessage(data[m.customId[m.customId.length-1]].id, this.client);
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(sentMessage.guildId).channels.cache.get(sentMessage.channelId).messages.cache.get(sentMessage.id).edit({ components: [] });
})
/** /**
* @param {Number} id * @param {Number} id
*/ */
async function sendMessage(id) async function sendMessage(id, client)
{ {
const data = await new Anilist().getCharInfo(id); const data = await new Anilist().getCharInfo(id);
data.description = data.description.replaceAll('~!', '').replaceAll('!~', '').replaceAll(/<[^>]*>/g, ''); data.description = data.description.replaceAll('~!', '').replaceAll('!~', '').replaceAll(/<[^>]*>/g, '');
@ -80,18 +84,9 @@ class char extends Command{
.addFields( .addFields(
{name:'Page', value:data.url, inline:true} {name:'Page', value:data.url, inline:true}
); );
if(data.age) if(data.age) embed.addFields({name:'Age:',value:data.age, inline:true});
{ if(data.gender) embed.addFields({name:'Gender:', value:data.gender?data.gender:'', inline:true},);
embed.addFields({name:'Age:',value:data.age, inline:true}); if(!data.name.native) embed.setTitle(`${data.name.full}`)
}
if(data.gender)
{
embed.addFields({name:'Gender:', value:data.gender?data.gender:'', inline:true},);
}
if(!data.name.native)
{
embed.setTitle(`${data.name.full}`)
}
const randomID = Random(); const randomID = Random();
const row = new ActionRowBuilder() const row = new ActionRowBuilder()
.addComponents( .addComponents(
@ -107,6 +102,10 @@ class char extends Command{
{ {
m.message.delete(); m.message.delete();
}); });
collector.on('end', async ()=>
{
client.guilds.cache.get(sentMessage.guildId).channels.cache.get(sentMessage.channelId).messages.cache.get(sentMessage.id).edit({ components: [] });
})
} }
} }

18
commands/search/searchManga.js
Unescape View File

@ -15,7 +15,7 @@ class manga extends Command{
} }
async run(message, args) async run(message, args)
{ {
if(!args[0]) return new ErrorMessage(this.client).send(ErrorType.Arguments, message) if(!args[0]) return new ErrorMessage(this.client).send(ErrorType.NoArguments, message)
const data = await new Anilist().searchManga(args.join(' ')); const data = await new Anilist().searchManga(args.join(' '));
if(data=='Error') return new ErrorMessage(this.client).send(ErrorType.Arguments, message, [`Couldn't find any character with the search argument you provided.`]) if(data=='Error') return new ErrorMessage(this.client).send(ErrorType.Arguments, message, [`Couldn't find any character with the search argument you provided.`])
// console.log('SearchManga: Data:', data) // console.log('SearchManga: Data:', data)
@ -52,18 +52,22 @@ class manga extends Command{
embeds.unshift(embed); embeds.unshift(embed);
const filter = i => i.customId.slice(0,-1) === randomID; const filter = i => i.customId.slice(0,-1) === randomID;
await message.channel.send({ephemeral: true, embeds, components: [row] }); const Message = await message.channel.send({ephemeral: true, embeds, components: [row] });
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
collector.on('collect', async m => collector.on('collect', async m =>
{ {
message.delete(); message.delete();
m.message.delete(); m.message.delete();
if(m.customId[m.customId.length-1]!=4) sendMessage(data[m.customId[m.customId.length-1]].id); if(m.customId[m.customId.length-1]!=4) sendMessage(data[m.customId[m.customId.length-1]].id, this.client);
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
/** /**
* @param {Number} id * @param {Number} id
*/ */
async function sendMessage(id) async function sendMessage(id, client)
{ {
const data = await new Anilist().getMangaInfo(id); const data = await new Anilist().getMangaInfo(id);
data.description = data.description.replaceAll('~!', '').replaceAll('!~', '').replaceAll(/<[^>]*>/g, ''); data.description = data.description.replaceAll('~!', '').replaceAll('!~', '').replaceAll(/<[^>]*>/g, '');
@ -88,12 +92,16 @@ class manga extends Command{
.setStyle(ButtonStyle.Primary), .setStyle(ButtonStyle.Primary),
); );
const filter = i => i.customId === randomID; const filter = i => i.customId === randomID;
await message.channel.send({ephemeral: true, embeds: [embed], components: [row] }); const sentMessage = await message.channel.send({ephemeral: true, embeds: [embed], components: [row] });
const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 }); const collector = message.channel.createMessageComponentCollector({ filter, time: 60000 });
collector.on('collect', async m => collector.on('collect', async m =>
{ {
m.message.delete(); m.message.delete();
}); });
collector.on('end', async ()=>
{
client.guilds.cache.get(sentMessage.guildId).channels.cache.get(sentMessage.channelId).messages.cache.get(sentMessage.id).edit({ components: [] });
})
} }
} }
}module.exports = manga; }module.exports = manga;

7
lib.js
Unescape View File

@ -515,7 +515,7 @@ class ErrorMessage
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
.setEmoji('❌') .setEmoji('❌')
); );
await this.client.channels.cache.get(message.channel.id).send({ephemeral: true, embeds: [embed], components: [row] }); const Message = await this.client.channels.cache.get(message.channel.id).send({ephemeral: true, embeds: [embed], components: [row] });
const filter = i => i.customId === randomID; const filter = i => i.customId === randomID;
@ -526,6 +526,11 @@ class ErrorMessage
message.delete().then(()=>m.message.delete()) message.delete().then(()=>m.message.delete())
.catch(()=>m.message.delete()); .catch(()=>m.message.delete());
}); });
collector.on('end', async ()=>
{
this.client.guilds.cache.get(Message.guildId).channels.cache.get(Message.channelId).messages.cache.get(Message.id).edit({ components: [] });
})
} }
}module.exports.ErrorMessage = ErrorMessage; }module.exports.ErrorMessage = ErrorMessage;

Write Preview
Loading…
Cancel
Save