Merge pull request #21 from spasten-studio/dev/unstable

.gitignore

@@ -1,4 +1,3 @@
 .DS_Store
 /node_modules
-/data/.env
-/data/data.db
+/data/config.env

README.md

@@ -28,7 +28,7 @@
 <br/>
 <br/>
   <div align="center">
-    ™ and © 2021 The Golden Authors. All Rights Reserved.
+    ™ and © 2022 The Golden Authors. All Rights Reserved.
     </div>
   <div align="center">
   <br/>

data/template.env

@@ -0,0 +1,47 @@
+# .env template for Golden 4.3
+
+# Start by copying this file and renaming it to config.env
+# The template.env file might change on updates
+
+# Golden
+GOLDEN_HEADER="https://cdn.discordapp.com/attachments/911271717492621343/914553180883406898/bg2v3.png"
+GOLDEN_EMBED_THUMBNAIL="https://cdn.discordapp.com/attachments/911271717492621343/912002185267646544/bg4.png"
+GOLDEN_EMBED_TITLE="<:musicnote:930887306045435934> | No song is being played"
+GOLDEN_EMBED_DESCRIPTION="[Bot Invite](https://golden.invite.spasten.studio/) | [Dashboard](https://golden.spasten.studio) | [Commands](https://golden.spasten.studio) | [Support](https://discord.gg/PX28nyVgdP)"
+GOLDEN_EMBED_MESSAGE="\n__**Queue:**__\nJoin a Voice Channel and add a Song or a Playlist"
+
+# Discord API see https://discord.com/developers/
+DISCORD_TOKEN=""
+DISCORD_APPID=""
+
+DISCORD_GLOBAL_COMMANDS=true
+DISCORD_GUILDID=""
+
+# MySQL / MariaDB
+DB_HOST="localhost"
+DB_PORT=3306
+DB_USERNAME=""
+DB_DATABASE=""
+DB_PASSWORD=""
+
+# LavaLink see https://github.com/freyacodes/Lavalink
+LAVALINK_HOST="localhost"
+LAVALINK_PORT=2333
+LAVALINK_PASSWORD=""
+LAVALINK_SSL=false
+
+# Spotify see https://developer.spotify.com/dashboard/
+SPOTIFY_ENABLED=false
+SPOTIFY_CLIENTID=""
+SPOTIFY_CLIENTSECRET=""
+
+# Better Uptime see https://betteruptime.com/
+BETTERUPTIME_ENABLED=false
+BETTERUPTIME_HEARTBEAT_URL=""
+BETTERUPTIME_TIME=1
+BETTERUPTIME_TIME_TYPE="minute"
+
+# Analytics
+# Golden tracks the amount of current listeners and players and save them to the database
+# You might use a service like https://grafana.com/ to display the data inside an dashboard
+ANALYTICS_ENABLED=false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "golden",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "A Premium Discord Bot with a lot of functions and wihtout any Paywalls!",
   "main": "./src/golden.js",
   "scripts": {
@@ -9,17 +9,18 @@
   "author": "Botis",
   "license": "ISC",
   "dependencies": {
-    "@devsnowflake/quick.db": "^2.0.3",
     "@discordjs/builders": "^0.9.0",
     "@discordjs/rest": "^0.1.0-canary.0",
+    "better-erela.js-spotify": "^1.3.6",
     "better-uptime": "^1.1.4",
     "check-links": "^1.1.8",
+    "console-stamp": "^3.0.3",
     "discord-api-types": "^0.25.2",
     "discord-together": "^1.3.25",
     "discord.js": "^13.3.1",
     "dotenv": "^10.0.0",
-    "erela.js-spotify": "^1.2.0",
     "erela.js-vk": "^2.3.3-vk-8",
-    "format-duration": "^1.4.0"
+    "format-duration": "^1.4.0",
+    "mariadb": "^2.5.5"
   }
 }

src/commands/information/status.js

@@ -1,6 +1,6 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
 const { MessageEmbed } = require("discord.js");
-const { getGlobal } = require("../../modules/databaseModule/databaseModule");
+const { getChannelsCreated } = require("../../modules/databaseModule/databaseModule");
 
 module.exports = {
   data: new SlashCommandBuilder()
@@ -26,7 +26,8 @@ module.exports = {
     let seconds = Math.floor(totalSeconds % 60);
 
     const usage = process.cpuUsage();
-
+    const channelsCreated = await getChannelsCreated();
+
     interaction.editReply({
       embeds: [
         embed
@@ -83,12 +84,12 @@ module.exports = {
             },
             {
               name: "Music channels",
-              value: `${getGlobal().stats.goldenChannelCount}`,
+              value: `${channelsCreated.value}`,
               inline: true,
             },
             {
               name: "Users",
-              value: `${client.users.cache.size}`,
+              value: `${client.guilds.cache.map((g) => g.memberCount).reduce((a, c) => a + c)}`,
               inline: true,
             }
           )

src/commands/music/autoplay.js

@@ -13,10 +13,10 @@ module.exports = {
 
         const channel = interaction.member.voice;
         if (!channel) return replyInteractionEmbed(interaction, '', 'Join a voice channel first.', 'DARK_RED');
-        if (channel.channel.id!= player.voiceChannel)
+        if (channel.channelId != player.voiceChannel)
             return replyInteractionEmbed(interaction, '', 'I\'ve to be in the same voice channel with you for toggling Autoplay.', 'DARK_RED');
 
-        player.set(`autoplay`, !player.get(`autoplay`))
+        player.set(`autoplay`, !player.get(`autoplay`));
 
         setEmbed(interaction.guild, player);
         return replyInteractionEmbed(interaction, '', `**${player.get(`autoplay`) ? "activated" : "deactivated"}** Autoplay`, 'DARK_GREEN');

src/commands/music/nowplaying.js

@@ -55,5 +55,19 @@ async function NPEmbed(interaction, player)
 				.setURL('https://www.youtube.com/watch?v=' + queue.current.identifier)
 		);
 
+	if (typeof queue.current.resolve == 'function') await queue.current.resolve();
 	await replyBtnInteractionEmbed(interaction, '', `<:musicnote:930887306045435934> **Now Playing:** [${queue.current.title} by ${queue.current.author}](${queue.current.uri})\n**Duration:** ${bar} ${formatDuration(player.position)}|${formatDuration(queue.current.duration)}\n**Requested by:** ${queue.current.requester}`, `DARK_GREEN`, queue.current.displayThumbnail("mqdefault"), channelControlComponent);
+
+	const Interval = setInterval(() =>
+	{
+		const pos = formatDuration(player.position);
+		if (queue.current == undefined || interaction == undefined || player.position > (queue.current.duration - 5000))
+		{
+			editBtnInteractionEmbed(interaction, '', '**Player stopped or its not available anymore!', 'DARK_RED');
+			clearInterval(Interval);
+			return;
+		};
+		bar = generateProgressBar(player.position, queue.current.duration);
+		editBtnInteractionEmbed(interaction, '', `<:musicnote:930887306045435934> **Now Playing:** [${queue.current.title} by ${queue.current.author}](${queue.current.uri})\n**Duration:** ${bar} ${pos}|${formatDuration(queue.current.duration)}\n**Requested by:** ${queue.current.requester}`, `DARK_GREEN`, queue.current.displayThumbnail("mqdefault"));
+	}, 5000);
 };