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

v3.2.7

Browse source 
Информация о профиле на сайте
This commit is contained in:
JonnyBro 2022-01-12 20:31:47 +05:00
parent 93a74149c4
commit fbd42b6fa5
12 changed files with 86 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/General/setafk.js
View file

@ -35,7 +35,7 @@ class Setafk extends Command {
const m = await message.success("general/setafk:SUCCESS", { const m = await message.success("general/setafk:SUCCESS", {
reason, reason,
prefix: message.guild ? data.guild.prefix : "$" prefix: message.guild ? data.guild.prefix : ""
}); });
setTimeout(() => { setTimeout(() => {

1
dashboard/app.js
View file

@ -43,6 +43,7 @@ module.exports.load = async(client) => {
if (req.user) { if (req.user) {
req.translate = req.client.translations.get(req.locale); req.translate = req.client.translations.get(req.locale);
req.printDate = (date) => req.client.printDate(date, null, req.locale); req.printDate = (date) => req.client.printDate(date, null, req.locale);
req.convertTime = (time) => req.client.convertTime(time, "to", true, req.locale);
}; };
next(); next();
}) })

3
dashboard/routes/guild-manager.js
View file

@ -16,12 +16,15 @@ router.get("/:serverID", CheckAuth, async(req, res) => {
// Fetch guild informations // Fetch guild informations
const guildInfos = await utils.fetchGuild(guild.id, req.client, req.user.guilds); const guildInfos = await utils.fetchGuild(guild.id, req.client, req.user.guilds);
const memberData = await req.client.findOrCreateMember({ id: req.userInfos.id, guildID: guild.id });
res.render("manager/guild", { res.render("manager/guild", {
guild: guildInfos, guild: guildInfos,
user: req.userInfos, user: req.userInfos,
memberData: memberData,
translate: req.translate, translate: req.translate,
bot: req.client, bot: req.client,
convertTime: req.convertTime,
currentURL: `${req.client.config.dashboard.baseURL}/${req.originalUrl}` currentURL: `${req.client.config.dashboard.baseURL}/${req.originalUrl}`
}); });
}); });

4
dashboard/routes/settings.js
View file

