From dbf229e771bf9c503a8d0f8f4eda23b6da06fc83 Mon Sep 17 00:00:00 2001 From: Corwin Date: Sat, 14 Jan 2023 11:54:20 +0100 Subject: [PATCH 1/9] Update README.md --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6cd57fb..6738d2f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@

Discord-Bot

- Discord-bot is a Advanced Multipurpose bot containing more than 400+ Commands. It can do Moderation, Tickets, Radio, Games, Giveaways, Customisation, Economy, Leveling, Invites, Messages, Utilities, Suggestions, Server Stats etc. + Discord-bot is a updated version of DBot, a advanced Discord multipurpose botcontaining more than 400+ Commands.
It can do Moderation, Tickets, Radio, Games, Giveaways, Customisation, Economy, Leveling, Invites, Messages, Utilities, Suggestions, Server Stats etc.
Unfortunately the owners stopped at the peak and decided to put the source online of which I made an updated version.

Report Bug @@ -30,6 +30,15 @@ Request Feature

+ + + +### 》Notice +> You may not claim this as your own! The original source was created by [Dotwood Media](https://github.com/DotwoodMedia) and [Graphix Development](https://github.com/GraphixDevelopment). The source is modified and being updated by my(CorwinDev) + +> Discord-Bot is a Multipurpose Discord bot base in [Discord.js](https://github.com/Discordjs/discordjs) +If you liked this repository, feel free to leave a star ⭐ to motivate me! + ## 》Description @@ -84,11 +93,6 @@ To start your bot ```js node src/index.js ``` -### 》Notice -> You may not claim this as your own!! **Copyright to Graphix Development and CorwinDev** - -> Discord-Bot is a Multipurpose Discord bot base in [Discord.js](https://github.com/Discordjs/discordjs) -If you liked this repository, feel free to leave a star ⭐ to motivate me! ## 》Support Server [![DiscordBanner](https://invidget.switchblade.xyz/jVeC7cFX5T)](https://discord.gg/jVeC7cFX5T) @@ -106,7 +110,6 @@ npm run add-dev YOUR_ID 》[Sponsor](https://github.com/sponsors/CorwinDev) - [version-shield]: https://img.shields.io/github/package-json/v/CorwinDev/Discord-Bot?style=for-the-badge [version-url]: https://github.com/brblacky/WaveMusic [contributors-shield]: https://img.shields.io/github/contributors/CorwinDev/Discord-Bot.svg?style=for-the-badge From cf1ec85337305ac454ce0caedb5b89637456e699 Mon Sep 17 00:00:00 2001 From: Anugrah Bimantara <90950617+bimantaraz@users.noreply.github.com> Date: Mon, 16 Jan 2023 06:04:34 +0700 Subject: [PATCH 2/9] Fix typo --- src/commands/images/cat.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/images/cat.js b/src/commands/images/cat.js index 9155b0f..a948999 100644 --- a/src/commands/images/cat.js +++ b/src/commands/images/cat.js @@ -9,11 +9,11 @@ module.exports = async (client, interaction, args) => { .then((res) => res.json()).catch({}) .then(async (json) => { client.embed({ - title: `🐱・Random Car`, + title: `🐱・Random Cat`, image: json.link, type: 'editreply' }, interaction) }).catch({}) } - \ No newline at end of file + From 6fc4e18bec5810f0042c7d8e27e49901d6664010 Mon Sep 17 00:00:00 2001 From: Dotwood Media <55753961+DotwoodMedia@users.noreply.github.com> Date: Tue, 17 Jan 2023 14:38:55 +0100 Subject: [PATCH 3/9] Code made more compact --- src/commands/setup/logs.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/commands/setup/logs.js b/src/commands/setup/logs.js index 7e06f78..fdbbf42 100644 --- a/src/commands/setup/logs.js +++ b/src/commands/setup/logs.js @@ -7,18 +7,14 @@ const levelLogs = require("../../database/models/levelChannels"); module.exports = async (client, interaction, args) => { const choice = interaction.options.getString('setup'); const channel = interaction.options.getChannel('channel'); + + const choices = { + 'serverLogs' : logs, + 'levelLogs' : levelLogs, + 'boostLogs' : boostLogs + }; - if (choice == "serverLogs") { - client.createChannelSetup(logs, channel, interaction) - } - - if (choice == "levelLogs") { - client.createChannelSetup(levelLogs, channel, interaction) - } - - if (choice == "boostLogs") { - client.createChannelSetup(boostLogs, channel, interaction) - } + client.createChannelSetup(choices[choice], channel, interaction); } - \ No newline at end of file + From bb3e9cac3924343a024dc119747b59ebc9f3d065 Mon Sep 17 00:00:00 2001 From: Dotwood Media <55753961+DotwoodMedia@users.noreply.github.com> Date: Tue, 17 Jan 2023 14:41:13 +0100 Subject: [PATCH 4/9] Removed ' --- src/commands/setup/logs.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands/setup/logs.js b/src/commands/setup/logs.js index fdbbf42..205bdfa 100644 --- a/src/commands/setup/logs.js +++ b/src/commands/setup/logs.js @@ -9,9 +9,9 @@ module.exports = async (client, interaction, args) => { const channel = interaction.options.getChannel('channel'); const choices = { - 'serverLogs' : logs, - 'levelLogs' : levelLogs, - 'boostLogs' : boostLogs + serverLogs : logs, + levelLogs : levelLogs, + boostLogs : boostLogs }; client.createChannelSetup(choices[choice], channel, interaction); From 7ef3ebf1961e5f67e9706077e30865e1026315ed Mon Sep 17 00:00:00 2001 From: Dotwood Media <55753961+DotwoodMedia@users.noreply.github.com> Date: Tue, 17 Jan 2023 14:43:01 +0100 Subject: [PATCH 5/9] Code made more compact --- src/commands/setup/fun.js | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/commands/setup/fun.js b/src/commands/setup/fun.js index f009188..e1ca849 100644 --- a/src/commands/setup/fun.js +++ b/src/commands/setup/fun.js @@ -9,26 +9,16 @@ const StarBoard = require("../../database/models/starboardChannels"); module.exports = async (client, interaction, args) => { const choice = interaction.options.getString('setup'); const channel = interaction.options.getChannel('channel'); + + const choices = { + birthdays : Birthdays, + chatbot : Chatbot, + reviews : Review, + suggestions : Suggestion, + starboard : StarBoard + }; - if (choice == "birthdays") { - client.createChannelSetup(Birthdays, channel, interaction) - } - - if (choice == "chatbot") { - client.createChannelSetup(Chatbot, channel, interaction) - } - - if (choice == "reviews") { - client.createChannelSetup(Review, channel, interaction) - } - - if (choice == "suggestions") { - client.createChannelSetup(Suggestion, channel, interaction) - } - - if (choice == "starboard") { - client.createChannelSetup(StarBoard, channel, interaction) - } + client.createChannelSetup(choices[choice], channel, interaction); } - \ No newline at end of file + From 7c2b8eb27b8788eb22aa3df59e13bcf85a9f923d Mon Sep 17 00:00:00 2001 From: Dotwood Media <55753961+DotwoodMedia@users.noreply.github.com> Date: Tue, 17 Jan 2023 14:43:45 +0100 Subject: [PATCH 6/9] Code made more compact --- src/commands/setup/welcomechannels.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/commands/setup/welcomechannels.js b/src/commands/setup/welcomechannels.js index 356ec82..f27ca16 100644 --- a/src/commands/setup/welcomechannels.js +++ b/src/commands/setup/welcomechannels.js @@ -7,13 +7,12 @@ module.exports = async (client, interaction, args) => { const choice = interaction.options.getString('setup'); const channel = interaction.options.getChannel('channel'); - if (choice == "welcomechannel") { - client.createChannelSetup(welcomeChannel, channel, interaction) - } + const choices = { + welcomechannel : welcomeChannel, + leavechannel : leaveChannel + }; - if (choice == "leavechannel") { - client.createChannelSetup(leaveChannel, channel, interaction) - } + client.createChannelSetup(choices[choice], channel, interaction); } - \ No newline at end of file + From 2492f879602780023a3372d708d491c58442e7c5 Mon Sep 17 00:00:00 2001 From: Dotwood Media <55753961+DotwoodMedia@users.noreply.github.com> Date: Wed, 18 Jan 2023 13:46:21 +0100 Subject: [PATCH 7/9] Fixed typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6738d2f..cfd4ded 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@

