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

Фиксы

Browse source
This commit is contained in:
JonnyBro 2022-02-25 00:56:32 +05:00
parent 049d65b935
commit f96f9ba7e8
42 changed files with 97 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
commands/Economy/divorce.js
View file

@ -33,6 +33,7 @@ class Divorce extends Command {
message.success("economy/divorce:DIVORCED", { message.success("economy/divorce:DIVORCED", {
username: user.username username: user.username
}); });
user.send({ user.send({
content: message.translate("economy/divorce:DIVORCED_U", { content: message.translate("economy/divorce:DIVORCED_U", {
username: message.author.username username: message.author.username

2
commands/Fun/ascii.js
View file

@ -25,7 +25,7 @@ class Ascii extends Command {
const rendered = await figletAsync(text); const rendered = await figletAsync(text);
message.channel.send({ message.reply({
content: "```" + rendered + "```" content: "```" + rendered + "```"
}); });
} }

2
commands/Fun/lmg.js
View file

@ -20,7 +20,7 @@ class Lmg extends Command {
const question = args.join(" "); const question = args.join(" ");
if (!question) return message.error("fun/lmg:MISSING"); if (!question) return message.error("fun/lmg:MISSING");
const encodedQuestion = question.replace(/[' '_]/g, "+"); const encodedQuestion = question.replace(/[' '_]/g, "+");
await message.channel.send({ await message.reply({
content: `https://google.gik-team.com/?q=${encodedQuestion}` content: `https://google.gik-team.com/?q=${encodedQuestion}`
}); });
message.delete().catch(() => {}); message.delete().catch(() => {});

2
commands/General/permissions.js
View file

@ -41,7 +41,7 @@ class Permissions extends Command {
}); });
text += `\n${total.allowed} ✅ | ${total.denied} ❌`; text += `\n${total.allowed} ✅ | ${total.denied} ❌`;
message.channel.send({ message.reply({
content: text content: text
}); });
} }

2
commands/General/report.js
View file

@ -18,7 +18,7 @@ class Report extends Command {
} }
async run(message, args, data) { async run(message, args, data) {
if (message.author.id === "285109105717280768") return message.channel.send({ content: "Пошёл нахуй фахон" }); if (message.author.id === "285109105717280768") return message.reply({ content: "Пошёл нахуй фахон" });
const repChannel = message.guild.channels.cache.get(data.guild.plugins.reports); const repChannel = message.guild.channels.cache.get(data.guild.plugins.reports);
if (!repChannel) return message.error("general/report:MISSING_CHANNEL"); if (!repChannel) return message.error("general/report:MISSING_CHANNEL");

2
commands/General/suggest.js
View file

@ -18,7 +18,7 @@ class Suggest extends Command {
} }
async run(message, args, data) { async run(message, args, data) {
if (message.author.id === "285109105717280768") return message.channel.send({ content: "Пошёл нахуй фахон" }); if (message.author.id === "285109105717280768") return message.reply({ content: "Пошёл нахуй фахон" });
const suggChannel = message.guild.channels.cache.get(data.guild.plugins.suggestions); const suggChannel = message.guild.channels.cache.get(data.guild.plugins.suggestions);
if (!suggChannel) return message.error("general/suggest:MISSING_CHANNEL"); if (!suggChannel) return message.error("general/suggest:MISSING_CHANNEL");

2
commands/Images/approved.js
View file

@ -29,7 +29,7 @@ class Approved extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "approved.png", name: "approved.png",
attachment: buffer attachment: buffer

4
commands/Images/avatar.js
View file

@ -24,9 +24,9 @@ class Avatar extends Command {
size: 512 size: 512
}); });
if (args[0] === "link") return message.channel.send({ content: `<${avatarURL}>` }); if (args[0] === "link") return message.reply({ content: `<${avatarURL}>` });
message.channel.send({ message.reply({
files: [{ files: [{
attachment: avatarURL attachment: avatarURL
}] }]

2
commands/Images/batslap.js
View file

@ -36,7 +36,7 @@ class BatSlap extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "batslap.png", name: "batslap.png",
attachment: buffer attachment: buffer

2
commands/Images/beautiful.js
View file

@ -29,7 +29,7 @@ class Beautiful extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "beautiful.png", name: "beautiful.png",
attachment: buffer attachment: buffer

2
commands/Images/bed.js
View file

@ -34,7 +34,7 @@ class Bed extends Command {
})); }));
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "bed.png", name: "bed.png",
attachment: buffer attachment: buffer

2
commands/Images/brazzers.js
View file

@ -29,7 +29,7 @@ class Brazzers extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "brazzers.png", name: "brazzers.png",
attachment: buffer attachment: buffer

2
commands/Images/burn.js
View file

@ -29,7 +29,7 @@ class Burn extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "burn.png", name: "burn.png",
attachment: buffer attachment: buffer

2
commands/Images/captcha.js
View file

@ -27,7 +27,7 @@ class Captcha extends Command {
const json = await res.json(); const json = await res.json();
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "captcha.png", name: "captcha.png",
attachment: json.message attachment: json.message

2
commands/Images/challenger.js
View file

@ -29,7 +29,7 @@ class Challenger extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "challenger.png", name: "challenger.png",
attachment: buffer attachment: buffer

2
commands/Images/clyde.js
View file

@ -28,7 +28,7 @@ class Clyde extends Command {
try { try {
const res = await fetch(encodeURI(`https://nekobot.xyz/api/imagegen?type=clyde&text=${text}`)); const res = await fetch(encodeURI(`https://nekobot.xyz/api/imagegen?type=clyde&text=${text}`));
const json = await res.json(); const json = await res.json();
message.channel.send({ message.reply({
files: [{ files: [{
name: "clyde.png", name: "clyde.png",
attachment: json.message attachment: json.message

2
commands/Images/crush.js
View file

@ -29,7 +29,7 @@ class Crush extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "crush.png", name: "crush.png",
attachment: buffer attachment: buffer

2
commands/Images/dictator.js
View file

@ -29,7 +29,7 @@ class Dictator extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "dictator.png", name: "dictator.png",
attachment: buffer attachment: buffer

2
commands/Images/facepalm.js
View file

@ -43,7 +43,7 @@ class Facepalm extends Command {
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "facepalm.png", name: "facepalm.png",
attachment: canvas.toBuffer() attachment: canvas.toBuffer()

2
commands/Images/fire.js
View file

@ -29,7 +29,7 @@ class Fire extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "fire.png", name: "fire.png",
attachment: buffer attachment: buffer

2
commands/Images/jail.js
View file

@ -29,7 +29,7 @@ class Jail extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "jail.png", name: "jail.png",
attachment: buffer attachment: buffer

2
commands/Images/love.js
View file

@ -29,7 +29,7 @@ class Love extends Command {
try { try {
const res = await fetch(encodeURI(`https://nekobot.xyz/api/imagegen?type=ship&user1=${users[0].displayAvatarURL({ format: "png", size: 512 })}&user2=${users[1].displayAvatarURL({ format: "png", size: 512 })}`)); const res = await fetch(encodeURI(`https://nekobot.xyz/api/imagegen?type=ship&user1=${users[0].displayAvatarURL({ format: "png", size: 512 })}&user2=${users[1].displayAvatarURL({ format: "png", size: 512 })}`));
const json = await res.json(); const json = await res.json();
message.channel.send({ message.reply({
files: [{ files: [{
name: "love.png", name: "love.png",
attachment: json.message attachment: json.message

2
commands/Images/magik.js
View file

@ -29,7 +29,7 @@ class Magik extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "magik.png", name: "magik.png",
attachment: buffer attachment: buffer

2
commands/Images/mission.js
View file

@ -29,7 +29,7 @@ class Mission extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "mission.png", name: "mission.png",
attachment: buffer attachment: buffer

2
commands/Images/phcomment.js
View file

@ -40,7 +40,7 @@ class Phcomment extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "phcomment.png", name: "phcomment.png",
attachment: buffer attachment: buffer

2
commands/Images/ps4.js
View file

@ -29,7 +29,7 @@ class Ps4 extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "ps4.png", name: "ps4.png",
attachment: buffer attachment: buffer

2
commands/Images/rip.js
View file

@ -29,7 +29,7 @@ class Rip extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "rip.png", name: "rip.png",
attachment: buffer attachment: buffer

2
commands/Images/scary.js
View file

@ -29,7 +29,7 @@ class Scary extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "scary.png", name: "scary.png",
attachment: buffer attachment: buffer

2
commands/Images/steamcard.js
View file

@ -33,7 +33,7 @@ class SteamCard extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "steamcard.png", name: "steamcard.png",
attachment: buffer attachment: buffer

2
commands/Images/tobecontinued.js
View file

@ -29,7 +29,7 @@ class Tobecontinued extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "tobecontinued.png", name: "tobecontinued.png",
attachment: buffer attachment: buffer

2
commands/Images/trash.js
View file

@ -28,7 +28,7 @@ class Trash extends Command {
})); }));
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "trash.png", name: "trash.png",
attachment: buffer attachment: buffer

2
commands/Images/triggered.js
View file

@ -29,7 +29,7 @@ class Triggered extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "triggered.gif", name: "triggered.gif",
attachment: buffer attachment: buffer

2
commands/Images/wanted.js
View file

@ -29,7 +29,7 @@ class Wanted extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "wanted.png", name: "wanted.png",
attachment: buffer attachment: buffer

2
commands/Images/wasted.js
View file

@ -29,7 +29,7 @@ class Wasted extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "wasted.png", name: "wasted.png",
attachment: buffer attachment: buffer

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

@ -38,7 +38,7 @@ class Ytcomment extends Command {
}); });
m.delete(); m.delete();
message.channel.send({ message.reply({
files: [{ files: [{
name: "ytcomment.png", name: "ytcomment.png",
attachment: image attachment: image

2
commands/Moderation/announcement.js
View file

@ -23,7 +23,7 @@ class Announcement extends Command {
if (text.length > 1030) return message.error("moderation/announcement:TOO_LONG"); if (text.length > 1030) return message.error("moderation/announcement:TOO_LONG");
let mention = null; let mention = null;
const msg = await message.channel.send(message.translate("moderation/announcement:MENTION_PROMPT")); const msg = await message.sendT("moderation/announcement:MENTION_PROMPT");
const filter = m => m.author.id === message.author.id; const filter = m => m.author.id === message.author.id;
const collector = new Discord.MessageCollector(message.channel, { const collector = new Discord.MessageCollector(message.channel, {

6
commands/Moderation/ban.js
View file

@ -58,12 +58,14 @@ class Ban extends Command {
reason reason
}).then(() => { }).then(() => {
// Send a success message in the current channel // Send a success message in the current channel
message.channel.send(message.translate("moderation/ban:BANNED", { message.reply({
content: message.translate("moderation/ban:BANNED", {
username: user.tag, username: user.tag,
server: message.guild.name, server: message.guild.name,
moderator: message.author.tag, moderator: message.author.tag,
reason reason
})); })
});
const caseInfo = { const caseInfo = {
channel: message.channel.id, channel: message.channel.id,

12
commands/Moderation/kick.js
View file

@ -37,22 +37,26 @@ class Kick extends Command {
if (message.member.ownerId !== message.author.id && !(moderationPosition > memberPosition)) return message.error("moderation/ban:SUPERIOR"); if (message.member.ownerId !== message.author.id && !(moderationPosition > memberPosition)) return message.error("moderation/ban:SUPERIOR");
if (!member.kickable) return message.error("moderation/kick:MISSING_PERM"); if (!member.kickable) return message.error("moderation/kick:MISSING_PERM");
await member.send(message.translate("moderation/kick:KICKED_DM", { await member.send({
content: message.translate("moderation/kick:KICKED_DM", {
username: member.user.tag, username: member.user.tag,
server: message.guild.name, server: message.guild.name,
moderator: message.author.tag, moderator: message.author.tag,
reason reason
})).catch(() => {}); })
});
// Kick the user // Kick the user
member.kick(reason).then(() => { member.kick(reason).then(() => {
// Send a success message in the current channel // Send a success message in the current channel
message.channel.send(message.translate("moderation/kick:KICKED", { message.reply({
content: message.translate("moderation/kick:KICKED", {
username: member.user.tag, username: member.user.tag,
server: message.guild.name, server: message.guild.name,
moderator: message.author.tag, moderator: message.author.tag,
reason reason
})); })
});
data.guild.casesCount++; data.guild.casesCount++;
data.guild.save(); data.guild.save();

6
commands/Moderation/mute.js
View file

@ -45,13 +45,15 @@ class Mute extends Command {
}).catch(() => {}); }).catch(() => {});
}); });
member.send(message.translate("moderation/mute:MUTED_DM", { member.send({
content: message.translate("moderation/mute:MUTED_DM", {
username: member.user.username, username: member.user.username,
server: message.guild.name, server: message.guild.name,
moderator: message.author.tag, moderator: message.author.tag,
time, time,
reason reason
})); })
});
message.success("moderation/mute:MUTED", { message.success("moderation/mute:MUTED", {
username: member.user.tag, username: member.user.tag,

2
commands/Moderation/poll.js
View file

@ -22,7 +22,7 @@ class Poll extends Command {
if (!question) return message.error("moderation/poll:MISSING_QUESTION"); if (!question) return message.error("moderation/poll:MISSING_QUESTION");
let mention = null; let mention = null;
const msg = await message.channel.send(message.translate("moderation/announcement:MENTION_PROMPT")); const msg = await message.sendT("moderation/announcement:MENTION_PROMPT");
const filter = m => m.author.id === message.author.id; const filter = m => m.author.id === message.author.id;
const collector = new Discord.MessageCollector(message.channel, { const collector = new Discord.MessageCollector(message.channel, {

18
commands/Moderation/warn.js
View file

@ -60,12 +60,14 @@ class Warn extends Command {
if (banCount) { if (banCount) {
if (sanctions >= banCount) { if (sanctions >= banCount) {
member.send(message.translate("moderation/ban:BANNED_DM", { member.send({
content: message.translate("moderation/ban:BANNED_DM", {
username: member.user, username: member.user,
moderator: message.author.tag, moderator: message.author.tag,
server: message.guild.name, server: message.guild.name,
reason reason
})); })
});
caseInfo.type = "ban"; caseInfo.type = "ban";
embed.setAuthor({ embed.setAuthor({
name: message.translate("moderation/ban:CASE", { name: message.translate("moderation/ban:CASE", {
@ -83,12 +85,14 @@ class Warn extends Command {
if (kickCount) { if (kickCount) {
if (sanctions >= kickCount) { if (sanctions >= kickCount) {
member.send(message.translate("moderation/kick:KICKED_DM", { member.send({
content: message.translate("moderation/kick:KICKED_DM", {
username: member.user, username: member.user,
moderator: message.author.tag, moderator: message.author.tag,
server: message.guild.name, server: message.guild.name,
reason reason
})); })
});
caseInfo.type = "kick"; caseInfo.type = "kick";
embed.setAuthor({ embed.setAuthor({
name: message.translate("moderation/kick:CASE", { name: message.translate("moderation/kick:CASE", {
@ -104,12 +108,14 @@ class Warn extends Command {
} }
} }
member.send(message.translate("moderation/warn:WARNED_DM", { member.send({
content: message.translate("moderation/warn:WARNED_DM", {
username: member.user.tag, username: member.user.tag,
server: message.guild.name, server: message.guild.name,
moderator: message.author.tag, moderator: message.author.tag,
reason reason
})); })
});
caseInfo.type = "warn"; caseInfo.type = "warn";
embed.setAuthor({ embed.setAuthor({
name: message.translate("moderation/warn:CASE", { name: message.translate("moderation/warn:CASE", {

4
commands/Owner/eval.js
View file

@ -26,14 +26,14 @@ class Eval extends Command {
depth: 0 depth: 0
}); });
if (output.includes(this.client.token)) output = output.replace(this.client.token, "T0K3N"); if (output.includes(this.client.token)) output = output.replace(this.client.token, "T0K3N");
message.channel.send({ message.reply({
content: "```js\n" + output + "```" content: "```js\n" + output + "```"
}); });
}).catch((err) => { }).catch((err) => {
console.error(err); console.error(err);
err = err.toString(); err = err.toString();
if (err.includes(this.client.token)) err = err.replace(this.client.token, "T0K3N"); if (err.includes(this.client.token)) err = err.replace(this.client.token, "T0K3N");
message.channel.send({ message.reply({
content: "```js\n" + err + "```" content: "```js\n" + err + "```"
}); });
}); });