master
Kit Kasune 3 years ago
parent c1e6f16ae7
commit 563b538a06
  1. 52
      commands/fun/kiss.js
  2. 28
      commands/social/kiss.js

@ -1,52 +0,0 @@
const Discord = require('discord.js');
const Saves = require('../../models/saves');
const UserData = require('../../models/user');
const makeId = require('../../util/makeid');
module.exports = {
name: "kiss",
help: "Ask for a kiss with `{{p}}kiss`, or give one by mentioning someone!",
meta: {
category: 'Fun',
description: "Give someone a kiss, or show that you're looking for one. Best of luck pal!",
syntax: '`kiss <@user>`',
extra: null
},
async execute(message, msg, args, cmd, prefix, mention, client) {
let savess = await Saves.findOne({name: 'kiss'}) ? await Saves.findOne({name: 'kiss'}) : new Saves({name: 'kiss'});
let saves = savess.saves;
if (!args.length) {
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${message.guild ? message.member.displayName : message.author.username} wants a kiss!`)
.setThumbnail(message.author.avatarURL({size: 2048}))
.setDescription(`Give them a little kiss with \`${prefix}kiss @${message.member.displayName}\`!`)
.setColor('c375f0')
.setFooter('Natsuki', client.user.avatarURL())
.setTimestamp()]}
: "I'm not really into that kind of thing. Maybe try asking in a server?"
);}
if (mention && args[0].match(/^<@(?:!?)(?:\d+)>$/)) {
if (!message.guild) {return message.reply("Please make sure you're in a server so you can mention someone other than me to kiss!");}
if (!message.guild.members.cache.has(mention.id)) {return message.reply("That user is not in this server!");}
if (message.author.id === mention.id) {return message.reply("A self-kiss ought to be a little hard, don't you think?");}
return message.channel.send({embeds: [new Discord.MessageEmbed()
.setAuthor(`${message.guild ? message.member.displayName : message.author.username} kisses ${message.guild.members.cache.get(mention.id).displayName}`, message.author.avatarURL())
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('d428a0')
]});
}
if (['s', 'save', 'n', 'new', 'a', 'add'].includes(args[0].toLowerCase())) {
if (!args[1]) {return message.channel.send('oi there cunt, give me a link of an image to add!');}
let tu = await UserData.findOne({uid: message.author.id});
if ((!tu || !tu.developer) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Developer in order to add new kiss GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
args.shift();
saves.set(id, args.join(" ").trim());
savess.saves = saves;
savess.save();
return message.channel.send("Save added!");
}
}
};

@ -1,9 +1,6 @@
const Discord = require('discord.js'); const Discord = require('discord.js');
const Saves = require('../../models/saves'); const Saves = require('../../models/saves');
const UserData = require('../../models/user'); const UserData = require('../../models/user');
const VC = require('../../models/vscount');
const makeId = require('../../util/makeid'); const makeId = require('../../util/makeid');
module.exports = { module.exports = {
@ -23,32 +20,25 @@ module.exports = {
.setTitle(`${message.guild ? message.member.displayName : message.author.username} wants a kiss!`) .setTitle(`${message.guild ? message.member.displayName : message.author.username} wants a kiss!`)
.setThumbnail(message.author.avatarURL({size: 2048})) .setThumbnail(message.author.avatarURL({size: 2048}))
.setDescription(`Give them a little kiss with \`${prefix}kiss @${message.member.displayName}\`!`) .setDescription(`Give them a little kiss with \`${prefix}kiss @${message.member.displayName}\`!`)
.setColor('328ba8') .setColor('c375f0')
.setFooter('Luno', client.user.avatarURL()) .setFooter('Natsuki', client.user.avatarURL())
.setTimestamp()]} .setTimestamp()]}
: "Sorry..my lips are for Crescent only!" : "I'm not really into that kind of thing. Maybe try asking in a server?"
);} );}
if (mention && args[0].match(/^<@(?:!?)(?:\d+)>$/)) { if (mention && args[0].match(/^<@(?:!?)(?:\d+)>$/)) {
if (!message.guild) {return message.reply("I'd rather kiss in public..maybe try in a server?");} if (!message.guild) {return message.reply("Please make sure you're in a server so you can mention someone other than me to kiss!");}
if (!message.guild.members.cache.has(mention.id)) {return message.reply("That person must have ran from your love..");} if (!message.guild.members.cache.has(mention.id)) {return message.reply("That user is not in this server!");}
if (message.author.id === mention.id) {return message.reply("A self-kiss ought to be a little hard, don't you think?");} if (message.author.id === mention.id) {return message.reply("A self-kiss ought to be a little hard, don't you think?");}
let kiss = await VC.findOne({uid: message.author.id, countOf: 'kiss'}) || new VC({uid: message.author.id, countOf: 'kiss'});
kiss.against[mention.id] = kiss.against[mention.id] ? kiss.against[mention.id] + 1 : 1;
kiss.total++;
kiss.markModified(`against.${mention.id}`);
kiss.save();
return message.channel.send({embeds: [new Discord.MessageEmbed() return message.channel.send({embeds: [new Discord.MessageEmbed()
.setAuthor(`${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a kiss!`, message.author.avatarURL()) .setAuthor(`${message.guild ? message.member.displayName : message.author.username} kisses ${message.guild.members.cache.get(mention.id).displayName}`, message.author.avatarURL())
.setDescription(`You've kissed them **${kiss.against[mention.id] === 1 ? 'once' : `${kiss.against[mention.id]} times!`}**`)
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('ac0f0f') .setColor('d428a0')
.setFooter(`${kiss.total} kisse${kiss.total === 1 ? '' : 's'} total`)
]}); ]});
} }
if (['s', 'save', 'n', 'new', 'a', 'add'].includes(args[0].toLowerCase())) { if (['s', 'save', 'n', 'new', 'a', 'add'].includes(args[0].toLowerCase())) {
if (!args[1]) {return message.channel.send('oi there cunt, give me a link of an image to add!');} if (!args[1]) {return message.channel.send('oi there cunt, give me a link of an image to add!');}
let tu = await UserData.findOne({uid: message.author.id}); let tu = await UserData.findOne({uid: message.author.id});
if ((!tu || !tu.developer) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Luno Developer in order to add new kissing GIFs.");} if ((!tu || !tu.developer) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Developer in order to add new kiss GIFs.");}
let e = true; let e = true;
let id; let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}} while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
@ -56,7 +46,7 @@ module.exports = {
saves.set(id, args.join(" ").trim()); saves.set(id, args.join(" ").trim());
savess.saves = saves; savess.saves = saves;
savess.save(); savess.save();
return message.channel.send("Save added master!"); return message.channel.send("Save added!");
} }
} }
}; };
Loading…
Cancel
Save