diff --git a/.env.example b/.env.example
index c02e4e3..184ef84 100644
--- a/.env.example
+++ b/.env.example
@@ -17,6 +17,8 @@ MARIADB_AUTO_UPGRADE=1
NETNEUTRALITY_PO_TOKEN=
NETNEUTRALITY_VISITOR_DATA=
+NETNEUTRALITY_CIPHER_URL=http://localhost:8001
+NETNEUTRALITY_CIPHER_PASSWORD=
NETNEUTRALITY_SENTRY_DSN=
GITLAB_HOST=
diff --git a/bot.properties.example b/bot.properties.example
index 7ad94bc..184ef84 100644
--- a/bot.properties.example
+++ b/bot.properties.example
@@ -1,18 +1,24 @@
+NETNEUTRALITY_TAG=latest
+
NETNEUTRALITY_BOT_ENV=dev
NETNEUTRALITY_BOT_TOKEN=
-NETNEUTRALITY_BOT_PREFIX=
+NETNEUTRALITY_BOT_PREFIX=$
NETNEUTRALITY_BOT_OWNER=
NETNEUTRALITY_BOT_INVITE=
NETNEUTRALITY_API_PORT=9000
MYSQL_HOST=127.0.0.1
-MYSQL_USER=root
-MYSQL_PASSWORD=
-MYSQL_DATABASE=
MYSQL_PORT=3306
+MYSQL_USER=java
+MYSQL_PASSWORD=password
+MYSQL_DATABASE=netneutrality
+MYSQL_ROOT_PASSWORD=password
+MARIADB_AUTO_UPGRADE=1
NETNEUTRALITY_PO_TOKEN=
NETNEUTRALITY_VISITOR_DATA=
+NETNEUTRALITY_CIPHER_URL=http://localhost:8001
+NETNEUTRALITY_CIPHER_PASSWORD=
NETNEUTRALITY_SENTRY_DSN=
GITLAB_HOST=
diff --git a/docker-compose.yml b/docker-compose.yml
index 178a023..1b37db7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,7 +31,14 @@ services:
MYSQL_USER: java
MYSQL_PASSWORD: password
MYSQL_DATABASE: netneutrality
-
+ ejs-api:
+ image: ghcr.io/kikkia/yt-cipher:master
+ container_name: ejs_signature_api
+ restart: unless-stopped
+ networks:
+ - netneutrality
+ # environment: # UNCOMMENT THIS LINE AND API_TOKEN TO ADD A PASSWORD
+ # - API_TOKEN=test
volumes:
netneutrality-db: null
diff --git a/pom.xml b/pom.xml
index 0eb17a4..d4afede 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
dev.lavalink.youtube
v2
- 1.13.3
+ 1.15.0
diff --git a/src/main/java/me/bobert/netneutrality/NetNeutrality.java b/src/main/java/me/bobert/netneutrality/NetNeutrality.java
index a942b82..6d786a4 100644
--- a/src/main/java/me/bobert/netneutrality/NetNeutrality.java
+++ b/src/main/java/me/bobert/netneutrality/NetNeutrality.java
@@ -53,6 +53,8 @@ public class NetNeutrality {
if ("dev".equals(env)) {
Configurator.setLevel("net.dv8tion.jda", Level.DEBUG);
+ Configurator.setLevel("dev.lavalink.youtube", Level.DEBUG);
+ Configurator.setLevel("com.sedmelluq.discord", Level.DEBUG);
}
instance = new NetNeutrality();
diff --git a/src/main/java/me/bobert/netneutrality/core/tasks/TaskManager.java b/src/main/java/me/bobert/netneutrality/core/tasks/TaskManager.java
index 6d4cf93..f3c9f3d 100644
--- a/src/main/java/me/bobert/netneutrality/core/tasks/TaskManager.java
+++ b/src/main/java/me/bobert/netneutrality/core/tasks/TaskManager.java
@@ -58,6 +58,8 @@ public class TaskManager {
}
public void init() {
+ logger.info("Initializing task manager...");
+
loadBuiltInTasks();
loadScheduledTasks();
taskService.loadTasks();
diff --git a/src/main/java/me/bobert/netneutrality/music/MusicManager.java b/src/main/java/me/bobert/netneutrality/music/MusicManager.java
index 870c85f..b4a09b8 100644
--- a/src/main/java/me/bobert/netneutrality/music/MusicManager.java
+++ b/src/main/java/me/bobert/netneutrality/music/MusicManager.java
@@ -13,6 +13,7 @@ import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudAudioSourceManager;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import dev.lavalink.youtube.YoutubeAudioSourceManager;
+import dev.lavalink.youtube.YoutubeSourceOptions;
import me.bobert.netneutrality.core.command.CommandExecutionResult;
import me.bobert.netneutrality.core.context.CommandContext;
import me.bobert.netneutrality.db.GSettings;
@@ -60,7 +61,16 @@ public class MusicManager {
}
public static void initPlayerManager() {
- playerManager.registerSourceManager(new YoutubeAudioSourceManager());
+ logger.debug("Initializing music player sources..");
+
+ String cipherUrl = Settings.getInstance().get("NETNEUTRALITY_CIPHER_URL");
+ String cipherPassword = Settings.getInstance().get("NETNEUTRALITY_CIPHER_PASSWORD");
+ YoutubeSourceOptions options = new YoutubeSourceOptions()
+ .setAllowSearch(true)
+ .setAllowDirectVideoIds(true)
+ .setAllowDirectPlaylistIds(true)
+ .setRemoteCipher(cipherUrl, cipherPassword, "");
+ playerManager.registerSourceManager(new YoutubeAudioSourceManager(options, YoutubeAudioSourceManager.DEFAULT_CLIENTS));
playerManager.registerSourceManager(SoundCloudAudioSourceManager.createDefault());
playerManager.registerSourceManager(new UdioAudioSourceManager());
playerManager.registerSourceManager(new HttpAudioSourceManager());
diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties
index 836ebf0..fd7ea4f 100644
--- a/src/main/resources/log4j2.properties
+++ b/src/main/resources/log4j2.properties
@@ -36,7 +36,11 @@ logger.lavaplayer.additivity = false
logger.lavaplayer.appenderRef.rolling.ref = LogToRollingFile
logger.lavaplayer.appenderRef.console.ref = consoleLogger
-
+logger.lavalink.name = dev.lavalink.youtube
+logger.lavalink.level = info
+logger.lavalink.additivity = false
+logger.lavalink.appenderRef.rolling.ref = LogToRollingFile
+logger.lavalink.appenderRef.console.ref = consoleLogger
logger.app.name = me.bobert.netneutrality
logger.app.level = debug