diff --git a/.gitignore b/.gitignore index 0ca06765..7e73524e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,6 @@ # Node package-lock.json node_modules -yarn.lock -# Backups -/.backup +# SQlite +/json.sqlite diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 0db19757..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "dashboard/dashboard-core"] - path = dashboard/dashboard-core - url = https://github.com/JonnyBro/dashboard-core diff --git a/README.md b/README.md index 180221bc..0184dae7 100644 --- a/README.md +++ b/README.md @@ -28,15 +28,14 @@ JaBa имеет множество функций, вот **8 основных * 👑 **Команды владельца**: `eval`, `getinvite`, `servers-list` и ещё **2** команды! [Список изменений](/dashboard/docs/updates.md)
-[Полный список команд](http://jababot.duckdns.org:8080/docs) +[Полный список команд](http://jababot.duckdns.org:8080/commands) ### *Относительно* мощная панель управления -У JaBa есть своя панель управления с доступом к настройке параметров сервера и просмотру таблицы лидеров! Панель работает на Express и EJS! +У JaBa есть своя панель управления с доступом к настройке параметров сервера! -Вы можете **настраивать параметры** каждого сервера где есть JaBa (вы должны иметь права администратора), **просматривать таблицу лидеров**, **управлять своим профилем**! > Код панели находится в папке dashboard! ## Установка diff --git a/commands/Music/play.js b/commands/Music/play.js index 118970ce..357cf92d 100644 --- a/commands/Music/play.js +++ b/commands/Music/play.js @@ -70,7 +70,8 @@ class Play extends BaseCommand { leaveOnEnd: false, leaveOnStop: true, skipOnNoStream: true, - bufferingTimeout: 1000, + maxSize: 500, + maxHistorySize: 100, }); } diff --git a/commands/Owner/reload.js b/commands/Owner/reload.js index 17aaa996..a60310a1 100644 --- a/commands/Owner/reload.js +++ b/commands/Owner/reload.js @@ -1,7 +1,7 @@ const { SlashCommandBuilder } = require("discord.js"); const BaseCommand = require("../../base/BaseCommand"), - i18next = require("i18next"), - autoUpdateDocs = require("../../helpers/autoUpdateDocs"); + i18next = require("i18next"); + // autoUpdateDocs = require("../../helpers/autoUpdateDocs"); class Reload extends BaseCommand { /** @@ -53,7 +53,7 @@ class Reload extends BaseCommand { await client.loadCommand(`../commands/${cmd.category}`, cmd.command.name); i18next.reloadResources(["ru-RU", "uk-UA", "en-US"]); - autoUpdateDocs.update(client); + // autoUpdateDocs.update(client); interaction.success("owner/reload:SUCCESS", { command: cmd.command.name, diff --git a/dashboard/dashboard-core b/dashboard/dashboard-core deleted file mode 160000 index 1722b9f7..00000000 --- a/dashboard/dashboard-core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1722b9f763855c8ed5af526ee860f0192410209f diff --git a/dashboard/dashboard.js b/dashboard/dashboard.js index 7ded1023..68e6650b 100644 --- a/dashboard/dashboard.js +++ b/dashboard/dashboard.js @@ -1,7 +1,6 @@ const SoftUI = require("dbd-soft-ui"), DBD = require("discord-dashboard"), - os = require("os"), - fs = require("fs").promises; + os = require("os"); /** * @@ -28,7 +27,7 @@ module.exports.load = async client => { return { category: c, categoryId: c.toLowerCase(), - subTitle: "bottom text", + subTitle: "", hideAlias: true, hideDescription: false, hideSidebarItem: c === "Owner" || c === "IAT" || c === "SunCountry" ? true : false, @@ -40,7 +39,7 @@ module.exports.load = async client => { DBD.Dashboard = DBD.UpdatedClass(); const Dashboard = new DBD.Dashboard({ - port: 80, + port: client.config.dashboard.port, client: { id: client.config.user, secret: client.config.dashboard.secret, @@ -56,6 +55,7 @@ module.exports.load = async client => { clientId: client.config.user, scopes: ["bot", "applications.commands"], permissions: "8", + redirectUri: client.config.dashboard.domain, }, supportServer: { slash: "/support", @@ -84,6 +84,7 @@ module.exports.load = async client => { }, useTheme404: true, useThemeMaintenance: true, + useUnderMaintenance: false, underMaintenanceAccessKey: client.config.dashboard.maintanceKey, underMaintenanceAccessPage: "/get-access", underMaintenance: { @@ -195,9 +196,9 @@ module.exports.load = async client => { }, commands: categories, locales: { - enUS: JSON.parse(await fs.readFile("languages/en-US/dashboard.json", { encoding: "utf-8" })), - ruRU: JSON.parse(await fs.readFile("languages/ru-RU/dashboard.json", { encoding: "utf-8" })), - ukUA: JSON.parse(await fs.readFile("languages/uk-UA/dashboard.json", { encoding: "utf-8" })), + enUS: require("../languages/en-US/dashboard.json"), + ruRU: require("../languages/ru-RU/dashboard.json"), + ukUA: require("../languages/uk-UA/dashboard.json"), }, }), settings: [{ diff --git a/package.json b/package.json index 0187e00b..e0a65cfe 100644 --- a/package.json +++ b/package.json @@ -12,32 +12,25 @@ "author": "Jonny_Bro#4226", "license": "ISC", "dependencies": { - "@discord-player/extractor": "^4.2.2", + "@discord-player/extractor": "^4.3.1", "@discordjs/opus": "^0.9.0", "@discordjs/voice": "^0.16.0", - "btoa": "^1.2.1", - "canvacord": "^5.1.0", "canvas": "^2.10.2", "chalk": "^4.1.2", - "cors": "^2.8.5", "cron": "^2.1.0", "dbd-soft-ui": "^1.6.48-beta.1", "discord-dashboard": "^2.3.61", "discord-giveaways": "^6.0.1", - "discord-player": "^6.2.1", + "discord-player": "^6.5.0", "discord.js": "^14.11.0", - "ejs": "^3.1.3", - "express": "^4.17.1", - "express-session": "^1.17.0", "gamedig": "^4.0.2", "i18next": "^21.9.1", "i18next-fs-backend": "^1.1.5", - "markdown-table": "^2.0.0", "md5": "^2.2.1", "moment": "^2.26.0", "mongoose": "^5.13.15", "ms": "^2.1.3", - "ytdl-core": "npm:@distube/ytdl-core@^4.11.10" + "play-dl": "^1.9.6" }, "devDependencies": { "eslint": "^8.23.0"