diff --git a/main.js b/main.js index 0ae8ac6..ca208de 100644 --- a/main.js +++ b/main.js @@ -20,9 +20,8 @@ client.on('message', gotMessage); function gotMessage(message){ - let msg = message.content.toLowerCase(); - console.log(msg) + // console.log(message) if(message.content.includes('https://media.discordapp.net')) { if(message.content.includes('webm') || message.content.includes('mov') || @@ -67,10 +66,11 @@ function hug(message){ var mentionedRoles = message.mentions.roles.values() var mentionedRolesSize = message.mentions.roles.size - msg = message.content.toLowerCase() + var msg = message.content.toLowerCase() let randomNum = RNG(hugGifs.length) - title = message.author.username + " hugs" + let title = message.author.username + " hugs" + let embed; if (mentionedUsersSize > 0 || mentionedRolesSize > 0){ let allMentions = "" for (let i = 0; i < mentionedUsersSize; i++) { @@ -111,42 +111,40 @@ function move(message, splits){ if(splits.length == 1 && message.mentions.channels.first() != undefined){ + message.react('🐮') + var replyMessageId = message.reference.messageID; mentionedChannelId = splits[0].substring(2, splits[0].length - 1); replyChannelId = message.reference.channelID; - var replyChannel = client.channels.cache.find(channel => channel.id === replyChannelId); + var replyChannel = client.channels.cache.get(replyChannelId); replyChannel.messages.fetch(replyMessageId).then(msg => { - var movedMessageContent; - if(msg.attachments.size > 0){ - allAttachments = msg.attachments.values() - movedMessageContent = []; - for (let i = 0; i < msg.attachments.size; i++) { - currAttachment = allAttachments.next().value - movedMessageContent.push(new Discord.MessageAttachment(currAttachment.url)); - } - client.channels.cache.get(mentionedChannelId).send(movedMessageContent) - // client.channels.cache.get(mentionedChannelId).send(movedMessageContent).then(msgToEdit => { - // msgToEdit.edit("Sent by <@" + msg.author + "> \nmooved <@" + message.author + ">\n" + msgToEdit.content); - // }); + let newMessage = [] + let allAttachments = msg.attachments.values() + for (let i = 0; i < msg.attachments.size; i++){ + let currAttachment = allAttachments.next().value + newMessage.push(new Discord.MessageAttachment(currAttachment.url)) } - else{ - movedMessageContent = msg.content; - client.channels.cache.get(mentionedChannelId).send(movedMessageContent).then(msgToEdit => { - msgToEdit.edit("Sent by <@" + msg.author + "> \nmooved <@" + message.author + ">\n" + msgToEdit.content); - }); + + if (newMessage.length > 0){ + client.channels.cache.get(mentionedChannelId).send(newMessage).then(msgToEdit => { + msgToEdit.edit(`Sent by ${msg.author}\nmooved ${message.author}\n`) + }) + msg.delete({timeout: 3000}); + } + + if (msg.embeds.length > 0){ + client.channels.cache.get(mentionedChannelId).send("Can't really moove embeds, sowwy :c") } - msg.delete({timeout: 3000}); }); message.delete({timeout: 3000}); } } - function createEmbed(title, img, desc){ - embed = new Discord.MessageEmbed() + let embed = new Discord.MessageEmbed() .setTitle(title) .setImage(img) .setDescription(desc) @@ -168,7 +166,6 @@ function RNG(max){ return Math.floor(Math.random() * max) } -// move nefunguje na embedoch // narodeniny? // vianoce, novy rok a tak // .say s vymazanim