From e96bcf6fec338aea932f3c44844ee7b95d0f6431 Mon Sep 17 00:00:00 2001 From: WubzyGD Date: Tue, 21 Dec 2021 21:53:46 -0700 Subject: [PATCH] not even gonna explain --- .idea/workspace.xml | 29 +++++++++++++++++++++++++---- commands/social/fuck.js | 22 ++++++++++++++++------ events/guildMemberRemove.js | 2 +- 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 31cc396..8d763ff 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,11 +5,11 @@ - + + - - - + + + + + + @@ -76,10 +80,27 @@ + + + + + + + \ No newline at end of file diff --git a/commands/social/fuck.js b/commands/social/fuck.js index c700bb2..f2a1d32 100644 --- a/commands/social/fuck.js +++ b/commands/social/fuck.js @@ -16,8 +16,8 @@ module.exports = { extra: null }, async execute(message, msg, args, cmd, prefix, mention, client) { - let savess = await Saves.findOne({name: 'fuck'}) ? await Saves.findOne({name: 'fuck'}) : new Saves({name: 'fuck'}); - let saves = savess.saves; + let savess; + let saves; if (!args.length) { return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${message.guild ? message.member.displayName : message.author.username} is horny!`) @@ -26,13 +26,23 @@ module.exports = { .setColor('dda0dd') .setFooter('Luno', client.user.avatarURL()) .setTimestamp()]} - : "You can't bang me.......only Crescent can." + : "You can't bang me.......only Wubzy can." );} - if (mention && args[0].match(/^<@(?:!?)(?:\d+)>$/)) { + if (mention && args[0].match(/^<@!?\d+>$/)) { if (!message.guild) {return message.reply("Can't bang someone that doesn't exist.");} if (!message.guild.members.cache.has(mention.id)) {return message.reply("They ran away from you..I wonder why.");} if (message.author.id === mention.id) {return message.reply("Go fuck yourself..oh wait you can't.");} - let fuck = await VC.findOne({uid: message.author.id, countOf: 'fuck'}) || new VC({uid: message.author.id, countOf: 'fuck'}); + + let fuck; + if (message.channel.nsfw) { + fuck = await VC.findOne({uid: message.author.id, countOf: 'realfuck'}) || new VC({uid: message.author.id, countOf: 'realfuck'}); + savess = await Saves.findOne({name: 'realfuck'}) ? await Saves.findOne({name: 'realfuck'}) : new Saves({name: 'realfuck'}); + saves = savess.saves; + } else { + fuck = await VC.findOne({uid: message.author.id, countOf: 'fuck'}) || new VC({uid: message.author.id, countOf: 'fuck'}); + savess = await Saves.findOne({name: 'fuck'}) ? await Saves.findOne({name: 'fuck'}) : new Saves({name: 'fuck'}); + saves = savess.saves; + } fuck.against[mention.id] = fuck.against[mention.id] ? fuck.against[mention.id] + 1 : 1; fuck.total++; fuck.markModified(`against.${mention.id}`); @@ -56,7 +66,7 @@ module.exports = { saves.set(id, args.join(" ").trim()); savess.saves = saves; savess.save(); - return message.channel.send("Save added!.....master.."); + return message.channel.send("Save added!"); } } }; \ No newline at end of file diff --git a/events/guildMemberRemove.js b/events/guildMemberRemove.js index 63d8fcf..598a359 100644 --- a/events/guildMemberRemove.js +++ b/events/guildMemberRemove.js @@ -11,6 +11,6 @@ module.exports = async (client, member) => { && member.guild.channels.cache.get(tg.lch).permissionsFor(client.user.id).has("SEND_MESSAGES") && !client.users.cache.get(member.id).bot ) { - try {member.guild.channels.cache.get(tg.lch).send(await sendResponse(member, member.guild.channels.cache.get(tg.lch), 'xdlol', client, tr.responses.get(tr.bindings.get('leave'))));} catch {} + try {member.guild.channels.cache.get(tg.lch).send(await sendResponse(member, member.guild.channels.cache.get(tg.lch).catch(() => {}), 'xdlol', client, tr.responses.get(tr.bindings.get('leave')))).catch(() => {});} catch {} } }; \ No newline at end of file