Merge branch 'master' of gitlab.com:loicbersier/discordbot
This commit is contained in:
Loïc Bersier
commit
b6d26fa86f
4 changed files with 13 additions and 8 deletions
|
|
@ -14,7 +14,7 @@ class OwnedCommand extends Command {
|
|||
}
|
||||
|
||||
async exec(message) {
|
||||
let ownedMessage = ['TROLOLOLO OWNED EPIC STYLE', 'Owned noob', 'HAHA BRO YOU JUST GOT OOOOOOOOWNED HAHAHAHAHHAHA NOOOB NOOOOB NOOOB OWNED NOOB<:youngtroll:488559163832795136>', '<a:op:516341492982218756> op op op owned epic style <a:op:516341492982218756>', 'HAHAHA BRO YOU HAVE BEEN OWNED TROLL BRO STYLE', 'OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED YOU JUST GOT OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED YOU JUST GOT OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED YOU JUST GOT OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED YOU JUST GOT OWNED'];
|
||||
let ownedMessage = ['TROLOLOLO OWNED EPIC STYLE', 'Owned noob', 'HAHA BRO YOU JUST GOT OOOOOOOOWNED HAHAHAHAHHAHA NOOOB NOOOOB NOOOB OWNED NOOB<:youngtroll:488559163832795136>', '<a:op:516341492982218756> op op op owned epic style <a:op:516341492982218756>', 'HAHAHA BRO YOU HAVE BEEN OWNED TROLL BRO STYLE', 'OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED YOU JUST GOT OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED YOU JUST GOT OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED YOU JUST GOT OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED OWNED YOU JUST GOT OWNED', 'OWNED\nFUCKING OWNED', 'OWNED!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'];
|
||||
ownedMessage = ownedMessage[Math.floor( Math.random() * ownedMessage.length )];
|
||||
return message.channel.send(ownedMessage);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,12 @@ class fartpissCommand extends Command {
|
|||
aliases: ['fartpiss'],
|
||||
cooldown: 86400000,
|
||||
ratelimit: 5,
|
||||
category: 'reserver',
|
||||
category: 'reserved',
|
||||
args: [
|
||||
{
|
||||
id: 'member',
|
||||
type: 'member'
|
||||
type: 'member',
|
||||
match: 'rest'
|
||||
}
|
||||
],
|
||||
description: {
|
||||
|
|
@ -28,7 +29,7 @@ class fartpissCommand extends Command {
|
|||
|
||||
if (!args.member) {
|
||||
message.guild.members.get(message.author.id).setNickname('fart piss')
|
||||
.then(() => message.channel.send('sucessfully fart pissed on you <:youngtroll:488559163832795136'))
|
||||
.then(() => message.channel.send('sucessfully fart pissed on you <:youngtroll:488559163832795136>'))
|
||||
.catch(() => message.channel.send('Sorry i could not fart piss on you :('));
|
||||
}
|
||||
args.member.setNickname('fart piss')
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class MessageReactionAddListener extends Listener {
|
|||
});
|
||||
}
|
||||
|
||||
async exec(reaction, user) {
|
||||
async exec(reaction, user) {
|
||||
if (reaction.message.author == user) return;
|
||||
let messageContent = reaction.message.content;
|
||||
let messageAttachments = reaction.message.attachments.map(u=> u.url);
|
||||
|
|
@ -46,8 +46,10 @@ class MessageReactionAddListener extends Listener {
|
|||
|
||||
const starEmbed = new MessageEmbed()
|
||||
.setColor(reaction.message.member.displayHexColor)
|
||||
.setDescription(`[Jump to message](https://discordapp.com/channels/${reaction.message.guild.id}/${reaction.message.channel.id}/${reaction.message.id})\n\n${messageContent}`)
|
||||
.setAuthor(reaction.message.author.username, reaction.message.author.displayAvatarURL())
|
||||
.setDescription(messageContent)
|
||||
.addField('Jump to', `[message](https://discordapp.com/channels/${reaction.message.guild.id}/${reaction.message.channel.id}/${reaction.message.id})`)
|
||||
.setFooter(reaction.count + ' ' + staremote)
|
||||
.setTimestamp();
|
||||
|
||||
return channel.send(`in: ${reaction.message.channel}`, {files: messageAttachments, embed: starEmbed})
|
||||
|
|
@ -84,8 +86,10 @@ class MessageReactionAddListener extends Listener {
|
|||
|
||||
const shameEmbed = new MessageEmbed()
|
||||
.setColor(reaction.message.member.displayHexColor)
|
||||
.setDescription(`[Jump to message](https://discordapp.com/channels/${reaction.message.guild.id}/${reaction.message.channel.id}/${reaction.message.id})\n\n${messageContent}`)
|
||||
.setAuthor(reaction.message.author.username, reaction.message.author.displayAvatarURL())
|
||||
.setDescription(messageContent)
|
||||
.addField('Jump to', `[message](https://discordapp.com/channels/${reaction.message.guild.id}/${reaction.message.channel.id}/${reaction.message.id})`)
|
||||
.setFooter(reaction.count + ' ' + shameemote)
|
||||
.setTimestamp();
|
||||
|
||||
return channel.send(`in: ${reaction.message.channel}`,{files: messageAttachments, embed: shameEmbed})
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[
|
||||
"you", "everything you type", "Le funny meme", "PewDiePie", "Casey Frey", "EatDatPussy445", "Grandayy", "Dolan Dark", "my wee wee grow"
|
||||
"you", "everything you type", "Le funny meme", "PewDiePie", "Casey Frey", "EatDatPussy445", "Grandayy", "Dolan Dark", "my wee wee grow", "Big owned getting owned"
|
||||
]
|
||||
Loading…
Reference in a new issue