Remove nsfw/useless commands, refactor stuff

This commit is contained in:
Dragon Fire
2018-08-15 19:34:34 -04:00
parent cc3680009a
commit b3c6b591d3
38 changed files with 192 additions and 531 deletions
+2 -4
View File
@@ -1,6 +1,6 @@
const { ArgumentType } = require('discord.js-commando');
class AvatarArgumentType extends ArgumentType {
module.exports = class AvatarArgumentType extends ArgumentType {
constructor(client) {
super(client, 'avatar');
}
@@ -13,6 +13,4 @@ class AvatarArgumentType extends ArgumentType {
const user = await this.client.registry.types.get('user').parse(value, msg, arg);
return user.displayAvatarURL({ format: 'png', size: 512 });
}
}
module.exports = AvatarArgumentType;
};
+13 -15
View File
@@ -1,7 +1,7 @@
const { ArgumentType, util: { disambiguation } } = require('discord.js-commando');
const { escapeMarkdown } = require('discord.js');
class EmojiArgumentType extends ArgumentType {
module.exports = class EmojiArgumentType extends ArgumentType {
constructor(client) {
super(client, 'emoji');
}
@@ -11,13 +11,13 @@ class EmojiArgumentType extends ArgumentType {
if (matches && msg.client.emojis.has(matches[2])) return true;
if (!msg.guild) return false;
const search = value.toLowerCase();
let emojis = msg.guild.emojis.filterArray(nameFilterInexact(search));
if (!emojis.length) return false;
if (emojis.length === 1) return true;
let emojis = msg.guild.emojis.filter(nameFilterInexact(search));
if (!emojis.size) return false;
if (emojis.size === 1) return true;
const exactEmojis = emojis.filter(nameFilterExact(search));
if (exactEmojis.length === 1) return true;
if (exactEmojis.length > 0) emojis = exactEmojis;
return emojis.length <= 15
if (exactEmojis.size === 1) return true;
if (exactEmojis.size > 0) emojis = exactEmojis;
return emojis.size <= 15
? `${disambiguation(emojis.map(emoji => escapeMarkdown(emoji.name)), 'emojis', null)}\n`
: 'Multiple emojis found. Please be more specific.';
}
@@ -26,11 +26,11 @@ class EmojiArgumentType extends ArgumentType {
const matches = value.match(/^(?:<a?:([a-zA-Z0-9_]+):)?([0-9]+)>?$/);
if (matches) return msg.client.emojis.get(matches[2]) || null;
const search = value.toLowerCase();
const emojis = msg.guild.emojis.filterArray(nameFilterInexact(search));
if (!emojis.length) return null;
if (emojis.length === 1) return emojis[0];
const exactEmojis = emojis.filterArray(nameFilterExact(search));
if (exactEmojis.length === 1) return exactEmojis[0];
const emojis = msg.guild.emojis.filter(nameFilterInexact(search));
if (!emojis.size) return null;
if (emojis.size === 1) return emojis.first();
const exactEmojis = emojis.filter(nameFilterExact(search));
if (exactEmojis.size === 1) return exactEmojis.first();
return null;
}
}
@@ -41,6 +41,4 @@ function nameFilterExact(search) {
function nameFilterInexact(search) {
return thing => thing.name.toLowerCase().includes(search);
}
module.exports = EmojiArgumentType;
};
+2 -4
View File
@@ -1,6 +1,6 @@
const { ArgumentType } = require('discord.js-commando');
class ImageArgumentType extends ArgumentType {
module.exports = class ImageArgumentType extends ArgumentType {
constructor(client) {
super(client, 'image');
}
@@ -19,6 +19,4 @@ class ImageArgumentType extends ArgumentType {
isEmpty(value, msg) {
return msg.attachments.size === 0;
}
}
module.exports = ImageArgumentType;
};
+2 -4
View File
@@ -1,7 +1,7 @@
const { ArgumentType } = require('discord.js-commando');
const months = require('../assets/json/month');
class MonthArgumentType extends ArgumentType {
module.exports = class MonthArgumentType extends ArgumentType {
constructor(client) {
super(client, 'month');
}
@@ -18,6 +18,4 @@ class MonthArgumentType extends ArgumentType {
if (!Number.isNaN(num)) return num;
return months.indexOf(value.toLowerCase()) + 1;
}
}
module.exports = MonthArgumentType;
};