mirror of
https://github.com/JonnyBro/JaBa.git
synced 2024-11-24 22:24:58 +05:00
v3.4.5
This commit is contained in:
parent
f06f73f739
commit
c1af0b825a
16 changed files with 210 additions and 177 deletions
|
@ -1,39 +0,0 @@
|
|||
const Command = require("../../base/Command"),
|
||||
Discord = require("discord.js");
|
||||
|
||||
class Joke extends Command {
|
||||
constructor(client) {
|
||||
super(client, {
|
||||
name: "joke",
|
||||
dirname: __dirname,
|
||||
enabled: true,
|
||||
guildOnly: false,
|
||||
aliases: ["jo"],
|
||||
memberPermissions: [],
|
||||
botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
|
||||
nsfw: false,
|
||||
ownerOnly: false,
|
||||
cooldown: 2000
|
||||
});
|
||||
}
|
||||
|
||||
async run(message, args, data) {
|
||||
const joke = await this.client.icanhazdadjoke();
|
||||
if (joke.status !== 200) return message.error("misc:ERR_OCCURRED");
|
||||
|
||||
const embed = new Discord.MessageEmbed()
|
||||
.setDescription(joke.joke)
|
||||
.setFooter({
|
||||
text: message.translate("fun/joke:FOOTER", {
|
||||
id: joke.id
|
||||
})
|
||||
})
|
||||
.setColor(data.config.embed.color);
|
||||
|
||||
message.reply({
|
||||
embeds: [embed]
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Joke;
|
|
@ -21,7 +21,7 @@ class Lmg extends Command {
|
|||
if (!question) return message.error("fun/lmg:MISSING");
|
||||
const encodedQuestion = question.replace(/[' '_]/g, "+");
|
||||
await message.reply({
|
||||
content: `<https://google.gik-team.com/?q=${encodedQuestion}>`
|
||||
content: `<https://letmegooglethat.com/?q=${encodedQuestion}>`
|
||||
});
|
||||
message.delete().catch(() => {});
|
||||
}
|
||||
|
|
78
commands/Fun/memes.js
Normal file
78
commands/Fun/memes.js
Normal file
|
@ -0,0 +1,78 @@
|
|||
const Command = require("../../base/Command"),
|
||||
Discord = require("discord.js"),
|
||||
fetch = require("node-fetch");
|
||||
|
||||
class Memes extends Command {
|
||||
constructor(client) {
|
||||
super(client, {
|
||||
name: "memes",
|
||||
dirname: __dirname,
|
||||
enabled: true,
|
||||
guildOnly: true,
|
||||
aliases: ["mem"],
|
||||
memberPermissions: [],
|
||||
botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"],
|
||||
nsfw: false,
|
||||
ownerOnly: false,
|
||||
cooldown: 2000
|
||||
});
|
||||
}
|
||||
|
||||
async run(message, args, data) {
|
||||
const tag = args[0];
|
||||
const subs = ["memes", "dankmemes", "me_irl", "wholesomememes"];
|
||||
|
||||
if (tag === "list") {
|
||||
const embed = new Discord.MessageEmbed()
|
||||
.setColor(data.config.embed.color)
|
||||
.setFooter({
|
||||
text: data.config.embed.footer
|
||||
})
|
||||
.setTitle(message.translate("fun/memes:EMBED_TITLE"))
|
||||
.setDescription(subs.join("\n"))
|
||||
.setTimestamp();
|
||||
|
||||
message.reply({
|
||||
embeds: [embed]
|
||||
});
|
||||
} else if (!tag) {
|
||||
const m = await message.sendT("fun/memes:SEARCHING_RANDOM");
|
||||
|
||||
const res = await fetch("https://meme-api.herokuapp.com/gimme/").then(response => response.json());
|
||||
const embed = new Discord.MessageEmbed()
|
||||
.setColor(data.config.embed.color)
|
||||
.setFooter({
|
||||
text: data.config.embed.footer
|
||||
})
|
||||
.setTitle(`${res.title}\n${message.translate("fun/memes:SUBREDDIT")}: ${res.subreddit}\n${message.translate("common:AUTHOR")}: ${res.author}\n${message.translate("fun/memes:UPS")}: ${res.ups}`)
|
||||
.setImage(res.url)
|
||||
.setTimestamp();
|
||||
|
||||
m.edit({
|
||||
content: null,
|
||||
embeds: [embed]
|
||||
});
|
||||
} else if (subs.includes(tag)) {
|
||||
const m = await message.sendT("fun/memes:SEARCHING", {
|
||||
tag
|
||||
});
|
||||
|
||||
const res = await fetch(`https://meme-api.herokuapp.com/gimme/${tag}`).then(response => response.json());
|
||||
const embed = new Discord.MessageEmbed()
|
||||
.setColor(data.config.embed.color)
|
||||
.setFooter({
|
||||
text: data.config.embed.footer
|
||||
})
|
||||
.setTitle(`${res.title}\n${message.translate("fun/memes:SUBREDDIT")}: ${res.subreddit}\n${message.translate("common:AUTHOR")}: ${res.author}\n${message.translate("fun/memes:UPS")}: ${res.ups}`)
|
||||
.setImage(res.url)
|
||||
.setTimestamp();
|
||||
|
||||
m.edit({
|
||||
content: null,
|
||||
embeds: [embed]
|
||||
});
|
||||
} else return message.error("fun/memes:NOT_FOUND");
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Memes;
|
|
@ -1,106 +0,0 @@
|
|||
const Command = require("../../base/Command"),
|
||||
Discord = require("discord.js"),
|
||||
fetch = require("node-fetch");
|
||||
|
||||
class Hentai extends Command {
|
||||
constructor(client) {
|
||||
super(client, {
|
||||
name: "hentai",
|
||||
dirname: __dirname,
|
||||
enabled: true,
|
||||
guildOnly: true,
|
||||
aliases: ["hen"],
|
||||
memberPermissions: [],
|
||||
botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"],
|
||||
nsfw: true,
|
||||
ownerOnly: false,
|
||||
cooldown: 2000
|
||||
});
|
||||
}
|
||||
|
||||
async run(message, args, data) {
|
||||
const category = args[0];
|
||||
let gif = null;
|
||||
const embed = new Discord.MessageEmbed()
|
||||
.setColor(data.config.embed.color)
|
||||
.setFooter({
|
||||
text: data.config.embed.footer
|
||||
})
|
||||
.setTimestamp();
|
||||
|
||||
switch (category) {
|
||||
case "neko":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/nsfw_neko_gif").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "cum":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/cum").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "solo":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/solo").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "anal":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/anal").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "yuri":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/yuri").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "blowjob":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/bj").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "bj":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/bj").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "pussy":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/pussy").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "classic":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/hentai").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "futa":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/futanari").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "futanari":
|
||||
gif = await fetch("https://nekos.life/api/v2/img/futanari").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
break;
|
||||
|
||||
case "help":
|
||||
embed.setTitle(message.translate("nsfw/hentai:HELP_1"));
|
||||
embed.setDescription(message.translate("nsfw/hentai:HELP_2"));
|
||||
break;
|
||||
|
||||
default:
|
||||
gif = await fetch("https://nekos.life/api/v2/img/Random_hentai_gif").then(response => response.json());
|
||||
embed.setImage(gif.url);
|
||||
embed.setDescription(message.translate("nsfw/hentai:NOCATEGORY", {
|
||||
prefix: data.guild.prefix
|
||||
}));
|
||||
break;
|
||||
}
|
||||
message.reply({
|
||||
embeds: [embed]
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Hentai;
|
78
commands/NSFW/nsfw.js
Normal file
78
commands/NSFW/nsfw.js
Normal file
|
@ -0,0 +1,78 @@
|
|||
const Command = require("../../base/Command"),
|
||||
Discord = require("discord.js"),
|
||||
fetch = require("node-fetch");
|
||||
|
||||
class NSFW extends Command {
|
||||
constructor(client) {
|
||||
super(client, {
|
||||
name: "nsfw",
|
||||
dirname: __dirname,
|
||||
enabled: true,
|
||||
guildOnly: true,
|
||||
aliases: ["n"],
|
||||
memberPermissions: [],
|
||||
botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"],
|
||||
nsfw: true,
|
||||
ownerOnly: false,
|
||||
cooldown: 2000
|
||||
});
|
||||
}
|
||||
|
||||
async run(message, args, data) {
|
||||
const tag = args[0];
|
||||
const subs = ["ecchi", "lewdanimegirls", "hentai", "hentaifemdom", "animearmpits", "animefeets", "animebooty", "biganimetiddies", "sideoppai", "ahegao"];
|
||||
|
||||
if (tag === "list") {
|
||||
const embed = new Discord.MessageEmbed()
|
||||
.setColor(data.config.embed.color)
|
||||
.setFooter({
|
||||
text: data.config.embed.footer
|
||||
})
|
||||
.setTitle(message.translate("nsfw/nsfw:EMBED_TITLE"))
|
||||
.setDescription(subs.join("\n"))
|
||||
.setTimestamp();
|
||||
|
||||
message.reply({
|
||||
embeds: [embed]
|
||||
});
|
||||
} else if (!tag) {
|
||||
const m = await message.sendT("nsfw/nsfw:SEARCHING_RANDOM");
|
||||
|
||||
const res = await fetch("https://meme-api.herokuapp.com/gimme/hentai").then(response => response.json());
|
||||
const embed = new Discord.MessageEmbed()
|
||||
.setColor(data.config.embed.color)
|
||||
.setFooter({
|
||||
text: data.config.embed.footer
|
||||
})
|
||||
.setTitle(`${res.title}\n${message.translate("fun/memes:SUBREDDIT")}: ${res.subreddit}\n${message.translate("common:AUTHOR")}: ${res.author}\n${message.translate("fun/memes:UPS")}: ${res.ups}`)
|
||||
.setImage(res.url)
|
||||
.setTimestamp();
|
||||
|
||||
m.edit({
|
||||
content: null,
|
||||
embeds: [embed]
|
||||
});
|
||||
} else if (subs.includes(tag)) {
|
||||
const m = await message.sendT("nsfw/nsfw:SEARCHING", {
|
||||
tag
|
||||
});
|
||||
|
||||
const res = await fetch(`https://meme-api.herokuapp.com/gimme/${tag}`).then(response => response.json());
|
||||
const embed = new Discord.MessageEmbed()
|
||||
.setColor(data.config.embed.color)
|
||||
.setFooter({
|
||||
text: data.config.embed.footer
|
||||
})
|
||||
.setTitle(`${res.title}\n${message.translate("fun/memes:SUBREDDIT")}: ${res.subreddit}\n${message.translate("common:AUTHOR")}: ${res.author}\n${message.translate("fun/memes:UPS")}: ${res.ups}`)
|
||||
.setImage(res.url)
|
||||
.setTimestamp();
|
||||
|
||||
m.edit({
|
||||
content: null,
|
||||
embeds: [embed]
|
||||
});
|
||||
} else return message.error("nsfw/nsfw:NOT_FOUND");
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = NSFW;
|
|
@ -1,3 +1,13 @@
|
|||
### JaBa v3.4.5
|
||||
* Добавлено
|
||||
* Команда *memes* - Получить мем с выбранного или случайного сабреддита.
|
||||
|
||||
* Изменено
|
||||
* Переписана команда *hentai*! Теперь она называется *nsfw (n)* и имеет другие категории.
|
||||
|
||||
* Удалено
|
||||
* Команда *joke*.
|
||||
|
||||
### JaBa v3.4.4a
|
||||
* Исправления
|
||||
* Фикс *clear all*.
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"DESCRIPTION": "Получить случайную шутку!",
|
||||
"USAGE": "{{prefix}}joke",
|
||||
"EXAMPLES": "{{prefix}}joke",
|
||||
"FOOTER": "JaBa | ID шутки: {{id}} | icanhazdadjoke.com"
|
||||
}
|
11
languages/ru-RU/fun/memes.json
Normal file
11
languages/ru-RU/fun/memes.json
Normal file
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
"DESCRIPTION": "Получить мем с выбранного или случайного сабреддита",
|
||||
"USAGE": "{{prefix}}memes (тег)",
|
||||
"EXAMPLES": "{{prefix}}memes\n{{prefix}}memes me_irl",
|
||||
"SEARCHING": "Ищу мем по тегу `{{tag}}`...",
|
||||
"SEARCHING_RANDOM": "Ищу случайный мем...",
|
||||
"EMBED_TITLE": "Доступные категории",
|
||||
"NOT_FOUND": "Данной категории не существует!",
|
||||
"SUBREDDIT": "Сабреддит",
|
||||
"UPS": "Апвоуты"
|
||||
}
|
|
@ -1,8 +0,0 @@
|
|||
{
|
||||
"DESCRIPTION": "Получить NSFW гифку",
|
||||
"USAGE": "{{prefix}}hentai (категория/help)",
|
||||
"EXAMPLES": "{{prefix}}hentai\n{{prefix}}hentai help",
|
||||
"NOCATEGORY": "Если Вы хотите увидеть что-либо из определённой категории, введите её название после команды.\nИспользуйте **`{{prefix}}hentai help`** чтобы увидеть все категории\n",
|
||||
"HELP_1": "Доступные категории (вы так же можете использовать команду без аргументов)",
|
||||
"HELP_2": "```neko\ncum\nsolo\nanal\nyuri\nblowjob - bj\npussy\nclassic\nfutanari - futa\n```"
|
||||
}
|
9
languages/ru-RU/nsfw/nsfw.json
Normal file
9
languages/ru-RU/nsfw/nsfw.json
Normal file
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"DESCRIPTION": "Получить NSFW изображение с выбранного или случайного сабреддита",
|
||||
"USAGE": "{{prefix}}hentai (тег/list)",
|
||||
"EXAMPLES": "{{prefix}}hentai\n{{prefix}}hentai list",
|
||||
"SEARCHING": "Ищу изображение по тегу `{{tag}}`",
|
||||
"SEARCHING_RANDOM": "Ищу случайное изображение",
|
||||
"EMBED_TITLE": "Доступные категории",
|
||||
"NOT_FOUND": "Данной категории не существует!"
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"DESCRIPTION": "Отримати випадковий жарт!",
|
||||
"USAGE": "{{prefix}}joke",
|
||||
"EXAMPLES": "{{prefix}}joke",
|
||||
"FOOTER": "JaBa | ID жарту: {{id}} | icanhazdadjoke.com"
|
||||
}
|
11
languages/uk-UA/fun/memes.json
Normal file
11
languages/uk-UA/fun/memes.json
Normal file
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
"DESCRIPTION": "Получить мем с выбранного или случайного сабреддита",
|
||||
"USAGE": "{{prefix}}memes (тег)",
|
||||
"EXAMPLES": "{{prefix}}memes\n{{prefix}}memes me_irl",
|
||||
"SEARCHING": "Ищу мем по тегу `{{tag}}`...",
|
||||
"SEARCHING_RANDOM": "Ищу случайный мем...",
|
||||
"EMBED_TITLE": "Доступные категории",
|
||||
"NOT_FOUND": "Данной категории не существует!",
|
||||
"SUBREDDIT": "Сабреддит",
|
||||
"UPS": "Апвоуты"
|
||||
}
|
|
@ -1,8 +0,0 @@
|
|||
{
|
||||
"DESCRIPTION": "Отримати NSFW гіфку",
|
||||
"USAGE": "{{prefix}}hentai (категорія/help)",
|
||||
"EXAMPLES": "{{prefix}}hentai\n{{prefix}}hentai help",
|
||||
"NOCATEGORY": "Якщо Ви хочете побачити що-небудь з певної категорії, введіть її назву після команди.\nВикористовуйте **`{{prefix}}hentai help`** щоб побачити всі категорії\n",
|
||||
"HELP_1": "Доступні категорії (ви можете використовувати команду без аргументів)",
|
||||
"HELP_2": "neko\ncum\nsolo\nanal\nyuri\nblowjob - bj\npussy\nclassic\nfutanari - futa\n```"
|
||||
}
|
9
languages/uk-UA/nsfw/nsfw.json
Normal file
9
languages/uk-UA/nsfw/nsfw.json
Normal file
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"DESCRIPTION": "Получить NSFW изображение с выбранного или случайного сабреддита",
|
||||
"USAGE": "{{prefix}}hentai (тег/list)",
|
||||
"EXAMPLES": "{{prefix}}hentai\n{{prefix}}hentai list",
|
||||
"SEARCHING": "Ищу изображение по тегу `{{tag}}`",
|
||||
"SEARCHING_RANDOM": "Ищу случайное изображение",
|
||||
"EMBED_TITLE": "Доступные категории",
|
||||
"NOT_FOUND": "Данной категории не существует!"
|
||||
}
|
4
package-lock.json
generated
4
package-lock.json
generated
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "jaba",
|
||||
"version": "3.4.4a",
|
||||
"version": "3.4.5",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "jaba",
|
||||
"version": "3.4.3",
|
||||
"version": "3.4.5",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@discordjs/opus": "^0.7.0",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "jaba",
|
||||
"version": "3.4.4a",
|
||||
"version": "3.4.5",
|
||||
"description": "A very complete Discord bot (more than 100 commands) that uses the Discord.js",
|
||||
"main": "index.js",
|
||||
"private": true,
|
||||
|
|
Loading…
Reference in a new issue