jonny_bro/JaBa
1
0
Fork 0
mirror of https://github.com/JonnyBro/JaBa.git synced 2024-11-24 22:24:58 +05:00
Code Issues Projects Releases Packages Wiki Activity

v3.3.2

Browse source 
Новые генерации
Удалена tweet т.к. не работает
This commit is contained in:
JonnyBro 2022-01-24 01:34:45 +05:00
parent 56ed066dd5
commit d7b29e73cf
39 changed files with 181 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/Economy/marry.js
View file

@ -97,7 +97,7 @@ class Marry extends Command {
const messageOptions = {
content: `${member.toString()} :heart: ${message.author.toString()}`,
files: [{
name: "unlocked.png",
name: "achievement_unlocked3.png",
attachment: "./assets/img/achievements/achievement_unlocked3.png"
}]
};

2
commands/Economy/rep.js
View file

@ -52,7 +52,7 @@ class Rep extends Command {
userData.achievements.rep.achieved = true;
message.channel.send({
files: [{
name: "unlocked.png",
name: "achievement_unlocked6.png",
attachment: "./assets/img/achievements/achievement_unlocked6.png"
}]
});

4
commands/Economy/slots.js
View file

@ -103,7 +103,7 @@ class Slots extends Command {
data.userData.achievements.slots.achieved = true;
message.channel.send({
files: [{
name: "unlocked.png",
name: "achievement_unlocked4.png",
attachment: "./assets/img/achievements/achievement_unlocked4.png"
}]
});
@ -144,7 +144,7 @@ class Slots extends Command {
data.userData.achievements.slots.achieved = true;
message.channel.send({
files: [{
name: "unlocked.png",
name: "achievement_unlocked4.png",
attachment: "./assets/img/achievements/achievement_unlocked4.png"
}]
});

1
commands/Images/approved.js
View file

@ -31,6 +31,7 @@ class Approved extends Command {
message.channel.send({
files: [{
name: "approved.png",
attachment: buffer
}]
});

1
commands/Images/avatar.js
View file

@ -29,6 +29,7 @@ class Avatar extends Command {
message.channel.send({
files: [{
name: "avatar.png",
attachment: avatarURL
}]
});

1
commands/Images/batslap.js
View file

@ -38,6 +38,7 @@ class BatSlap extends Command {
message.channel.send({
files: [{
name: "batslap.png",
attachment: buffer
}]
});

1
commands/Images/beautiful.js
View file

@ -31,6 +31,7 @@ class Beautiful extends Command {
message.channel.send({
files: [{
name: "beautiful.png",
attachment: buffer
}]
});

1
commands/Images/bed.js
View file

@ -36,6 +36,7 @@ class Bed extends Command {
message.channel.send({
files: [{
name: "bed.png",
attachment: buffer
}]
});

1
commands/Images/brazzers.js
View file

@ -31,6 +31,7 @@ class Brazzers extends Command {
message.channel.send({
files: [{
name: "brazzers.png",
attachment: buffer
}]
});

1
commands/Images/burn.js
View file

@ -31,6 +31,7 @@ class Burn extends Command {
message.channel.send({
files: [{
name: "burn.png",
attachment: buffer
}]
});

1
commands/Images/captcha.js
View file

@ -29,6 +29,7 @@ class Captcha extends Command {
message.channel.send({
files: [{
name: "captcha.png",
attachment: json.message
}]
});

1
commands/Images/challenger.js
View file

@ -31,6 +31,7 @@ class Challenger extends Command {
message.channel.send({
files: [{
name: "challenger.png",
attachment: buffer
}]
});

1
commands/Images/clyde.js
View file

@ -30,6 +30,7 @@ class Clyde extends Command {
const json = await res.json();
message.channel.send({
files: [{
name: "clyde.png",
attachment: json.message
}]
});

41
commands/Images/crush.js Normal file
View file

@ -0,0 +1,41 @@
const Command = require("../../base/Command");
class Crush extends Command {
constructor(client) {
super(client, {
name: "crush",
dirname: __dirname,
enabled: true,
guildOnly: false,
aliases: [],
memberPermissions: [],
botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"],
nsfw: false,
ownerOnly: false,
cooldown: 3000
});
}
async run(message, args) {
const user = await this.client.resolveUser(args[0]) || message.author;
const m = await message.sendT("misc:PLEASE_WAIT", null, {
prefixEmoji: "loading"
});
const buffer = await this.client.AmeAPI.generate("crush", {
url: user.displayAvatarURL({
format: "png",
size: 512
})
});
m.delete();
message.channel.send({
files: [{
name: "crush.png",
attachment: buffer
}]
});
}
}
module.exports = Crush;

1
commands/Images/dictator.js
View file

@ -31,6 +31,7 @@ class Dictator extends Command {
message.channel.send({
files: [{
name: "dictator.png",
attachment: buffer
}]
});

1
commands/Images/facepalm.js
View file

@ -45,6 +45,7 @@ class Facepalm extends Command {
message.channel.send({
files: [{
name: "facepalm.png",
attachment: canvas.toBuffer()
}]
});

1
commands/Images/fire.js
View file

@ -31,6 +31,7 @@ class Fire extends Command {
message.channel.send({
files: [{
name: "fire.png",
attachment: buffer
}]
});

3
commands/Images/jail.js
View file

@ -24,13 +24,14 @@ class Jail extends Command {
const buffer = await this.client.AmeAPI.generate("jail", {
url: user.displayAvatarURL({
format: "png",
size: 1024
size: 512
})
});
m.delete();
message.channel.send({
files: [{
name: "jail.png",
attachment: buffer
}]
});

1
commands/Images/love.js
View file

@ -31,6 +31,7 @@ class Love extends Command {
const json = await res.json();
message.channel.send({
files: [{
name: "love.png",
attachment: json.message
}]
});

41
commands/Images/magik.js Normal file
View file

@ -0,0 +1,41 @@
const Command = require("../../base/Command");
class Magik extends Command {
constructor(client) {
super(client, {
name: "magik",
dirname: __dirname,
enabled: true,
guildOnly: false,
aliases: [],
memberPermissions: [],
botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"],
nsfw: false,
ownerOnly: false,
cooldown: 3000
});
}
async run(message, args) {
const user = await this.client.resolveUser(args[0]) || message.author;
const m = await message.sendT("misc:PLEASE_WAIT", null, {
prefixEmoji: "loading"
});
const buffer = await this.client.AmeAPI.generate("magik", {
url: user.displayAvatarURL({
format: "png",
size: 512
})
});
m.delete();
message.channel.send({
files: [{
name: "magik.png",
attachment: buffer
}]
});
}
}
module.exports = Magik;

1
commands/Images/mission.js
View file

@ -31,6 +31,7 @@ class Mission extends Command {
message.channel.send({
files: [{
name: "mission.png",
attachment: buffer
}]
});

1
commands/Images/phcomment.js
View file

@ -42,6 +42,7 @@ class Phcomment extends Command {
message.channel.send({
files: [{
name: "phcomment.png",
attachment: buffer
}]
});

41
commands/Images/ps4.js Normal file
View file

@ -0,0 +1,41 @@
const Command = require("../../base/Command");
class Ps4 extends Command {
constructor(client) {
super(client, {
name: "ps4",
dirname: __dirname,
enabled: true,
guildOnly: false,
aliases: [],
memberPermissions: [],
botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"],
nsfw: false,
ownerOnly: false,
cooldown: 3000
});
}
async run(message, args) {
const user = await this.client.resolveUser(args[0]) || message.author;
const m = await message.sendT("misc:PLEASE_WAIT", null, {
prefixEmoji: "loading"
});
const buffer = await this.client.AmeAPI.generate("ps4", {
url: user.displayAvatarURL({
format: "png",
size: 512
})
});
m.delete();
message.channel.send({
files: [{
name: "ps4.png",
attachment: buffer
}]
});
}
}
module.exports = Ps4;

1
commands/Images/rip.js
View file

@ -31,6 +31,7 @@ class Rip extends Command {
message.channel.send({
files: [{
name: "rip.png",
attachment: buffer
}]
});

1
commands/Images/scary.js
View file

@ -31,6 +31,7 @@ class Scary extends Command {
message.channel.send({
files: [{
name: "scary.png",
attachment: buffer
}]
});

1
commands/Images/tobecontinued.js
View file

@ -31,6 +31,7 @@ class Tobecontinued extends Command {
message.channel.send({
files: [{
name: "tobecontinued.png",
attachment: buffer
}]
});

1
commands/Images/trash.js
View file

@ -30,6 +30,7 @@ class Trash extends Command {
message.channel.send({
files: [{
name: "trash.png",
attachment: buffer
}]
});

51
commands/Images/tweet.js
View file

@ -1,51 +0,0 @@
const Command = require("../../base/Command");
class Tweet extends Command {
constructor(client) {
super(client, {
name: "tweet",
dirname: __dirname,
enabled: false,
guildOnly: false,
aliases: ["twitter"],
memberPermissions: [],
botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"],
nsfw: false,
ownerOnly: false,
cooldown: 3000
});
}
async run(message, args) {
const user = message.mentions.users.first() || message.author;
const text = args.slice(1).join(" ");
if (!user) return message.error("images/tweet:MISSING_USERNAME");
if (!text) return message.error("images/tweet:MISSING_TEXT");
const m = await message.sendT("misc:PLEASE_WAIT", null, {
prefixEmoji: "loading"
});
await message.guild.members.fetch();
const randomMembers = message.guild.members.cache.random(3);
const buffer = await this.client.AmeAPI.generate("twitter", {
url: user.displayAvatarURL(),
avatar1: randomMembers[0].user.displayAvatarURL(),
avatar2: randomMembers[1].user.displayAvatarURL(),
avatar3: randomMembers[2].user.displayAvatarURL(),
text
});
m.delete();
message.channel.send({
files: [{
attachment: buffer
}]
});
}
}
module.exports = Tweet;

1
commands/Images/wanted.js
View file

@ -31,6 +31,7 @@ class Wanted extends Command {
message.channel.send({
files: [{
name: "wanted.png",
attachment: buffer
}]
});

1
commands/Images/wasted.js
View file

@ -31,6 +31,7 @@ class Wasted extends Command {
message.channel.send({
files: [{
name: "wasted.png",
attachment: buffer
}]
});

9
commands/Images/youtube-comment.js
View file

@ -1,14 +1,14 @@
const Command = require("../../base/Command"),
canvacord = require("canvacord");
class YouTubeComment extends Command {
class Ytcomment extends Command {
constructor(client) {
super(client, {
name: "youtube-comment",
name: "ytcomment",
dirname: __dirname,
enabled: true,
guildOnly: false,
aliases: ["ytcomment"],
aliases: [],
memberPermissions: [],
botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"],
nsfw: false,
@ -40,10 +40,11 @@ class YouTubeComment extends Command {
message.channel.send({
files: [{
name: "ytcomment.png",
attachment: image
}]
});
}
}
module.exports = YouTubeComment;
module.exports = Ytcomment;

7
dashboard/public/docs/updates.md
View file

@ -1,3 +1,10 @@
### JaBa v3.3.2
* Добавлено
* Команды *crush*, *magik* и *ps4* в категорию *Images*.
* Удалено
* Команда *tweet*.
### JaBa v3.3.1
* Изменено
* Команды *findwords*, *horserace*, *number* и *tictactoe* перемещены в категорию *Economy*.

2
events/guildMemberUpdate.js
View file

@ -17,7 +17,7 @@ module.exports = class {
newMember.send({
files: [{
name: "unlocked.png",
name: "achievement_unlocked5.png",
attachment: "./assets/img/achievements/achievement_unlocked5.png"
}]
});

2
events/messageCreate.js
View file

@ -190,7 +190,7 @@ module.exports = class {
await data.userData.save();
await message.channel.send({
files: [{
name: "unlocked.png",
name: "achievement_unlocked2.png",
attachment: "./assets/img/achievements/achievement_unlocked2.png"
}]
});

5
languages/ru-RU/images/crush.json Normal file
View file

@ -0,0 +1,5 @@
{
"DESCRIPTION": "Создать изображение \"crush\"",
"USAGE": "{{prefix}}crush (@пользователь)",
"EXAMPLES": "{{prefix}}crush\n{{prefix}}crush @Jonny_Bro#4226"
}

5
languages/ru-RU/images/magik.json Normal file
View file

@ -0,0 +1,5 @@
{
"DESCRIPTION": "Создать изображение \"magik\"",
"USAGE": "{{prefix}}magik (@пользователь)",
"EXAMPLES": "{{prefix}}magik\n{{prefix}}magik @Jonny_Bro#4226"
}

5
languages/ru-RU/images/ps4.json Normal file
View file

@ -0,0 +1,5 @@
{
"DESCRIPTION": "Создать изображение \"ps4\"",
"USAGE": "{{prefix}}ps4 (@пользователь)",
"EXAMPLES": "{{prefix}}ps4\n{{prefix}}ps4 @Jonny_Bro#4226"
}

8
languages/ru-RU/images/tweet.json
View file

@ -1,8 +0,0 @@
{
"DESCRIPTION": "Создать изображение \"tweet\"",
"USAGE": "{{prefix}}tweet [@пользователь] [текст]",
"EXAMPLES": "{{prefix}}tweet @Jonny_Bro#4226 Люблю спать",
"MISSING_USERNAME": "Вы должны упомянуть пользователя!",
"MISSING_TEXT": "Укажите текст!",
"SUCCESS": "Новый твит от {{user}}:"
}

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "jaba",
"version": "3.3.1",
"version": "3.3.2",
"description": "A very complete Discord bot (more than 100 commands) that uses the Discord.js",
"main": "index.js",
"private": true,