@ -4,7 +4,7 @@ const express = require("express"),
// Gets profile page // Gets profile page
router.get("/", CheckAuth, async function(req, res) { router.get("/", CheckAuth, async function(req, res) {
res.render("settings", { res.render("profile", {
user: req.userInfos, user: req.userInfos,
translate: req.translate, translate: req.translate,
printDate: req.printDate, printDate: req.printDate,
@ -25,7 +25,7 @@ router.post("/", CheckAuth, async function(req, res) {
}; };
await user.save(); await user.save();
res.redirect(303, "/settings"); res.redirect(303, "/profile");
}); });
module.exports = router; module.exports = router;

11
dashboard/views/docs.ejs
View file

@ -193,13 +193,20 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<pre class="brush: html"> <pre class="brush: html">
-----------------------------------------------------------------------------------------
JaBa v3.2.7
-----------------------------------------------------------------------------------------
Добавлено
- Некоторая информация о вашем профиле на сайте, на страницах серверов и в настройках.
(Скоро там будет больше всякой информации).
----------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------
JaBa v3.2.6 JaBa v3.2.6
----------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------
Исправления Исправления
- Команда goodbye снова работает. - Команда goodbye снова работает.
Изменено Изменения
- Команда setafk и ответ бота автоматически удаляются через 10 секунд. - Команда setafk и ответ бота автоматически удаляются через 10 секунд.
- Новые карточки при входе и выходе пользователей - Новые карточки при входе и выходе пользователей
(Я не дизайнер, не бейте :( ). (Я не дизайнер, не бейте :( ).
@ -208,7 +215,7 @@
----------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------
JaBa v3.2.5 JaBa v3.2.5
----------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------
Изменено Изменения
- Переписана команда loop. - Переписана команда loop.
Теперь нужен аргумент song или queue для включения соответствующего режима повтора. Теперь нужен аргумент song или queue для включения соответствующего режима повтора.
Если не указать агрумент, то повтор отключится. Если не указать агрумент, то повтор отключится.

4
dashboard/views/includes/sidebar.ejs
View file

@ -40,11 +40,11 @@
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</span> </span>
</a> </a>
<% if(user.displayedGuilds) { %> <% if (user.displayedGuilds) { %>
<ul class="treeview-menu"> <ul class="treeview-menu">
<% user.displayedGuilds.forEach((guild) => { %> <% user.displayedGuilds.forEach((guild) => { %>
<li><a href="<%= guild.settingsUrl %>"><i <li><a href="<%= guild.settingsUrl %>"><i
class="fa fa-circle-o text-<%= guild.owner ? "blue" : "grey" %>"></i> class="fa fa-circle-o text-<%= guild.owner ? "green" : "grey" %>"></i>
<%= guild.name %></a></li> <%= guild.name %></a></li>
<% }); %> <% }); %>
</ul> </ul>

61
dashboard/views/manager/guild.ejs
View file

@ -29,8 +29,9 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="box box-widget widget-user"> <div class="box box-widget widget-user">
<div class="widget-user-header bg-aqua-active"> <div class="widget-user-header bg-red">
<h3 class="widget-user-username"><%= guild.name %></h3> <h3 class="widget-user-username"><%= guild.name %></h3>
<i> <%= guild.id %> </i>
</div> </div>
<div class="widget-user-image"> <div class="widget-user-image">
<img class="img-circle" src="<%= guild.iconURL %>" alt="Server icon"> <img class="img-circle" src="<%= guild.iconURL %>" alt="Server icon">
@ -50,6 +51,38 @@
</div> </div>
<!-- /.box-footer --> <!-- /.box-footer -->
</div> </div>
<div class="info-box">
<span class="info-box-icon bg-green"><i class="fa fa-area-chart"></i></span>
<div class="info-box-content">
<span class="info-box-text"><%= translate("common:LEVEL") %></span>
<span class="info-box-number"><%= guild.members.find(u => u.id === user.id).level %></span>
</div>
<!-- /.info-box-content -->
</div>
<div class="info-box">
<span class="info-box-icon bg-green"><i class="fa fa-money"></i></span>
<div class="info-box-content">
<span class="info-box-text"><%= translate("common:CREDITS") %> / <%= translate("economy/transactions:BANK") %></span>
<span class="info-box-number"><%= guild.members.find(u => u.id === user.id).money %> / <%= guild.members.find(u => u.id === user.id).bankSold %></span>
</div>
<!-- /.info-box-content -->
</div>
<!-- /.info-box -->
<div class="info-box">
<span class="info-box-icon bg-green"><i class="fa fa-refresh"></i></span>
<div class="info-box-content">
<span class="info-box-text"><%= translate("dashboard:COOLDOWNS") %></span>
<% for (const c in memberData.cooldowns) { %>
<% if (c !== "rob") { %>
<span class="info-box-number"><%= translate("dashboard:" + c.toUpperCase()) %>: <%= memberData.cooldowns[c] !== 0 ? convertTime(memberData.cooldowns[c]) : translate("dashboard:CAN_USE") %></span>
<% } else { %>
<span class="info-box-number"><%= translate("dashboard:" + c.toUpperCase()) %>: <%= memberData.cooldowns[c] !== 0 ? convertTime(memberData.cooldowns[c]) : translate("dashboard:NO_DEFENCE") %></span>
<% }; %>
<% }; %>
</div>
<!-- /.info-box-content -->
</div>
<!-- /.info-box -->
<!-- BASIC CONFIGURATION --> <!-- BASIC CONFIGURATION -->
<div class="box box-warning"> <div class="box box-warning">
<div class="box-header with-border"> <div class="box-header with-border">
@ -69,7 +102,7 @@
<label><%= translate("common:LANGUAGE") %></label> <label><%= translate("common:LANGUAGE") %></label>
<select class="form-control" name="language"> <select class="form-control" name="language">
<% bot.languages.forEach((language) => { %> <% bot.languages.forEach((language) => { %>
<% if(guild.language === language.name) { %> <% if (guild.language === language.name) { %>
<option selected="selected"><%= language.aliases[0] %></option> <option selected="selected"><%= language.aliases[0] %></option>
<% } else { %> <% } else { %>
<option><%= language.aliases[0] %></options> <option><%= language.aliases[0] %></options>
@ -98,7 +131,7 @@
<div class="form-group"> <div class="form-group">
<label><%= translate("common:SUGGESTIONS") %></label> <label><%= translate("common:SUGGESTIONS") %></label>
<select class="form-control" name="suggestions"> <select class="form-control" name="suggestions">
<% if(guild.plugins.suggestions && bot.channels.cache.has(guild.plugins.suggestions)) { %> <% if (guild.plugins.suggestions && bot.channels.cache.has(guild.plugins.suggestions)) { %>
<option selected="selected"> <option selected="selected">
#<%= bot.channels.cache.get(guild.plugins.suggestions).name %></option> #<%= bot.channels.cache.get(guild.plugins.suggestions).name %></option>
<% guild.channels.cache.filter((ch) => ch.type === "GUILD_TEXT" && ch.id !== guild.plugins.suggestions).forEach((ch) => { %> <% guild.channels.cache.filter((ch) => ch.type === "GUILD_TEXT" && ch.id !== guild.plugins.suggestions).forEach((ch) => { %>
@ -116,7 +149,7 @@
<div class="form-group"> <div class="form-group">
<label><%= translate("common:REPORTS") %></label> <label><%= translate("common:REPORTS") %></label>
<select class="form-control" name="reports"> <select class="form-control" name="reports">
<% if(guild.plugins.reports && bot.channels.cache.has(guild.plugins.reports)) { %> <% if (guild.plugins.reports && bot.channels.cache.has(guild.plugins.reports)) { %>
<option selected="selected"> <option selected="selected">
#<%= bot.channels.cache.get(guild.plugins.reports).name %></option> #<%= bot.channels.cache.get(guild.plugins.reports).name %></option>
<% guild.channels.cache.filter((ch) => ch.type === "GUILD_TEXT" && ch.id !== guild.plugins.reports).forEach((ch) => { %> <% guild.channels.cache.filter((ch) => ch.type === "GUILD_TEXT" && ch.id !== guild.plugins.reports).forEach((ch) => { %>
@ -134,7 +167,7 @@
<div class="form-group"> <div class="form-group">
<label><%= translate("common:MODLOGS") %></label> <label><%= translate("common:MODLOGS") %></label>
<select class="form-control" name="modlogs"> <select class="form-control" name="modlogs">
<% if(guild.plugins.modlogs && bot.channels.cache.has(guild.plugins.modlogs)) { %> <% if (guild.plugins.modlogs && bot.channels.cache.has(guild.plugins.modlogs)) { %>
<option selected="selected"> <option selected="selected">
#<%= bot.channels.cache.get(guild.plugins.modlogs).name %></option> #<%= bot.channels.cache.get(guild.plugins.modlogs).name %></option>
<% guild.channels.cache.filter((ch) => ch.type === "GUILD_TEXT" && ch.id !== guild.plugins.modlogs).forEach((ch) => { %> <% guild.channels.cache.filter((ch) => ch.type === "GUILD_TEXT" && ch.id !== guild.plugins.modlogs).forEach((ch) => { %>
@ -152,7 +185,7 @@
<div class="form-group"> <div class="form-group">
<label><%= translate("common:BIRTHDAYS") %></label> <label><%= translate("common:BIRTHDAYS") %></label>
<select class="form-control" name="birthdays"> <select class="form-control" name="birthdays">
<% if(guild.plugins.birthdays && bot.channels.cache.has(guild.plugins.birthdays)) { %> <% if (guild.plugins.birthdays && bot.channels.cache.has(guild.plugins.birthdays)) { %>
<option selected="selected"> <option selected="selected">
#<%= bot.channels.cache.get(guild.plugins.birthdays).name %></option> #<%= bot.channels.cache.get(guild.plugins.birthdays).name %></option>
<% guild.channels.cache.filter((ch) => ch.type === "GUILD_TEXT" && ch.id !== guild.plugins.birthdays).forEach((ch) => { %> <% guild.channels.cache.filter((ch) => ch.type === "GUILD_TEXT" && ch.id !== guild.plugins.birthdays).forEach((ch) => { %>
@ -196,7 +229,7 @@
<div class="form-group"> <div class="form-group">
<label><%= translate("common:CHANNEL") %></label> <label><%= translate("common:CHANNEL") %></label>
<select class="form-control" name="channel"> <select class="form-control" name="channel">
<% if(guild.plugins.welcome.enabled && bot.channels.cache.has(guild.plugins.welcome.channel)) { %> <% if (guild.plugins.welcome.enabled && bot.channels.cache.has(guild.plugins.welcome.channel)) { %>
<option selected="selected"> <option selected="selected">
#<%= bot.channels.cache.get(guild.plugins.welcome.channel).name %> #<%= bot.channels.cache.get(guild.plugins.welcome.channel).name %>
</option> </option>
@ -216,7 +249,7 @@
<div class="form-group"> <div class="form-group">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<% if(guild.plugins.welcome.withImage || !guild.plugins.welcome.enabled) { %> <% if (guild.plugins.welcome.withImage || !guild.plugins.welcome.enabled) { %>
<input type="checkbox" name="withImage" <input type="checkbox" name="withImage"
checked><%= translate("dashboard:WELCOME_IMG") %> checked><%= translate("dashboard:WELCOME_IMG") %>
<% } else { %> <% } else { %>
@ -229,7 +262,7 @@
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer"> <div class="box-footer">
<% if(guild.plugins.welcome.enabled) { %> <% if (guild.plugins.welcome.enabled) { %>
<button type="submit" name="welcomeDisable" <button type="submit" name="welcomeDisable"
class="btn btn-danger"><%= translate("dashboard:DISABLE_MESSAGES") %></button> class="btn btn-danger"><%= translate("dashboard:DISABLE_MESSAGES") %></button>
<button type="submit" name="welcomeUpdate" <button type="submit" name="welcomeUpdate"
@ -259,7 +292,7 @@
<div class="form-group"> <div class="form-group">
<label><%= translate("common:CHANNEL") %></label> <label><%= translate("common:CHANNEL") %></label>
<select class="form-control" name="channel"> <select class="form-control" name="channel">
<% if(guild.plugins.goodbye.enabled && bot.channels.cache.has(guild.plugins.goodbye.channel)) { %> <% if (guild.plugins.goodbye.enabled && bot.channels.cache.has(guild.plugins.goodbye.channel)) { %>
<option selected="selected"> <option selected="selected">
#<%= bot.channels.cache.get(guild.plugins.goodbye.channel).name %> #<%= bot.channels.cache.get(guild.plugins.goodbye.channel).name %>
</option> </option>
@ -279,7 +312,7 @@
<div class="form-group"> <div class="form-group">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<% if(guild.plugins.goodbye.withImage || !guild.plugins.goodbye.enabled) { %> <% if (guild.plugins.goodbye.withImage || !guild.plugins.goodbye.enabled) { %>
<input type="checkbox" name="withImage" <input type="checkbox" name="withImage"
checked><%= translate("dashboard:GOODBYE_IMG") %> checked><%= translate("dashboard:GOODBYE_IMG") %>
<% } else { %> <% } else { %>
@ -292,7 +325,7 @@
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer"> <div class="box-footer">
<% if(guild.plugins.goodbye.enabled) { %> <% if (guild.plugins.goodbye.enabled) { %>
<button type="submit" name="goodbyeDisable" <button type="submit" name="goodbyeDisable"
class="btn btn-danger"><%= translate("dashboard:DISABLE_MESSAGES") %></button> class="btn btn-danger"><%= translate("dashboard:DISABLE_MESSAGES") %></button>
<button type="submit" name="goodbyeUpdate" <button type="submit" name="goodbyeUpdate"
@ -316,7 +349,7 @@
<div class="form-group"> <div class="form-group">
<label><%= translate("common:ROLE") %></label> <label><%= translate("common:ROLE") %></label>
<select class="form-control" name="role"> <select class="form-control" name="role">
<% if(guild.plugins.autorole.enabled && guild.roles.cache.has(guild.plugins.autorole.role)) { %> <% if (guild.plugins.autorole.enabled && guild.roles.cache.has(guild.plugins.autorole.role)) { %>
<option selected="selected"> <option selected="selected">
@<%= guild.roles.cache.get(guild.plugins.autorole.role).name %></option> @<%= guild.roles.cache.get(guild.plugins.autorole.role).name %></option>
<% guild.roles.cache.filter((r) => r.id !== guild.plugins.autorole.role && r.name !== "@everyone").forEach((r) => { %> <% guild.roles.cache.filter((r) => r.id !== guild.plugins.autorole.role && r.name !== "@everyone").forEach((r) => { %>
@ -334,7 +367,7 @@
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer"> <div class="box-footer">
<% if(guild.plugins.autorole.enabled) { %> <% if (guild.plugins.autorole.enabled) { %>
<button type="submit" name="autoroleDisable" <button type="submit" name="autoroleDisable"
class="btn btn-danger"><%= translate("dashboard:DISABLE_AUTOROLE") %></button> class="btn btn-danger"><%= translate("dashboard:DISABLE_AUTOROLE") %></button>
<button type="submit" name="autoroleUpdate" <button type="submit" name="autoroleUpdate"

2
dashboard/views/selector.ejs
View file

@ -23,7 +23,7 @@
<section class="content"> <section class="content">
<div class="row"> <div class="row">
<% if(user.displayedGuilds) { user.displayedGuilds.forEach(function(guild) { %> <% if (user.displayedGuilds) { user.displayedGuilds.forEach(function(guild) { %>
<!-- Displays 4 servers by line --> <!-- Displays 4 servers by line -->
<div class="col-md-3"> <div class="col-md-3">
<div class="box box-solid"> <div class="box box-solid">

9
dashboard/views/settings.ejs
View file

@ -30,6 +30,15 @@
<!-- Info boxes --> <!-- Info boxes -->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="info-box">
<span class="info-box-icon bg-green"><i class="fa fa-star-o"></i></span>
<div class="info-box-content">
<span class="info-box-text"><%= translate("dashboard:REPUTATION") %></span>
<span class="info-box-number"><%= user.rep %></span>
</div>
<!-- /.info-box-content -->
</div>
<!-- /.info-box -->
<!-- general form elements --> <!-- general form elements -->
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">

2
helpers/autoUpdateDocs.js
View file

@ -31,7 +31,7 @@ module.exports = {
else return 1; else return 1;
}).forEach((cmd) => { }).forEach((cmd) => {
arrCat.push([ arrCat.push([
`**${cmd.help.name}** ${cmd.help.aliases.length ? `**(${cmd.help.aliases.join(", ")})**` : ""}`, `**${cmd.help.name}** ${cmd.help.aliases.length ? `**(${cmd.help.aliases.join(", ")})**` : ""} ${cmd.conf.guildOnly ? "*Только на сервере*" : ""}`,
client.translate(`${cmd.help.category.toLowerCase()}/${cmd.help.name}:DESCRIPTION`), client.translate(`${cmd.help.category.toLowerCase()}/${cmd.help.name}:DESCRIPTION`),
client.translate(`${cmd.help.category.toLowerCase()}/${cmd.help.name}:USAGE`), client.translate(`${cmd.help.category.toLowerCase()}/${cmd.help.name}:USAGE`),
`${Math.ceil(cmd.conf.cooldown / 1000)} ${client.getNoun(Math.ceil(cmd.conf.cooldown / 1000), "секунда", "секунды", "секунд")}` `${Math.ceil(cmd.conf.cooldown / 1000)} ${client.getNoun(Math.ceil(cmd.conf.cooldown / 1000), "секунда", "секунды", "секунд")}`

10
languages/ru-RU/dashboard.json
View file

@ -21,5 +21,13 @@
"ENABLE_AUTOROLE": "Включить", "ENABLE_AUTOROLE": "Включить",
"DISABLE_AUTOROLE": "Выключить", "DISABLE_AUTOROLE": "Выключить",
"SELECTOR": "Выбор серверов", "SELECTOR": "Выбор серверов",
"MANAGE": "Управление" "MANAGE": "Управление",
"REPUTATION": "Очки репутации",
"COOLDOWNS": "Откаты",
"REP": "Команда rep",
"WORK": "Зарплата в work",
"ROB": "Защита от rob",
"CAN_USE": "Можно использовать",
"NO_DEFENCE": "Вы беспомощны"
} }

2
package.json
View file

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