From 9d3001eaba9587e914b9571ce1f4779faf021f82 Mon Sep 17 00:00:00 2001 From: JonnyBro Date: Fri, 26 Aug 2022 10:30:07 +0500 Subject: [PATCH] =?UTF-8?q?Blague=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=92=20=D1=81=D0=BA=D0=BE?= =?UTF-8?q?=D1=80=D0=BE=D0=BC=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D1=83?= =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D1=8E=20=D0=B8=20Amethyste,=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BE=D0=BD=20=D1=82=D0=BE=D0=B6=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5?= =?UTF-8?q?=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/JaBa.js | 4 ++-- config.sample.js | 9 +-------- languages/en-US/fun/fml.json | 6 ------ languages/en-US/fun/joke.json | 6 ------ scripts/verify-config.js | 15 --------------- 5 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 languages/en-US/fun/fml.json delete mode 100644 languages/en-US/fun/joke.json diff --git a/base/JaBa.js b/base/JaBa.js index 10c3e154..194f29b8 100644 --- a/base/JaBa.js +++ b/base/JaBa.js @@ -7,7 +7,7 @@ const { Client, Collection, SlashCommandBuilder, ContextMenuCommandBuilder } = r const BaseEvent = require("./BaseEvent.js"), BaseCommand = require("./BaseCommand.js"), - AmeClient = require("amethyste-api"), + // AmeClient = require("amethyste-api"), path = require("path"), fs = require("fs").promises, mongoose = require("mongoose"), @@ -47,7 +47,7 @@ class JaBa extends Client { this.databaseCache.usersReminds = new Collection(); // members with active reminds this.databaseCache.mutedUsers = new Collection(); // members who are currently muted - if (this.config.apiKeys.amethyste) this.AmeAPI = new AmeClient(this.config.apiKeys.amethyste); + // if (this.config.apiKeys.amethyste) this.AmeAPI = new AmeClient(this.config.apiKeys.amethyste); this.discordTogether = new DiscordTogether(this); diff --git a/config.sample.js b/config.sample.js index 1913090e..1bd1cf9c 100644 --- a/config.sample.js +++ b/config.sample.js @@ -29,18 +29,11 @@ module.exports = { /* Bot's owner informations */ owner: { id: "XXXXXXXXXXX", // The ID of the bot's owner - name: "@XXXXXXXXXXX#1234" // And the name of the bot's owner + name: "XXXXXXXXXXX#1234" // And the name of the bot's owner }, /* The API keys that are required for certain commands */ apiKeys: { - // BLAGUE.XYZ: https://blague.xyz/ - blagueXYZ: "XXXXXXXXXXX", // AMETHYSTE: https://api.amethyste.moe amethyste: "XXXXXXXXXXX" - }, - /* The others utils links */ - others: { - github: "https://github.com/XXXXXXXXXXX", // Founder's github account - donate: "https://patreon.com/XXXXXXXXXXX" // Donate link } }; \ No newline at end of file diff --git a/languages/en-US/fun/fml.json b/languages/en-US/fun/fml.json deleted file mode 100644 index eeef2938..00000000 --- a/languages/en-US/fun/fml.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "DESCRIPTION": "Gets a random FML", - "USAGE": "fml", - "EXAMPLES": "fml", - "FOOTER": "blague.xyz | By Skiz#0001" -} \ No newline at end of file diff --git a/languages/en-US/fun/joke.json b/languages/en-US/fun/joke.json deleted file mode 100644 index 169f0eb5..00000000 --- a/languages/en-US/fun/joke.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "DESCRIPTION": "Gets a wonderful joke specially made for you!", - "USAGE": "joke", - "EXAMPLES": "joke", - "FOOTER": "blague.xyz | By Skiz#0001" -} \ No newline at end of file diff --git a/scripts/verify-config.js b/scripts/verify-config.js index ea518f50..644eff85 100644 --- a/scripts/verify-config.js +++ b/scripts/verify-config.js @@ -79,21 +79,6 @@ const checks = [ success("Valid Amethyste API key"); } } - if (!config.apiKeys.blagueXYZ) { - ignore("blague.xyz API is not configured, skipping check."); - } else { - const res = await fetch("https://blague.xyz/api/joke/random", { - headers: { - Authorization: config.apiKeys.blagueXYZ - } - }); - const result = await res.json(); - if (result.status === 401) { - error("Not valid blague.xyz key", "get your key here: https://blague.xyz/"); - } else { - success("Valid blague.xyz key"); - } - } resolve(); }); },