diff --git a/.gitignore b/.gitignore
index 63ad009..44751e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,10 @@ node_modules/
config.json
auth.json
test.js
-/.idea/
\ No newline at end of file
+gauth.json
+/.idea/
+
+api/**/*
+api/
+.idea/**/*
+/man.js
\ No newline at end of file
diff --git a/.idea/Natsuki.iml b/.idea/Natsuki.iml
index d007bc1..0c1c525 100644
--- a/.idea/Natsuki.iml
+++ b/.idea/Natsuki.iml
@@ -5,6 +5,8 @@
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8cf679b..f55688a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,18 +4,31 @@
-
-
-
+
+
+
+
+
+ {
+ "lastFilter": {
+ "state": "OPEN",
+ "assignee": "WubzyGD"
+ }
+}
@@ -24,9 +37,21 @@
+ {
+ "selectedUrlAndAccountId": {
+ "url": "https://github.com/NatsukiDev/Natsuki",
+ "accountId": "a2fe51af-f1ea-4d53-a0fa-bb9dd34a3ffc"
+ }
+}
+
+
+
+ {
+ "associatedIndex": 5
+}
@@ -35,34 +60,106 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -79,6 +176,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1640148826800
@@ -108,7 +234,140 @@
1640214318896
-
+
+ 1642539309483
+
+
+
+ 1642539309483
+
+
+ 1642551387709
+
+
+
+ 1642551387709
+
+
+ 1642551629134
+
+
+
+ 1642551629134
+
+
+ 1642560099716
+
+
+
+ 1642560099716
+
+
+ 1642707545761
+
+
+
+ 1642707545761
+
+
+ 1642708137867
+
+
+
+ 1642708137867
+
+
+ 1644449776897
+
+
+
+ 1644449776897
+
+
+ 1644454927810
+
+
+
+ 1644454927810
+
+
+ 1644454968528
+
+
+
+ 1644454968528
+
+
+ 1645501776749
+
+
+
+ 1645501776749
+
+
+ 1645649572924
+
+
+
+ 1645649572924
+
+
+ 1645650089290
+
+
+
+ 1645650089290
+
+
+ 1645660453432
+
+
+
+ 1645660453432
+
+
+ 1645679244004
+
+
+
+ 1645679244004
+
+
+ 1647787801198
+
+
+
+ 1647787801198
+
+
+ 1647788334624
+
+
+
+ 1647788334624
+
+
+ 1738924961613
+
+
+
+ 1738924961613
+
+
+ 1739137258111
+
+
+
+ 1739137258111
+
+
+ 1739137274080
+
+
+
+ 1739137274080
+
+
@@ -124,7 +383,6 @@
-
@@ -132,6 +390,25 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bot.js b/bot.js
index 2edc42d..f9a100d 100644
--- a/bot.js
+++ b/bot.js
@@ -1,19 +1,20 @@
const Discord = require('discord.js');
-
+const spinnies = require('dreidels');
+const gs = require('gradient-string');
const chalk = require('chalk');
const ora = require('ora');
const mongoose = require('mongoose');
const readline = require('readline');
-const {SlashCommand} = require('./util/slash');
const {SlashManager} = require('./util/slashmanager');
-const {SlashCommandBuilder} = require('@discordjs/builders');
const {Tag} = require('./util/tag');
const {TagFilter} = require('./util/tagfilter');
+const wait = require('./util/wait');
const flags = Discord.Intents.FLAGS;
let fl = []; Object.keys(flags).forEach(flag => fl.push(flags[flag]));
let client = new Discord.Client({intents: fl, partials: ["CHANNEL", "REACTION", "MESSAGE"]});
+let botReadyResolver;
client.misc = {
savers: ['497598953206841375', '480535078150340609', '468903364533420074'],
@@ -34,8 +35,12 @@ client.misc = {
hasLevelRoles: [],
disabledChannels: new Map()
},
- chests: [],
chestsTimeout: new Map(),
+ chests: {
+ enabled: [],
+ timeout: new Map(),
+ waiting: new Map()
+ },
monit: {},
monitEnabled: [],
inVC: [],
@@ -47,7 +52,13 @@ client.misc = {
animeID: new Discord.Collection(),
charsNum: 0,
charsLove: new Discord.Collection(),
- monners: {}
+ monners: {},
+ lastMonners: {},
+ monnersNames: new Map(),
+ spin: new spinnies(),
+ rp: new Map(),
+ returnToSleep: new Map(),
+ marriageRequests: new Discord.Collection()
},
loggers: {},
rl: readline.createInterface({input: process.stdin, output: process.stdout}),
@@ -57,14 +68,36 @@ client.misc = {
dev: false,
logs: 'normal',
lightstartup: false,
- ignorecmds: []
- }
+ ignorecmds: [],
+ gradients: false,
+ spinners: false
+ },
+ botFinished: new Promise(r => {botReadyResolver = r;}),
+ fullyReady: false
};
-//const config = require('./config.js');
-const auth = require('./auth.json');
-//client.config = config;
+
+
+let waitAmount = 1000 * 10;
+function testConnection() {
+ return new Promise(async r => {
+ require('dns').lookup('www.google.com', async e => {
+ if (e) {
+ await wait(waitAmount);
+ waitAmount *= 2;
+ await testConnection();
+ r();
+ }
+ else {r();}
+ })
+ });
+}
+
+
+
+
+const auth = require('./auth.json');
async function init() {
const cliargs = new TagFilter([
@@ -72,7 +105,9 @@ async function init() {
new Tag(['dev', 'd', 'development', 'test'], 'dev', 'toggle'),
new Tag(['logs', 'l', 'loglevel', 'll'], 'logs', 'append'),
new Tag(['lightstart', 'lightstartup', 'ls'], 'lightstartup', 'toggle'),
- new Tag(['i', 'ignore', 'icmd', 'ignorecmd'], 'ignorecmds', 'listAppend')
+ new Tag(['i', 'ignore', 'icmd', 'ignorecmd'], 'ignorecmds', 'listAppend'),
+ new Tag(['g', 'gradient', 'gradients'], 'gradients', 'toggle'),
+ new Tag(['s', 'sp', 'spinners', 'spin'], 'spinners', 'toggle')
]).test(process.argv.slice(2).join(" "));
if (Object.keys(cliargs).length) {
@@ -93,10 +128,6 @@ async function init() {
client.misc.startupNoConnect = new Date();
client.config = auth;
- client.slash = new SlashManager(client).setTestServer('691122844339404800').importCommands().init();
- client.slash.register();
- client = client.slash.client;
-
let mloginsp = ora(chalk.magentaBright('Connecting to Mongo client...')).start();
let pmcc = new Date().getTime();
const config = client.config;
@@ -116,25 +147,56 @@ async function init() {
mloginsp.stop(); mloginsp.clear();
}
+ client.developers = ["330547934951112705", "673477059904929802"];
+
+ client.utils = {};
+ client.utils.s = num => num === 1 ? '' : 's';
+ client.utils.as = (num, text) => `${text}${client.utils.s(num)}`;
+ client.utils.an = (text, caps) => `${caps ? 'A' : 'a'}${['a', 'e', 'i', 'o', 'u'].includes(text.toLowerCase().trim().slice(0, 1)) ? 'n' : ''} ${text}`;
+ client.utils.c = (text, a=true) => `${text.slice(0, 1).toUpperCase()}${a ? text.slice(1).toLowerCase() : text.slice(1)}`;
+ client.utils.ca = (text, a=true) => text.split(/\s+/gm).map(t => client.utils.c(t, a)).join(" ");
+ client.utils.sm = (mpr, ago=true) => `${mpr.years ? `${mpr.years} year${client.utils.s(mpr.years)} ` : ''}${mpr.months ? `${mpr.months} month${client.utils.s(mpr.months)} ` : ''}${mpr.days} day${client.utils.s(mpr.days)}${ago ? ' ago' : ''}`;
+ client.utils.p = (text) => text.endsWith('s') ? "'" : "'s";
+ client.utils.ps = (text) => `${text}${client.utils.p(text)}`;
+
['commands', 'aliases', 'executables'].forEach(x => client[x] = new Discord.Collection());
client.responses = {triggers: [], commands: new Discord.Collection()};
+ let iters = ['command', 'event', 'response'];
+ if (client.misc.config.spinners) {
+ console.log('');
+ client.misc.cache.spinLog = [];
+ iters.map(i => `Loading ${i.slice(0, 1).toUpperCase()}${i.slice(1)}s`)
+ .map(i => client.misc.config.gradients ? gs.instagram(i) : chalk.blue(i))
+ .forEach((i, ind) => client.misc.cache.spin.add(iters[ind], {text: i}));
+ }
- ['command', 'event', 'response'].forEach(x => require(`./handle/${x}`)(client));
- if (!client.misc.config.nocli) {require('./handle/console')(client);}
+ for (let i = 0; i < iters.length; i++) {let x = iters[i]; await require(`./handle/${x}`)(client);}
+ const spl = client.misc.config.spinners ? (i) => client.misc.cache.spinLog.push(i) : (i) => console.log(i);
+ spl(`\n${chalk.gray('[BOOT]')} >> ${chalk.blue('Getting Slash Commands...')}\n`);
+ client.slash = new SlashManager(client)
+ .setTestServer('691122844339404800')
+ .importCommands(false, undefined, (cmd) => spl(`${chalk.gray('[LOAD]')} >> ${chalk.blueBright('Loaded Slash Command')} ${chalk.white(cmd.name)}`))
+ .init();
+ if (client.misc.config.dev) {await client.slash.devRegister();}
+ else {await client.slash.register();}
+ client = client.slash.client;
+ spl(`\n${chalk.gray('[BOOT]')} >> ${chalk.blue('Loaded all Slash Commands')}`);
- client.developers = ["330547934951112705", "673477059904929802"];
- client.utils = {};
+ if (client.misc.config.spinners) {
+ client.misc.cache.spinLog.forEach(log => console.log(log));
+ }
+ if (!client.misc.config.nocli) {require('./handle/console')(client);}
client.utils.logch = async () => {return client.guilds.cache.get('762707532417335296').channels.cache.get('762732961753595915');};
- client.utils.s = num => num === 1 ? '' : 's';
- client.utils.as = (num, text) => `${text}${client.utils.s(num)}`;
- client.utils.an = (text, caps) => `${caps ? 'A' : 'a'}${['a', 'e', 'i', 'o'].includes(text.toLowerCase().trim().slice(0, 1)) ? 'n' : ''} ${text}`;
client.guildconfig = {};
client.guildconfig.prefixes = new Map();
client.guildconfig.logs = new Map();
+ botReadyResolver(0);
+
await require('./util/wait')(5000);
if (!client.misc.readied) {client.misc.forcedReady = true; await require('./events/ready')(client);}
}
-init().then(() => {});
\ No newline at end of file
+
+testConnection().then(() => init());
\ No newline at end of file
diff --git a/commands/anime/anime.js b/commands/anime/anime.js
index 772c3ac..110a504 100644
--- a/commands/anime/anime.js
+++ b/commands/anime/anime.js
@@ -35,7 +35,6 @@ module.exports = {
queue = true;
}
options = new TagFilter([
- new Tag(['ask', 'question'], 'ask', 'toggle'),
new Tag(['title', 't', 'name', 'n'], 'name', 'append'),
new Tag(['japname', 'japanesename', 'jn'], 'japname', 'append'),
new Tag(['description', 'desc', 'd', 'plot', 'p'], 'plot', 'append'),
@@ -78,7 +77,7 @@ module.exports = {
dmch = mesg.channel;
options.name = await ask(mesg, "What is the anime's name? Make sure to use proper capitalization and spelling. This applies to the rest of the questions I'll ask you.", 60000, true); if (!options.name) {return;}
- if (options.name.length > 75) {clearDM(); return dmch.send("The anime name can't be more than 75 characters!");}
+ if (options.name.length > (queue ? 75 : 250)) {clearDM(); return dmch.send(`The anime name can't be more than ${queue ? 75 : 250} characters!`);}
options.plot = await ask(mesg, "How would you describe the anime? Give a very brief description of things like its plot, main characters, and setting.", 240000, true); if (!options.plot) {return clearDM();}
if (options.plot.length > 500) {clearDM(); return dmch.send("Oi! I said give a \"very brief\" description of the anime!");}
@@ -96,14 +95,13 @@ module.exports = {
options.publishers = options.publishers.split(/,\s+/gm);
if (options.publishers.length > 5) {clearDM(); return dmch.send("No way there were actually that many publishers...");}
- options.airStartDate = await ask(mesg, "When did the anime start? Please format this as \"Month Day, Year\" - e.g. January 1, 2021", 120000, true); if (!options.airStartDate) {return clearDM();}
- options.airEndDate = await ask(mesg, "When did the anime end? If the anime never ended, you can say \"N/A\"", 120000, true); if (!options.airEndDate) {return clearDM();}
- options.lastUpdate = await ask(mesg, "When was the last time a new episode was released for the anime?", 120000, true); if (!options.lastUpdate) {return clearDM();}
-
options.isComplete = await ask(mesg, "Is the anime completed? (If the most recent season has finished, you may only say \"no\" if the next season is *confirmed* by the *studio or publishers* or the next season is in the works.", 60000, true); if (!options.isComplete) {return clearDM();}
if (!['y', 'yes', 'ye', 'n', 'no'].includes(options.isComplete.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
options.isComplete = ['y', 'yes', 'ye'].includes(options.isComplete.trim().toLowerCase());
+ //options.airStartDate = await ask(mesg, "When did the anime start? Please format this as \"Month Day, Year\" - e.g. January 1, 2021", 120000, true); if (!options.airStartDate) {return clearDM();}
+ //if (options.isComplete) {options.airEndDate = await ask(mesg, "When did the anime end?", 120000, true); if (!options.airEndDate) {return clearDM();}}
+
options.seasons = await ask(mesg, "How many seasons does the anime have? Please don't include spinoffs. (Gun Gale Online spinoff doesn't count as a Sword Art Online season.)", 120000, true); if (!options.seasons) {return clearDM();}
if (isNaN(options.seasons) || Number(options.seasons < 1)) {clearDM(); return dmch.send("You either didn't give a number, or it was < 1.");}
options.seasons = Number(options.seasons);
@@ -154,11 +152,11 @@ module.exports = {
.addField('Info', `**Name:** ${options.name}\n**Japanese Name:** ${options.japname}\n\n**Publishers:** ${foptions.publishers}\n**Studios:** ${foptions.studios}`)
.addField('Description', options.plot)
.addField('Length', `**# of Seasons:** ${options.seasons}\n**# of Episodes:** ${options.episodes}`)
- .addField('Airing', `**Began:** ${options.airStartDate}\n**Ended:** ${options.isComplete ? options.airEndDate : 'This anime is still airing!'}`)
- .addField('Other', `**Genre(s):** ${foptions.genres}\n**Tags:** ${foptions.tags}\n**Characters:** ${foptions.characters}\n**Stream this at:** ${foptions.streamAt}`)
+ //.addField('Airing', `**Began:** ${options.airStartDate}\n**Ended:** ${options.isComplete ? options.airEndDate : 'This anime is still airing!'}`)
+ .addField('Other', `**Genre(s):** ${foptions.genres}\n**Characters:** ${foptions.characters}\n**Stream this at:** ${foptions.streamAt}`)
.setColor("c375f0")
.setImage(options.thumbnail)
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp();
try {
am = await dmch.send({embeds: [amEmbed]});
@@ -177,8 +175,8 @@ module.exports = {
client.misc.cache.animeID.set(options.id, options.name);
}
else {amEmbed.addField("ID", options.id);}
- amEmbed.setAuthor({name: !queue ? "Anime Added" : "Anime Submitted", iconURL: message.author.avatarURL()});
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({embeds: [amEmbed]}));
+ amEmbed.setAuthor({name: !queue ? "Anime Added" : "Anime Submitted", iconURL: message.author.displayAvatarURL()});
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177823630762014').send({embeds: [amEmbed]}));
if (!queue) {options.queued = false;}
await new AniData(options).save();
return message.author.send(`Your anime has been ${!queue ? "added" : "submitted"}`);
@@ -191,6 +189,75 @@ module.exports = {
return;
}
+ if (['e', 'edit'].includes(args[0].toLowerCase())) {
+ args.shift();
+ let tu = await UserData.findOne({uid: message.author.id});
+ if (!tu || !tu.staff) {return await message.channel.send("Since you aren't a Natsuki Staff member, you can't edit anime.");}
+ if (!args.length) {return message.channel.send("You have to provide tags to edit anime with.");}
+ options = new TagFilter([
+ new Tag(['title', 't', 'name', 'n'], 'name', 'append'),
+ new Tag(['rn', 'rename'], 'rename', 'append'),
+ new Tag(['japname', 'japanesename', 'jn'], 'japname', 'append'),
+ new Tag(['description', 'desc', 'd', 'plot', 'p'], 'plot', 'append'),
+ new Tag(['pub', 'pubs', 'publishers', 'publisher', 'pb'], 'publishers', 'listAppend'),
+ new Tag(['stud', 's', 'studio', 'studs', 'studios'], 'studios', 'listAppend'),
+ new Tag(['began', 'airstart', 'as'], 'airStartDate', 'append'),
+ new Tag(['ended', 'airend', 'ae'], 'airEndDate', 'append'),
+ new Tag(['iscomplete', 'completed', 'ic'], 'isComplete', 'toggle'),
+ new Tag(['seasons', 'sns'], 'seasons', 'append'),
+ new Tag(['episodes', 'es'], 'episodes', 'append'),
+ new Tag(['genres', 'g'], 'genres', 'listAppend'),
+ new Tag(['tags', 'ta', 'tgs', 'tg', 'tag'], 'tags', 'listAppend'),
+ new Tag(['streams', 'streamat', 'sa'], 'streamAt', 'listAppend'),
+ new Tag(['img', 'thumb', 'thumbnail', 'image'], 'thumbnail', 'append')
+ ]).test(args.join(' '));
+ if (!options.name) {
+ let tempani = await ask(message, "What anime would you like to edit?", 60000, false, true);
+ if (!tempani) {return;}
+ options.name = tempani.split(/\s+/g);
+ }
+ let asr = await ans(message, client, options.name.toLowerCase(), -700, 0);
+ let fn;
+ if (asr === 0) {
+ return message.channel.send("That search returned no results! Try again?");
+ } else if (asr instanceof Pagination) {
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
+ await asr.message.react('✅');
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
+ let arc;
+ try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
+ catch {return message.reply("Looks like you didn't find the anime you were looking for.");}
+ collected = arc.first().emoji.name;
+ if (collected === '✅') {
+ fn = client.misc.cache.anime.get(asr.getCurrentPage().title.trim());
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
+ }
+ else {return message.reply("Looks like you didn't find the anime you were looking for.");}
+ } else {fn = asr.id;}
+ let ani = await AniData.findOne({id: fn});
+ if (!ani) {return message.channel.send("\\*Head scratching* that anime seems to have vanished into thin air. Try again or go yell at my devs.");}
+ Object.keys(options).forEach(o => {if (![undefined, null].includes(options[o]) && o !== 'name') {
+ if (o === 'japname') {
+ client.misc.cache.anime.delete(ani.japname);
+ client.misc.cache.anime.set(options.japname, ani.id);
+ }
+ if (Array.isArray(options[o])) {options[o].forEach(i => ani[o].push(i));}
+ else {ani[o] = options[o];}
+ ani.markModified(o);
+ if (o === 'rename') {
+ delete ani.rename;
+ client.misc.cache.animeID.set(ani.id, options.rename);
+ client.misc.cache.anime.delete(ani.name);
+ client.misc.cache.anime.set(options.rename, ani.id);
+ ani.name = options.rename;
+ }
+ }});
+ ani.save();
+ return message.channel.send('Anime updated.');
+ }
+
if (['s', 'search'].includes(args[0].trim().toLowerCase())) {
args.shift();
if (!args[0]) {
@@ -202,7 +269,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
} else {
await message.channel.send({embeds: [asr.embed]});
}
@@ -220,7 +287,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
} else {
await message.channel.send({embeds: [asr.embed]});
}
@@ -238,6 +305,35 @@ module.exports = {
.catch(() => {return message.reply("It seems that submission wasn't deleted for some reason. \*insert head scratching*");});
}
+ if (['accept', 'approve'].includes(args[0].toLowerCase())) {
+ let tu = await UserData.findOne({uid: message.author.id});
+ if (!tu || !tu.staff) {await message.channel.send("Since you aren't a Natsuki Staff member, you can't accept anime submissions!");}
+ let tr = await AniData.findOne({id: args[1].toLowerCase()});
+ if (!tr) {return message.reply("That anime submission doesn't seem to exist!");}
+ if (tr.queued !== true) {return message.reply("That anime was already accepted, so you can't accept it again...");}
+ tr.queued = false;
+ return await tr.save()
+ .then(() => {
+ client.misc.cache.anime.set(ani.japname.normalize("NFD").replace(/[\u0300-\u036f]/g, ""), ani.id);
+ client.misc.cache.anime.set(ani.name.normalize("NFD").replace(/[\u0300-\u036f]/g, ""), ani.id);
+ if (ani.altNames) {ani.altNames.forEach(altName => client.misc.cache.anime.set(altName, ani.id));}
+ client.misc.cache.animeID.set(ani.id, ani.name.normalize("NFD").replace(/[\u0300-\u036f]/g, ""));
+ client.misc.cache.animeLove.set(ani.id, ani.watchers);
+ client.misc.cache.animeNum++;
+ client.guilds.cache.get('762707532417335296').channels.cache.get('932177823630762014').send({embeds: [new Discord.MessageEmbed()
+ .setTitle(`Anime Accepted -> ${tr.name}`)
+ .setAuthor({name: 'Anime Approved', iconURL: message.author.displayAvatarURL()})
+ .setThumbnail(tr.thumbnail)
+ .setDescription(`${tr.name} has been approved, and is now available to all Natsuki users.`)
+ .setColor('c375f0')
+ .setFooter({text: "Natsuki"})
+ .setTimestamp()
+ ]}).catch(() => {});
+ return message.channel.send("I've accepted that submission.");
+ })
+ .catch(() => {return message.reply("It seems that submission wasn't accepted for some reason. \*insert head scratching*");});
+ }
+
if (['r', 'rand', 'random', 'any'].includes(args[0].toLowerCase())) {
let asr = await ans(message, client, client.misc.cache.anime.random(), -100000);
return await message.channel.send({embeds: [asr.embed]});
@@ -245,6 +341,36 @@ module.exports = {
if (['w', 'watched'].includes(args[0].toLowerCase())) {
args.shift();
+ if (args[0] && ['v', 'view'].includes(args[0].toLowerCase())) {
+ if (mention) {args.shift();}
+ let user = mention || message.author;
+ let af = await AF.findOne({uid: user.id});
+ if (!af || !af.watched.length) {return message.channel.send(`${user.id === message.author.id ? "You haven't" : "That person hasn't"} watched any anime.`);}
+ let pages = [];
+ let pl = (Math.floor(af.watched.length / 10) + 1);
+ for (let i = 0; i < pl; i++) {
+ let s = '';
+ for (let x = 0; x < 10; x++) {
+ if (!af.watched[(i * 10) + x]) {break;}
+ s += `**${x + (i * 10) + 1}.** ${client.misc.cache.animeID.get(af.watched[(i * 10) + x])}\n`;
+ }
+ pages.push(new Discord.MessageEmbed()
+ .setAuthor({
+ name: message.guild ? message.guild.members.cache.get(user.id).displayName : user.username,
+ iconURL: message.guild ? message.guild.members.cache.get(user.id).displayAvatarURL({dynamic: true}) : user.displayAvatarURL({dynamic: true})
+ })
+ .setTitle("Finished Anime List")
+ .setDescription(s)
+ .setColor('c375f0')
+ .setTimestamp()
+ );
+ }
+ if (pages.length > 1) {
+ let pag = new Pagination(message.channel, pages, message, client, true);
+ return await pag.start({user: message.author.id, time: 60000});
+ } else {return message.channel.send({embeds: [pages[0].setFooter({text: "Natsuki"})]});}
+ }
+
if (!args[0]) {
let tempchar = await ask(message, "What anime would you like to add to your finished list?", 60000, false, true);
if (!tempchar) {return;}
@@ -255,35 +381,47 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
- await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
let arc;
try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
catch {return message.reply("Looks like you didn't find the anime you were looking for.");}
collected = arc.first().emoji.name;
if (collected === '✅') {
fn = client.misc.cache.anime.get(asr.getCurrentPage().title.trim());
- asr.stop();
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
}
else {return message.reply("Looks like you didn't find the anime you were looking for.");}
} else {
- await message.channel.send({embeds: [asr.embed]});
- let conf = await ask(message, "Is this the anime you meant?", 60000);
+ let preConfEmbed = await message.channel.send({embeds: [asr.embed]});
+ let conf = await ask(message, "Is this the anime you meant?", 60000, undefined, undefined, true);
if (!['y', 'yes', 'ye', 'n', 'no'].includes(conf.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
conf = ['y', 'yes', 'ye'].includes(conf.trim().toLowerCase());
+ preConfEmbed.delete().catch(() => {});
if (!conf) {return message.channel.send("Well, I've got nothing, then. If that doesn't match the anime you're looking for then I would try again with a more narrow search.");}
- fn = asr.id;}
+ fn = asr.id;
+ }
let af = await AF.findOne({uid: message.author.id}) || new AF({uid: message.author.id});
if (af.watched.includes(fn)) {return message.channel.send("Looks like that anime is already on your finished list!");}
let tfc = await AniData.findOne({id: fn});
tfc.watchers += 1;
tfc.markModified('watchers');
- tfc.save();
af.watched.push(fn);
af.markModified('watched');
+ let dw = false;
+ if (af.toWatch.includes(fn)) {
+ af.toWatch.splice(af.toWatch.indexOf(fn), 1);
+ af.markModified('toWatch');
+ tfc.listed--;
+ tfc.save();
+ dw = true;
+ }
af.save();
- return message.channel.send(`I've added **${tfc.name}** to your list of finished animes!`);
+ tfc.save();
+ return message.channel.send(`I've added **${tfc.name}** to your list of finished animes!${dw ? " I've also removed it from your watch list for you :p" : ''}`);
}
if (['nn', 'nickname', 'altname', 'nick', 'an'].includes(args[0].toLowerCase())) {
@@ -298,7 +436,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
let arc;
@@ -328,10 +466,10 @@ module.exports = {
ch.save();
client.misc.cache.anime.set(nn, ch.id);
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177814638186516').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Anime Alt Name ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}** | \`${ch.id}\``)
.addField("Name", nn)
@@ -361,7 +499,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
let arc;
@@ -419,10 +557,10 @@ module.exports = {
ch.markModified('images');
ch.save();
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Anime Image ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}**`)
.setThumbnail(ch.thumbnail)
@@ -439,10 +577,10 @@ module.exports = {
ch.markModified('images');
ch.save();
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Anime Images ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}**`)
.addField("Images", images.map(img => `${img}\n`).join(""))
@@ -456,5 +594,68 @@ module.exports = {
}
}
}
+
+ if (['l', 'love', 'favorite', 'fav'].includes(args[0].toLowerCase())) {
+ args.shift();
+ if (!args[0]) {
+ let tempchar = await ask(message, "What anime would you like to add to your favorites list?", 60000, false, true);
+ if (!tempchar) {return;}
+ args = tempchar.split(/\s+/g);
+ }
+ let asr = await ans(message, client, args.join(" ").trim().toLowerCase(), -700, 0);
+ let fn;
+ if (asr === 0) {
+ return message.channel.send("That search returned no results! Try again?");
+ } else if (asr instanceof Pagination) {
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
+ await asr.message.react('✅');
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
+ let arc;
+ try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
+ catch {return message.reply("Looks like you didn't find the anime you were looking for.");}
+ collected = arc.first().emoji.name;
+ if (collected === '✅') {
+ fn = client.misc.cache.chars.get(asr.getCurrentPage().title.trim());
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
+ }
+ else {return message.reply("Looks like you didn't find the anime you were looking for.");}
+ } else {
+ let preConfEmbed = await message.channel.send({embeds: [asr.embed]});
+ let conf = await ask(message, "Is this the anime you meant?", 60000, undefined, undefined, true);
+ if (!['y', 'yes', 'ye', 'n', 'no'].includes(conf.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
+ conf = ['y', 'yes', 'ye'].includes(conf.trim().toLowerCase());
+ preConfEmbed.delete().catch(() => {});
+ if (!conf) {return message.channel.send("Well, I've got nothing, then. If that doesn't match the anime you're looking for then I would try again with a more narrow search.");}
+ fn = asr.id;
+ }
+ let cf = await AF.findOne({uid: message.author.id}) || new AF({uid: message.author.id});
+ if (cf.liked.includes(fn)) {return message.channel.send("Looks like that anime is already on your loved list!");}
+ let tfc = await AniData.findOne({id: fn});
+ tfc.liked += 1;
+ tfc.save();
+ cf.liked.push(fn);
+ cf.markModified('liked');
+ cf.save();
+ return message.channel.send(`I've added **${tfc.name}** to your loved/favorited anime list!`);
+ }
+
+ if (['loved', 'favorites', 'favs', 'ls', 'fs'].includes(args[0].toLowerCase())) {
+ let cf = await AF.findOne({uid: mention ? mention.id : message.author.id});
+ if (!cf || !cf.liked.length) {return message.channel.send(`Looks like ${mention ? 'they' : 'you'} haven't favorited any anime!`);}
+ let chars = cf.liked;
+ chars = chars.map(tc => client.misc.cache.animeID.get(tc));
+ let n = mention ? message.guild ? message.mentions.members.first().displayName : message.mentions.users.first().username : message.guild ? message.member.displayName : message.author.username;
+ return message.channel.send({embeds: [
+ new Discord.MessageEmbed()
+ .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Anime`, iconURL: mention ? mention.displayAvatarURL() : message.author.displayAvatarURL()})
+ .setDescription(`**${chars.length} anime favorited**\n\n${chars.join(", ")}`)
+ .setColor('c375f0')
+ .setFooter({text: "Natsuki"})
+ .setTimestamp()
+ ]});
+ }
+
}
};
diff --git a/commands/anime/animeimage.js b/commands/anime/animeimage.js
index 2a6e022..146cbe5 100644
--- a/commands/anime/animeimage.js
+++ b/commands/anime/animeimage.js
@@ -37,7 +37,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
let arc;
@@ -95,10 +95,10 @@ module.exports = {
ch.markModified('images');
ch.save();
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Anime Image ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}**`)
.setThumbnail(ch.thumbnail)
@@ -115,10 +115,10 @@ module.exports = {
ch.markModified('images');
ch.save();
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Anime Images ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}**`)
.addField("Images", images.map(img => `${img}\n`).join(""))
diff --git a/commands/anime/animenick.js b/commands/anime/animenick.js
index 2d4b0e8..b7261a3 100644
--- a/commands/anime/animenick.js
+++ b/commands/anime/animenick.js
@@ -32,7 +32,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
let arc;
@@ -62,10 +62,10 @@ module.exports = {
ch.save();
client.misc.cache.anime.set(nn, ch.id);
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177814638186516').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Anime Alt Name ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}** | \`${ch.id}\``)
.addField("Name", nn)
diff --git a/commands/anime/char.js b/commands/anime/char.js
index e9cb2a2..e5398c3 100644
--- a/commands/anime/char.js
+++ b/commands/anime/char.js
@@ -39,7 +39,6 @@ module.exports = {
queue = true;
}
options = new TagFilter([
- new Tag(['ask', 'question'], 'ask', 'toggle'),
new Tag(['name', 'n'], 'name', 'append'),
new Tag(['description', 'desc', 'p', 'personality'], 'personality', 'append'),
new Tag(['anime', 'ani', 'a'], 'anime', 'append'),
@@ -47,20 +46,21 @@ module.exports = {
new Tag(['img', 'image', 'i'], 'images', 'listAppend'),
new Tag(['loveInterest', 'dating', 'married', 'li'], 'loveInterest', 'append'),
new Tag(['gender', 'g', 'sex'], 'gender', 'append'),
- new Tag(['nickname', 'nn', 'nick'], 'nicknames', 'listAppend')
+ new Tag(['nickname', 'nn', 'nick'], 'nicknames', 'listAppend'),
+ new Tag(['force', 'f'], 'force', 'toggle')
]).test(args.slice(1).join(' '));
if (Object.keys(options).length) {
if (message.attachments.size) {
if (options.thumbnail) {
if (!options.images) {options.images = [];}
- Array.from(message.attachments.keys()).forEach(i => options.images.push(i));
+ Array.from(message.attachments.keys()).forEach(i => options.images.push(message.attachments.get(i).url));
} else {
if (!options.images) {options.images = [];}
let att = Array.from(message.attachments.keys());
if (message.attachments.size > 1) {
for (let i = 1; i < att.length; i++) {
- options.images.push(message.attachments.get(att[i].url));
+ options.images.push(message.attachments.get(att[i]).url);
}
}
options.thumbnail = message.attachments.get(att[0]).url;
@@ -83,7 +83,7 @@ module.exports = {
let asr = await ans(message, client, options.anime.trim().toLowerCase(), undefined, 0);
if (asr === 0) {return message.channel.send("That search returned no results! Try remaking the character?");}
else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
let arc;
@@ -129,7 +129,7 @@ module.exports = {
fn = options.anime;
}
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
await dmch.send("React with :white_check_mark: when you've found the anime you want!");
let arc;
@@ -189,42 +189,144 @@ module.exports = {
.addField('Other', `**Anime**: ${forceAni ? options.anime : `${aniData.name} | ${aniData.japname} | \`${aniData.id}\``}\n\n**Gender**: ${options.gender}\n`)
.setColor("c375f0")
.setImage(options.thumbnail)
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp();
- try {
- am = await dmch.send({embeds: [amEmbed]});
- await am.react('👍').catch(() => {});
- await am.react('👎').catch(() => {});
- } catch {return dmch.send(":thinking: hmmm... something went wrong there. I might not have permissions to add reactions to messages, and this could be the issue.");}
- try {
- let rc = am.createReactionCollector({filter: (r, u) => ['👍', '👎'].includes(r.emoji.name) && u.id === message.author.id, max: 1, time: 60000});
- rc.on("collect", async r => {
- if (r.emoji.name !== '👎') {
- while (true) {options.id = require('../../util/makeid')(4); if (!await Char.findOne({id: options.id})) {break;}}
- if (!queue) {
- amEmbed.addField("Reviewed", `Reviewed and submitted by <@${message.author.id}>`);
- client.misc.cache.chars.set(options.name, options.id);
- client.misc.cache.charsID.set(options.id, options.name);
+ const addChar = async () => {
+ while (true) {options.id = require('../../util/makeid')(4); if (!await Char.findOne({id: options.id})) {break;}}
+ if (!queue) {
+ amEmbed.addField("Reviewed", `Reviewed and submitted by <@${message.author.id}>`);
+ client.misc.cache.chars.set(options.name, options.id);
+ client.misc.cache.charsID.set(options.id, options.name);
+ if (options.nicknames) {options.nicknames.forEach(nn => client.misc.cache.chars.set(nn, options.id));}
+ }
+ else {amEmbed.addField("ID", options.id);}
+ amEmbed.setAuthor({name: !queue ? "Character Added" : "Character Submitted", iconURL: message.author.displayAvatarURL()});
+ if (!queue) {options.queued = false;}
+ await new Char(options).save();
+ if (aniData) {
+ aniData.characters.push(options.id);
+ aniData.markModified('characters');
+ aniData.save();
+ }
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177797705781308').send({embeds: [amEmbed]}).catch(() => {})).catch(() => {});
+ if (options.images && options.images.length) {
+ let imagesEmbed = new Discord.MessageEmbed()
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
+ .setTitle(`New Image${client.utils.s(options.images.length)} ${queue ? "Submitted" : "Added"}`)
+ .setDescription(`For **${options.name}** | \`${options.id}\` from ${client.misc.cache.animeID.get(options.anime)}`)
+ .setThumbnail(options.thumbnail)
+ .setImage(options.images[0])
+ .setColor('c375f0')
+ .setTimestamp()
+ .setFooter({text: "Natsuki"})
+ if (options.images.length > 1) {imagesEmbed.addField("Images", options.images.join("\n"));}
+ client.guilds.cache.get('762707532417335296').channels.cache.get('932177850239422494').send({
+ embeds: [imagesEmbed], content: queue ? '<@330547934951112705>' : undefined
+ }).catch(() => {});
+ }
+ if (am) {am.delete().catch(() => {});}
+ return dmch.send(`Your character${options.images.length ? `, and ${options.gender === 'Male' ? 'his' : options.gender === 'Female' ? 'her' : 'their'} ${options.images.length} ${client.utils.as(options.images.length, 'image')},` : ''} has been ${!queue ? "added" : "submitted"}`);
+ };
+ if (!options.force) {
+ try {
+ am = await dmch.send({embeds: [amEmbed]});
+ await am.react('👍').catch(() => {});
+ await am.react('👎').catch(() => {});
+ } catch {return dmch.send(":thinking: hmmm... something went wrong there. I might not have permissions to add reactions to messages, and this could be the issue.");}
+ try {
+ let rc = am.createReactionCollector({filter: (r, u) => ['👍', '👎'].includes(r.emoji.name) && u.id === message.author.id, max: 1, time: 60000});
+ rc.on("collect", async r => {
+ if (r.emoji.name !== '👎') {
+ await addChar();
+ } else {
+ return dmch.send("Oh, okay. I'll discard that then!");
}
- else {amEmbed.addField("ID", options.id);}
- amEmbed.setAuthor({name: !queue ? "Character Added" : "Character Submitted", iconURL: message.author.avatarURL()});
- if (!queue) {options.queued = false;}
- await new Char(options).save();
- if (aniData) {
- aniData.characters.push(options.id);
- aniData.markModified('characters');
- aniData.save();
+ });
+ rc.on("end", collected => {if (!collected.size) {return message.author.send("Looks like you ran out of time! Try again?");}});
+ } catch {return message.author.send("Hmm... there was some kind of error when I tried to submit that character. Try again, and if it keeps not working, then go yell at my devs!");}
+ } else {await addChar();}
+ return;
+ }
+
+ if (['e', 'edit'].includes(args[0].toLowerCase())) {
+ args.shift();
+ let tu = await UserData.findOne({uid: message.author.id});
+ if (!tu || !tu.staff) {return await message.channel.send("Since you aren't a Natsuki Staff member, you can't edit characters.");}
+ if (!args.length) {return message.channel.send("You have to provide tags to edit characters with.");}
+ options = new TagFilter([
+ new Tag(['name', 'n'], 'name', 'append'),
+ new Tag(['rn', 'rename'], 'rename', 'append'),
+ new Tag(['description', 'desc', 'p', 'personality'], 'personality', 'append'),
+ //new Tag(['anime', 'ani', 'a'], 'anime', 'append'),
+ new Tag(['thumb', 'thumbnail', 't'], 'thumbnail', 'append'),
+ new Tag(['img', 'image', 'i'], 'images', 'listAppend'),
+ new Tag(['loveInterest', 'dating', 'married', 'li'], 'loveInterest', 'append'),
+ new Tag(['gender', 'g', 'sex'], 'gender', 'append'),
+ new Tag(['nickname', 'nn', 'nick'], 'nicknames', 'listAppend'),
+ new Tag(['force', 'f'], 'force', 'toggle')
+ ]).test(args.join(' '));
+ if (!options.name) {
+ let tempani = await ask(message, "What character would you like to edit?", 60000, false, true);
+ if (!tempani) {return;}
+ options.name = tempani.split(/\s+/g);
+ }
+ let asr = await chs(message, client, options.name.toLowerCase(), -700, 0);
+ let fn;
+ if (asr === 0) {
+ return message.channel.send("That search returned no results! Try again?");
+ } else if (asr instanceof Pagination) {
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
+ await asr.message.react('✅');
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the character you want!");
+ let arc;
+ try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
+ catch {return message.reply("Looks like you didn't find the character you were looking for.");}
+ collected = arc.first().emoji.name;
+ if (collected === '✅') {
+ fn = client.misc.cache.anime.get(asr.getCurrentPage().title.trim());
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
+ }
+ else {return message.reply("Looks like you didn't find the character you were looking for.");}
+ } else {fn = asr.id;}
+ let ech = await Char.findOne({id: fn});
+ if (!ech) {return message.channel.send("\\*Head scratching* that character seems to have vanished into thin air. Try again or go yell at my devs.");}
+ if (message.attachments.size) {
+ if (options.thumbnail) {
+ if (!options.images) {options.images = [];}
+ Array.from(message.attachments.keys()).forEach(i => options.images.push(message.attachments.get(i).url));
+ } else {
+ if (!options.images) {options.images = [];}
+ let att = Array.from(message.attachments.keys());
+ if (message.attachments.size > 1) {
+ for (let i = 1; i < att.length; i++) {
+ options.images.push(message.attachments.get(att[i]).url);
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({embeds: [amEmbed]}));
- am.delete().catch(() => {});
- return dmch.send(`Your character has been ${!queue ? "added" : "submitted"}`);
- } else {
- return dmch.send("Oh, okay. I'll discard that then!");
}
- });
- rc.on("end", collected => {if (!collected.size) {return message.author.send("Looks like you ran out of time! Try again?");}});
- } catch {return message.author.send("Hmm... there was some kind of error when I tried to submit that character. Try again, and if it keeps not working, then go yell at my devs!");}
- return;
+ options.thumbnail = message.attachments.get(att[0]).url;
+ }
+ }
+ Object.keys(options).forEach(async o => {if (![undefined, null].includes(options[o]) && o !== 'name') {
+ /*if (o === 'anime') {
+ let ani = await AniData.findOne({id: ech.anime});
+ if (ani) {
+
+ }
+ }*/
+ if (Array.isArray(options[o])) {options[o].forEach(i => ech[o].push(i));}
+ else {ech[o] = options[o];}
+ ech.markModified(o);
+ if (o === 'rename') {
+ delete ech.rename;
+ client.misc.cache.charsID.set(ech.id, options.rename);
+ client.misc.cache.chars.delete(ech.name);
+ client.misc.cache.chars.set(options.rename, ech.id);
+ ech.name = options.rename;
+ }
+ }});
+ ech.save();
+ return message.channel.send('Character updated.');
}
if (['s', 'search'].includes(args[0].trim().toLowerCase())) {
@@ -238,7 +340,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
} else {
await message.channel.send({embeds: [asr.embed]});
}
@@ -256,7 +358,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
} else {
await message.channel.send({embeds: [asr.embed]});
}
@@ -266,7 +368,7 @@ module.exports = {
if (['reject'].includes(args[0].trim().toLowerCase())) {
let tu = await UserData.findOne({uid: message.author.id});
if (!tu || !tu.staff) {await message.channel.send("Since you aren't a Natsuki Staff member, you can't reject character submissions!");}
- let tr = await CharData.findOne({id: args[1].toLowerCase()});
+ let tr = await Char.findOne({id: args[1].toLowerCase()});
if (!tr) {return message.reply("That character submission doesn't seem to exist!");}
if (tr.queued !== true) {return message.reply("That character was already accepted, so you can't reject it.");}
return await CharData.deleteOne({id: args[1].toLowerCase()})
@@ -274,6 +376,43 @@ module.exports = {
.catch(() => {return message.reply("It seems that submission wasn't deleted for some reason. \*insert head scratching*");});
}
+ if (['accept', 'approve'].includes(args[0].toLowerCase())) {
+ let tu = await UserData.findOne({uid: message.author.id});
+ if (!tu || !tu.staff) {await message.channel.send("Since you aren't a Natsuki Staff member, you can't accept character submissions!");}
+ let tr = await Char.findOne({id: args[1].toLowerCase()});
+ if (!tr) {return message.reply("That character submission doesn't seem to exist!");}
+ if (tr.queued !== true) {return message.reply("That character was already accepted, so you can't accept it again...");}
+ tr.queued = false;
+ return await tr.save()
+ .then(async () => {
+ client.misc.cache.chars.set(tr.name.normalize("NFD").replace(/[\u0300-\u036f]/g, ""), tr.id);
+ tr.nicknames.forEach(nn => client.misc.cache.chars.set(nn.normalize("NFD").replace(/[\u0300-\u036f]/g, ""), tr.id));
+ client.misc.cache.charsID.set(tr.id, tr.name.normalize("NFD").replace(/[\u0300-\u036f]/g, ""));
+ client.misc.cache.charsNum++;
+ client.misc.cache.charsLove.set(char.id, char.loved);
+ client.guilds.cache.get('762707532417335296').channels.cache.get('932177797705781308').send({embeds: [new Discord.MessageEmbed()
+ .setTitle(`Character Accepted -> ${tr.name}`)
+ .setAuthor({name: 'Character Approved', iconURL: message.author.displayAvatarURL()})
+ .setThumbnail(tr.thumbnail)
+ .setDescription(`${tr.name} has been approved, and is now available to all Natsuki users.`)
+ .setColor('c375f0')
+ .setFooter({text: "Natsuki"})
+ .setTimestamp()
+ ]}).catch(() => {});
+ let ani = await AniData.findOne({id: tr.anime});
+ if (!ani) {
+ tr.queued = false;
+ tr.save();
+ return message.channel.send("I can't accept that submission for you because it doesn't have a valid anime listed. Please report this to a dev.");
+ }
+ ani.characters.push(tr.id);
+ ani.markModified('characters');
+ ani.save();
+ return message.channel.send("I've accepted that submission.");
+ })
+ .catch(() => {return message.reply("It seems that submission wasn't accepted for some reason. \*insert head scratching*");});
+ }
+
if (['r', 'rand', 'random', 'any'].includes(args[0].toLowerCase())) {
let asr = await chs(message, client, client.misc.cache.chars.random(), -100000);
return await message.channel.send({embeds: [asr.embed]});
@@ -291,23 +430,26 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
- await message.channel.send("React with :white_check_mark: when you've found the character you want!");
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the character you want!");
let arc;
try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
catch {return message.reply("Looks like you didn't find the character you were looking for.");}
collected = arc.first().emoji.name;
if (collected === '✅') {
fn = client.misc.cache.chars.get(asr.getCurrentPage().title.trim());
- asr.stop();
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
}
else {return message.reply("Looks like you didn't find the character you were looking for.");}
} else {
- await message.channel.send({embeds: [asr.embed]});
- let conf = await ask(message, "Is this the character you meant?", 60000);
+ let preConfEmbed = await message.channel.send({embeds: [asr.embed]});
+ let conf = await ask(message, "Is this the character you meant?", 60000, undefined, undefined, true);
if (!['y', 'yes', 'ye', 'n', 'no'].includes(conf.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
conf = ['y', 'yes', 'ye'].includes(conf.trim().toLowerCase());
+ preConfEmbed.delete().catch(() => {});
if (!conf) {return message.channel.send("Well, I've got nothing, then. If that doesn't match the character you're looking for then I would try again with a more narrow search.");}
fn = asr.id;
}
@@ -331,7 +473,7 @@ module.exports = {
let n = mention ? message.guild ? message.mentions.members.first().displayName : message.mentions.users.first().username : message.guild ? message.member.displayName : message.author.username;
return message.channel.send({embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Characters`, iconURL: mention ? mention.avatarURL() : message.author.avatarURL()})
+ .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Characters`, iconURL: mention ? mention.displayAvatarURL() : message.author.displayAvatarURL()})
.setDescription(`**${chars.length} character${chars.length === 1 ? '': 's'} favorited**\n\n${chars.join(", ")}`)
.setColor('c375f0')
.setFooter({text: "Natsuki"})
@@ -356,16 +498,18 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
- await message.channel.send("React with :white_check_mark: when you've found the character you want!");
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the character you want!");
let arc;
try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
catch {return message.reply("Looks like you didn't find the character you were looking for.");}
- collected = arc.first().emoji.name;
+ let collected = arc.first().emoji.name;
if (collected === '✅') {
fn = client.misc.cache.chars.get(asr.getCurrentPage().title.trim());
- asr.stop();
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
}
else {return message.reply("Looks like you didn't find the character you were looking for.");}
} else {fn = asr.id;}
@@ -381,7 +525,7 @@ module.exports = {
ch.images.push(ch.thumbnail);
let pages = ch.images.map(im => new Discord.MessageEmbed()
.setTitle(ch.name)
- .setDescription(`**Name:** ${ch.name}`)
+ .setDescription(`**Name:** ${ch.name} -> ${ch.images.length} ${client.utils.as(ch.images.length, 'image')}`)
.addField('Other', `**Anime**: ${client.misc.cache.animeID.get(ch.anime)}\n\n**Gender**: ${ch.gender}\n`)
.setColor("c375f0")
.setImage(im)
@@ -389,7 +533,7 @@ module.exports = {
if (pages.length > 1) {
let pag = new Pagination(message.channel, pages, message, client, true);
return await pag.start({user: message.author.id, time: 60000});
- } else {return message.channel.send(pages[0].setTimestamp());}
+ } else {return message.channel.send({embeds: [pages[0].setTimestamp()]});}
} else {
args.shift();
let images = [];
@@ -413,10 +557,10 @@ module.exports = {
ch.markModified('images');
ch.save();
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Image ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`)
.setThumbnail(ch.thumbnail)
@@ -433,10 +577,10 @@ module.exports = {
ch.markModified('images');
ch.save();
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Images ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`)
.addField("Images", images.map(img => `${img}\n`).join(""))
@@ -465,7 +609,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
let arc;
@@ -492,7 +636,7 @@ module.exports = {
.addField("Loved by", `**${ch.loved}** Natsuki user${ch.loved === 1 ? '' : 's'}!\n\`${prefix}char love ${ch.name}\``)
.setColor("c375f0")
.setImage(ch.thumbnail)
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
));
let pag = new Pagination(message.channel, pages, message, client, true);
@@ -502,9 +646,10 @@ module.exports = {
new Discord.MessageEmbed()
.setTitle(`${anime.name}: Characters`)
.setThumbnail(anime.thumbnail)
- .setDescription(anime.characters.map(ch => client.misc.cache.charsID.get(ch)).join(", "))
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setDescription(`**${anime.characters.length} Characters**\n` + anime.characters.map(ch => client.misc.cache.charsID.get(ch)).join(", "))
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
+ .setColor('c375f0')
]});
}
}
@@ -521,7 +666,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
await message.channel.send("React with :white_check_mark: when you've found the character you want!");
let arc;
@@ -550,10 +695,10 @@ module.exports = {
ch.save();
client.misc.cache.chars.set(nn, ch.id);
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177814638186516').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Character Nickname ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`)
.addField("Name", nn)
diff --git a/commands/anime/charimage.js b/commands/anime/charimage.js
index 0154b6e..d8916bc 100644
--- a/commands/anime/charimage.js
+++ b/commands/anime/charimage.js
@@ -37,16 +37,18 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
- await message.channel.send("React with :white_check_mark: when you've found the character you want!");
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the character you want!");
let arc;
try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
catch {return message.reply("Looks like you didn't find the character you were looking for.");}
- collected = arc.first().emoji.name;
+ let collected = arc.first().emoji.name;
if (collected === '✅') {
fn = client.misc.cache.chars.get(asr.getCurrentPage().title.trim());
- asr.stop();
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
}
else {return message.reply("Looks like you didn't find the character you were looking for.");}
} else {fn = asr.id;}
@@ -62,7 +64,7 @@ module.exports = {
ch.images.push(ch.thumbnail);
let pages = ch.images.map(im => new Discord.MessageEmbed()
.setTitle(ch.name)
- .setDescription(`**Name:** ${ch.name}`)
+ .setDescription(`**Name:** ${ch.name} -> ${ch.images.length} ${client.utils.as(ch.images.length, 'image')}`)
.addField('Other', `**Anime**: ${client.misc.cache.animeID.get(ch.anime)}\n\n**Gender**: ${ch.gender}\n`)
.setColor("c375f0")
.setImage(im)
@@ -70,7 +72,7 @@ module.exports = {
if (pages.length > 1) {
let pag = new Pagination(message.channel, pages, message, client, true);
return await pag.start({user: message.author.id, time: 60000});
- } else {return message.channel.send(pages[0].setTimestamp());}
+ } else {return message.channel.send({embeds: [pages[0].setTimestamp()]});}
} else {
args.shift();
let images = [];
@@ -94,10 +96,10 @@ module.exports = {
ch.markModified('images');
ch.save();
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Image ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`)
.setThumbnail(ch.thumbnail)
@@ -114,10 +116,10 @@ module.exports = {
ch.markModified('images');
ch.save();
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Images ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`)
.addField("Images", images.map(img => `${img}\n`).join(""))
diff --git a/commands/anime/charlb.js b/commands/anime/charlb.js
index b47af35..bd65e9e 100644
--- a/commands/anime/charlb.js
+++ b/commands/anime/charlb.js
@@ -22,7 +22,7 @@ module.exports = {
.map((c, i) => `${i+1}. **${client.misc.cache.charsLove.get(c)} vote${client.misc.cache.charsLove.get(c) === 1 ? '' : 's'}** -> ${client.misc.cache.charsID.get(c)}`)
.join('\n')
).setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
diff --git a/commands/anime/charnick.js b/commands/anime/charnick.js
index afb54e0..69b94a7 100644
--- a/commands/anime/charnick.js
+++ b/commands/anime/charnick.js
@@ -32,7 +32,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
await message.channel.send("React with :white_check_mark: when you've found the character you want!");
let arc;
@@ -61,10 +61,10 @@ module.exports = {
ch.save();
client.misc.cache.chars.set(nn, ch.id);
}
- client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('817466729293938698').send({
+ client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177814638186516').send({
embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()})
+ .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()})
.setTitle(`New Character Nickname ${queue ? "Submitted" : "Added"}`)
.setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`)
.addField("Name", nn)
diff --git a/commands/anime/haswatched.js b/commands/anime/haswatched.js
index b39d25d..08308d8 100644
--- a/commands/anime/haswatched.js
+++ b/commands/anime/haswatched.js
@@ -1,5 +1,3 @@
-const Discord = require('discord.js');
-
const AF = require("../../models/anifav");
const AniData = require('../../models/anime');
@@ -23,7 +21,7 @@ module.exports = {
help: "Check if you or another user has watched an anime with `{{p}}haswatched`",
async execute(message, msg, args, cmd, prefix, mention, client) {
let user;
- if (args[0] && args[0].match(/(?:<@\!?\d+>|\d+)/gm)) {
+ if (args[0] && args[0].match(/<@!?\d+>|\d+/gm)) {
user = message.guild ? (mention || client.users.cache.get(args[0])) : message.author;
if (!user) {return message.channel.send("Hmmm... for some reason I can't find the user you're looking for?");}
args.shift();
@@ -38,7 +36,7 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
let arc;
@@ -53,7 +51,7 @@ module.exports = {
} else {fn = asr.id;}
let ani = await AniData.findOne({id: fn});
let af = await AF.findOne({uid: user.id});
- if (!af || !af.watched.includes(fn)) {return message.channel.send(`${user.id === message.author.id ? "You haven't" : "That person hasn't"} watched **${ani.name}**.`);}
+ if (!af || !af.watched.includes(fn)) {return message.channel.send(`${user.id === message.author.id ? "You haven't" : "That person hasn't"} watched **${ani.name}**${af && af.toWatch.includes(fn) ? `, *but* it is on ${user.id === message.author.id ? "your" : "their"} watch list` : ''}.`);}
else {return message.channel.send(`${user.id === message.author.id ? "You have" : "That person has"} watched **${ani.name}**.`);}
}
};
\ No newline at end of file
diff --git a/commands/anime/highvalue.js b/commands/anime/highvalue.js
index 1548732..f24cf62 100644
--- a/commands/anime/highvalue.js
+++ b/commands/anime/highvalue.js
@@ -1,5 +1,3 @@
-const Discord = require('discord.js');
-
const UserData = require('../../models/user');
const CharData = require('../../models/char');
@@ -30,23 +28,26 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
- await message.channel.send("React with :white_check_mark: when you've found the character you want!");
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the character you want!");
let arc;
try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
catch {return message.reply("Looks like you didn't find the character you were looking for.");}
collected = arc.first().emoji.name;
if (collected === '✅') {
fn = client.misc.cache.chars.get(asr.getCurrentPage().title.trim());
- asr.stop();
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
}
else {return message.reply("Looks like you didn't find the character you were looking for.");}
} else {
- await message.channel.send({embeds: [asr.embed]});
- let conf = await ask(message, "Is this the character you meant?", 60000);
+ let preConfEmbed = await message.channel.send({embeds: [asr.embed]});
+ let conf = await ask(message, "Is this the character you meant?", 60000, undefined, undefined, true);
if (!['y', 'yes', 'ye', 'n', 'no'].includes(conf.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
conf = ['y', 'yes', 'ye'].includes(conf.trim().toLowerCase());
+ preConfEmbed.delete().catch(() => {});
if (!conf) {return message.channel.send("Well, I've got nothing, then. If that doesn't match the character you're looking for then I would try again with a more narrow search.");}
fn = asr.id;
}
diff --git a/commands/anime/listanime.js b/commands/anime/listanime.js
index 4c48260..36327f0 100644
--- a/commands/anime/listanime.js
+++ b/commands/anime/listanime.js
@@ -39,7 +39,7 @@ module.exports = {
s = `${s}${ps.join('\n')}`;
pages.push(new Discord.MessageEmbed()
.setTitle("Anime Database")
- .setThumbnail(client.user.avatarURL({size: 1024, dynamic: true, format: 'png'}))
+ .setThumbnail(client.user.displayAvatarURL({size: 1024, dynamic: true, format: 'png'}))
.setDescription(s)
.setColor('c375f0')
.setTimestamp()
diff --git a/commands/anime/loveani.js b/commands/anime/loveani.js
new file mode 100644
index 0000000..d88d41c
--- /dev/null
+++ b/commands/anime/loveani.js
@@ -0,0 +1,83 @@
+const Discord = require('discord.js');
+
+const AF = require("../../models/anifav");
+const AniData = require('../../models/anime');
+
+const ask = require('../../util/ask');
+const ans = require('../../util/anime/anisearch');
+const {Pagination} = require('../../util/pagination');
+
+module.exports = {
+ name: "loveani",
+ aliases: ['lani', 'loveanime', 'favani', 'favoriteani', 'favoriteanime', 'fa', 'favani'],
+ meta: {
+ category: 'Anime',
+ description: "Show your love for an anime",
+ syntax: '`loveani `',
+ extra: null
+ },
+ help: new Discord.MessageEmbed()
+ .setTitle("Help -> Character Favoriting")
+ .setDescription("Show your love for a character with this command. A replica of running `char love `.")
+ .addField("Syntax", "`lovechar `"),
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ if (args[0] && ['v', 'view'].includes(args[0].toLowerCase())) {
+ let cf = await AF.findOne({uid: mention ? mention.id : message.author.id});
+ if (!cf || !cf.liked.length) {return message.channel.send(`Looks like ${mention ? 'they' : 'you'} haven't favorited any anime!`);}
+ let chars = cf.liked;
+ chars = chars.map(tc => client.misc.cache.animeID.get(tc));
+ let n = mention ? message.guild ? message.mentions.members.first().displayName : message.mentions.users.first().username : message.guild ? message.member.displayName : message.author.username;
+ return message.channel.send({embeds: [
+ new Discord.MessageEmbed()
+ .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Anime`, iconURL: mention ? mention.displayAvatarURL() : message.author.displayAvatarURL()})
+ .setDescription(`**${chars.length} anime favorited**\n\n${chars.join(", ")}`)
+ .setColor('c375f0')
+ .setFooter({text: "Natsuki"})
+ .setTimestamp()
+ ]});
+ } else {
+ if (!args[0]) {
+ let tempchar = await ask(message, "What anime would you like to add to your favorites list?", 60000, false, true);
+ if (!tempchar) {return;}
+ args = tempchar.split(/\s+/g);
+ }
+ let asr = await ans(message, client, args.join(" ").trim().toLowerCase(), -700, 0);
+ let fn;
+ if (asr === 0) {
+ return message.channel.send("That search returned no results! Try again?");
+ } else if (asr instanceof Pagination) {
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
+ await asr.message.react('✅');
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
+ let arc;
+ try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
+ catch {return message.reply("Looks like you didn't find the anime you were looking for.");}
+ collected = arc.first().emoji.name;
+ if (collected === '✅') {
+ fn = client.misc.cache.chars.get(asr.getCurrentPage().title.trim());
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
+ }
+ else {return message.reply("Looks like you didn't find the anime you were looking for.");}
+ } else {
+ let preConfEmbed = await message.channel.send({embeds: [asr.embed]});
+ let conf = await ask(message, "Is this the anime you meant?", 60000, undefined, undefined, true);
+ if (!['y', 'yes', 'ye', 'n', 'no'].includes(conf.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
+ conf = ['y', 'yes', 'ye'].includes(conf.trim().toLowerCase());
+ preConfEmbed.delete().catch(() => {});
+ if (!conf) {return message.channel.send("Well, I've got nothing, then. If that doesn't match the anime you're looking for then I would try again with a more narrow search.");}
+ fn = asr.id;
+ }
+ let cf = await AF.findOne({uid: message.author.id}) || new AF({uid: message.author.id});
+ if (cf.liked.includes(fn)) {return message.channel.send("Looks like that anime is already on your loved list!");}
+ let tfc = await AniData.findOne({id: fn});
+ tfc.liked += 1;
+ tfc.save();
+ cf.liked.push(fn);
+ cf.markModified('liked');
+ cf.save();
+ return message.channel.send(`I've added **${tfc.name}** to your loved/favorited anime list!`);
+ }
+ }
+};
\ No newline at end of file
diff --git a/commands/anime/lovechar.js b/commands/anime/lovechar.js
index 64a51a5..fde97f5 100644
--- a/commands/anime/lovechar.js
+++ b/commands/anime/lovechar.js
@@ -29,7 +29,7 @@ module.exports = {
let n = mention ? message.guild ? message.mentions.members.first().displayName : message.mentions.users.first().username : message.guild ? message.member.displayName : message.author.username;
return message.channel.send({embeds: [
new Discord.MessageEmbed()
- .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Characters`, iconURL: mention ? mention.avatarURL() : message.author.avatarURL()})
+ .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Characters`, iconURL: mention ? mention.displayAvatarURL() : message.author.displayAvatarURL()})
.setDescription(`**${chars.length} character${chars.length === 1 ? '': 's'} favorited**\n\n${chars.join(", ")}`)
.setColor('c375f0')
.setFooter({text: "Natsuki"})
@@ -46,23 +46,26 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
- await message.channel.send("React with :white_check_mark: when you've found the character you want!");
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the character you want!");
let arc;
- try {arc = await asr.message.awaitReactions({filter: (r, u) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
+ try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
catch {return message.reply("Looks like you didn't find the character you were looking for.");}
collected = arc.first().emoji.name;
if (collected === '✅') {
fn = client.misc.cache.chars.get(asr.getCurrentPage().title.trim());
- asr.stop();
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
}
else {return message.reply("Looks like you didn't find the character you were looking for.");}
} else {
- await message.channel.send({embeds: [asr.embed]});
- let conf = await ask(message, "Is this the character you meant?", 60000);
+ let preConfEmbed = await message.channel.send({embeds: [asr.embed]});
+ let conf = await ask(message, "Is this the character you meant?", 60000, undefined, undefined, true);
if (!['y', 'yes', 'ye', 'n', 'no'].includes(conf.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
conf = ['y', 'yes', 'ye'].includes(conf.trim().toLowerCase());
+ preConfEmbed.delete().catch(() => {});
if (!conf) {return message.channel.send("Well, I've got nothing, then. If that doesn't match the character you're looking for then I would try again with a more narrow search.");}
fn = asr.id;
}
diff --git a/commands/anime/watched.js b/commands/anime/watched.js
index 1ab89bc..153c589 100644
--- a/commands/anime/watched.js
+++ b/commands/anime/watched.js
@@ -58,34 +58,46 @@ module.exports = {
if (asr === 0) {
return message.channel.send("That search returned no results! Try again?");
} else if (asr instanceof Pagination) {
- await asr.start({user: message.author.id, startPage: 1, endTime: 60000});
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
await asr.message.react('✅');
- await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
let arc;
try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
catch {return message.reply("Looks like you didn't find the anime you were looking for.");}
collected = arc.first().emoji.name;
if (collected === '✅') {
fn = client.misc.cache.anime.get(asr.getCurrentPage().title.trim());
- asr.stop();
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
}
else {return message.reply("Looks like you didn't find the anime you were looking for.");}
} else {
- await message.channel.send({embeds: [asr.embed]});
- let conf = await ask(message, "Is this the anime you meant?", 60000);
+ let preConfEmbed = await message.channel.send({embeds: [asr.embed]});
+ let conf = await ask(message, "Is this the anime you meant?", 60000, undefined, undefined, true);
if (!['y', 'yes', 'ye', 'n', 'no'].includes(conf.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
conf = ['y', 'yes', 'ye'].includes(conf.trim().toLowerCase());
+ preConfEmbed.delete().catch(() => {});
if (!conf) {return message.channel.send("Well, I've got nothing, then. If that doesn't match the anime you're looking for then I would try again with a more narrow search.");}
- fn = asr.id;}
+ fn = asr.id;
+ }
let af = await AF.findOne({uid: message.author.id}) || new AF({uid: message.author.id});
if (af.watched.includes(fn)) {return message.channel.send("Looks like that anime is already on your finished list!");}
let tfc = await AniData.findOne({id: fn});
tfc.watchers += 1;
tfc.markModified('watchers');
- tfc.save();
af.watched.push(fn);
af.markModified('watched');
+ let dw = false;
+ if (af.toWatch.includes(fn)) {
+ af.toWatch.splice(af.toWatch.indexOf(fn), 1);
+ af.markModified('toWatch');
+ tfc.listed--;
+ tfc.save();
+ dw = true;
+ }
af.save();
- return message.channel.send(`I've added **${tfc.name}** to your list of finished animes!`);
+ tfc.save();
+ return message.channel.send(`I've added **${tfc.name}** to your list of finished animes!${dw ? " I've also removed it from your watch list for you :p" : ''}`);
}
};
\ No newline at end of file
diff --git a/commands/anime/watchedlb.js b/commands/anime/watchedlb.js
index 4f483f2..e68166a 100644
--- a/commands/anime/watchedlb.js
+++ b/commands/anime/watchedlb.js
@@ -22,7 +22,7 @@ module.exports = {
.map((c, i) => `${i+1}. **${client.misc.cache.animeLove.get(c)} watcher${client.misc.cache.animeLove.get(c) === 1 ? '' : 's'}** -> ${client.misc.cache.animeID.get(c)}`)
.join('\n')
).setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
diff --git a/commands/anime/watchlist.js b/commands/anime/watchlist.js
new file mode 100644
index 0000000..7bb7881
--- /dev/null
+++ b/commands/anime/watchlist.js
@@ -0,0 +1,150 @@
+const Discord = require('discord.js');
+
+const AF = require("../../models/anifav");
+const AniData = require('../../models/anime');
+
+const {Pagination} = require('../../util/pagination');
+const ask = require('../../util/ask');
+const ans = require('../../util/anime/anisearch');
+
+module.exports = {
+ name: "watchlist",
+ aliases: ['wl'],
+ meta: {
+ category: 'Anime',
+ description: "Add anime to your list of animes you want to watch",
+ syntax: '`watchlist `',
+ extra: null
+ },
+ help: new Discord.MessageEmbed()
+ .setTitle("Help -> WatchList")
+ .setDescription("Add anime to your watchlist (not to be confused with \"watchedlist\"; this is your list of anime you want to watch but haven't yet. You can view your list or anothers' list as well.)")
+ .addField("Removal from List", "If you're removing an item from your list because you've *seen* the anime, please run the `watched` command instead. It will automatically remove the anime from your watchlist and place it in your watchedlist.")
+ .addField("Syntax", "`watchlist `"),
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ if (!args.length) {return message.channel.send(`Syntax: \`${prefix}watchlist \``);}
+ if (['v', 'view'].includes(args[0].toLowerCase())) {
+ if (mention) {args.shift();}
+ let user = mention || message.author;
+ let af = await AF.findOne({uid: user.id});
+ if (!af || !af.toWatch.length) {return message.channel.send(`${user.id === message.author.id ? "You don't" : "That person doesn't"} have any watchlisted anime.`);}
+ let pages = [];
+ let pl = (Math.floor(af.toWatch.length / 10) + 1);
+ for (let i = 0; i < pl; i++) {
+ let s = '';
+ for (let x = 0; x < 10; x++) {
+ if (!af.toWatch[(i * 10) + x]) {break;}
+ s += `**${x + (i * 10) + 1}.** ${client.misc.cache.animeID.get(af.toWatch[(i * 10) + x])}\n`;
+ }
+ pages.push(new Discord.MessageEmbed()
+ .setAuthor({
+ name: message.guild ? message.guild.members.cache.get(user.id).displayName : user.username,
+ iconURL: message.guild ? message.guild.members.cache.get(user.id).displayAvatarURL({dynamic: true}) : user.displayAvatarURL({dynamic: true})
+ })
+ .setTitle("Anime Watch List")
+ .setDescription(s)
+ .setColor('c375f0')
+ .setTimestamp()
+ );
+ }
+ if (pages.length > 1) {
+ let pag = new Pagination(message.channel, pages, message, client, true);
+ return await pag.start({user: message.author.id, time: 60000});
+ } else {return message.channel.send({embeds: [pages[0].setFooter({text: "Natsuki"})]});}
+ }
+
+ if (['a', 'add'].includes(args[0].toLowerCase())) {
+ args.shift();
+ if (!args[0]) {
+ let tempchar = await ask(message, "What anime would you like to add to your watch list?", 60000, false, true);
+ if (!tempchar) {return;}
+ args = tempchar.split(/\s+/g);
+ }
+ let asr = await ans(message, client, args.join(" ").trim().toLowerCase(), -700, 0);
+ let fn;
+ if (asr === 0) {
+ return message.channel.send("That search returned no results! Try again?");
+ } else if (asr instanceof Pagination) {
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
+ await asr.message.react('✅');
+ let noticeDel = await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
+ let arc;
+ try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
+ catch {return message.reply("Looks like you didn't find the anime you were looking for.");}
+ collected = arc.first().emoji.name;
+ if (collected === '✅') {
+ fn = client.misc.cache.anime.get(asr.getCurrentPage().title.trim());
+ await asr.stop();
+ await asr.message.delete().catch(() => {});
+ await noticeDel.delete().catch(() => {});
+ }
+ else {return message.reply("Looks like you didn't find the anime you were looking for.");}
+ } else {
+ let preConfEmbed = await message.channel.send({embeds: [asr.embed]});
+ let conf = await ask(message, "Is this the anime you meant?", 60000, undefined, undefined, true);
+ if (!['y', 'yes', 'ye', 'n', 'no'].includes(conf.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
+ conf = ['y', 'yes', 'ye'].includes(conf.trim().toLowerCase());
+ preConfEmbed.delete().catch(() => {});
+ if (!conf) {return message.channel.send("Well, I've got nothing, then. If that doesn't match the anime you're looking for then I would try again with a more narrow search.");}
+ fn = asr.id;}
+ let af = await AF.findOne({uid: message.author.id}) || new AF({uid: message.author.id});
+ if (af.toWatch.includes(fn)) {return message.channel.send("Looks like that anime is already on your watch list!");}
+ if (af.watched.includes(fn)) {return message.channel.send("That anime is on your **watched** list already...");}
+ const tfc = await AniData.findOne({id: fn});
+ if (!tfc) {return message.channel.send("Huh... guess that anime just... vanished into thin air? I would go yell at my devs.");}
+ af.toWatch.push(fn);
+ af.markModified('toWatch');
+ af.save();
+ tfc.listed++;
+ tfc.save();
+ return message.channel.send(`I've added **${client.misc.cache.animeID.get(fn)}** to your watch list! ${[`Let me know if it's any good when you get around to it :3`, `Hope it's good!`, 'Try not to wait *too* long before you watch it.', `I've heard good things about that one.`][Math.floor(Math.random() * 4)]}`);
+ }
+
+ if (['d', 'delete', 'remove', 'r'].includes(args[0].toLowerCase())) {
+ let conf = await ask(message, "Real quick, before anything else, I have to ask: are you trying to remove an anime from your watch list because you've now watched it?", 60000);
+ if (!['y', 'yes', 'ye', 'n', 'no'].includes(conf.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
+ conf = ['y', 'yes', 'ye'].includes(conf.trim().toLowerCase());
+ if (conf) {return message.channel.send(`Good thing I asked then :brain: Please instead use the \`${prefix}watched\` command to handle removing the anime from your watch list.`);}
+ args.shift();
+ if (!args[0]) {
+ let tempchar = await ask(message, "What anime would you like to remove from your watch list?", 60000, false, true);
+ if (!tempchar) {return;}
+ args = tempchar.split(/\s+/g);
+ }
+ let asr = await ans(message, client, args.join(" ").trim().toLowerCase(), -700, 0);
+ let fn;
+ if (asr === 0) {
+ return message.channel.send("That search returned no results! Try again?");
+ } else if (asr instanceof Pagination) {
+ await asr.start({user: message.author.id, startPage: 0, endTime: 60000});
+ await asr.message.react('✅');
+ await message.channel.send("React with :white_check_mark: when you've found the anime you want!");
+ let arc;
+ try {arc = await asr.message.awaitReactions({filter: (r) => ['✅', '⏹'].includes(r.emoji.name), max: 1, errors: ['time']});}
+ catch {return message.reply("Looks like you didn't find the anime you were looking for.");}
+ collected = arc.first().emoji.name;
+ if (collected === '✅') {
+ fn = client.misc.cache.anime.get(asr.getCurrentPage().title.trim());
+ asr.stop();
+ }
+ else {return message.reply("Looks like you didn't find the anime you were looking for.");}
+ } else {
+ await message.channel.send({embeds: [asr.embed]});
+ let conf = await ask(message, "Is this the anime you meant?", 60000, undefined, undefined, true);
+ if (!['y', 'yes', 'ye', 'n', 'no'].includes(conf.trim().toLowerCase())) {clearDM(); return dmch.send("You must specify yes or no! Please try again.");}
+ conf = ['y', 'yes', 'ye'].includes(conf.trim().toLowerCase());
+ if (!conf) {return message.channel.send("Well, I've got nothing, then. If that doesn't match the anime you're looking for then I would try again with a more narrow search.");}
+ fn = asr.id;}
+ let af = await AF.findOne({uid: message.author.id}) || new AF({uid: message.author.id});
+ if (!af.toWatch.includes(fn)) {return message.channel.send("Looks like that anime isn't on your watch list!");}
+ const tfc = await AniData.findOne({id: fn});
+ if (!tfc) {return message.channel.send("Huh... guess that anime just... vanished into thin air? I would go yell at my devs.");}
+ af.toWatch.splice(af.toWatch.indexOf(fn), 1);
+ af.markModified('toWatch');
+ af.save();
+ tfc.listed--;
+ tfc.save();
+ return message.channel.send(`${['Guess it wasn\'t worth the watch after all, huh?', 'Oof. Did you lose interest? Well, either way,', 'Got it, got it.', 'Okie dokie!'][Math.floor(Math.random() * 4)]} I've removed **${client.misc.cache.animeID.get(fn)}** from your watch list.`);
+ }
+ }
+};
\ No newline at end of file
diff --git a/commands/dev/admin.js b/commands/dev/admin.js
index 957d74e..3ff4147 100644
--- a/commands/dev/admin.js
+++ b/commands/dev/admin.js
@@ -28,9 +28,9 @@ module.exports = {
else {tu.admin = false; tu.developer = false;}
tu.save();
const logemb = (act) => new Discord.MessageEmbed()
- .setAuthor({name: `Admin ${act}`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `Admin ${act}`, iconURL: message.author.displayAvatarURL()})
.setDescription("A user's Admin status was updated.")
- .setThumbnail(person.avatarURL({size: 1024}))
+ .setThumbnail(person.displayAvatarURL({size: 1024}))
.addField("Name", person.username, true)
.addField("Developer", message.author.username, true)
.setColor("e8da3a")
diff --git a/commands/dev/anipulse.js b/commands/dev/anipulse.js
new file mode 100644
index 0000000..bd28769
--- /dev/null
+++ b/commands/dev/anipulse.js
@@ -0,0 +1,83 @@
+const Discord = require('discord.js');
+
+const AniData = require("../../models/anime");
+const UserData = require('../../models/user');
+const CharData = require('../../models/char');
+
+const {Pagination} = require('../../util/pagination');
+const {Tag} = require('../../util/tag');
+const {TagFilter} = require('../../util/tagfilter');
+
+module.exports = {
+ name: "anipulse",
+ aliases: ['ap'],
+ meta: {
+ category: 'Developer',
+ description: "Get a pulse check of anime",
+ syntax: '`anipulse`',
+ extra: null
+ },
+ help: "Not much to see here!",
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ let tu = await UserData.findOne({uid: message.author.id});
+ if (!tu || !tu.staff) {return message.channel.send("You must be Natsuki staff in order to use this command.");}
+
+ let sm = await message.channel.send("One moment while I gather that information for you...");
+
+ let options = new TagFilter([
+ new Tag(['c', 'ch', 'char', 'chars', 'character', 'characters'], 'chars', 'append'),
+ new Tag(['a', 'ani', 'anime'], 'anime', 'append')
+ ]).test(args.join(" "));
+ Object.keys(options).forEach(o => {if (isNaN(Number(options[o]))) {delete options[o];}});
+
+ let ani = client.misc.cache.animeID.size;
+ let char = client.misc.cache.charsID.size;
+ let nick = Array.from(client.misc.cache.chars.keys()).filter(x => !Array.from(client.misc.cache.charsID.values()).includes(x)).length;
+
+ let charThresh = (options.chars !== undefined ? Number(options.chars) : 2);
+ let aniThresh = (options.anime !== undefined ? Number(options.anime) : 10);
+
+ let lowChars = [];
+ for await (const ani of AniData.find()) {
+ if (ani.characters.length < aniThresh) {lowChars.push(ani);}
+ }
+
+ let lowIms = [];
+ for await (const char of CharData.find()) {
+ if (char.images.length < charThresh) {lowIms.push(char);}
+ }
+
+ let pages = [new Discord.MessageEmbed()
+ .setTitle("Anime Database Pulse Check")
+ .setDescription(`**${ani}** Anime\n**${char}** Characters\n**${nick}** Nicknames`)
+ .addField(`Anime with < ${aniThresh} character${client.utils.s(aniThresh)}`, `${lowChars.length}`)
+ .addField(`Characters with < ${charThresh} extra image${client.utils.s(charThresh)}`, `${lowIms.length}`)
+ .setColor('c375f0')
+ ];
+
+ let ma = Math.floor(lowIms.length / 10);
+ for (let i = 0; i < ma; i++) {
+ if (!lowChars.slice(10 * i, Math.min((10 * i) + 10, lowChars.length)).length) {break;}
+ pages.push(new Discord.MessageEmbed()
+ .setTitle("Anime Database Pulse Check")
+ .setDescription(`**${ani}** Anime\n**${char}** Characters\n**${nick}** Nicknames`)
+ .addField(`Anime with < ${aniThresh} character${client.utils.s(aniThresh)}`, lowChars.slice(10 * i, Math.min((10 * i) + 10, lowChars.length)).filter(x=>![null,undefined].includes(x)).map((ani, y) => `${(10*i)+y+1}. ${ani.name} -> **${ani.characters.length}** Char${client.utils.s(ani.characters.length)}.`).join('\n'))
+ .setColor('c375f0')
+ );}
+
+ let mc = Math.floor(lowIms.length / 10);
+ for (let i = 0; i < mc; i++) {
+ if (!lowIms.slice(10 * i, Math.min((10 * i) + 10, lowIms.length)).length) {break;}
+ pages.push(new Discord.MessageEmbed()
+ .setTitle("Anime Database Pulse Check")
+ .setDescription(`**${ani}** Anime\n**${char}** Characters\n**${nick}** Nicknames`)
+ .addField(`Characters with < ${charThresh} extra image${client.utils.s(charThresh)}`, lowIms.slice(10 * i, Math.min((10 * i) + 10, lowIms.length)).filter(x=>![null,undefined].includes(x)).map((ch, y) => `${(10*i)+y+1}. ${ch.name} -> **${ch.images.length}** Image${client.utils.s(ch.images.length)}.`).join('\n'))
+ .setColor('c375f0')
+ );}
+
+ const pag = new Pagination(message.channel, pages, message, client, true);
+ sm.delete().catch(() => {});
+
+ return await pag.start({user: message.author.id, time: 60000});
+ }
+};
\ No newline at end of file
diff --git a/commands/dev/cachesync.js b/commands/dev/cachesync.js
new file mode 100644
index 0000000..6164b27
--- /dev/null
+++ b/commands/dev/cachesync.js
@@ -0,0 +1,23 @@
+const Discord = require('discord.js');
+
+const UserData = require('../../models/user');
+
+module.exports = {
+ name: "cachesync",
+ aliases: ['preres', 'pres'],
+ meta: {
+ category: 'Developer',
+ description: "Sync cached XP, monners, and monitor data to make client safe for a restart",
+ syntax: '`cachesync`',
+ extra: null
+ },
+ help: "Nothing to see here!",
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ const tu = await UserData.findOne({uid: message.author.id});
+ if ((!tu || !tu.developer) && !client.developers.includes(message.author.id)) {return message.channel.send("You must be a developer in order to do this!");}
+ await require('../../util/lxp/cacheloop')(client);
+ await require('../../util/vcloop')(client);
+ await require('../../util/monitorloop')(client);
+ return message.channel.send("Cache synchronized with DB!");
+ }
+};
\ No newline at end of file
diff --git a/commands/dev/developer.js b/commands/dev/developer.js
index 4d287d1..a2a1a00 100644
--- a/commands/dev/developer.js
+++ b/commands/dev/developer.js
@@ -30,9 +30,9 @@ module.exports = {
else {tu.developer = false;}
tu.save();
const logemb = (act) => new Discord.MessageEmbed()
- .setAuthor({name: `Developer ${act}`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `Developer ${act}`, iconURL: message.author.displayAvatarURL()})
.setDescription("A user's Developer status was updated.")
- .setThumbnail(person.avatarURL({size: 1024}))
+ .setThumbnail(person.displayAvatarURL({size: 1024}))
.addField("Name", person.username, true)
.addField("Developer", message.author.username, true)
.setColor("e8da3a")
diff --git a/commands/dev/eval.js b/commands/dev/eval.js
index 3960119..5ade095 100644
--- a/commands/dev/eval.js
+++ b/commands/dev/eval.js
@@ -16,6 +16,8 @@ module.exports = {
},
execute(message, msg, args, cmd, prefix, mention, client) {
try {
+ const dc = (...files) => {return files.forEach(file => {return delete require.cache[require.resolve(`../../${file}`)];});};
+
let timer = new Date().getTime();
if (!client.developers.includes(message.author.id)) {return message.channel.send("Sorry, but I've got trust issues, so only me devs can go commanding me around like that.");};
@@ -27,20 +29,20 @@ module.exports = {
if (!args.length) {return message.channel.send("Silly goose, if you want me to do something, you have to tell me what!");}
const result = new Promise((resolve) => resolve(eval(args.join(' '))));
return result.then((output) => {
- if (typeof output !== 'string') {
- output = require('util').inspect(output, {depth: 0});
- }
- output = output.replace(client.config.token, 'Client Token')
- .replace(client.config.database.password, 'Database Password')
- .replace(client.config.database.cluster, 'Database Cluster');
+ if (typeof output !== 'string') {
+ output = require('util').inspect(output, {depth: 0});
+ }
+ output = output.replace(client.config.token, 'Client Token')
+ .replace(client.config.database.password, 'Database Password')
+ .replace(client.config.database.cluster, 'Database Cluster');
- return options.silent ? null : message.channel.send({embeds: [new Discord.MessageEmbed()
- .setTitle('Client Evaluation')
- .setDescription(`\`\`\`js\n${output}\n\`\`\``)
- .setColor('c375f0')
- .setFooter({text: `Natsuki | Evaluated in ${new Date().getTime() - timer}ms`, iconURL: client.user.avatarURL()})
- .setTimestamp()]});
- }).catch(error => {return message.channel.send(`Error: \`${error}\`.`);});
+ return options.silent ? null : message.channel.send({embeds: [new Discord.MessageEmbed()
+ .setTitle('Client Evaluation')
+ .setDescription(`\`\`\`js\n${output}\n\`\`\``)
+ .setColor('c375f0')
+ .setFooter({text: `Natsuki | Evaluated in ${new Date().getTime() - timer}ms`, iconURL: client.user.displayAvatarURL()})
+ .setTimestamp()]});
+ }).catch(error => {return message.channel.send(`Error: \`${error}\`.`);});
} catch (error) {
let date = new Date; date = date.toString().slice(date.toString().search(":") - 2, date.toString().search(":") + 6);
console.error(`\n${chalk.red('[ERROR]')} >> ${chalk.yellow(`At [${date}] | Occurred while trying to run n?eval`)}`, error);
diff --git a/commands/dev/execute.js b/commands/dev/execute.js
index 94897ab..7f2811c 100644
--- a/commands/dev/execute.js
+++ b/commands/dev/execute.js
@@ -22,7 +22,7 @@ module.exports = {
.setTitle("Error")
.setDescription(`\`\`\`${error}\`\`\``)
.setColor("ff446a")
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
);
}
@@ -31,7 +31,7 @@ module.exports = {
.setTitle("Execution Successful")
.setDescription(`\`\`\`${stdout}\`\`\``)
.setColor("c375f0")
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
);
});
diff --git a/commands/dev/reload.js b/commands/dev/reload.js
index ed73ebc..00092c2 100644
--- a/commands/dev/reload.js
+++ b/commands/dev/reload.js
@@ -91,7 +91,9 @@ module.exports = {
});
if (!res) {return message.channel.send("I can't reload that command as I can't find file!");}
if (require.resolve(res) in require.cache) {delete require.cache[require.resolve(res)];}
- client.commands.set(lf, require(res));
+ const ncmd = require(res);
+ client.commands.set(lf, ncmd);
+ if (ncmd.aliases) {ncmd.aliases.forEach(alias => {if (!client.aliases.has(alias)) {client.aliases.set(alias, lf);}});}
return message.channel.send(`Reloaded command \`${lf}\` in ${new Date().getTime() - timer}ms`);
}
diff --git a/commands/dev/restart.js b/commands/dev/restart.js
new file mode 100644
index 0000000..14ac839
--- /dev/null
+++ b/commands/dev/restart.js
@@ -0,0 +1,34 @@
+const Discord = require('discord.js');
+const cp = require('child_process');
+
+module.exports = {
+ name: "restart",
+ aliases: ['res'],
+ meta: {
+ category: 'Developer',
+ description: "Fully restart Natsuki",
+ syntax: '`restart`',
+ extra: null
+ },
+ help: "Fully restarts the bot. Developer-only.",
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ if (!client.developers.includes(message.author.id)) {return message.channel.send("You must be a developer in order to do that!");}
+ try {
+ await require('../../util/lxp/cacheloop')(client);
+ await require('../../util/vcloop')(client);
+ await require('../../util/monitorloop')(client);
+ await message.channel.send("Cache synchronized with DB! Restarting...");
+ return cp.exec("pm2 restart natsuki", function(error, stdout, stderr) {
+ if (error) {
+ return message.channel.send({embeds: [new Discord.MessageEmbed()
+ .setTitle("Error")
+ .setDescription(`\`\`\`${error}\`\`\``)
+ .setColor("ff446a")
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
+ .setTimestamp()]}
+ );
+ }
+ });
+ } catch {return message.channel.send("There was an error in trying to do that!");}
+ }
+};
\ No newline at end of file
diff --git a/commands/dev/staff.js b/commands/dev/staff.js
index 088d63e..5038c52 100644
--- a/commands/dev/staff.js
+++ b/commands/dev/staff.js
@@ -28,9 +28,9 @@ module.exports = {
else {tu.staff = false; tu.admin = false; tu.developer = false;}
tu.save();
const logemb = (act) => new Discord.MessageEmbed()
- .setAuthor({name: `Staff ${act}`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `Staff ${act}`, iconURL: message.author.displayAvatarURL()})
.setDescription("A user's Staff status was updated.")
- .setThumbnail(person.avatarURL({size: 1024}))
+ .setThumbnail(person.displayAvatarURL({size: 1024}))
.addField("Name", person.username, true)
.addField("Developer", message.author.username, true)
.setColor("e8da3a")
diff --git a/commands/dev/support.js b/commands/dev/support.js
index fd423b4..4bf5f33 100644
--- a/commands/dev/support.js
+++ b/commands/dev/support.js
@@ -28,9 +28,9 @@ module.exports = {
else {tu.support = false; tu.staff = false; tu.admin = false; tu.developer = false;}
tu.save();
const logemb = (act) => new Discord.MessageEmbed()
- .setAuthor({name: `Support ${act}`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `Support ${act}`, iconURL: message.author.displayAvatarURL()})
.setDescription("A user's Support status was updated.")
- .setThumbnail(person.avatarURL({size: 1024}))
+ .setThumbnail(person.displayAvatarURL({size: 1024}))
.addField("Name", person.username, true)
.addField("Developer", message.author.username, true)
.setColor("e8da3a")
diff --git a/commands/dev/vip.js b/commands/dev/vip.js
index 356186b..652c11e 100644
--- a/commands/dev/vip.js
+++ b/commands/dev/vip.js
@@ -20,7 +20,7 @@ module.exports = {
if (!client.developers.includes(message.author.id) && !['check', 'c', 'view', 'v'].includes(args[0])) {return message.reply("Unfortunately, this is a **developer-only command**!");}
const GuildSettings = require('../../models/guild');
const logemb = (act) => new Discord.MessageEmbed()
- .setAuthor({name: `VIP Server ${act}`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `VIP Server ${act}`, iconURL: message.author.displayAvatarURL()})
.setDescription("A Server's VIP status was updated.")
.setThumbnail(message.guild.iconURL({size: 1024}))
.addField("Name", message.guild.name, true)
diff --git a/commands/fun/8ball.js b/commands/fun/8ball.js
index a39d78f..b327c3e 100644
--- a/commands/fun/8ball.js
+++ b/commands/fun/8ball.js
@@ -26,7 +26,7 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
return message.reply({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: "8ball Question", iconURL: message.author.avatarURL()})
+ .setAuthor({name: "8ball Question", iconURL: message.author.displayAvatarURL()})
.setDescription("**Question:** " + question + "\n**Answer:** " + responses[Math.floor(Math.random() * responses.length)])
.setColor("c375f0")
.setFooter({text: `Asked by ${name} | Natsuki`})
diff --git a/commands/fun/bite.js b/commands/fun/bite.js
index bef733a..ab8ed31 100644
--- a/commands/fun/bite.js
+++ b/commands/fun/bite.js
@@ -25,7 +25,7 @@ module.exports = {
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("Ew quit tryna bite yourself, that's weird.");}
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bites ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bites ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.displayAvatarURL()})
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('d93846')
]});
@@ -33,7 +33,7 @@ module.exports = {
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 bite GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new bite GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/fun/deathnote.js b/commands/fun/deathnote.js
index 6e8f889..f08c883 100644
--- a/commands/fun/deathnote.js
+++ b/commands/fun/deathnote.js
@@ -8,17 +8,20 @@ const {TagFilter} = require('../../util/tagfilter');
const deaths = [
"watching too much anime", "an overdose of waifus", "Hypotakunemia", "trying to self-isekai",
- "Bass:tm:", "cranking the music just a little too loud", "trying to swim in lava", "an unknown cause",
+ "Bass:tm:", "cranking the music just a little too loud", "trying to swim in lava",
"Despacito", "something really cliche and unoriginal", "'shrooms",
"clicking 'I agree' without reading the Terms of Service", "alchemy", "rusty spoons",
"picking the wrong waifu", "body pillows", "fur-con", "something to do with lamb sauce",
- "grandma's cookies"
+ "grandma's cookies", "trying to get cat ears", "not reading the assembly instructions for that ikea furniture",
+ "the wrong kind of coke", "getting cancelled irl", "getting their credit card declined",
+ "finishing the last episode", "posting memes in #general", "stepping on a lego", "stubbing their toe",
+ "fork in toaster", "toasterbath", "signing this book without reading the cover", "being Kirby's dinner"
]; // a list of preset death methods that can occur
const before = [
"A name is being written...", "Someone will perish soon...", "A body is *about* to be discovered...",
- "{p} is scribbling something in their notebook...", "\*Manical laughter echoes around you*...",
- "{p} laughs maniacally..."
+ "{w} is scribbling something in their notebook...", "\*Manical laughter echoes around you*...",
+ "{w} laughs maniacally..."
]; // things it says before the response is sent
const responses = {
@@ -102,12 +105,12 @@ module.exports = {
let victim = options.victim && options.victim.length ? options.victim : message.mentions.members.first().displayName;
let killer = message.member;
- let pretext = before[Math.floor(Math.random() * before.length)].replace(/{p}/g, victim);
+ let pretext = before[Math.floor(Math.random() * before.length)].replace(/{w}/g, killer.displayName);
let note = await message.channel.send({embeds: [new Discord.MessageEmbed()
.setDescription(pretext)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
@@ -131,13 +134,13 @@ module.exports = {
}
let finalEmbed = new Discord.MessageEmbed()
- .setAuthor({name: title, iconURL: message.author.avatarURL()})
+ .setAuthor({name: title, iconURL: message.author.displayAvatarURL()})
.setDescription(`${text}${dns ? `\n\n_Their name is in your deathnote **${dns.against[mention.id] === 1 ? 'once' : `${dns.against[mention.id]} times`}.**_` : ''}`)
.setColor('c375f0')
.setFooter({text: `Natsuki${dns ? ` | ${dns.total} name${dns.total === 1 ? ' has been' : 's'} written in your deathnote!` : ''}`})
.setTimestamp();
- if (mention) {finalEmbed.setThumbnail(mention.avatarURL({size: 1024}));}
+ if (mention) {finalEmbed.setThumbnail(mention.displayAvatarURL({size: 1024}));}
return note.edit({embeds: [finalEmbed]});
}
diff --git a/commands/fun/marry.js b/commands/fun/marry.js
new file mode 100644
index 0000000..a225082
--- /dev/null
+++ b/commands/fun/marry.js
@@ -0,0 +1,88 @@
+const Discord = require('discord.js');
+
+const UserData = require('../../models/user');
+
+const ask = require("../../util/ask");
+
+module.exports = {
+ name: "marry",
+ meta: {
+ category: 'Fun',
+ description: "Marry someone to get some extra fun benefits!",
+ syntax: '`marry <@user|status|decline>`',
+ extra: null,
+ guildOnly: true
+ },
+ help: new Discord.MessageEmbed()
+ .setTitle("Help -> Marriage")
+ .setDescription("Marry another Natsuki user. They'll have to accept your marriage request for you to be able to marry them, though.")
+ .addField("Syntax", "`marry <@user|status|decline>`"),
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ if (!args.length) {return message.channel.send(`Syntax: \`${prefix}marry <@user|status|decline>\``);}
+ if (['s', 'status', 'v', 'view'].includes(args[0].toLowerCase())) {
+ const tu = await UserData.findOne({uid: message.author.id});
+ if (!tu || !tu.marriedTo) {return message.channel.send("You aren't married to anyone :(");}
+ else {return message.channel.send({embeds: [new Discord.MessageEmbed()
+ .setTitle("Marriage Status")
+ .setDescription(`<@${message.author.id}> is married to <@${tu.marriedTo}>!`)
+ .setColor('c375f0')
+ .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setTimestamp()
+ ]});}
+ } else if (['d', 'decline', 'r', 'reject'].includes(args[0].toLowerCase())) {
+ let requests = client.misc.cache.marriageRequests.filter(u => u === message.author.id);
+ if (!requests.size) {return message.channel.send("You don't have any people trying to marry you!");}
+ let ra = Array.from(requests.keys());
+ message.channel.send({embeds: [new Discord.MessageEmbed()
+ .setTitle("Current Marriage Requests")
+ .setDescription(ra.map((r, i) => `${i+1}. <@${r}>`).join("\n"))
+ .addField("Decline", "To decline someone's request, please reply with the number that corresponds to the person you'd like to decline.")
+ .setColor('c375f0')
+ .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setTimestamp()
+ ]});
+ try {
+ let res = await message.channel.awaitMessages({filter: (m) => m.author.id === message.author.id, max: 1, errors: ['time'], time: 60000});
+ res = res.first().content;
+ if (isNaN(Number(res))) {return message.channel.send("You must reply with a number!");}
+ res = Number(res);
+ if (res < 1 || res > ra.length + 1) {return message.channel.send("That number isn't in your list.");}
+ let person = ra[res-1];
+ let err = false;
+ await message.guild.members.fetch(person).catch(() => err = true);
+ if (err) {return message.channel.send("There was an error in trying to do that!");}
+ let conf = await ask(message, `Are you sure you want to decline ${client.utils.ps(message.guild.members.cache.get(person).displayName)} marriage request?`, 60000);
+ if (!conf) {return;}
+ if (!['y', 'yes', 'ye', 'sure', 'mhm'].includes(conf.toLowerCase())) {return message.channel.send("Okay, nevermind then!");}
+ client.misc.cache.marriageRequests.delete(person);
+ return message.channel.send("Request declined.");
+ } catch {return message.reply("That request timed out. Please try again.");}
+ } else {
+ if (!mention) {return message.channel.send("You have to mention the person you'd like to marry!");}
+ if (!message.guild.members.cache.has(mention.id)) {return message.channel.send("I can't find that user! Make sure they're in this server before trying to marry them, or go to a server they're in. If you're certain that person is in this server, then wait for them to come online and send a message first; that might help.");}
+ if (mention.id === client.user.id) {return message.channel.send("I'm actually already married! Well, I will be soon, to my girlfriend Tamaki. I love her very much <:NC_hearty:841489530413383712>");}
+ if (mention.bot) {return message.channel.send("Us bots aren't smart enough to respond to a marriage request and we're really too boring to wanna marry in the first place, so I'll just stop you in your tracks now.");}
+ if (mention.id === message.author.id) {return message.channel.send("ehe :sweat_smile: it doesn't work that way...");}
+ const tu = await UserData.findOne({uid: message.author.id}) || new UserData({uid: message.author.id});
+ if (tu.marriedTo) {return message.channel.send("Looks like you're already married to someone. Cheating, are we?");}
+ const ou = await UserData.findOne({uid: mention.id}) || new UserData({uid: mention.id});
+ if (ou.marriedTo) {return message.channel.send("Looks like that person is already in a relationship. Yikes, good luck with that.");}
+ if (client.misc.cache.marriageRequests.has(ou.uid) && client.misc.cache.marriageRequests.get(ou.uid) === message.author.id) {
+ tu.marriedTo = ou.uid; ou.marriedTo = tu.uid;
+ tu.markModified('marriedTo'); ou.markModified('marriedTo');
+ await tu.save(); await ou.save();
+ return message.channel.send({embeds: [new Discord.MessageEmbed()
+ .setTitle(`New Marriage!`)
+ .setDescription(`With the powers invested in me by Wubzy ~~and myself because I'm cool like that~~, I now pronounce ${message.member.displayName} and ${message.guild.members.cache.get(ou.uid).displayName} a married couple till debt and richer Discord users do you part.`)
+ .setColor('c375f0')
+ .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setTimestamp()
+ ]});
+ }
+ if (client.misc.cache.marriageRequests.has(message.author.id)) {return message.channel.send("You're already waiting on another marriage response.");}
+ if (client.misc.cache.marriageRequests.filter(u => u === ou.uid).size > 10) {return message.channel.send("*10 people are waiting on a response to marry this person. Yikes.*");}
+ client.misc.cache.marriageRequests.set(message.author.id, ou.uid);
+ return message.channel.send(`<@${ou.uid}>, you have a marriage request from ${message.member.displayName}. Send \`${prefix}marry @${message.member.displayName}\` to accept!`);
+ }
+ }
+};
\ No newline at end of file
diff --git a/commands/fun/nowplaying.js b/commands/fun/nowplaying.js
index 845aae3..b90d481 100644
--- a/commands/fun/nowplaying.js
+++ b/commands/fun/nowplaying.js
@@ -29,7 +29,7 @@ module.exports = {
stream.on('nowPlaying', t => {
clearTimeout(timeout);
message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: message.guild ? message.guild.members.cache.get(user.id) ? message.guild.members.cache.get(user.id).displayName : user.username : user.username, iconURL: user.avatarURL()})
+ .setAuthor({name: message.guild ? message.guild.members.cache.get(user.id) ? message.guild.members.cache.get(user.id).displayName : user.username : user.username, iconURL: user.displayAvatarURL()})
.setTitle(`${saves.get(user.id)} | Now Playing`)
.setDescription(`<@${user.id}> is currently listening to **${t.name}** by **${t.artist['#text']}**.\nView the song [here](${t.url}).`)
.setColor("c375f0")
diff --git a/commands/fun/rp.js b/commands/fun/rp.js
new file mode 100644
index 0000000..33f0d08
--- /dev/null
+++ b/commands/fun/rp.js
@@ -0,0 +1,181 @@
+const Discord = require('discord.js');
+
+const RP = require("../../models/rpch");
+const RPC = require('../../models/rpconfig');
+
+const {Tag} = require('../../util/tag');
+const {TagFilter} = require('../../util/tagfilter');
+const ask = require('../../util/ask');
+
+module.exports = {
+ name: "rp",
+ aliases: ['roleplay'],
+ meta: {
+ category: 'Fun',
+ description: "Add and edit characters for roleplaying",
+ syntax: '`rp `',
+ extra: null,
+ guildOnly: true
+ },
+ help: new Discord.MessageEmbed()
+ .setTitle("Help -> Roleplay Characters")
+ .setDescription("Add and edit characters to roleplay with!")
+ .addField("Syntax", "`rp `"),
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ if (!args.length) {return message.channel.send(`Syntax: \`${prefix}rp \``);}
+ if (['add', 'a', 'n', 'new'].includes(args[0].toLowerCase())) {
+ let tags = true;
+ let options = new TagFilter([
+ new Tag(['i', 'img', 'image', 'pfp', 'thumbnail', 't', 'thumb'], 'image', 'append'),
+ new Tag(['n', 'name'], 'name', 'append'),
+ new Tag(['p', 'prefix'], 'prefix', 'append')
+ ]).test(args.join(" "));
+ if (!options.image || !options.name || !options.prefix) {
+ tags = false;
+ const name = await ask(message, "What is the character's name?", 60000, false, undefined, true); if (!name) {return;}
+ if (name.length > 50) {return message.channel.send("That name is a little too long.");}
+ options.name = name;
+
+ let prefix = await ask(message, "What is the character's prefix? This is how you will use the character.", 60000, false, undefined, true); if (!prefix) {return;}
+ if (prefix.length > 8) {return message.channel.send("Your prefix should be less than 8 characters.");}
+ if (!prefix.match(/^[a-zA-Z0-9-_]+$/)) {return message.channel.send("Your prefix must contain only alphanumeric characters.");}
+ options.prefix = prefix.toLowerCase();
+
+ let imp = await message.channel.send("Please send an image for the character's profile picture. **Do not** send NSFW.");
+ try {
+ const im = await message.channel.awaitMessages({filter: m => m.author.id === message.author.id, time: 60000, max: 1, errors: ['time']});
+ imp.delete().catch(() => {});
+ if (!im.first().attachments.size) {return message.channel.send("You must directly upload an image to use for the profile picture.");}
+ options.image = im.first().attachments.first().url;
+ }
+ catch {imp.delete().catch(() => {}); return message.reply("Your character creation timed out.");}
+ } else {
+ if (options.prefix.length > 8) {return message.channel.send("Your prefix should be less than 8 characters.");}
+ if (!options.prefix.match(/^[a-zA-Z0-9-_]+$/)) {return message.channel.send("Your prefix must contain only alphanumeric characters.");}
+ }
+
+ if (!options.image.startsWith('https://cdn.discordapp.com/attachments/')) {return message.channel.send(tags ? "You must provide a cdn.discordapp.com link." : "It seems you didn't upload an image, or there was an error on my side. If the problem persists, please contact my developers.");}
+ if (options.image.length > 350) {return message.channel.send("That image URL is a little too long.");}
+
+ let rp = await RP.findOne({uid: message.author.id}) || new RP({uid: message.author.id});
+ if (rp.chars[options.prefix]) {return message.channel.send("You already have a character with that prefix. Please try again with a different prefix.");}
+ if (Object.keys(rp.chars).length >= 20) {return message.channel.send("The current maximum of characters is 20, and you've reached that maximum. Sorry!");}
+ rp.chars[options.prefix] = options;
+ rp.markModified(`chars.${options.prefix}`);
+ rp.save();
+
+ return message.channel.send(`${options.name} has been added successfully to your characters list. To use this character, you'll need to be in a channel that is RP-enabled. \`${options.prefix}: \``);
+ } else if (['list', 'l'].includes(args[0].toLowerCase())) {
+ let rp = await RP.findOne({uid: message.author.id});
+ if (!rp) {return message.channel.send("You don't have any characters made!");}
+ let n = message.member ? message.member.displayName : message.author.username;
+ return message.channel.send({embeds: [new Discord.MessageEmbed()
+ .setAuthor({name: `${n}${n.endsWith('s') ? "'" : "'s"} RP Characters`, iconURL: (message.member || message.author).displayAvatarURL({dynamic: true})})
+ .setDescription(Object.keys(rp.chars).map(ch => `\`${ch}\`: ${rp.chars[ch].name}`).join(', '))
+ .setColor('c375f0')
+ .setFooter({text: "Natsuki"})
+ .setTimestamp()
+ ]});
+ } else if (['view', 'v'].includes(args[0].toLowerCase())) {
+ let rp = await RP.findOne({uid: message.author.id});
+ if (!rp) {return message.channel.send("You don't have any characters made!");}
+ if (!args[1] || !rp.chars[args[1].toLowerCase()]) {return message.channel.send("You don't have a character with that prefix.");}
+ let ch = rp.chars[args[1]];
+ let n = message.member ? message.member.displayName : message.author.username;
+ return message.channel.send({embeds: [new Discord.MessageEmbed()
+ .setAuthor({name: `${n}${n.endsWith('s') ? "'" : "'s"} RP Character`, iconURL: (message.member || message.author).displayAvatarURL({dynamic: true})})
+ .setTitle(ch.name)
+ .setColor('c375f0')
+ .setFooter({text: "Natsuki"})
+ .setImage(ch.image)
+ .setTimestamp()
+ ]});
+ } else if (['edit', 'e'].includes(args[0].toLowerCase())) {
+ const rp = await RP.findOne({uid: message.author.id});
+ if (!rp || !Object.keys(rp.chars).length) {return message.channel.send("You don't have any characters to edit.");}
+ if (!args[1]) {return message.channel.send("You must provide the prefix of a character to edit!");}
+ if (!rp.chars[args[1].toLowerCase()]) {return message.channel.send("A character with that prefix doesn't exist.");}
+ let char = rp.chars[args[1].toLowerCase()];
+
+ if (!args[2]) {return message.channel.send(`Syntax: \`${prefix}rp edit \``);}
+
+ if (['p', 'prefix'].includes(args[2].toLowerCase())) {
+ let old = char.prefix;
+ let prefix;
+ if (!args[3]) {
+ prefix = await ask(message, "What prefix would you like to set?", 60000);
+ if (!prefix) {return;}
+ } else {prefix = args[3];}
+ prefix = prefix.toLowerCase();
+ if (prefix.length > 8) {return message.channel.send("Your prefix should be less than 8 characters.");}
+ if (!prefix.match(/^[a-zA-Z0-9-_]+$/)) {return message.channel.send("Your prefix must contain only alphanumeric characters.");}
+ if (prefix === old) {return message.channel.send("That's the same prefix you already had, silly!");}
+ char.prefix = prefix;
+ delete rp.chars[old];
+ rp.chars[prefix] = char;
+ ['chars', `chars.${old}`, `chars.${prefix}`].forEach(x => rp.markModified(x));
+ rp.save();
+ return message.channel.send("Prefix saved!");
+ } else if (['i', 'image', 'img'].includes(args[2].toLowerCase())) {
+ let image;
+ if (!args[3]) {
+ image = await ask(message, "What image would you like to set?", 60000);
+ if (!image) {return;}
+ } else {image = args[3];}
+ if (!image.startsWith('https://cdn.discordapp.com/attachments/')) {return message.channel.send("You must provide a cdn.discordapp.com link.");}
+ if (image.length > 350) {return message.channel.send("That image URL is a little too long.");}
+ rp.chars[char.prefix].image = image;
+ rp.markModified(`chars.${char.prefix}`);
+ rp.save();
+ return message.channel.send("Image saved!");
+ } else if (['n', 'name'].includes(args[2].toLowerCase())) {
+ args = args.slice(3);
+ let name;
+ if (!args[0]) {
+ name = await ask(message, "What name would you like to set?", 60000);
+ if (!name) {return;}
+ } else {name = args.join(" ");}
+ if (name.length > 50) {return message.channel.send("That name is a little too long.");}
+ rp.chars[char.prefix].name = name;
+ rp.markModified(`chars.${char.prefix}`);
+ rp.save();
+ return message.channel.send("Name saved!");
+ } else {return message.channel.send(`Invalid arg! Syntax: \`${prefix}rp edit \``);}
+ } else if (['delete', 'd'].includes(args[0].toLowerCase())) {
+ const rp = await RP.findOne({uid: message.author.id});
+ if (!rp || !Object.keys(rp.chars).length) {return message.channel.send("You don't have any characters to delete.");}
+ if (!args[1]) {return message.channel.send("You must provide the prefix of a character to delete!");}
+ if (!rp.chars[args[1].toLowerCase()]) {return message.channel.send("A character with that prefix doesn't exist.");}
+ let char = rp.chars[args[1].toLowerCase()];
+ let conf = await ask(message, `Are you sure you want to delete ${char.name}?`, 60000);
+ if (!conf) {return;}
+ if (!['yes', 'y', 'sure', 'mhm', 'ye'].includes(conf.toLowerCase())) {return message.channel.send("Okay, I won't do anything then.");}
+ delete rp.chars[char.prefix];
+ rp.markModified(`chars.${char.prefix}`);
+ rp.save();
+ return message.channel.send("I've deleted that character for you.");
+ } else if (['enable', 'en'].includes(args[0].toLowerCase())) {
+ if (!message.guild) {return message.channel.send("You must be in a server in order to enable RP character usage for a specific channel.");}
+ if (!message.member.permissionsIn(message.channel.id).has("MANAGE_WEBHOOKS")) {return message.channel.send("You must have permissions to edit webhooks here in order to do that.");}
+ if (!message.guild.me.permissions.has("MANAGE_WEBHOOKS")) {return message.channel.send("I don't have permissions to manage webhooks in this server.");}
+ if (!message.guild.me.permissionsIn(message.channel.id).has("MANAGE_WEBHOOKS")) {return message.channel.send("I don't have the permissions to edit webhooks in this channel.");}
+ const webhooks = await message.channel.fetchWebhooks();
+ if (webhooks.find(wh => wh.token)) {return message.channel.send("It would seem RP is already enabled in this channel. If it's not working in this channel, please contact my developers.");}
+ try {
+ return message.channel.createWebhook("Natsuki RP Webhook", {avatar: client.user.avatarURL({size: 2048})})
+ .then(async () => {
+ const config = await RPC.findOne({gid: message.guild.id}) || new RPC({gid: message.guild.id});
+ config.channels.push(message.channel.id);
+ config.markModified('channels');
+ if (!client.misc.cache.rp.has(message.guild.id)) {client.misc.cache.rp.set(message.guild.id, []);}
+ client.misc.cache.rp.get(message.guild.id).push(message.channel.id);
+ config.save();
+ return message.channel.send("RP features were successfully enabled in this channel.");
+ })
+ .catch(message.channel.send("There was an error doing that. Please make sure my permissions are properly set in this channel and try again. If the error persists, please contact my developers."));
+ } catch {return message.channel.send("There was an error doing that. Please make sure my permissions are properly set in this channel and try again. If the error persists, please contact my developers.");}
+ }
+
+ return message.channel.send(`Invalid arg! Syntax: \`${prefix}rp \``);
+ }
+};
\ No newline at end of file
diff --git a/commands/fun/secretsanta.js b/commands/fun/secretsanta.js
index 7fcd721..67e152a 100644
--- a/commands/fun/secretsanta.js
+++ b/commands/fun/secretsanta.js
@@ -78,11 +78,11 @@ module.exports = {
return dmch.send({embeds: [new Discord.MessageEmbed()
.setTitle("Secret Santa Created!")
.setDescription("Your Secret Santa has been completed! Have your members join by using `n?secretsanta join ` where the ID is the ID displayed below. You can start your secret santa when you have at least 3 members with `n?secretsanta start `. If someone joins that you don't want in your secret santa, use `n?secretsanta kick <@member|userID>`. If you want to also participate, just join the same way as everyone else.")
- .setThumbnail(message.author.avatarURL({size: 1024}))
+ .setThumbnail(message.author.displayAvatarURL({size: 1024}))
.addField("ID", `\`${id}\``, true)
.addField("Owner", message.author.username, true)
.setColor("01bd2f")
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
@@ -117,7 +117,7 @@ module.exports = {
.addField("Owner", o.username, true)
.addField("Members", `${tss.members ? tss.members.length : 0}`, true)
.setColor("01bd2f")
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
diff --git a/commands/fun/slap.js b/commands/fun/slap.js
index cc05d17..0057e16 100644
--- a/commands/fun/slap.js
+++ b/commands/fun/slap.js
@@ -31,7 +31,7 @@ module.exports = {
slaps.markModified(`against.${mention.id}`);
slaps.save();
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} slaps ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} slaps ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.displayAvatarURL()})
.setDescription(`That makes slap **#${slaps.against[mention.id]}** from you to them!`)
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('d93846')
@@ -41,7 +41,7 @@ module.exports = {
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 slap GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new slap GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/leveling/chests.js b/commands/leveling/chests.js
index 2626b49..f1320e5 100644
--- a/commands/leveling/chests.js
+++ b/commands/leveling/chests.js
@@ -22,9 +22,8 @@ module.exports = {
async execute(message, msg, args, cmd, prefix, mention, client) {
if (!message.member.permissions.has("ADMINISTRATOR")) {return message.channel.send("You must have administrator permissions in order to edit these settings.");}
if (!args.length) {args[0] = 'enable';}
-
if (['e', 'enable'].includes(args[0].toLowerCase())) {
- if (client.misc.cache.chests.includes(message.guild.id)) {return message.channel.send("This server already has chest spawning enabled.")};
+ if (client.misc.cache.chests.enabled.includes(message.guild.id)) {return message.channel.send("This server already has chest spawning enabled.")};
try {
am = await message.channel.send("Would you like to have me send chests to a specific channel?");
await am.react('👍');
@@ -43,13 +42,13 @@ module.exports = {
}
let c = new Chests({gid: message.guild.id, channel: chestCh});
c.save();
- client.misc.cache.chests.push(message.guild.id);
+ client.misc.cache.chests.enabled.push(message.guild.id);
return message.channel.send({embeds: [new Discord.MessageEmbed()
.setTitle("Chest Spawning Enabled!")
.setThumbnail(message.guild.iconURL({size: 2048}))
.setDescription(`Your server now has its chest spawning enabled! Chests will spawn in ${chestCh.length ? `<#${chestCh}>` : 'any channel'}.`)
.setColor("c375f0")
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
});
diff --git a/commands/leveling/claim.js b/commands/leveling/claim.js
new file mode 100644
index 0000000..a6d6f87
--- /dev/null
+++ b/commands/leveling/claim.js
@@ -0,0 +1,29 @@
+const Discord = require('discord.js');
+
+module.exports = {
+ name: "claim",
+ aliases: [],
+ meta: {
+ category: 'Leveling',
+ description: "Claim a chest that has spawned in the channel",
+ syntax: '`claim [specialText]`',
+ extra: null,
+ guildOnly: true
+ },
+ help: "Claim a chest that has spawned in the channel. You must be in the same channel as the chest in order to claim it.",
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ if (!client.misc.cache.chests.enabled.includes(message.guild.id)) {return message.channel.send("Chests aren't enabled in this server!");}
+ if (!client.misc.cache.chests.waiting.has(message.channel.id)) {return message.channel.send("There are no chests to claim in this channel.");}
+ if (!client.misc.cache.monners[message.author.id]) {return message.channel.send(`There was an issue on my side with claiming your chest. This happened because I don't have your ${message.misc.mn} info cached, so send a message anywhere and then try again. Sorry!`);}
+
+ let chest = client.misc.cache.chests.waiting.get(message.channel.id);
+ client.misc.cache.monners[message.author.id] += chest.amount;
+ client.misc.cache.chests.waiting.delete(message.channel.id);
+ chest.message.delete().catch(() => {});
+ return message.channel.send({embeds: [new Discord.MessageEmbed()
+ .setAuthor({name: message.member.displayName, iconURL: message.member.displayAvatarURL()})
+ .setDescription(`You've claimed ${client.utils.an(chest.rarity.name, true)} Chest with **${chest.amount} ${message.misc.mn}<:monners:926736756047495218>**`)
+ .setColor(chest.rarity.color)
+ ]}).catch(() => {});
+ }
+};
\ No newline at end of file
diff --git a/commands/leveling/daily.js b/commands/leveling/daily.js
index 17888bb..1c4459a 100644
--- a/commands/leveling/daily.js
+++ b/commands/leveling/daily.js
@@ -20,22 +20,22 @@ module.exports = {
async execute(message, msg, args, cmd, prefix, mention, client) {
let tm = await Monners.findOne({uid: message.author.id}) || new Monners({uid: message.author.id});
if (!client.misc.cache.monners[message.author.id]) {client.misc.cache.monners[message.author.id] = tm.currency;}
- if (tm.daily && tm.daily.last && ((new Date().getTime() - tm.daily.last) < (1000 * 60 * 60 * 24))) {
+ if (tm.daily && tm.daily.last && ((new Date().getTime() - tm.daily.last) < (1000 * 60 * 60 * 22))) {
return message.channel.send({embeds: [new Discord.MessageEmbed()
.setAuthor({iconURL: message.guild ? message.member.displayAvatarURL() : message.author.iconURL(), name: message.guild ? message.member.displayName : message.author.username})
- .setDescription(`Your daily is not available yet! You can claim your next daily in **${moment.preciseDiff(new Date().getTime(), tm.daily.last + (1000 * 60 * 60 * 24))}**`)
+ .setDescription(`Your daily is not available yet! You can claim your next daily in **${moment.preciseDiff(new Date().getTime(), tm.daily.last + (1000 * 60 * 60 * 22))}**`)
.setColor('c92a45')
]});
}
if (!tm.daily || !Object.keys(tm.daily).length) {tm.daily = {total: 0, last: new Date().getTime(), streak: 0};}
let streakIncrease = false;
- if (new Date().getTime() - tm.daily.last < (1000 * 60 * 60 * 36)) {
+ if (new Date().getTime() - tm.daily.last < (1000 * 60 * 60 * 47)) {
streakIncrease = true;
tm.daily.streak++
} else {tm.daily.streak = 1;}
tm.daily.total++;
tm.daily.last = new Date().getTime();
- let bonus = (75 + (tm.daily.streak * 45) + Math.floor(Math.random() * (15 + (tm.daily.streak * 2))));
+ let bonus = (75 + (tm.daily.streak * (15 + Math.floor(Math.random() * 20))) + Math.floor(Math.random() * (15 + (tm.daily.streak * 2))));
client.misc.cache.monners[message.author.id] += bonus;
tm.markModified('daily');
['streak', 'last', 'total'].forEach(x => {tm.markModified(`daily.${x}`);});
@@ -44,7 +44,7 @@ module.exports = {
.setAuthor({iconURL: message.guild ? message.member.displayAvatarURL() : message.author.iconURL(), name: message.guild ? message.member.displayName : message.author.username})
.setDescription(`You've claimed today's daily!`)
.addField("Streak", streakIncrease ? `Your streak has **increased** to **${tm.daily.streak}**` : 'Your streak has **reset** to **1**.', true)
- .addField("Bonus Monners", `<:monners:926736756047495218> ${bonus}`, true)
+ .addField(`Bonus ${message.misc.mn}`, `<:monners:926736756047495218> ${bonus}`, true)
.addField("Total Dailies Claimed", `${tm.daily.total}`)
.setColor('c375f0')
]});
diff --git a/commands/leveling/levelrole.js b/commands/leveling/levelrole.js
index 2f6cc34..a2c121c 100644
--- a/commands/leveling/levelrole.js
+++ b/commands/leveling/levelrole.js
@@ -35,7 +35,7 @@ module.exports = {
if (!role) {return message.channel.send("I can't find that role!");}
role = role.id;
let lr = await LR.findOne({gid: message.guild.id}) || new LR({gid: message.guild.id});
- if (Object.keys(lr.roles).length >= 10) {return message.channel.send("Due to data storage concerns, you can only have 10 level roles in this server. If you believe you need more, come to the support server and talk to my devs and see if they would be willing to raise this requirement for you.");}
+ if (Object.keys(lr.roles).length >= 20) {return message.channel.send("Due to data storage concerns, you can only have 20 level roles in this server. If you believe you need more, come to the support server and talk to my devs and see if they would be willing to raise this requirement for you.");}
lr.roles[level] = role;
lr.markModified(`roles.${level}`);
lr.save();
@@ -64,7 +64,7 @@ module.exports = {
.setThumbnail(message.guild.iconURL({size: 2048}))
.setDescription(s)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
diff --git a/commands/leveling/namemonners.js b/commands/leveling/namemonners.js
new file mode 100644
index 0000000..1621217
--- /dev/null
+++ b/commands/leveling/namemonners.js
@@ -0,0 +1,41 @@
+const Discord = require('discord.js');
+
+const Saves = require('../../models/saves');
+
+module.exports = {
+ name: "namemonners",
+ aliases: ['namemon', 'nm'],
+ meta: {
+ category: 'Leveling',
+ description: "Rename the currency for your server",
+ syntax: '`namemonners `',
+ extra: null,
+ guildOnly: true
+ },
+ help: new Discord.MessageEmbed()
+ .setTitle("Help -> Monners Naming")
+ .setDescription("Rename the Monners for your server. This merely a cosmetic effect. Monners gains will remain global regardless.")
+ .addField("Notice", "You must be an administrator in the server in order to edit these settings.")
+ .addField("Syntax", "`namemonners `"),
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ if (!args.length) {return message.channel.send(`Syntax: \`${prefix}namemonners \``);}
+ if (!message.member.permissions.has("ADMINISTRATOR")) {return message.channel.send("You must be an administrator in this server in order to do that.");}
+ let name = args.join(" ");
+ const names = await Saves.findOne({name: 'monnersnames'});
+ const nsaves = names.saves;
+ if (name.toLowerCase() === 'clear') {
+ nsaves.delete(message.guild.id);
+ client.misc.cache.monnersNames.delete(message.guild.id);
+ message.channel.send("I'll now refer to currency in this server as Monners again.");
+ } else {
+ if (name.length > 12) {return message.channel.send("That name is too long! Keep it short and simple.");}
+ if (name.match(//gm)) {return message.channel.send("You can't have an emoji in your monners name.");}
+ if (!name.match(/^[a-zA-Z0-9-]+$/gm)) {return message.channel.send("Your name must contain only alphanumeric characters.");}
+ nsaves.set(message.guild.id, name);
+ client.misc.cache.monnersNames.set(message.guild.id, name);
+ message.channel.send(`Cool. I'll refer to Monners in this server as "${name}" now.`);
+ }
+ names.saves = nsaves;
+ return await names.save();
+ }
+};
\ No newline at end of file
diff --git a/commands/leveling/setupleveling.js b/commands/leveling/setupleveling.js
index 0532a31..7ddf572 100644
--- a/commands/leveling/setupleveling.js
+++ b/commands/leveling/setupleveling.js
@@ -38,7 +38,7 @@ module.exports = {
.setThumbnail(message.guild.iconURL({size: 2048}))
.setDescription(`Your server now has its leveling system enabled! If you enabled level up messages, you can set the channel for that using \`${prefix}levelchannel\`.\n\nAll members of your server will now gain XP as they talk. I'm a smart cookie, so don't try spamming. It won't work. Every member can gain more XP once per minute, no matter how many messages they send in that one minute.\n\nIf you want to see your level and how much more XP you need to level up, run \`${prefix}stats\`.`)
.setColor("c375f0")
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
});
diff --git a/commands/leveling/stats.js b/commands/leveling/stats.js
index da059ca..818b6db 100644
--- a/commands/leveling/stats.js
+++ b/commands/leveling/stats.js
@@ -53,17 +53,16 @@ module.exports = {
.setDescription("View your level and XP in the server, or someone else's")
.addField("Syntax", "`stats [@user|userID]`"),
async execute(message, msg, args, cmd, prefix, mention, client) {
- if (!client.misc.cache.lxp.enabled.includes(message.guild.id)) {return message.channel.send("Your server doesn't have leveling enabled!");}
let u = args[0] ? (message.mentions.members.first() || message.guild.members.cache.get(args[0])) : message.member;
if (!u) {return message.channel.send("I can't find that user!");}
- let xp;
+ let xp; let hasXp = true;
if (!client.misc.cache.lxp.xp[message.guild.id] || !client.misc.cache.lxp.xp[message.guild.id][u.id]) {
let txp = await LXP.findOne({gid: message.guild.id});
- if (!txp) {return message.channel.send("Your server doesn't have leveling enabled!");}
- if (!txp.xp[u.id]) {return message.channel.send(`${u.id === message.author.id ? "You" : "That user"} doesn't have any leveling info available!`);}
- xp = {xp: txp.xp[u.id][0], level: txp.xp[u.id][1]};
- } else {xp = client.misc.cache.lxp.xp[message.guild.id][u.id];}
+ if (!txp) {hasXp = false;}
+ else {if (txp.xp[u.id]) {xp = {xp: txp.xp[u.id][0], level: txp.xp[u.id][1]};}}
+ } else if (hasXp) {xp = client.misc.cache.lxp.xp[message.guild.id][u.id];}
let tmoon = client.misc.cache.monners[u.id] ? {currency: client.misc.cache.monners[u.id]} : await Monners.findOne({uid: u.id});
+ if (!tmoon) {return message.channel.send("There was an error getting your level and Monners information. Try again?");}
let tcur = tmoon ? tmoon.currency : 0;
if (!message.channel.permissionsFor(message.guild.me.id).has("ATTACH_FILES")) {
return message.channel.send({embeds: [new Discord.MessageEmbed()
@@ -71,8 +70,8 @@ module.exports = {
.setDescription("Local leveling stats")
.addField("Level", `${xp.level}`, true)
.addField("XP", `**${xp.xp}** of **${Math.ceil(100 + (((xp.level / 3) ** 2) * 2))}** needed to level up`, true)
- .addField("Monners", `<:monners:926736756047495218> ${tcur}`)
- .setThumbnail(client.users.cache.get(u.id).avatarURL({size: 2048}))
+ .addField(`${message.misc.mn}`, `<:monners:926736756047495218> ${tcur}`)
+ .setThumbnail(client.users.cache.get(u.id).displayAvatarURL({size: 2048}))
.setColor("c375f0")
.setFooter({text: "Natsuki"})
.setTimestamp()
@@ -94,9 +93,9 @@ module.exports = {
ctx.fillStyle = '#ffffff';
ctx.fillText(`${u.displayName}${u.displayName.toLowerCase().endsWith('s') ? "'" : "'s"} Stats`, canvas.width / 2.8, canvas.height / 2);
- ctx.font = applyText(120, canvas, `${xp.xp} / ${Math.ceil(100 + (((xp.level / 3) ** 2) * 2))} | Level ${xp.level}`); //top text
+ ctx.font = applyText(120, canvas, xp ? `${xp.xp} / ${Math.ceil(100 + (((xp.level / 3) ** 2) * 2))} | Level ${xp.level}` : "Leveling N/A"); //top text
ctx.fillStyle = '#ffffff';
- ctx.fillText(`${xp.xp} / ${Math.ceil(100 + (((xp.level / 3) ** 2) * 2))} | Level ${xp.level}`, canvas.width / 2.8, canvas.height / 3.2);
+ ctx.fillText(xp ? `${xp.xp} / ${Math.ceil(100 + (((xp.level / 3) ** 2) * 2))} | Level ${xp.level}` : "Leveling N/A", canvas.width / 2.8, canvas.height / 3.2);
const monnersImage = await Canvas.loadImage('https://cdn.discordapp.com/emojis/926736756047495218');
ctx.drawImage(monnersImage, canvas.width / 2.8, (canvas.height / 1.53) - 11, 58, 60); //draw monners icon
@@ -104,16 +103,18 @@ module.exports = {
ctx.fillText(`${tcur}`, (canvas.width / 2.8) + 70, (canvas.height / 1.53) + 57 - 20);
ctx.fillText(` | `, (canvas.width / 2.8) + 70 + ctx.measureText(`${tcur}`).width, (canvas.height / 1.53) + 57 - 24); // draw monners amount
let monnersWidth = ctx.measureText(`${tcur} | `).width + 75; //get width of monners text and icon to account for bar size later
-
- //draw the bar borders
- ctx.strokeStyle = '#ffffff';
- ctx.strokeWidth = 6;
- roundRect(ctx, (canvas.width / 2.8) + monnersWidth, canvas.height / 1.53, canvas.width - (canvas.width / 2.8) - monnersWidth - 80, 40, 10, false, true, false);
- //set a clipping area to keep the bar filler inside the rounded borders
- roundRect(ctx, (canvas.width / 2.8) + monnersWidth, canvas.height / 1.53, canvas.width - (canvas.width / 2.8) - monnersWidth - 80, 40, 10, false, false, true);
- ctx.fillStyle = '#4aa4e0c8';
- //draw the bar filler
- ctx.fillRect((canvas.width / 2.8) + monnersWidth, canvas.height / 1.53, (xp.xp / Math.ceil(100 + (((xp.level / 3) ** 2) * 2))) * (canvas.width - (canvas.width / 2.8) - monnersWidth - 80), 40);
+
+ if (xp) {
+ //draw the bar borders
+ ctx.strokeStyle = '#ffffff';
+ ctx.strokeWidth = 6;
+ roundRect(ctx, (canvas.width / 2.8) + monnersWidth, canvas.height / 1.53, canvas.width - (canvas.width / 2.8) - monnersWidth - 80, 40, 10, false, true, false);
+ //set a clipping area to keep the bar filler inside the rounded borders
+ roundRect(ctx, (canvas.width / 2.8) + monnersWidth, canvas.height / 1.53, canvas.width - (canvas.width / 2.8) - monnersWidth - 80, 40, 10, false, false, true);
+ ctx.fillStyle = '#4aa4e0c8';
+ //draw the bar filler
+ ctx.fillRect((canvas.width / 2.8) + monnersWidth, canvas.height / 1.53, (xp.xp / Math.ceil(100 + (((xp.level / 3) ** 2) * 2))) * (canvas.width - (canvas.width / 2.8) - monnersWidth - 80), 40);
+ }
message.channel.send({files: [new Discord.MessageAttachment(canvas.toBuffer(), 'xp-stats.png')]});
}
diff --git a/commands/leveling/streak.js b/commands/leveling/streak.js
new file mode 100644
index 0000000..0b62601
--- /dev/null
+++ b/commands/leveling/streak.js
@@ -0,0 +1,26 @@
+const Discord = require('discord.js');
+
+const Monners = require("../../models/monners");
+
+module.exports = {
+ name: "streak",
+ aliases: [],
+ meta: {
+ category: 'Leveling',
+ description: "View yours or someone else's daily streak.",
+ syntax: '`streak [@user]`',
+ extra: null
+ },
+ help: "View your streak, or mention someone else to view theirs.",
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ const tm = await Monners.findOne({uid: mention ? mention.id : message.author.id});
+ return message.channel.send(tm ? {embeds: [
+ new Discord.MessageEmbed()
+ .setAuthor({name: "Daily Streak", iconURL: mention ? mention.displayAvatarURL() : message.author.displayAvatarURL()})
+ .setDescription(`${mention ? "That user's" : "Your"} streak is **${tm.daily.streak}**.`)
+ .setFooter({text: "Natsuki"})
+ .setColor("c375f0")
+ .setTimestamp()
+ ]} : `${mention ? "That user doesn't" : "You don't"} have a streak yet!`);
+ }
+};
\ No newline at end of file
diff --git a/commands/misc/ar.js b/commands/misc/ar.js
index beabbfb..e69cc13 100644
--- a/commands/misc/ar.js
+++ b/commands/misc/ar.js
@@ -72,7 +72,7 @@ module.exports = {
.setTitle("Auto-Responses in this Server")
.setDescription(string)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp();
if (mode) {embed.addField(mode === 'edit' ? "Editing" : 'Deletion', `Please say the **number** of the AR you wish to ${mode}.`);}
let r = await message.channel.send({embeds: [embed]});
diff --git a/commands/misc/avatar.js b/commands/misc/avatar.js
index e76b9cb..fa2113a 100644
--- a/commands/misc/avatar.js
+++ b/commands/misc/avatar.js
@@ -1,6 +1,8 @@
const Discord = require('discord.js');
+
const {Tag} = require('../../util/tag');
const {TagFilter} = require('../../util/tagfilter');
+const {Pagination} = require('../../util/pagination');
module.exports = {
name: "avatar",
@@ -13,21 +15,38 @@ module.exports = {
extra: null
},
async execute(message, msg, args, cmd, prefix, mention, client) {
- let member = args.length ? (mention || client.users.cache.get(args[0]) || message.author) : message.author;
+ let fail = false;
+ let member = args.length && !fail ? (mention || client.users.cache.get(args[0]) || message.author) : message.author;
+ await client.users.fetch(member.id, {force: true}).catch(() => fail = true);
+ if (message.guild) {message.guild.members.fetch(member.id, {force: true});}
let name = message.guild ? message.guild.members.cache.get(member.id).displayName : member.username;
let options = new TagFilter([
new Tag(['small', 's', 'mini', 'm'], 'small', 'toggle'),
- new Tag(['verysmall', 'vsmall', '-vs', 'xs'], 'vsmall', 'toggle')
+ new Tag(['verysmall', 'vsmall', '-vs', 'xs'], 'vsmall', 'toggle'),
+ new Tag(['g', 'global', 'user', 'u'], 'global', 'toggle'),
+ new Tag(['b', 'both'], 'both', 'toggle')
]).test(args.join(" "));
try {
- let avem = new Discord.MessageEmbed()
- .setTitle(`${name.endsWith('s') ? `${name}'` : `${name}'s`} Avatar`)
- .setImage(message.guild ? message.guild.members.cache.get(member.id).displayAvatarURL({size: options.vsmall ? 128 : options.small ? 256 : 2048, dynamic: true, format: "png"}) : member.displayAvatarURL({size: options.vsmall ? 128 : options.small ? 256 : 2048, dynamic: true, format: "png"}))
- .setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
- if (!options.vsmall) {avem.setTimestamp();}
- return message.channel.send({embeds: [avem]});
+ if (options.both && message.guild ? member.displayAvatarURL({size: 2048, dynamic: true, format: 'png'}) !== message.guild.members.cache.get(member.id).displayAvatarURL({size: 2048, dynamic: true, format: 'png'}) : false) {
+ const pag = new Pagination(message.channel, [message.guild.members, client.users]
+ .map(source => source.cache.get(member.id).displayAvatarURL({size: options.vsmall ? 128 : options.small ? 256 : 2048, dynamic: true, format: "png"}))
+ .map((avatar, index) => new Discord.MessageEmbed()
+ .setTitle(`${name.endsWith('s') ? `${name}'` : `${name}'s`} ${['Server', 'Global'][index]} Avatar`)
+ .setImage(avatar)
+ .setColor('c375f0')
+ ), message, client
+ );
+ return await pag.start({user: message.author.id, time: 60000});
+ } else {
+ let avem = new Discord.MessageEmbed()
+ .setTitle(`${name.endsWith('s') ? `${name}'` : `${name}'s`} Avatar`)
+ .setImage(message.guild ? (options.global ? client.users : message.guild.members).cache.get(member.id).displayAvatarURL({size: options.vsmall ? 128 : options.small ? 256 : 2048, dynamic: true, format: "png"}) : member.displayAvatarURL({size: options.vsmall ? 128 : options.small ? 256 : 2048, dynamic: true, format: "png"}))
+ .setColor('c375f0')
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
+ if (!options.vsmall) {avem.setTimestamp();}
+ return message.channel.send({embeds: [avem]});
+ }
} catch (e) {console.error(e); return message.reply("Hmm, there seems to have been an error while I tried to show you that user's avatar.");}
}
};
\ No newline at end of file
diff --git a/commands/misc/commands.js b/commands/misc/commands.js
index 930de10..c7ecaf5 100644
--- a/commands/misc/commands.js
+++ b/commands/misc/commands.js
@@ -17,7 +17,7 @@ module.exports = {
.setTitle("Commands")
.setDescription(`You can use \`${prefix}help\` on any command to get more help on it.`)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp();
categories.forEach(category => ce.addField(category, Array.from(client.commands.values()).filter(command => command.meta ? command.meta.category === category : category === "Uncategorized").map(cmd => `\`${cmd.name}\``).join(', ')));
return message.channel.send({embeds: [ce]});
diff --git a/commands/misc/emoji.js b/commands/misc/emoji.js
index 675317c..9b8877e 100644
--- a/commands/misc/emoji.js
+++ b/commands/misc/emoji.js
@@ -34,7 +34,7 @@ module.exports = {
.setDescription(`Name: ${spl[1] ? `\`:${spl[1]}:\`` : "Not Found"}\nID: ${spl[2].slice(0, spl[2].length - 1)}\nURL: [Here](${`https://cdn.discordapp.com/emojis/${spl[2].slice(0, spl[2].length - 1)}${spl[0].includes('a') ? '.gif' : ""}`})\nAnimated: ${spl[0].includes('a') === true}\n\nI have access: ${client.emojis.cache.has(spl[2].slice(0, spl[2].length - 1))}`)
.setColor('c375f0')
.setImage(`https://cdn.discordapp.com/emojis/${spl[2].slice(0, spl[2].length - 1)}${spl[0].includes('a') ? '.gif' : ""}`)
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp();
if (client.emojis.cache.has(spl[2].slice(0, spl[2].length - 1))) {finEm.setThumbnail(client.emojis.cache.get(spl[2].slice(0, spl[2].length - 1)).guild.iconURL({size: 1024}));}
if (client.emojis.cache.has(spl[2].slice(0, spl[2].length - 1)) && client.emojis.cache.get(spl[2].slice(0, spl[2].length - 1)).guild.members.cache.has(message.author.id) && client.emojis.cache.get(spl[2].slice(0, spl[2].length - 1)).guild.id !== (message.guild ? message.guild.id : 1)) {finEm.addField("Server", `You're in the server this emoji is from: **${client.emojis.cache.get(spl[2].slice(0, spl[2].length - 1)).guild.name}**`);}
@@ -63,7 +63,7 @@ module.exports = {
.setTitle(`Emoji Lookup Results [${(x * 20) + 1}-${(x * 20) + 20} of ${lookup.size}]`)
.setDescription(page)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
);
if (cond) {break;}
@@ -78,7 +78,7 @@ module.exports = {
.setTitle(`Emoji Lookup Results - ${lookup.size}`)
.setDescription(page)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
@@ -110,7 +110,7 @@ module.exports = {
.setDescription(`Name: ${name ? `\`:${name}:\`` : "Not Found"}\nID: ${id}\nURL: [Here](${url})\nAnimated: ${animated === true}\n\nI have access: ${access}`)
.setColor('c375f0')
.setImage(url)
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp();
if (access) {finEm.setThumbnail(client.emojis.cache.get(id).guild.iconURL({size: 1024}));}
if (access && client.emojis.cache.get(id).guild.members.cache.has(message.author.id) && client.emojis.cache.get(id).guild.id !== (message.guild ? message.guild.id : 1)) {finEm.addField("Server", `You're in the server this emoji is from: **${client.emojis.cache.get(id).guild.name}**`);}
diff --git a/commands/misc/help.js b/commands/misc/help.js
index 1755e15..d2a614b 100644
--- a/commands/misc/help.js
+++ b/commands/misc/help.js
@@ -18,7 +18,7 @@ module.exports = {
let category; for (category of Object.keys(sorted)) {
let categorySorted = [];
let current = 1;
- let currentEmbed = new Discord.MessageEmbed().setAuthor({name: "Help Menu", iconURL: message.author.avatarURL()}).setTitle(category).setDescription("React to control the menu! You can also specify a command name when doing the help command to get more info about it.").setColor("c375f0");
+ let currentEmbed = new Discord.MessageEmbed().setAuthor({name: "Help Menu", iconURL: message.author.displayAvatarURL()}).setTitle(category).setDescription("React to control the menu! You can also specify a command name when doing the help command to get more info about it.").setColor("c375f0");
let commands = Object.keys(sorted[category]);
let command; for (command of commands) {
let aliases = '';
@@ -29,7 +29,7 @@ module.exports = {
if (current === 5) {
categorySorted.push(currentEmbed);
current = 1;
- currentEmbed = new Discord.MessageEmbed().setAuthor({name: "Help Menu", iconURL: message.author.avatarURL()}).setTitle(category).setDescription("React to control the menu! You can also specify a command name when doing the help command to get more info about it.").setColor("c375f0");
+ currentEmbed = new Discord.MessageEmbed().setAuthor({name: "Help Menu", iconURL: message.author.displayAvatarURL()}).setTitle(category).setDescription("React to control the menu! You can also specify a command name when doing the help command to get more info about it.").setColor("c375f0");
}
}
if (current > 1) {categorySorted.push(currentEmbed);}
@@ -43,7 +43,7 @@ module.exports = {
.addField("Category", "What category would you like to view?\n:one: - Fun\n:two: - Utility\n:three: - Misc\n:four: - Developer\n:five: - Moderation\n:six: - Social\n:seven: - Leveling\n:eight: - Anime\n:nine: - **All**")
.setColor('c375f0')
.setFooter({text: "Natsuki | Will time out in 60 seconds."})
- .setThumbnail(client.user.avatarURL({size: 2048}))
+ .setThumbnail(client.user.displayAvatarURL({size: 2048}))
.setTimestamp()
]});
@@ -100,7 +100,7 @@ module.exports = {
if (pages.length > 1) {
let help = new Pagination(message.channel, pages, message, client, true);
return await help.start({endTime: 60000, user: message.author.id}).catch(() => {});
- } else {return message.channel.send({embeds: [pages[0].setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}).setTimestamp()]}).catch(() => {});}
+ } else {return message.channel.send({embeds: [pages[0].setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}).setTimestamp()]}).catch(() => {});}
} else {
let command;
if (client.commands.has(args[0])) {command = client.commands.get(args[0]);}
@@ -109,7 +109,7 @@ module.exports = {
return message.reply(command.help
? command.help instanceof Discord.MessageEmbed
- ? {embeds: [command.help.setFooter({text: "Natsuki | [optional]", iconURL: client.user.avatarURL()}).setColor("c375f0").setTimestamp()]}
+ ? {embeds: [command.help.setFooter({text: "Natsuki | [optional]", iconURL: client.user.displayAvatarURL()}).setColor("c375f0").setTimestamp()]}
: command.help.replace(/{{p}}/g, prefix)
: "I don't seem to have any help info available for that command."
);
diff --git a/commands/misc/info.js b/commands/misc/info.js
index 5200ee8..0bf57e4 100644
--- a/commands/misc/info.js
+++ b/commands/misc/info.js
@@ -19,8 +19,8 @@ module.exports = {
let user = await UserData.findOne({uid: message.author.id});
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: "About Me!", iconURL: client.users.cache.get(client.developers[Math.floor(Math.random() * client.developers.length)]).avatarURL()})
- .setThumbnail(client.user.avatarURL({size: 1024}))
+ .setAuthor({name: "About Me!", iconURL: client.users.cache.get(client.developers[Math.floor(Math.random() * client.developers.length)]).displayAvatarURL()})
+ .setThumbnail(client.user.displayAvatarURL({size: 1024}))
.setDescription(`I am created by WubzyGD#8766 and Slushie#1234 - a pair conveniently known as NatsukiDev - in JavaScript/Discord.js!\n\nI'm a powerful all-purpose bot with everything you could want or need, and I have my own set of unique skills that you won't find anywhere else ^^`)
.addField("Presence", `I'm currently in **${client.guilds.cache.size}** servers, and I'm watching over approximately **${client.users.cache.size}** people!`)
.addField("Restarts", `${botData.restarts}`, true)
diff --git a/commands/misc/invite.js b/commands/misc/invite.js
index f39e2b0..d1ce32b 100644
--- a/commands/misc/invite.js
+++ b/commands/misc/invite.js
@@ -13,8 +13,8 @@ module.exports = {
async execute(message, msg, args, cmd, prefix, mention, client) {
return message.channel.send({embeds: [new Discord.MessageEmbed()
.setTitle("My links!")
- .setThumbnail(client.user.avatarURL({size: 2048}))
- .setDescription("[Bot Invite](https://discord.com/oauth2/authorize?client_id=762701327431237644&scope=bot&permissions=1581116647)\n`->` Use this link to invite Natsuki to your server! This has all the required permissions in it that the I need to work, and it is not recommended that you change them. Doing so will make it so that some commands don't function properly or won't complete (I'll usually tell you when I'm missing a permission).\n\n[Support Server Invite](https://discord.gg/u9c2uD24wB)\n`->` Use this to join my support server! Here you can talk to the devs, suggest features, hang out with the community, get update alerts, report bugs/issues and get help, or just stop and say hi!")
+ .setThumbnail(client.user.displayAvatarURL({size: 2048}))
+ .setDescription("[Bot Invite](https://discord.com/api/oauth2/authorize?client_id=762701327431237644&permissions=1507482660086&scope=bot%20applications.commands)\n`->` Use this link to invite Natsuki to your server! This has all the required permissions in it that the I need to work, and it is not recommended that you change them. Doing so will make it so that some commands don't function properly or won't complete (I'll usually tell you when I'm missing a permission).\n\n[Support Server Invite](https://discord.gg/u9c2uD24wB)\n`->` Use this to join my support server! Here you can talk to the devs, suggest features, hang out with the community, get update alerts, report bugs/issues and get help, or just stop and say hi!")
.setColor("c375f0")
.setFooter({text: "Natsuki"})
.setTimestamp()
diff --git a/commands/misc/ping.js b/commands/misc/ping.js
new file mode 100644
index 0000000..6bf497a
--- /dev/null
+++ b/commands/misc/ping.js
@@ -0,0 +1,22 @@
+const Discord = require('discord.js');
+
+module.exports = {
+ name: "ping",
+ aliases: [],
+ meta: {
+ category: 'Misc',
+ description: "Find out Natsuki's latency",
+ syntax: '`ping`',
+ extra: null
+ },
+ help: "Definitely not much to see here...",
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ return message.channel.send({embeds: [new Discord.MessageEmbed()
+ .setTitle("Client Latency")
+ .setDescription(`Response Latency: \`${new Date().getTime() - message.createdTimestamp}ms\`\nAPI Latency: \`${client.ws.ping}ms\``)
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
+ .setTimestamp()
+ .setColor('c375f0')
+ ]});
+ }
+};
\ No newline at end of file
diff --git a/commands/misc/prefix.js b/commands/misc/prefix.js
index 38d0c9d..d9fa137 100644
--- a/commands/misc/prefix.js
+++ b/commands/misc/prefix.js
@@ -36,12 +36,12 @@ module.exports = {
let upm = await message.reply("sure thing!");
await require('../../util/wait')(1750);
return upm.edit({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: 'Prefix updated!', iconURL: message.author.avatarURL()})
+ .setAuthor({name: 'Prefix updated!', iconURL: message.author.displayAvatarURL()})
.setDescription(`New prefix: \`${np}\``)
.addField('Auditing Admin', `<@${message.member.id}>`, true)
.addField("Notice", "Prefixes are cached, and may take up to a minute to update.")
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
diff --git a/commands/misc/serverinfo.js b/commands/misc/serverinfo.js
index ed5ef35..a180f4e 100644
--- a/commands/misc/serverinfo.js
+++ b/commands/misc/serverinfo.js
@@ -1,5 +1,6 @@
const Discord = require("discord.js");
const moment = require('moment');
+require('moment-precise-range-plugin');
module.exports = {
name: "serverinfo",
@@ -14,18 +15,28 @@ module.exports = {
},
execute(message, msg, args, cmd, prefix, mention, client) {
let now = new Date();
- return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: "Server info", iconURL: message.author.avatarURL()})
- .setTitle(message.guild.name)
- .setThumbnail(message.guild.iconURL({size: 2048}))
- .setDescription(`Name: \`${message.guild.name}\`\n\nOwner: <@${message.guild.ownerId}>\nRegion: ${message.guild.region}\nIcon: [URL](${message.guild.iconURL({size: 2048})})`)
- .addField("Members", `${message.guild.members.cache.size}\n[${message.guild.members.cache.filter(m => !client.users.cache.get(m.id).bot).size} Humans | ${message.guild.members.cache.filter(m => client.users.cache.get(m.id).bot).size} Bots]\n\nOnline: ${message.guild.members.cache.filter(m => client.users.cache.get(m.id).presence.status === "online").size} | Idle: ${message.guild.members.cache.filter(m => client.users.cache.get(m.id).presence.status === "idle").size} | Do not Disturb: ${message.guild.members.cache.filter(m => client.users.cache.get(m.id).presence.status === "dnd").size}`)
- .addField("Channels", `${message.guild.channels.cache.size}\n[${message.guild.channels.cache.filter(ch => ch.type === "text").size} Text | ${message.guild.channels.cache.filter(ch => ch.type === "voice").size} Voice]`, true)
- .addField("Roles", `${message.guild.roles.cache.size} (you have ${message.member.roles.cache.size})\nYour highest is <@&${message.member.roles.highest.id}>`, true)
- .addField("Other Info", `Server created roughly **${moment(message.guild.createdAt).fromNow()}**\n\nYou joined ${moment(message.member.joinedAt).fromNow()} (Member for **${Math.round(((now.getTime() - new Date(message.member.joinedAt.getTime()).getTime()) / (new Date(message.guild.createdAt).getTime() - now.getTime())) * -100)}%** of server lifetime)`)
+ let tg = message.guild;
+ let text = ["GUILD_MESSAGE", "DM", "GUILD_NEWS_THREAD", "GUILD_PRIVATE_THREAD", "GUILD_PUBLIC_THREAD", "GUILD_NEWS", "GROUP_DM", "GUILD_STORE", "GUILD_TEXT"];
+ let voice = ["GUILD_VOICE", "GUILD_STAGE_VOICE"];
+ let siembed = new Discord.MessageEmbed()
+ .setAuthor({name: "Server info", iconURL: message.author.displayAvatarURL({dynamic: true})})
+ .setTitle(tg.name)
+ .setThumbnail(tg.iconURL({size: 2048, dynamic: true, format: 'png'}))
+ .setDescription(`Name: \`${tg.name}\`\n\nOwner: <@${tg.ownerId}>\nBoost Level: **${tg.premiumTier === 'NONE' ? 'None' : tg.premiumTier.slice(tg.premiumTier.length - 1, tg.premiumTier.length)}**\nIcon: [URL](${tg.iconURL({size: 2048})})${tg.banner ? ` | Banner: [URL](${tg.bannerURL({size: 4096, format: 'png'})})` : ''}${tg.splash ? ` | Splash: [URL](${tg.splashURL({size: 4096, format: 'png'})})` : ''}\nID: ${tg.id}`)
+ .addField("Channels", `${tg.channels.cache.filter(ch => ch.type !== 'GUILD_CATEGORY').size}\n[${tg.channels.cache.filter(ch => text.includes(ch.type)).size} Text | ${tg.channels.cache.filter(ch => voice.includes(ch.type)).size} Voice]`, true)
+ .addField("Roles", `${tg.roles.cache.size} (you have ${message.member.roles.cache.size}) -> ${Math.round((message.member.roles.cache.size / tg.roles.cache.size) * 100)}%\nYour highest is <@&${message.member.roles.highest.id}>`, true)
+ .addField("Members", `${tg.memberCount}\n[${tg.members.cache.filter(m => !client.users.cache.get(m.id).bot).size} Humans | ${tg.members.cache.filter(m => client.users.cache.get(m.id).bot).size} Bots]\n\nOnline: ${tg.members.cache.filter(m => m.presence && m.presence.status === "online").size} | Idle: ${tg.members.cache.filter(m => m.presence && m.presence.status === "idle").size} | Do not Disturb: ${tg.members.cache.filter(m => m.presence && m.presence.status === "dnd").size}`)
+ .addField("Emojis", `${tg.emojis.cache.size}`, true)
+ .addField("Stickers", `${tg.stickers.cache.size}`, true)
+ .addField("Other Info", `Server created **${client.utils.sm(moment.preciseDiff(Date.now(), tg.createdAt, true))}**\nYou joined ${client.utils.sm(moment.preciseDiff(Date.now(), message.member.joinedAt, true))} (Member for **${Math.round(((now.getTime() - message.member.joinedAt.getTime()) / (now.getTime() - message.guild.createdAt.getTime())) * 100)}%** of server lifetime)`)
.setColor('c375f0')
.setFooter({text: "Natsuki"})
- .setTimestamp()
- ]});
+ .setTimestamp();
+
+ if (tg.banner) {siembed.setImage(tg.bannerURL({size: 4096, format: 'png'}));}
+ else if (tg.splash) {siembed.setImage(tg.splashURL({size: 4096, format: 'png'}));}
+ if (tg.premiumTier !== 'NONE') {siembed.addField("Features", tg.features.map(f => client.utils.ca(f.replace(/_/gm, ' '))).join(", "));}
+
+ return message.channel.send({embeds: [siembed]});
}
};
\ No newline at end of file
diff --git a/commands/misc/sleeping.js b/commands/misc/sleeping.js
new file mode 100644
index 0000000..8d01607
--- /dev/null
+++ b/commands/misc/sleeping.js
@@ -0,0 +1,54 @@
+const Discord = require('discord.js');
+
+const UserData = require("../../models/user");
+
+module.exports = {
+ name: "sleeping",
+ aliases: ['asleep', 'sloopin', 'ischleep'],
+ meta: {
+ category: 'Misc',
+ description: "Set your status to tell others you're sleeping.",
+ syntax: '`sleeping`',
+ extra: null
+ },
+ help: new Discord.MessageEmbed()
+ .setTitle("Help -> Sleeping")
+ .setDescription("Use this command to set an automatically-clearing AFK status that lets people who ping you know you're asleep. Send any message to any server with Natsuki in it to clear the status.")
+ .addField("Syntax", "`sleeping`"),
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ let tu = await UserData.findOne({uid: message.author.id}) || new UserData({uid: message.author.id});
+ tu.statusclearmode = 'auto';
+ tu.statustype = 'afk';
+ tu.statusmsg = [
+ " Sleeping",
+ " Getting a good night's rest",
+ " Big sleep",
+ " \\*snore\\*"
+ ][Math.floor(Math.random() * 4)];
+ tu.statussetat = new Date();
+ let tempDate = new Date();
+ tu.statusclearat = tempDate.setHours(tempDate.getHours() + 12);
+ tu.statusSleeping = true;
+ tu.markModified("statusSleeping");
+ tu.markModified("statussetat");
+ tu.markModified("statusclearat");
+ tu.save();
+ require('../../util/cachestatus')(message.author.id, tempDate.setHours(tempDate.getHours() + 10));
+ return message.channel.send(
+ (client.misc.cache.returnToSleep.has(message.author.id) && new Date().getTime() - client.misc.cache.returnToSleep.get(message.author.id) < 600000
+ ? [
+ "Ah, well I'm glad you're getting back to sleep! Try to put the phone down and get some rest qt",
+ "Actually taking my advice and getting some sleep? You need it after all!",
+ ":D You're going back to bed! I don't wanna see you up again. You need some sleep qt ^^",
+ "Sleep is good for you! It's best uninterrupted. Get some good sleep and try not to pick up your phone again."
+ ]
+ : [
+ "Goodnight qt <:NC_wave:830704926576345119>",
+ "<:NC_hearty:841489530413383712> Have a good sleep! ^^",
+ "Sleep well. You deserve it <3 ",
+ "<:NC_nezuGUN:852735951712157698> Get good sleep coward!"
+ ]
+ )[Math.floor(Math.random() * 4)]
+ );
+ }
+};
\ No newline at end of file
diff --git a/commands/misc/supportserver.js b/commands/misc/supportserver.js
index 6710d2f..2a6125a 100644
--- a/commands/misc/supportserver.js
+++ b/commands/misc/supportserver.js
@@ -13,7 +13,7 @@ module.exports = {
async execute(message, msg, args, cmd, prefix, mention, client) {
return message.channel.send({embeds: [new Discord.MessageEmbed()
.setTitle("Sure thing!")
- .setThumbnail(client.user.avatarURL({size: 2048}))
+ .setThumbnail(client.user.displayAvatarURL({size: 2048}))
.setDescription("Join the server with [this link](https://discord.gg/u9c2uD24wB)!\n\n`->` Here you can talk to the devs, suggest features, hang out with the community, get update alerts, report bugs/issues and get help, or just stop and say hi!")
.setColor("c375f0")
.setFooter({text: "Natsuki"})
diff --git a/commands/misc/userinfo.js b/commands/misc/userinfo.js
index 54eb21b..b59f720 100644
--- a/commands/misc/userinfo.js
+++ b/commands/misc/userinfo.js
@@ -1,6 +1,7 @@
const Discord = require('discord.js');
const moment = require('moment');
-const mongoose = require('mongoose');
+require('moment-precise-range-plugin');
+
const UserData = require('../../models/user');
module.exports = {
@@ -11,35 +12,44 @@ module.exports = {
category: 'Misc',
description: "See some info about a user",
syntax: '`userinfo [@user]`',
- extra: null
+ extra: null,
+ guildOnly: true
},
async execute(message, msg, args, cmd, prefix, mention, client) {
- let person = message.guild ? mention ? message.guild.members.cache.get(mention.id) : args[0] ? message.guild.members.cache.has(args[0]) ? message.guild.members.cache.get(args[0]) : message.member : message.member : message.author;
+ let person = message.mentions.members.first() || message.guild.members.cache.get(args[0]) || message.member;
+ if (!person) {return message.channel.send("Hmmm... that doesn't seem to be a real user.");}
+ let u = await client.users.fetch(person.id, {force: true, cache: false}).catch(() => {});
+ if (!u) {return message.channel.send("There was an issue finding that user. They might not be a real user!");}
+ temp = await message.guild.members.fetch(person.id);
+ if (!temp) {return message.channel.send("There was an issue finding that user. They might not be a real user, or not one that exists in this server.");}
let name = message.guild ? person.displayName : person.username;
let tu = await UserData.findOne({uid: person.id});
let now = new Date();
let infoembed = new Discord.MessageEmbed()
.setTitle(`User Info for ${name}`)
.setDescription(`Requested by ${message.guild ? message.member.displayName : message.author.username}`)
- .setThumbnail(client.users.cache.get(person.id).avatarURL({size: 2048}))
- .addField("Account Created", `${moment(client.users.cache.get(person.id).createdAt).fromNow()}`, true)
- .addField("Bot User?", client.users.cache.get(person.id).bot ? "Is a bot" : "Is not a bot", true)
+ .setThumbnail((message.guild ? person : u).displayAvatarURL({size: 4096, dynamic: true, format: 'png'}))
+ .addField("Account Created", `${moment.preciseDiff(Date.now(), u.createdAt)} ago`, true)
+ .addField("Bot User?", u.bot ? "Is a bot" : "Is not a bot", true)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp();
if (message.guild) {
- infoembed.addField('In Server Since', `${moment(person.joinedAt).fromNow()}${!moment(person.joinedAt).fromNow().includes('days') ? ` | ${Math.floor((new Date().getTime() - person.joinedAt.getTime()) / (60 * 60 * 24 * 1000))} days` : ''}\nMember for **${Math.round(((now.getTime() - new Date(message.member.joinedAt.getTime()).getTime()) / (new Date(message.guild.createdAt).getTime() - now.getTime())) * -100)}%** of server lifetime`, false)
+ infoembed.addField('In Server Since', `${client.utils.sm(moment.preciseDiff(Date.now(), person.joinedAt, true))}${!moment(person.joinedAt).fromNow().includes('days') ? ` | ${Math.floor((new Date().getTime() - person.joinedAt.getTime()) / (60 * 60 * 24 * 1000))} days` : ''}\nMember for **${Math.round(((now.getTime() - person.joinedAt.getTime()) / (now.getTime() - message.guild.createdAt.getTime())) * 100)}%** of server lifetime`, false)
.addField('Roles', `**${person.roles.cache.size}** roles | [${person.roles.cache.size}/${message.guild.roles.cache.size}] - ${Math.round((person.roles.cache.size / message.guild.roles.cache.size) * 100)}%\nHighest: ${person.roles.highest ? `<@&${person.roles.highest.id}>` : 'No roles!'}`, true)
if (message.guild.ownerId === person.id) {infoembed.addField("Extra", "User is the server's owner!");}
else if (person.permissions.has("ADMINISTRATOR")) {infoembed.addField("Extra", "User is an admin! Watch out :eyes:");}
}
if (tu) {
- infoembed.addField('Natsuki Commands Executed', `${tu.commands}`)
- .addField('Donator?', tu.developer ? `Well, ${name} makes me work, so they're a supporter in my book!` : tu.donator ? 'Yes! They have donated or supported me in the past!' : 'No', true)
- .addField('Natsuki Staff Level', tu.developer ? 'Developer' : tu.admin ? 'Admin; Audit access to the bot' : tu.staff ? 'Staff; Support but with maintenance permissions' : tu.support ? 'Support; Answers tickets and help queries' : 'Member; Does not have a staff rank.', true);
+ infoembed.addField('Natsuki Commands Executed', `${tu.commands}`);
+ if (tu.donator || tu.developer) {infoembed.addField('Donator?', tu.developer ? `Well, ${name} makes me work, so they're a supporter in my book!` : tu.donator ? 'Yes! They have donated or supported me in the past!' : 'No', true);}
+ if (tu.staff) {infoembed.addField('Natsuki Staff Level', tu.developer ? 'Developer' : tu.admin ? 'Admin; Audit access to the bot' : tu.staff ? 'Staff; Support but with maintenance permissions' : tu.support ? 'Support; Answers tickets and help queries' : 'Member; Does not have a staff rank.', true);}
}
+
+ if (u.banner) {infoembed.setImage(u.bannerURL({size: 4096, dynamic: true, format: 'png'}));}
+
return message.channel.send({embeds: [infoembed]});
}
};
\ No newline at end of file
diff --git a/commands/moderation/autorole.js b/commands/moderation/autorole.js
index 4ee54b4..c312d54 100644
--- a/commands/moderation/autorole.js
+++ b/commands/moderation/autorole.js
@@ -28,10 +28,10 @@ module.exports = {
tg.save();
return message.channel.send(new Discord.MessageEmbed()
.setTitle("Join Role Updated")
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Role: ${tg.joinrole.length ? `<@&${tg.joinrole}>` : "None"}`)
.setColor("c375f0")
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
);
}
diff --git a/commands/moderation/checkwarnings.js b/commands/moderation/checkwarnings.js
index 77bb4bf..97daa22 100644
--- a/commands/moderation/checkwarnings.js
+++ b/commands/moderation/checkwarnings.js
@@ -39,11 +39,11 @@ module.exports = {
if (cwc === mh.warnings[user.id].length) {return message.reply("That user has no uncleared warnings.");}
return message.channel.send({embeds: [new Discord.MessageEmbed()
.setTitle("User Warnings")
- .setThumbnail(client.users.cache.get(user.id).avatarURL({size: 1024}))
+ .setThumbnail(client.users.cache.get(user.id).displayAvatarURL({size: 1024}))
.setDescription(`For ${user.displayName}`)
.addField("Warnings", ws)
.setColor("c375f0")
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
diff --git a/commands/moderation/leave.js b/commands/moderation/leave.js
index 90fe85b..4737408 100644
--- a/commands/moderation/leave.js
+++ b/commands/moderation/leave.js
@@ -41,7 +41,7 @@ module.exports = {
.setTitle("Leave Channel/Message Updated")
.setDescription(`This server's leave-notifying settings have been altered by ${message.author.tag}.\n\n**Channel**: <#${ch}>\n**Response Name**: \`${args[2].toLowerCase()}\``)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]})
}
@@ -64,7 +64,7 @@ module.exports = {
.setTitle("Leave Channel/Message Updated")
.setDescription(`This server's leave-notifying settings have been altered by ${message.author.tag}.\n\n**Channel**: None`)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
diff --git a/commands/moderation/response.js b/commands/moderation/response.js
index e8638e0..7df88b0 100644
--- a/commands/moderation/response.js
+++ b/commands/moderation/response.js
@@ -68,7 +68,7 @@ module.exports = {
.addField("Name/ID", args[1].toLowerCase(), true)
.addField("Type", tr.responses.get(args[1].toLowerCase()).embed ? "Embed" : "Message", true)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp();
if (hasBinding) {infoEmbed.addField("Server Bindings", bm);}
return message.channel.send({embeds: [infoEmbed]});
diff --git a/commands/moderation/staffrole.js b/commands/moderation/staffrole.js
index 2a20aaa..0c91921 100644
--- a/commands/moderation/staffrole.js
+++ b/commands/moderation/staffrole.js
@@ -42,12 +42,12 @@ module.exports = {
let upm = await message.reply("sure thing!");
await require('../../util/wait')(1750);
return upm.edit({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: 'Staff role updated!', iconURL: message.author.avatarURL()})
+ .setAuthor({name: 'Staff role updated!', iconURL: message.author.displayAvatarURL()})
.setDescription(`<@&${tguild.staffrole}> can now edit my settings in this server.`)
.addField('Auditing Admin', `<@${message.member.id}>`, true)
.addField('Role-Holders', `${message.guild.members.cache.filter(m => m.roles.cache.has(tguild.staffrole) && !client.users.cache.get(m.id).bot).size}+ members have this role`, true)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
diff --git a/commands/moderation/warn.js b/commands/moderation/warn.js
index 8fb3390..a481b1e 100644
--- a/commands/moderation/warn.js
+++ b/commands/moderation/warn.js
@@ -47,11 +47,11 @@ module.exports = {
if (cwc === mh.warnings[user.id].length) {return message.reply("That user has no uncleared warnings.");}
return message.channel.send({embeds: [new Discord.MessageEmbed()
.setTitle("User Warnings")
- .setThumbnail(client.users.cache.get(user.id).avatarURL({size: 1024}))
+ .setThumbnail(client.users.cache.get(user.id).displayAvatarURL({size: 1024}))
.setDescription(`For ${user.displayName}`)
.addField("Warnings", ws)
.setColor("c375f0")
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
diff --git a/commands/moderation/welcome.js b/commands/moderation/welcome.js
index ae2969b..d687c31 100644
--- a/commands/moderation/welcome.js
+++ b/commands/moderation/welcome.js
@@ -41,7 +41,7 @@ module.exports = {
.setTitle("Welcome Channel/Message Updated")
.setDescription(`This server's member-welcoming settings have been altered by ${message.author.tag}.\n\n**Channel**: <#${ch}>\n**Response Name**: \`${args[2].toLowerCase()}\``)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]})
}
@@ -64,7 +64,7 @@ module.exports = {
.setTitle("Welcome Channel/Message Updated")
.setDescription(`This server's member-welcoming settings have been altered by ${message.author.tag}.\n\n**Channel**: None`)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
diff --git a/commands/social/afk.js b/commands/social/afk.js
index 5e79512..a8e45c8 100644
--- a/commands/social/afk.js
+++ b/commands/social/afk.js
@@ -21,8 +21,8 @@ module.exports = {
? message.content.slice(prefix.length).trim().split(/ +/g)
: msg.startsWith('<@!')
? message.content.slice(4 + client.user.id.length).trim().split(/ +/g)
- : message.content.slice(3 + client.user.id.length).trim().split(/ +/g)
- .slice(2);
+ : message.content.slice(3 + client.user.id.length).trim().split(/ +/g);
+ args = args.slice(1);
if (!args.length) {return message.channel.send(`Syntax: \`${prefix}afk [clearMode] \``);}
let tu = await UserData.findOne({uid: message.author.id})
? await UserData.findOne({uid: message.author.id})
@@ -45,6 +45,6 @@ module.exports = {
tu.markModified("statusclearat");
tu.save();
require('../../util/cachestatus')(message.author.id, tempDate.setHours(tempDate.getHours() + 12));
- return message.reply(`I set your ${tu.statusclearmode === 'auto' ? 'automatically' : 'manually'}-clearing AFK message to: ${reason.trim()}`);
+ return message.channel.send(`I set your ${tu.statusclearmode === 'auto' ? 'automatically' : 'manually'}-clearing AFK message to: ${reason.trim()}`);
}
};
\ No newline at end of file
diff --git a/commands/social/angry.js b/commands/social/angry.js
index ae2210d..ea615e0 100644
--- a/commands/social/angry.js
+++ b/commands/social/angry.js
@@ -24,7 +24,7 @@ module.exports = {
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 angry GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new angry GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/bio.js b/commands/social/bio.js
index 758f254..6a064dc 100644
--- a/commands/social/bio.js
+++ b/commands/social/bio.js
@@ -23,10 +23,10 @@ module.exports = {
if (!pud || !pud.bio || !pud.bio.length) {return message.reply(person === message.author.id ? "You don't have a bio set!" : "That user has no bio for me to show you!");}
return message.channel.send({embeds: [new Discord.MessageEmbed()
.setTitle(`Bio for ${message.guild ? message.guild.members.cache.get(person).displayName : message.author.username}`)
- .setThumbnail(client.users.cache.get(person).avatarURL({size: 2048}))
+ .setThumbnail(client.users.cache.get(person).displayAvatarURL({size: 2048}))
.setDescription(pud.bio)
.setColor(pud.color && pud.color.length ? pud.color : 'c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
@@ -45,10 +45,10 @@ module.exports = {
tu.save();
return message.channel.send({embeds: [new Discord.MessageEmbed()
.setTitle(`Bio Set!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(tu.bio)
.setColor(tu.color && tu.color.length ? tu.color : 'c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()
]});
}
diff --git a/commands/social/blush.js b/commands/social/blush.js
index 8580b6e..635b2ca 100644
--- a/commands/social/blush.js
+++ b/commands/social/blush.js
@@ -23,7 +23,7 @@ module.exports = {
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 sip GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new sip GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/bonk.js b/commands/social/bonk.js
index 949615c..d8c55ab 100644
--- a/commands/social/bonk.js
+++ b/commands/social/bonk.js
@@ -21,10 +21,10 @@ module.exports = {
if (!args.length) {
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${message.guild ? message.member.displayName : message.author.username} needs a good bonk!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Give them one with \`${prefix}bonk @${message.member.displayName}\`!`)
.setColor('dda0dd')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "I fucking dare you to hit me."
);}
@@ -38,7 +38,7 @@ module.exports = {
bonk.markModified(`against.${mention.id}`);
bonk.save();
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bonks ${message.guild.members.cache.get(mention.id).displayName}!...ouch! `, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bonks ${message.guild.members.cache.get(mention.id).displayName}!...ouch! `, iconURL: message.author.displayAvatarURL()})
.setDescription(`You've bonked them **${bonk.against[mention.id] === 1 ? 'once' : `${bonk.against[mention.id]} times!`}**`)
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('dda0dd')
@@ -48,7 +48,7 @@ module.exports = {
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 bonk GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new bonk GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/creampie.js b/commands/social/creampie.js
index 21e5475..ba95e0c 100644
--- a/commands/social/creampie.js
+++ b/commands/social/creampie.js
@@ -20,10 +20,10 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${name} needs a creampie!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Help with their..ahem..problem..with \`${prefix}creampie @${name}\`!`)
.setColor('fffdd0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "Do. Not. Touch. Me."
);}
@@ -34,7 +34,7 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
let uname = message.guild.members.cache.get(mention.id).displayName;
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives a massive creampie to ${message.guild.members.cache.get(mention.id).displayName}..Tasty!`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives a massive creampie to ${message.guild.members.cache.get(mention.id).displayName}..Tasty!`, iconURL: message.author.displayAvatarURL()})
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('fffdd0')
]});
diff --git a/commands/social/cry.js b/commands/social/cry.js
index f9276b1..57b594d 100644
--- a/commands/social/cry.js
+++ b/commands/social/cry.js
@@ -24,7 +24,7 @@ module.exports = {
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 cry GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new cry GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/dance.js b/commands/social/dance.js
index 77ab09a..be293da 100644
--- a/commands/social/dance.js
+++ b/commands/social/dance.js
@@ -24,7 +24,7 @@ module.exports = {
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 dance GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new dance GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/dnd.js b/commands/social/dnd.js
index 76e91c0..1befcb2 100644
--- a/commands/social/dnd.js
+++ b/commands/social/dnd.js
@@ -22,8 +22,8 @@ module.exports = {
? message.content.slice(prefix.length).trim().split(/ +/g)
: msg.startsWith('<@!')
? message.content.slice(4 + client.user.id.length).trim().split(/ +/g)
- : message.content.slice(3 + client.user.id.length).trim().split(/ +/g)
- .slice(2);
+ : message.content.slice(3 + client.user.id.length).trim().split(/ +/g)
+ args = args.slice(1);
let tu = await UserData.findOne({uid: message.author.id})
? await UserData.findOne({uid: message.author.id})
: new UserData({uid: message.author.id});
diff --git a/commands/social/dodge.js b/commands/social/dodge.js
index 2fbfe44..d3ed8e0 100644
--- a/commands/social/dodge.js
+++ b/commands/social/dodge.js
@@ -24,7 +24,7 @@ module.exports = {
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 smile GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new smile GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/feed.js b/commands/social/feed.js
index caf3946..d9004b0 100644
--- a/commands/social/feed.js
+++ b/commands/social/feed.js
@@ -20,10 +20,10 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${name} is hungry, why not feed them?`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Bless someone with some food with \`${prefix}feed @${name}\`!`)
.setColor('bb0a1e')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "Sorry..I'm kinda full right now."
);}
@@ -34,7 +34,7 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
let uname = message.guild.members.cache.get(mention.id).displayName;
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} feeds ${message.guild.members.cache.get(mention.id).displayName} a delicous treat!`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} feeds ${message.guild.members.cache.get(mention.id).displayName} a delicous treat!`, iconURL: message.author.displayAvatarURL()})
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('fed8b1')
]});
diff --git a/commands/social/fuck.js b/commands/social/fuck.js
index d236f1e..b308497 100644
--- a/commands/social/fuck.js
+++ b/commands/social/fuck.js
@@ -5,9 +5,12 @@ const UserData = require('../../models/user');
const VC = require('../../models/vscount');
const makeId = require('../../util/makeid');
+const {Tag} = require('../../util/tag');
+const {TagFilter} = require('../../util/tagfilter');
module.exports = {
name: "fuck",
+ aliases: ['sex', 'bang', 'rail', 'verykindlythank'],
help: "Tell others you're horny with `{{p}}fuck`, or bang someone by mentioning someone to fuck!",
meta: {
category: 'Social',
@@ -21,15 +24,16 @@ module.exports = {
if (!args.length) {
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${message.guild ? message.member.displayName : message.author.username} is horny!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Show them some love with \`${prefix}fuck @${message.member.displayName}\`!`)
.setColor('dda0dd')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
- : "You can't bang me.......only Wubzy can."
+ : "You can't bang me....... only Wubzy can."
);}
let fuck;
- if (message.channel.nsfw) {
+ let options = new TagFilter([new Tag(['sfw', 'nonsfw', 'clean'], 'sfw', 'toggle')]).test(args.join(" "));
+ if (message.channel.nsfw && !options.sfw) {
fuck = await VC.findOne({uid: message.author.id, countOf: 'realfuck'}) || new VC({uid: message.author.id, countOf: 'realfuck'});
savess = await Saves.findOne({name: 'realfuck'}) || new Saves({name: 'realfuck'});
saves = savess.saves;
@@ -48,7 +52,7 @@ module.exports = {
fuck.markModified(`against.${mention.id}`);
fuck.save();
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bangs ${message.guild.members.cache.get(mention.id).displayName}!...Kinky! `, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bangs ${message.guild.members.cache.get(mention.id).displayName}!...Kinky! `, iconURL: message.author.displayAvatarURL()})
.setDescription(`You've banged them **${fuck.against[mention.id] === 1 ? 'once' : `${fuck.against[mention.id]} times!`}**`)
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('dda0dd')
@@ -58,7 +62,7 @@ module.exports = {
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 bang GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new bang GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/handhold.js b/commands/social/handhold.js
index 28a96c7..c276eb8 100644
--- a/commands/social/handhold.js
+++ b/commands/social/handhold.js
@@ -20,10 +20,10 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${name} is feeling a little lonely. If only someone would hold their hand...`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Let them know you love them with \`${prefix}handhold @${name}\`!`)
.setColor('328ba8')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "Yikes... I'm kinda germaphobic you know. Maybe try asking in a server?"
);}
@@ -34,7 +34,7 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
let uname = message.guild.members.cache.get(mention.id).displayName;
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} holds ${uname.endsWith('s') ? `${uname}'` : `${uname}'s`} hand!`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} holds ${uname.endsWith('s') ? `${uname}'` : `${uname}'s`} hand!`, iconURL: message.author.displayAvatarURL()})
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('d428a0')
]});
diff --git a/commands/social/heal.js b/commands/social/heal.js
index f27e846..e41b1d1 100644
--- a/commands/social/heal.js
+++ b/commands/social/heal.js
@@ -20,10 +20,10 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${name} needs healing!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Lend them some help with \`${prefix}heal @${name}\`!`)
.setColor('ffc0cb')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "I am immortal, I don't need healing."
);}
@@ -34,7 +34,7 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
let uname = message.guild.members.cache.get(mention.id).displayName;
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} heals ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} heals ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.displayAvatarURL()})
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('ffc0cb')
]});
diff --git a/commands/social/hug.js b/commands/social/hug.js
index ae47c13..4b9a4ab 100644
--- a/commands/social/hug.js
+++ b/commands/social/hug.js
@@ -21,10 +21,10 @@ module.exports = {
if (!args.length) {
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${message.guild ? message.member.displayName : message.author.username} needs a hug!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Show them some love with \`${prefix}hug @${message.member.displayName}\`!`)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "Sorry, but I'm a bot, and I can't hug you. Go into a server and ask for some hugs!"
);}
@@ -38,7 +38,7 @@ module.exports = {
hugs.markModified(`against.${mention.id}`);
hugs.save();
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a hug!`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a hug!`, iconURL: message.author.displayAvatarURL()})
.setDescription(`You've hugged them **${hugs.against[mention.id] === 1 ? 'once' : `${hugs.against[mention.id]} times!`}**`)
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('52c7bb')
@@ -48,7 +48,7 @@ module.exports = {
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 hug GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new hug GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/kill.js b/commands/social/kill.js
index 2d06868..eaaa5f0 100644
--- a/commands/social/kill.js
+++ b/commands/social/kill.js
@@ -20,10 +20,10 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${name} is feeling homicidal..watch out!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Brutally murder someone with \`${prefix}kill @${name}\`!`)
.setColor('bb0a1e')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "You can't kill me..don't even try."
);}
@@ -34,7 +34,7 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
let uname = message.guild.members.cache.get(mention.id).displayName;
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} brutally murders ${message.guild.members.cache.get(mention.id).displayName}..Rest in Peace.`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} brutally murders ${message.guild.members.cache.get(mention.id).displayName}..Rest in Peace.`, iconURL: message.author.displayAvatarURL()})
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('bb0a1e')
]});
diff --git a/commands/social/kiss.js b/commands/social/kiss.js
index d7cc506..438cbbe 100644
--- a/commands/social/kiss.js
+++ b/commands/social/kiss.js
@@ -18,10 +18,10 @@ module.exports = {
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}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Give them a little kiss with \`${prefix}kiss @${message.member.displayName}\`!`)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "I'm not really into that kind of thing. Maybe try asking in a server?"
);}
@@ -30,7 +30,7 @@ module.exports = {
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({name: `${message.guild ? message.member.displayName : message.author.username} kisses ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} kisses ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.displayAvatarURL()})
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('d428a0')
]});
@@ -38,7 +38,7 @@ module.exports = {
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.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new kiss GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/laugh.js b/commands/social/laugh.js
index ae42664..f260bbe 100644
--- a/commands/social/laugh.js
+++ b/commands/social/laugh.js
@@ -24,7 +24,7 @@ module.exports = {
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 laugh GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new laugh GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/pat.js b/commands/social/pat.js
index c47c0d0..e85df17 100644
--- a/commands/social/pat.js
+++ b/commands/social/pat.js
@@ -22,10 +22,10 @@ module.exports = {
if (!args.length) {
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${message.guild ? message.member.displayName : message.author.username} wants some pats!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Give them some with \`${prefix}pat @${message.member.displayName}\`!`)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "Sorry, but I'm only able to pat one person, and it's not you ^^"
);}
@@ -39,7 +39,7 @@ module.exports = {
pats.markModified(`against.${mention.id}`);
pats.save();
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} pats ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} pats ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.displayAvatarURL()})
.setDescription(`You've given them **${pats.against[mention.id]}** pat${pats.against[mention.id] === 1 ? '' : 's'}!`)
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('52c7bb')
@@ -49,7 +49,7 @@ module.exports = {
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 hug GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new hug GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/run.js b/commands/social/run.js
index 2f7a9d8..33653fa 100644
--- a/commands/social/run.js
+++ b/commands/social/run.js
@@ -24,7 +24,7 @@ module.exports = {
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 running GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new running GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/simp.js b/commands/social/simp.js
index bd4530f..0dc4423 100644
--- a/commands/social/simp.js
+++ b/commands/social/simp.js
@@ -20,10 +20,10 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${name} is feeling lonely..maybe you should simp for them!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Fall madly in love with someone with \`${prefix}simp @${name}\`!`)
.setColor('ffb6c1')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "Nobody simps for me. That's just weird. Be weird to someone else."
);}
@@ -34,7 +34,7 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
let uname = message.guild.members.cache.get(mention.id).displayName;
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} falls madly in love with ${message.guild.members.cache.get(mention.id).displayName}..what a simp.`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} falls madly in love with ${message.guild.members.cache.get(mention.id).displayName}..what a simp.`, iconURL: message.author.displayAvatarURL()})
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('ffb6c1')
]});
diff --git a/commands/social/sip.js b/commands/social/sip.js
index 52b56a9..4e7360a 100644
--- a/commands/social/sip.js
+++ b/commands/social/sip.js
@@ -23,7 +23,7 @@ module.exports = {
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 sip GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new sip GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/smile.js b/commands/social/smile.js
index b068ad2..b89b8f5 100644
--- a/commands/social/smile.js
+++ b/commands/social/smile.js
@@ -24,7 +24,7 @@ module.exports = {
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 smile GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new smile GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/snuggle.js b/commands/social/snuggle.js
index e75a2f2..fca6829 100644
--- a/commands/social/snuggle.js
+++ b/commands/social/snuggle.js
@@ -22,10 +22,10 @@ module.exports = {
if (!args.length) {
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${message.guild ? message.member.displayName : message.author.username} needs a snuggle!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Show them some love with \`${prefix}snuggle @${message.member.displayName}\`!`)
.setColor('c375f0')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "Sorry, but I'm a bot, and I can't snuggle you. Go into a server and ask for some snuggles!"
);}
@@ -39,7 +39,7 @@ module.exports = {
snuggles.markModified(`against.${mention.id}`);
snuggles.save();
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a snuggle!`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a snuggle!`, iconURL: message.author.displayAvatarURL()})
.setDescription(`You've snuggled them **${snuggles.against[mention.id] === 1 ? 'once' : `${snuggles.against[mention.id]} times!`}**`)
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('52c7bb')
@@ -49,7 +49,7 @@ module.exports = {
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 snuggle GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new snuggle GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/spank.js b/commands/social/spank.js
index 57a8761..8eac3c1 100644
--- a/commands/social/spank.js
+++ b/commands/social/spank.js
@@ -29,7 +29,7 @@ module.exports = {
spanks.markModified(`against.${mention.id}`);
spanks.save();
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a spank!`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a spank!`, iconURL: message.author.displayAvatarURL()})
.setDescription(`You've spanked them **${spanks.against[mention.id] === 1 ? 'once' : `${spanks.against[mention.id]} times!`}**`)
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('52c7bb')
@@ -39,7 +39,7 @@ module.exports = {
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 spank GIFs.");}
+ if ((!tu || !tu.staff) && !client.misc.savers.includes(message.author.id)) {return message.reply("You must be a Natsuki Staff member in order to add new spank GIFs.");}
let e = true;
let id;
while (e === true) {id = makeId(6); if (!saves.has(id)) {e = false;}}
diff --git a/commands/social/wink.js b/commands/social/wink.js
index 9234b7e..bf8c29b 100644
--- a/commands/social/wink.js
+++ b/commands/social/wink.js
@@ -20,10 +20,10 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed()
.setTitle(`${name} is feeling flirty, maybe you should give them a wink!`)
- .setThumbnail(message.author.avatarURL({size: 2048}))
+ .setThumbnail(message.author.displayAvatarURL({size: 2048}))
.setDescription(`Give them a little wink with \`${prefix}wink @${name}\`!`)
.setColor('8a2be2')
- .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+ .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()})
.setTimestamp()]}
: "W-why are you winking at me privately..do it in a server! "
);}
@@ -34,7 +34,7 @@ module.exports = {
let name = message.guild ? message.member.displayName : message.author.username;
let uname = message.guild.members.cache.get(mention.id).displayName;
return message.channel.send({embeds: [new Discord.MessageEmbed()
- .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} winks at ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.avatarURL()})
+ .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} winks at ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.displayAvatarURL()})
.setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)]))
.setColor('8a2be2')
]});
diff --git a/commands/utility/checklist.js b/commands/utility/checklist.js
new file mode 100644
index 0000000..d572bc5
--- /dev/null
+++ b/commands/utility/checklist.js
@@ -0,0 +1,46 @@
+const Discord = require('discord.js');
+
+const GuildLists = require("../../models/guildlist");
+const Checklists = require("../../models/checklist");
+
+const ask = require('../../util/ask');
+const makeId = require('../../util/makeid');
+
+module.exports = {
+ name: "checklist",
+ aliases: ['chl', 'list'],
+ meta: {
+ category: 'Utility',
+ description: "Create and manage checklists, which let you manage tasks for server members",
+ syntax: '`checklist `',
+ extra: null,
+ guildOnly: true
+ },
+ help: new Discord.MessageEmbed()
+ .setTitle("Help -> Checklists")
+ .setDescription("Checklists manage large goals for your server, for any purpose, and can be assigned tasks, members, and more.")
+ .addField("Creation", "Use `checklist admin` to toggle admin-locked checklist creation, making it so only admins can make checklists.")
+ .addField("Syntax", "`checklist `"),
+ async execute(message, msg, args, cmd, prefix, mention, client) {
+ if (!args.length) {return message.channel.send(`Syntax: \`${prefix}checklist \``);}
+
+ const o = args[0].toLowerCase();
+ if (['c', 'new', 'create'].includes(o)) {
+ let gl = await GuildLists.findOne({gid: message.guild.id});
+ if (gl && gl.admin && !message.member.permissions.has("ADMINISTRATOR")) {return message.channel.send("You must be a server administrator in order to make new lists!");}
+ if (gl && gl.lists.length == 15) {return message.channel.send("Your server has reached the checklist maximum of 15!");}
+ const name = await ask(message, "What would you like to call this checklist?", 60000); if (!name) {return;}
+ if (name.length > 50) {return message.channel.send("Your list's name is too long!");}
+ const desc = await ask(message, "What is the main purpose of this list?", 120000); if (!desc) {return;}
+ if (desc.length > 400) {return message.channel.send("Please shorten that description a little!");}
+ let image = null;
+ let conf = await ask(message, "Would you like to add an image to your list?", 60000); if (!conf) {return;}
+ if (['yes', 'ye', 'y', 'sure'].includes(conf.trim().toLowerCase())) {
+ image = await ask(message, `Please paste the image or a link to the image you'd like to add to your new checklist.`, 60000, false, true);
+ if (!image || !image.match(/^https:\/\/(?:[\w\-].?)+[\/\w\-%()_]+\.(?:png|jpg|jpeg|gif|webp)$/gm)) {return message.channel.send("I don't think that's an image. Try again?");}
+ }
+ if (!gl) {gl = new GuildLists({gid: message.guild.id});}
+
+ }
+ }
+};
\ No newline at end of file
diff --git a/commands/utility/choose.js b/commands/utility/choose.js
new file mode 100644
index 0000000..0a031fc
--- /dev/null
+++ b/commands/utility/choose.js
@@ -0,0 +1,30 @@
+const Discord = require('discord.js');
+
+const {Tag} = require('../../util/tag');
+const {TagFilter} = require('../../util/tagfilter');
+
+module.exports = {
+ name: "choose",
+ aliases: ['po', 'pick', 'pickone', 'chooseone'],
+ meta: {
+ category: 'Utility',
+ description: "Feeling indecisive? Have Natsuki choose for you!",
+ syntax: '`choose