From ea0e1d47bd60ed62002f85b797f30534ffa38aa2 Mon Sep 17 00:00:00 2001 From: Corwin Date: Mon, 12 Dec 2022 18:50:28 +0100 Subject: [PATCH 1/7] Update README.md --- README.md | 49 +++++++++---------------------------------------- 1 file changed, 9 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index d3389b6..8729501 100644 --- a/README.md +++ b/README.md @@ -1,47 +1,16 @@ # Discord-Bot -Discord bot with over 400 commands. +## 🤖 Discord bot with over 400 commands. This contains: Moderation, Music, Economy and much more! -Discord: https://discord.gg/qHXxpQKC2H +![image](https://user-images.githubusercontent.com/88144943/207117434-d98356b1-bf19-418e-9e12-0ef83e0d9a21.png) + +Don't wanna host it yourself? [Use our public bot!](https://discord.com/api/oauth2/authorize?client_id=1051755231848972328&permissions=8&scope=bot%20applications.commands) + +### Replit: https://replit.com/@CorwinDeveloper/Discord-Bot?v=1 + +### Discord: https://discord.gg/qHXxpQKC2H -| Category | -| ------------- | -| AFK | -| Announcement | -| AutoMod | -| AutoSetup | -| Birthdays | -| Bot | -| Casino | -| Config | -| Custom-Commands | -| Developers | -| Economy | -| Family | -| Fun | -| Games | -| Giveaway | -| Guild | -| Images | -| Invites | -| Levels | -| Messages | -| Moderation | -| Music | -| NotePad | -| Profile | -| Radio | -| ReactionRoles | -| Search | -| Serverstats | -| Setup | -| SoundBoard | -| StickyMessages | -| Suggestions | -| Thanks | -| Tickets | -| Tools | -| Voice | *You may not claim this as your own!!* + **Copyright to DotwoodMedia and CorwinDev** From b778823523f387812a2c93ef24c87ef82a147596 Mon Sep 17 00:00:00 2001 From: Corwin Date: Mon, 12 Dec 2022 18:55:54 +0100 Subject: [PATCH 2/7] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 8729501..6126513 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,12 @@ This contains: Moderation, Music, Economy and much more! ![image](https://user-images.githubusercontent.com/88144943/207117434-d98356b1-bf19-418e-9e12-0ef83e0d9a21.png) + +## ⚒️ Requirements +- Node.JS v17 +- FFMPEG +- Discord bot + Don't wanna host it yourself? [Use our public bot!](https://discord.com/api/oauth2/authorize?client_id=1051755231848972328&permissions=8&scope=bot%20applications.commands) ### Replit: https://replit.com/@CorwinDeveloper/Discord-Bot?v=1 From b22099c0e4316476e5b5bf8c46ff282feaacd21c Mon Sep 17 00:00:00 2001 From: Corwin Date: Tue, 13 Dec 2022 07:33:22 +0100 Subject: [PATCH 3/7] Update .env.example --- .env.example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index d4ec083..f077170 100644 --- a/.env.example +++ b/.env.example @@ -3,6 +3,7 @@ MONGO_TOKEN= GIPHY_TOKEN= WEBHOOK_ID= WEBHOOK_TOKEN= +DISCORD_ID= # Not neccessary variables DISCORD_STATUS="Listening to meself, I'm a stupid bot, https://github.com/corwindev/discord-bot" @@ -12,4 +13,4 @@ SPOTIFY_CLIENT_ID= SPOTIFY_CLIENT_SECRET= LAVALINK_HOST=lava.link LAVALINK_PASSWORD=I'm a secret -LAVALINK_PORT=80 \ No newline at end of file +LAVALINK_PORT=80 From 9f917699952ab4e147214e8f1a3b050749aa56a0 Mon Sep 17 00:00:00 2001 From: Corwin Date: Tue, 13 Dec 2022 10:05:53 +0100 Subject: [PATCH 4/7] Update eval.js --- src/commands/developers/eval.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/commands/developers/eval.js b/src/commands/developers/eval.js index c026b5d..3c18c43 100644 --- a/src/commands/developers/eval.js +++ b/src/commands/developers/eval.js @@ -57,11 +57,7 @@ module.exports = async (client, interaction, args) => { }); } else { -<<<<<<< HEAD const output = new Discord.AttachmentBuilder(Buffer.from(outputResponse), { name: 'output.txt' }); -======= - const output = new Discord.MessageAttachment(Buffer.from(outputResponse), 'output.txt'); ->>>>>>> d66e109605f85a2a9d710732e8db419070b0f6e8 var embed2 = new Discord.EmbedBuilder() .setAuthor(client.user.username, client.user.avatarURL()) .addFields( @@ -102,4 +98,4 @@ const clean = text => { return text; } - \ No newline at end of file + From fbb9fcf105c614e9d8a1a852e04ee88bcdcff258 Mon Sep 17 00:00:00 2001 From: Corwin Date: Tue, 13 Dec 2022 11:22:39 +0100 Subject: [PATCH 5/7] Update info.js --- src/commands/bot/info.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/commands/bot/info.js b/src/commands/bot/info.js index 6aa84c9..97d5b57 100644 --- a/src/commands/bot/info.js +++ b/src/commands/bot/info.js @@ -24,7 +24,6 @@ module.exports = async (client, interaction, args) => { thumbnail: client.user.avatarURL({ size: 1024 }), fields: [{ name: "📢┆Alert!", - value: 'After more than 1 year we decided to stop Bot on April 15th, for more information go to [this server](https://discord.gg/techpoint)', inline: false, }, { @@ -143,4 +142,4 @@ module.exports = async (client, interaction, args) => { }) } - \ No newline at end of file + From cbec7dcb84018f56a3537a911292d592a2630c50 Mon Sep 17 00:00:00 2001 From: Corwin Date: Tue, 13 Dec 2022 11:24:05 +0100 Subject: [PATCH 6/7] Update info.js --- src/commands/bot/info.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/bot/info.js b/src/commands/bot/info.js index 97d5b57..83d458e 100644 --- a/src/commands/bot/info.js +++ b/src/commands/bot/info.js @@ -53,12 +53,12 @@ module.exports = async (client, interaction, args) => { }, { name: "🔧┆Bot owner", - value: `<@!534398298002292739> `, + value: `<@!755297485328482356> `, inline: true, }, { name: "🔧┆Bot developer", - value: `<@!402893517749354516>`, + value: `<@!755297485328482356>`, inline: true, }, { From 91a11f7f37b05844959a818a6bc7f06e84546b40 Mon Sep 17 00:00:00 2001 From: Corwin Date: Tue, 13 Dec 2022 11:26:31 +0100 Subject: [PATCH 7/7] Bug fixes --- src/events/message/messageCreate.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/events/message/messageCreate.js b/src/events/message/messageCreate.js index 0674a51..e180dd9 100644 --- a/src/events/message/messageCreate.js +++ b/src/events/message/messageCreate.js @@ -321,13 +321,13 @@ module.exports = async (client, message) => { new Discord.ButtonBuilder() .setLabel("Invite") .setURL( - "https://discord.com/oauth2/authorize?&client_id=798144456528363550&scope=applications.commands+bot&permissions=8" + client.config.discord.botInvite ) .setStyle(Discord.ButtonStyle.Link), new Discord.ButtonBuilder() .setLabel("Support server") - .setURL("https://discord.gg/56FZySQaY7") + .setURL(client.config.discord.serverInvite) .setStyle(Discord.ButtonStyle.Link) ); @@ -337,11 +337,6 @@ module.exports = async (client, message) => { title: "Hi, i'm Bot", desc: `Use with commands via Discord ${client.emotes.normal.slash} commands`, fields: [ - { - name: "📢┆Alert!", - value: 'After more than 1 year we decided to stop Bot on April 15th, for more information go to [this server](https://discord.gg/techpoint)', - inline: false, - }, { name: "📨┆Invite me", value: `Invite Bot in your own server! [Click here](${client.config.discord.botInvite})`, @@ -404,15 +399,15 @@ module.exports = async (client, message) => { if (command) { let row = new Discord.ActionRowBuilder().addComponents( new Discord.ButtonBuilder() - .setLabel("Invite") + .setLabel("Invite") .setURL( - "https://discord.com/oauth2/authorize?&client_id=798144456528363550&scope=applications.commands+bot&permissions=8" + client.config.discord.botInvite ) .setStyle(Discord.ButtonStyle.Link), new Discord.ButtonBuilder() .setLabel("Support server") - .setURL("https://discord.gg/56FZySQaY7") + .setURL(client.config.discord.serverInvite) .setStyle(Discord.ButtonStyle.Link) );