jonny_bro/JaBa
1
0
Fork 0
mirror of https://github.com/JonnyBro/JaBa.git synced 2024-12-29 23:03:02 +05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: jonny_bro:d1a6ed597c429917671ef719c1ee8909a5eee43b
Branches Tags
jonny_bro:main
jonny_bro:es-modules
jonny_bro:v4
...
compare: jonny_bro:8b677f9ec45074175882a41539593368414f2a7a
Branches Tags
jonny_bro:es-modules
jonny_bro:main
jonny_bro:v4

2 commits
d1a6ed597c ... 8b677f9ec4

Author SHA1 Message Date
Jonny_Bro (Nikita)
8b677f9ec4
v4.6.1 2024-06-23 18:01:23 +05:00
Jonny_Bro (Nikita)
0e38d2086c
Fix welcome/goodbye saving 
Remove images (fonts are broken)
 2024-06-23 18:00:59 +05:00
6 changed files with 50 additions and 38 deletions
Show stats Expand all files Collapse all files

22
commands/Administration/goodbye.js
View file

@ -61,16 +61,16 @@ class Goodbye extends BaseCommand {
uk: client.translate("administration/goodbye:MESSAGE", null, "uk-UA"),
ru: client.translate("administration/goodbye:MESSAGE", null, "ru-RU"),
}),
)
.addBooleanOption(option =>
option
.setName("image")
.setDescription(client.translate("administration/goodbye:IMAGE"))
.setDescriptionLocalizations({
uk: client.translate("administration/goodbye:IMAGE", null, "uk-UA"),
ru: client.translate("administration/goodbye:IMAGE", null, "ru-RU"),
}),
),
// .addBooleanOption(option =>
// option
// .setName("image")
// .setDescription(client.translate("administration/goodbye:IMAGE"))
// .setDescriptionLocalizations({
// uk: client.translate("administration/goodbye:IMAGE", null, "uk-UA"),
// ru: client.translate("administration/goodbye:IMAGE", null, "ru-RU"),
// }),
// ),
),
dirname: __dirname,
ownerOnly: false,
@ -103,13 +103,14 @@ class Goodbye extends BaseCommand {
withImage: null,
};
await guildData.markModified("plugins.goodbye");
await guildData.save();
interaction.success("administration/goodbye:DISABLED", null, { edit: true });
} else {
const channel = interaction.options.getChannel("channel") || interaction.channel;
const message = interaction.options.getString("message") || interaction.translate("administration/goodbye:DEFAULT_MESSAGE");
const image = interaction.options.getBoolean("image") || false;
const image = false; // interaction.options.getBoolean("image") || false;
guildData.plugins.goodbye = {
enabled: true,
@ -118,6 +119,7 @@ class Goodbye extends BaseCommand {
withImage: image,
};
await guildData.markModified("plugins.goodbye");
await guildData.save();
interaction.success("administration/goodbye:ENABLED", {

22
commands/Administration/welcome.js
View file

@ -61,16 +61,16 @@ class Welcome extends BaseCommand {
uk: client.translate("administration/goodbye:MESSAGE", null, "uk-UA"),
ru: client.translate("administration/goodbye:MESSAGE", null, "ru-RU"),
}),
)
.addBooleanOption(option =>
option
.setName("image")
.setDescription(client.translate("administration/goodbye:IMAGE"))
.setDescriptionLocalizations({
uk: client.translate("administration/goodbye:IMAGE", null, "uk-UA"),
ru: client.translate("administration/goodbye:IMAGE", null, "ru-RU"),
}),
),
// .addBooleanOption(option =>
// option
// .setName("image")
// .setDescription(client.translate("administration/goodbye:IMAGE"))
// .setDescriptionLocalizations({
// uk: client.translate("administration/goodbye:IMAGE", null, "uk-UA"),
// ru: client.translate("administration/goodbye:IMAGE", null, "ru-RU"),
// }),
// ),
),
dirname: __dirname,
ownerOnly: false,
@ -103,13 +103,14 @@ class Welcome extends BaseCommand {
withImage: null,
};
await guildData.markModified("plugins.welcome");
await guildData.save();
interaction.success("administration/welcome:DISABLED", null);
} else {
const channel = interaction.options.getChannel("channel") || interaction.channel;
const message = interaction.options.getString("message") || interaction.translate("administration/welcome:DEFAULT_MESSAGE");
const image = interaction.options.getBoolean("image") || false;
const image = false; // interaction.options.getBoolean("image") || false;
guildData.plugins.welcome = {
enabled: true,
@ -118,6 +119,7 @@ class Welcome extends BaseCommand {
withImage: image,
};
await guildData.markModified("plugins.welcome");
await guildData.save();
interaction.success("administration/welcome:ENABLED", {

16
events/Guild/guildMemberAdd.js
View file

@ -1,7 +1,9 @@
const Canvas = require("@napi-rs/canvas"),
BaseEvent = require("../../base/BaseEvent"),
{ AttachmentBuilder } = require("discord.js"),
{ applyText } = require("../../helpers/functions");
// const Canvas = require("@napi-rs/canvas"),
// BaseEvent = require("../../base/BaseEvent"),
// { AttachmentBuilder } = require("discord.js"),
// { applyText } = require("../../helpers/functions");
const BaseEvent = require("../../base/BaseEvent");
class GuildMemberAdd extends BaseEvent {
constructor() {
@ -34,6 +36,7 @@ class GuildMemberAdd extends BaseEvent {
.replace(/{server}/g, member.guild.name)
.replace(/{membercount}/g, member.guild.memberCount);
/*
if (guildData.plugins.welcome.withImage) {
const canvas = Canvas.createCanvas(1024, 450),
ctx = canvas.getContext("2d");
@ -127,8 +130,9 @@ class GuildMemberAdd extends BaseEvent {
content: message,
files: [attachment],
});
} else
channel.send({ content: message });
} else */
channel.send({ content: message });
}
}
}

16
events/Guild/guildMemberRemove.js
View file

@ -1,7 +1,9 @@
const Canvas = require("@napi-rs/canvas"),
BaseEvent = require("../../base/BaseEvent"),
{ AttachmentBuilder } = require("discord.js"),
{ applyText } = require("../../helpers/functions");
// const Canvas = require("@napi-rs/canvas"),
// BaseEvent = require("../../base/BaseEvent"),
// { AttachmentBuilder } = require("discord.js"),
// { applyText } = require("../../helpers/functions");
const BaseEvent = require("../../base/BaseEvent");
class GuildMemberRemove extends BaseEvent {
constructor() {
@ -32,6 +34,7 @@ class GuildMemberRemove extends BaseEvent {
.replace(/{server}/g, member.guild.name)
.replace(/{membercount}/g, member.guild.memberCount);
/*
if (guildData.plugins.goodbye.withImage) {
const canvas = Canvas.createCanvas(1024, 450),
ctx = canvas.getContext("2d");
@ -130,8 +133,9 @@ class GuildMemberRemove extends BaseEvent {
content: message,
files: [attachment],
});
} else
channel.send({ content: message });
} else */
channel.send({ content: message });
}
}
}

10
helpers/functions.js
View file

@ -1,9 +1,9 @@
const moment = require("moment"),
{ GlobalFonts } = require("@napi-rs/canvas"),
{ resolve } = require("path");
const moment = require("moment");
// const { GlobalFonts } = require("@napi-rs/canvas"),
// const { resolve } = require("path");
GlobalFonts.registerFromPath(resolve("./assets/fonts/RubikMonoOne-Regular.ttf"), "RubikMonoOne");
GlobalFonts.registerFromPath(resolve("./assets/fonts/KeepCalm-Medium.ttf"), "KeepCalm");
// GlobalFonts.registerFromPath(resolve("./assets/fonts/RubikMonoOne-Regular.ttf"), "RubikMonoOne");
// GlobalFonts.registerFromPath(resolve("./assets/fonts/KeepCalm-Medium.ttf"), "KeepCalm");
module.exports = {
/**

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "jaba",
"version": "4.6.0",
"version": "4.6.1",
"description": "My Discord Bot",
"main": "index.js",
"scripts": {