Discord-Bot

- Discord-bot is a updated version of DBot, a advanced Discord multipurpose botcontaining more than 400+ Commands.
It can do Moderation, Tickets, Radio, Games, Giveaways, Customisation, Economy, Leveling, Invites, Messages, Utilities, Suggestions, Server Stats etc.
Unfortunately the owners stopped at the peak and decided to put the source online of which I made an updated version. + Discord-bot is a updated version of Dbot, a advanced Discord multipurpose botcontaining more than 400+ Commands.
It can do Moderation, Tickets, Radio, Games, Giveaways, Customisation, Economy, Leveling, Invites, Messages, Utilities, Suggestions, Server Stats etc.
Unfortunately the owners stopped at the peak and decided to put the source online of which I made an updated version.

Report Bug From 5b4d449d02b3251b9170370447f64041de463dce Mon Sep 17 00:00:00 2001 From: DairyWeb3638077 <86208278+DairyWeb3638077@users.noreply.github.com> Date: Wed, 18 Jan 2023 22:30:31 -0500 Subject: [PATCH 8/9] Added an example Hex code --- src/interactions/Command/embed.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/interactions/Command/embed.js b/src/interactions/Command/embed.js index 0559f8c..252c663 100644 --- a/src/interactions/Command/embed.js +++ b/src/interactions/Command/embed.js @@ -311,7 +311,7 @@ module.exports = { if (i.values == "color_embed") { interaction.channel - .send({ content: "Please enter a color" }) + .send({ content: "Please enter a color. e.g. #FF0000" }) .then((message) => { const filterMessage = (m) => m.author.id === interaction.user.id && !m.author.bot; From 3a6e8ef9265c84124d889ea69ccf055df979c9c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 07:23:47 +0000 Subject: [PATCH 9/9] Bump jsdom from 20.0.3 to 21.1.0 Bumps [jsdom](https://github.com/jsdom/jsdom) from 20.0.3 to 21.1.0. - [Release notes](https://github.com/jsdom/jsdom/releases) - [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md) - [Commits](https://github.com/jsdom/jsdom/compare/20.0.3...21.1.0) --- updated-dependencies: - dependency-name: jsdom dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5d42729..ce1cce5 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "i": "^0.3.7", "is-hexcolor": "^1.0.0", "isgd": "^1.1.3", - "jsdom": "^20.0.3", + "jsdom": "^21.1.0", "libsodium-wrappers": "^0.7.10", "lyrics-finder": "^21.7.0", "mathjs": "^11.5.0",