Update dependencies and logging implementation

This commit is contained in:
anthorob committed 2024-05-14 04:01:20 -04:00
1 parent d61d15f36d
commit 77ef79d28e
26 files changed
+107 -115

No files matched your search

+23 -14
View File
@@ -102,6 +102,13 @@
<url>https://maven.lavalink.dev/snapshots</url> <url>https://maven.lavalink.dev/snapshots</url>
</repository> </repository>
<repository>
<id>arbjergDev-releases</id>
<name>Lavalink Repository</name>
<url>https://maven.lavalink.dev/releases</url>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
@@ -114,13 +121,19 @@
<dependency> <dependency>
<groupId>net.dv8tion</groupId> <groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId> <artifactId>JDA</artifactId>
<version>5.0.0-beta.21</version> <version>5.0.0-beta.24</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>dev.arbjerg</groupId> <groupId>dev.arbjerg</groupId>
<artifactId>lavaplayer</artifactId> <artifactId>lavaplayer</artifactId>
<version>0eaeee195f0315b2617587aa3537fa202df07ddc-SNAPSHOT</version> <version>0eaeee195f0315b2617587aa3537fa202df07ddc-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>dev.lavalink.youtube</groupId>
<artifactId>common</artifactId>
<version>1.2.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp3</groupId> <groupId>com.squareup.okhttp3</groupId>
@@ -138,16 +151,12 @@
<artifactId>hibernate-hikaricp</artifactId> <artifactId>hibernate-hikaricp</artifactId>
<version>6.1.7.Final</version> <version>6.1.7.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.sentry</groupId> <groupId>io.sentry</groupId>
<artifactId>sentry</artifactId> <artifactId>sentry</artifactId>
<version>7.6.0</version> <version>7.6.0</version>
</dependency> </dependency>
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>3.9.1</version>
</dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
@@ -166,6 +175,12 @@
<artifactId>mysql-connector-j</artifactId> <artifactId>mysql-connector-j</artifactId>
<version>8.3.0</version> <version>8.3.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.23.1</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
@@ -173,10 +188,11 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j2-impl</artifactId>
<version>2.23.1</version> <version>2.23.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
@@ -194,13 +210,6 @@
<version>4.13.2</version> <version>4.13.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>15.4</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
@@ -28,13 +28,13 @@ import netneutrality.thread.ThreadManager;
import netneutrality.utils.Settings; import netneutrality.utils.Settings;
import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.Configurator; import org.apache.logging.log4j.core.config.Configurator;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
public class NetNeutrality { public class NetNeutrality {
private static JDA jda; private static JDA jda;
public final static Logger logger = LoggerFactory.getLogger(NetNeutrality.class); public final static Logger logger = LogManager.getLogger(NetNeutrality.class);
public static final String VERSION = "2.0.0"; public static final String VERSION = "2.0.0";
@@ -1,5 +1,11 @@
package netneutrality.command; package netneutrality.command;
/*
* Copyright (c) anthorob
*
* https://discord.gg/qUa6zNFZsd
*/
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
@@ -28,6 +34,7 @@ public abstract class AbstractCommand implements ICommand {
return true; return true;
} }
@Deprecated
@Override @Override
public void execute(MessageCommandContext context) { public void execute(MessageCommandContext context) {
// Prefer slash commands // Prefer slash commands
@@ -2,8 +2,7 @@ package netneutrality.command;
/* /*
* Copyright (c) anthorob * Copyright (c) anthorob
* *
* https://xtremcommunity.com/ * https://discord.gg/qUa6zNFZsd
* https://discord.gg/CdFcyQ
*/ */
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
@@ -13,9 +13,9 @@ import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
import net.dv8tion.jda.api.requests.restaction.CommandListUpdateAction; import net.dv8tion.jda.api.requests.restaction.CommandListUpdateAction;
import netneutrality.NetNeutrality; import netneutrality.NetNeutrality;
import netneutrality.command.AbstractCommand; import netneutrality.command.AbstractCommand;
import org.apache.logging.log4j.LogManager;
import org.reflections.Reflections; import org.reflections.Reflections;
import org.slf4j.Logger; import org.apache.logging.log4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
@@ -26,7 +26,7 @@ import java.util.Set;
public class CommandManager { public class CommandManager {
private final static Logger logger = LoggerFactory.getLogger(CommandManager.class); private final static Logger logger = LogManager.getLogger(CommandManager.class);
public static final HashMap<String, AbstractCommand> commands = new HashMap<>(); public static final HashMap<String, AbstractCommand> commands = new HashMap<>();
public static void init() { public static void init() {
@@ -11,8 +11,8 @@ import netneutrality.db.entities.OGuild;
import netneutrality.db.entities.OGuildSetting; import netneutrality.db.entities.OGuildSetting;
import netneutrality.utils.JpaUtils; import netneutrality.utils.JpaUtils;
import org.hibernate.Session; import org.hibernate.Session;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -20,7 +20,7 @@ import java.util.Set;
public class GuildConfigManager { public class GuildConfigManager {
private static final Logger logger = LoggerFactory.getLogger(GuildConfigManager.class); private static final Logger logger = LogManager.getLogger(GuildConfigManager.class);
private final Guild guild; private final Guild guild;
private final OGuild guildEntity; private final OGuild guildEntity;
@@ -18,10 +18,10 @@ import netneutrality.db.entities.OGuild;
import netneutrality.thread.ThreadManager; import netneutrality.thread.ThreadManager;
import netneutrality.utils.JpaUtils; import netneutrality.utils.JpaUtils;
import netneutrality.utils.MessageFunction; import netneutrality.utils.MessageFunction;
import org.apache.logging.log4j.LogManager;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.slf4j.Logger; import org.apache.logging.log4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
@@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class GuildManager { public class GuildManager {
private static final Logger logger = LoggerFactory.getLogger(GuildManager.class); private static final Logger logger = LogManager.getLogger(GuildManager.class);
private static final Map<String, GuildManager> managers = new ConcurrentHashMap<>(); private static final Map<String, GuildManager> managers = new ConcurrentHashMap<>();
private static final SessionFactory sessionFactory = SessionManager.getSessionFactory(); private static final SessionFactory sessionFactory = SessionManager.getSessionFactory();
private final Set<String> blacklistCache = new HashSet<>(); private final Set<String> blacklistCache = new HashSet<>();
@@ -14,12 +14,12 @@ import netneutrality.core.context.SlashCommandContext;
import netneutrality.exceptions.CommandException; import netneutrality.exceptions.CommandException;
import netneutrality.exceptions.CommandExecutionException; import netneutrality.exceptions.CommandExecutionException;
import netneutrality.utils.MessageFunction; import netneutrality.utils.MessageFunction;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
public class LogHandler { public class LogHandler {
private final static Logger logger = LoggerFactory.getLogger(LogHandler.class); private final static Logger logger = LogManager.getLogger(LogHandler.class);
/** /**
* Log an exception accordingly * Log an exception accordingly
@@ -8,20 +8,20 @@ package netneutrality.core;
import io.sentry.Sentry; import io.sentry.Sentry;
import netneutrality.utils.Settings; import netneutrality.utils.Settings;
import org.apache.logging.log4j.LogManager;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.boot.Metadata; import org.hibernate.boot.Metadata;
import org.hibernate.boot.MetadataSources; import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
import org.slf4j.Logger; import org.apache.logging.log4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class SessionManager { public class SessionManager {
private final static Logger logger = LoggerFactory.getLogger(SessionManager.class); private final static Logger logger = LogManager.getLogger(SessionManager.class);
private static StandardServiceRegistry registry; private static StandardServiceRegistry registry;
private static SessionFactory sessionFactory; private static SessionFactory sessionFactory;
@@ -8,14 +8,14 @@ package netneutrality.db;
*/ */
import netneutrality.core.SessionManager; import netneutrality.core.SessionManager;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
public class DBController { public class DBController {
private final static Logger logger = LoggerFactory.getLogger(DBController.class); private final static Logger logger = LogManager.getLogger(DBController.class);
public static <T> T get(Class<T> returnType) { public static <T> T get(Class<T> returnType) {
if (returnType == null) if (returnType == null)
@@ -12,16 +12,16 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import netneutrality.core.GuildManager; import netneutrality.core.GuildManager;
import netneutrality.db.AbstractController; import netneutrality.db.AbstractController;
import netneutrality.db.entities.OLogMessage; import netneutrality.db.entities.OLogMessage;
import org.apache.logging.log4j.LogManager;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.query.Query; import org.hibernate.query.Query;
import org.slf4j.Logger; import org.apache.logging.log4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List; import java.util.List;
public class DBMessage extends AbstractController { public class DBMessage extends AbstractController {
private final static Logger logger = LoggerFactory.getLogger(DBMessage.class); private final static Logger logger = LogManager.getLogger(DBMessage.class);
public void log(GuildManager guildManager, MessageChannel channel, Member author, Message message) { public void log(GuildManager guildManager, MessageChannel channel, Member author, Message message) {
Session session = getSessionFactory().openSession(); Session session = getSessionFactory().openSession();
@@ -10,8 +10,8 @@ import net.dv8tion.jda.api.entities.Guild;
import netneutrality.NetNeutrality; import netneutrality.NetNeutrality;
import netneutrality.core.GuildManager; import netneutrality.core.GuildManager;
import netneutrality.http.WebModule; import netneutrality.http.WebModule;
import org.apache.logging.log4j.LogManager;
import org.json.JSONObject; import org.json.JSONObject;
import org.slf4j.LoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
@@ -24,7 +24,7 @@ public class ActionHandler extends AbstractHandler {
String path = exchange.getRequestURI().getRawPath(); String path = exchange.getRequestURI().getRawPath();
if (path.equals("/actions/shutdown")) { if (path.equals("/actions/shutdown")) {
LoggerFactory.getLogger(NetNeutrality.class).info("Request to shutdown received"); LogManager.getLogger(NetNeutrality.class).info("Request to shutdown received");
NetNeutrality.shutdown(); NetNeutrality.shutdown();
sendStringResponse(exchange, "Shutting down.."); sendStringResponse(exchange, "Shutting down..");
@@ -9,8 +9,8 @@ package netneutrality.http.server;
import com.sun.net.httpserver.HttpServer; import com.sun.net.httpserver.HttpServer;
import netneutrality.thread.BaseThreadFactory; import netneutrality.thread.BaseThreadFactory;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
@@ -19,7 +19,7 @@ import java.util.concurrent.Executors;
public class WebApi { public class WebApi {
private final static Logger logger = LoggerFactory.getLogger(WebApi.class); private final static Logger logger = LogManager.getLogger(WebApi.class);
private HttpServer server; private HttpServer server;
@@ -2,8 +2,7 @@ package netneutrality.music;
/* /*
* Copyright (c) anthorob * Copyright (c) anthorob
* *
* https://xtremcommunity.com/ * https://discord.gg/qUa6zNFZsd
* https://discord.gg/CdFcyQ
*/ */
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
@@ -3,8 +3,7 @@ package netneutrality.music;
/* /*
* Copyright (c) anthorob * Copyright (c) anthorob
* *
* https://xtremcommunity.com/ * https://discord.gg/qUa6zNFZsd
* https://discord.gg/CdFcyQ
*/ */
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
@@ -30,8 +29,8 @@ import netneutrality.music.source.UdioAudioSourceManager;
import netneutrality.thread.MusicPlayerAutoDisconnectThread; import netneutrality.thread.MusicPlayerAutoDisconnectThread;
import netneutrality.thread.ThreadManager; import netneutrality.thread.ThreadManager;
import netneutrality.utils.Settings; import netneutrality.utils.Settings;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -43,7 +42,7 @@ import java.util.concurrent.TimeUnit;
public class MusicManager { public class MusicManager {
private final static Logger logger = LoggerFactory.getLogger(MusicManager.class); private final static Logger logger = LogManager.getLogger(MusicManager.class);
private final static Map<String, MusicManager> managers = new ConcurrentHashMap<>(); private final static Map<String, MusicManager> managers = new ConcurrentHashMap<>();
private final static ScheduledExecutorService executor = ThreadManager.getMusicExecutor(); private final static ScheduledExecutorService executor = ThreadManager.getMusicExecutor();
@@ -2,16 +2,15 @@ package netneutrality.music;
/* /*
* Copyright (c) anthorob * Copyright (c) anthorob
* *
* https://xtremcommunity.com/ * https://discord.gg/qUa6zNFZsd
* https://discord.gg/CdFcyQ
*/ */
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import java.util.*; import java.util.*;
import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingDeque;
@@ -24,7 +23,7 @@ public class QueueManager {
private final AudioTrack track; private final AudioTrack track;
private final Member member; private final Member member;
private final Set<String> skips; private final Set<String> skips;
private final Logger logger = LoggerFactory.getLogger(QueueManager.class); private final Logger logger = LogManager.getLogger(QueueManager.class);
public TrackInfo(AudioTrack track, Member member) { public TrackInfo(AudioTrack track, Member member) {
this.track = track; this.track = track;
@@ -78,7 +77,7 @@ public class QueueManager {
} }
} }
private final Logger logger = LoggerFactory.getLogger(QueueManager.class); private final Logger logger = LogManager.getLogger(QueueManager.class);
private final TrackScheduler scheduler; private final TrackScheduler scheduler;
private final AudioPlayer player; private final AudioPlayer player;
@@ -3,8 +3,7 @@ package netneutrality.music;
/* /*
* Copyright (c) anthorob * Copyright (c) anthorob
* *
* https://xtremcommunity.com/ * https://discord.gg/qUa6zNFZsd
* https://discord.gg/CdFcyQ
*/ */
import java.util.regex.Matcher; import java.util.regex.Matcher;
@@ -2,8 +2,7 @@ package netneutrality.music;
/* /*
* Copyright (c) anthorob * Copyright (c) anthorob
* *
* https://xtremcommunity.com/ * https://discord.gg/qUa6zNFZsd
* https://discord.gg/CdFcyQ
*/ */
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
@@ -13,15 +12,15 @@ import netneutrality.music.loadable.CachedSource;
import netneutrality.music.loadable.LoadableMusicSource; import netneutrality.music.loadable.LoadableMusicSource;
import netneutrality.music.loadable.LoadableSong; import netneutrality.music.loadable.LoadableSong;
import netneutrality.thread.ThreadManager; import netneutrality.thread.ThreadManager;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class TrackLoader implements Runnable { public class TrackLoader implements Runnable {
private final Logger logger = LoggerFactory.getLogger(TrackLoader.class); private final Logger logger = LogManager.getLogger(TrackLoader.class);
private final CommandContext context; private final CommandContext context;
private final MusicManager musicManager; private final MusicManager musicManager;
private final AudioPlayerManager audioPlayerManager; private final AudioPlayerManager audioPlayerManager;
@@ -2,8 +2,7 @@ package netneutrality.music;
/* /*
* Copyright (c) anthorob * Copyright (c) anthorob
* *
* https://xtremcommunity.com/ * https://discord.gg/qUa6zNFZsd
* https://discord.gg/CdFcyQ
*/ */
@@ -15,13 +14,13 @@ import net.dv8tion.jda.api.entities.Guild;
import netneutrality.core.LogHandler; import netneutrality.core.LogHandler;
import netneutrality.core.context.CommandContext; import netneutrality.core.context.CommandContext;
import netneutrality.utils.MessageFunction; import netneutrality.utils.MessageFunction;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import java.util.function.Consumer; import java.util.function.Consumer;
public class TrackLoadingHandler implements AudioLoadResultHandler { public class TrackLoadingHandler implements AudioLoadResultHandler {
private final Logger logger = LoggerFactory.getLogger(TrackLoadingHandler.class); private final Logger logger = LogManager.getLogger(TrackLoadingHandler.class);
private final String identifier; private final String identifier;
private final SourceFinder.AudioSourceType type; private final SourceFinder.AudioSourceType type;
@@ -2,8 +2,7 @@ package netneutrality.music;
/* /*
* Copyright (c) anthorob * Copyright (c) anthorob
* *
* https://xtremcommunity.com/ * https://discord.gg/qUa6zNFZsd
* https://discord.gg/CdFcyQ
*/ */
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
@@ -17,11 +16,11 @@ import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import netneutrality.core.LogHandler; import netneutrality.core.LogHandler;
import netneutrality.utils.MessageFunction; import netneutrality.utils.MessageFunction;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
public class TrackScheduler extends AudioEventAdapter { public class TrackScheduler extends AudioEventAdapter {
private final static Logger logger = LoggerFactory.getLogger(TrackScheduler.class); private final static Logger logger = LogManager.getLogger(TrackScheduler.class);
private final QueueManager queueManager; private final QueueManager queueManager;
private final MusicManager manager; private final MusicManager manager;
@@ -7,9 +7,9 @@ package netneutrality.music.loadable;
*/ */
import netneutrality.http.WebModule; import netneutrality.http.WebModule;
import org.apache.logging.log4j.LogManager;
import org.json.JSONObject; import org.json.JSONObject;
import org.slf4j.Logger; import org.apache.logging.log4j.Logger;
import org.slf4j.LoggerFactory;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.util.Collections; import java.util.Collections;
@@ -19,7 +19,7 @@ import java.util.Map;
public class LoadableSourceManager { public class LoadableSourceManager {
private final Logger logger = LoggerFactory.getLogger(LoadableSourceManager.class); private final Logger logger = LogManager.getLogger(LoadableSourceManager.class);
private static final Map<String, CachedSource> cache = new HashMap<>(); private static final Map<String, CachedSource> cache = new HashMap<>();
public CachedSource get(LoadableMusicSource source) { public CachedSource get(LoadableMusicSource source) {
@@ -1,12 +1,11 @@
package netneutrality.music.source;/* package netneutrality.music.source;
/*
* Copyright (c) anthorob * Copyright (c) anthorob
* *
* https://xtremcommunity.com/ * https://discord.gg/qUa6zNFZsd
* https://discord.gg/CdFcyQ
*/ */
import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.io.JsonEOFException;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager; import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools; import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
@@ -14,7 +13,6 @@ import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser; import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools; import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface; import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager; import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
import com.sedmelluq.discord.lavaplayer.track.AudioItem; import com.sedmelluq.discord.lavaplayer.track.AudioItem;
@@ -23,26 +21,22 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo; import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClientBuilder; import org.apache.logging.log4j.LogManager;
import org.slf4j.Logger; import org.apache.logging.log4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataOutput; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS; import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
public class UdioAudioSourceManager implements AudioSourceManager, HttpConfigurable { public class UdioAudioSourceManager implements AudioSourceManager {
private static final Logger log = LoggerFactory.getLogger(UdioAudioSourceManager.class); private static final Logger log = LogManager.getLogger(UdioAudioSourceManager.class);
private static final String TRACK_URL_REGEX = "^https://www.udio.com/songs/[0-9A-Za-z]+$"; private static final String TRACK_URL_REGEX = "^https://www.udio.com/songs/[0-9A-Za-z]+$";
@@ -153,13 +147,4 @@ public class UdioAudioSourceManager implements AudioSourceManager, HttpConfigura
ExceptionTools.closeWithWarnings(httpInterfaceManager); ExceptionTools.closeWithWarnings(httpInterfaceManager);
} }
@Override
public void configureRequests(Function<RequestConfig, RequestConfig> configurator) {
httpInterfaceManager.configureRequests(configurator);
}
@Override
public void configureBuilder(Consumer<HttpClientBuilder> configurator) {
httpInterfaceManager.configureBuilder(configurator);
}
} }
@@ -1,11 +1,10 @@
package netneutrality.music.source;/* package netneutrality.music.source;
/*
* Copyright (c) anthorob * Copyright (c) anthorob
* *
* https://xtremcommunity.com/ * https://discord.gg/qUa6zNFZsd
* https://discord.gg/CdFcyQ
*/ */
import com.sedmelluq.discord.lavaplayer.container.mp3.Mp3AudioTrack; import com.sedmelluq.discord.lavaplayer.container.mp3.Mp3AudioTrack;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser; import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
@@ -18,8 +17,8 @@ import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
@@ -29,7 +28,7 @@ import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.
public class UdioAudioTrack extends DelegatedAudioTrack { public class UdioAudioTrack extends DelegatedAudioTrack {
private static final Logger log = LoggerFactory.getLogger(UdioAudioTrack.class); private static final Logger log = LogManager.getLogger(UdioAudioTrack.class);
private final UdioAudioSourceManager sourceManager; private final UdioAudioSourceManager sourceManager;
@@ -11,7 +11,7 @@ import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
import netneutrality.NetNeutrality; import netneutrality.NetNeutrality;
import netneutrality.music.MusicManager; import netneutrality.music.MusicManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.LogManager;
import java.util.List; import java.util.List;
@@ -36,7 +36,7 @@ public class MusicPlayerAutoDisconnectThread implements Runnable {
Thread.sleep(30000); Thread.sleep(30000);
if (conditionsMetToDisconnect(channel)) { if (conditionsMetToDisconnect(channel)) {
LoggerFactory.getLogger(MusicPlayerAutoDisconnectThread.class).debug("Guild {}: auto-disconnect player from voice channel: {}", guild.getId(), channel.getId()); LogManager.getLogger(MusicPlayerAutoDisconnectThread.class).debug("Guild {}: auto-disconnect player from voice channel: {}", guild.getId(), channel.getId());
manager.leave(); manager.leave();
} }
} }
@@ -16,8 +16,8 @@ import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder; import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
import netneutrality.core.context.CommandContext; import netneutrality.core.context.CommandContext;
import netneutrality.thread.ThreadManager; import netneutrality.thread.ThreadManager;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -27,7 +27,7 @@ import java.util.concurrent.locks.ReentrantLock;
public class ChannelMessagePurger { public class ChannelMessagePurger {
private static final Logger logger = LoggerFactory.getLogger(ChannelMessagePurger.class); private static final Logger logger = LogManager.getLogger(ChannelMessagePurger.class);
private static final Map<GuildMessageChannel, ChannelMessagePurger> instances = new HashMap<>(); private static final Map<GuildMessageChannel, ChannelMessagePurger> instances = new HashMap<>();
private final GuildMessageChannel channel; private final GuildMessageChannel channel;
private final Lock lock; private final Lock lock;
@@ -25,8 +25,8 @@ import netneutrality.music.MusicManager;
import netneutrality.music.QueueManager; import netneutrality.music.QueueManager;
import netneutrality.music.SourceFinder; import netneutrality.music.SourceFinder;
import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.lang3.time.DurationFormatUtils;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import java.awt.*; import java.awt.*;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
@@ -37,7 +37,7 @@ import java.util.Set;
public class MessageFunction { public class MessageFunction {
private final static Logger logger = LoggerFactory.getLogger(MessageFunction.class); private final static Logger logger = LogManager.getLogger(MessageFunction.class);
public static MessageEmbed buildCurrentlyPlayingMessage(MusicManager manager) { public static MessageEmbed buildCurrentlyPlayingMessage(MusicManager manager) {
AudioTrack current = manager.getCurrentlyPlaying(); AudioTrack current = manager.getCurrentlyPlaying();