locusworks/eight-track
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rework
All checks were successful
Locusworks Team/eight-track/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Isaac Parenteau
2020-10-23 11:56:48 -05:00
parent f051e98768
commit 4c40d33050
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -18,13 +18,13 @@
</scm> </scm>
<properties> <properties>
<flyway.version>6.4.3</flyway.version> <flyway.version>7.0.4</flyway.version>
<mysql.version>8.0.20</mysql.version> <mysql.version>8.0.22</mysql.version>
<hibernate.version>5.4.17.Final</hibernate.version> <hibernate.version>5.4.22.Final</hibernate.version>
<spring.version>5.2.6.RELEASE</spring.version> <spring.version>5.2.9.RELEASE</spring.version>
<spring.boot.version>2.3.0.RELEASE</spring.boot.version> <spring.boot.version>2.3.4.RELEASE</spring.boot.version>
<spring.data.version>2.3.0.RELEASE</spring.data.version> <spring.data.version>2.3.4.RELEASE</spring.data.version>
<jackson.version>2.11.0</jackson.version> <jackson.version>2.11.3</jackson.version>
<log4j.version>2.13.3</log4j.version> <log4j.version>2.13.3</log4j.version>
<slf4j.version>1.7.30</slf4j.version> <slf4j.version>1.7.30</slf4j.version>
<maven.enforcer.version>3.0.0-M3</maven.enforcer.version> <maven.enforcer.version>3.0.0-M3</maven.enforcer.version>
@ -154,7 +154,7 @@
<dependency> <dependency>
<groupId>net.dv8tion</groupId> <groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId> <artifactId>JDA</artifactId>
<version>4.1.1_155</version> <version>4.2.0_209</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
@ -174,7 +174,7 @@
<dependency> <dependency>
<groupId>com.sedmelluq</groupId> <groupId>com.sedmelluq</groupId>
<artifactId>lavaplayer</artifactId> <artifactId>lavaplayer</artifactId>
<version>1.3.49</version> <version>1.3.50</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.flywaydb/flyway-core --> <!-- https://mvnrepository.com/artifact/org.flywaydb/flyway-core -->

7
src/main/java/net/locusworks/discord/eighttrack/listeners/AbstractDiscordEventListener.java Normal file
View File

@ -0,0 +1,7 @@
package net.locusworks.discord.eighttrack.listeners;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
public abstract class AbstractDiscordEventListener extends ListenerAdapter {
}

11
src/main/java/net/locusworks/discord/eighttrack/handlers/DiscordEventHandler.java → src/main/java/net/locusworks/discord/eighttrack/listeners/DiscordEventListener.java
View File

@ -25,7 +25,7 @@
* IS". LOCUSWORKS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, * IS". LOCUSWORKS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
* ENHANCEMENTS, OR MODIFICATIONS. * ENHANCEMENTS, OR MODIFICATIONS.
*/ */
package net.locusworks.discord.eighttrack.handlers; package net.locusworks.discord.eighttrack.listeners;
import java.awt.Color; import java.awt.Color;
import java.io.IOException; import java.io.IOException;
@ -34,7 +34,6 @@ import java.nio.file.Path;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -46,23 +45,21 @@ import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.TextChannel; import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.events.ExceptionEvent; import net.dv8tion.jda.api.events.ExceptionEvent;
import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.locusworks.discord.eighttrack.database.entities.DiscordGuild;
import net.locusworks.discord.eighttrack.events.main.AbstractMainEventHandler; import net.locusworks.discord.eighttrack.events.main.AbstractMainEventHandler;
import net.locusworks.discord.eighttrack.handlers.ReactionHandler;
import net.locusworks.discord.eighttrack.services.ConfigurationService; import net.locusworks.discord.eighttrack.services.ConfigurationService;
import net.locusworks.discord.eighttrack.services.RepositoryService; import net.locusworks.discord.eighttrack.services.RepositoryService;
import net.locusworks.logger.ApplicationLogger; import net.locusworks.logger.ApplicationLogger;
import net.locusworks.logger.ApplicationLoggerFactory; import net.locusworks.logger.ApplicationLoggerFactory;
@Service @Service
public class DiscordEventHandler extends ListenerAdapter { public class DiscordEventListener extends AbstractDiscordEventListener {
private Path musicDir; private Path musicDir;
private ApplicationLogger logger = ApplicationLoggerFactory.getLogger(DiscordEventHandler.class); private ApplicationLogger logger = ApplicationLoggerFactory.getLogger(DiscordEventListener.class);
@Autowired @Autowired
private RepositoryService guildSongRepoService; private RepositoryService guildSongRepoService;

5
src/main/java/net/locusworks/discord/eighttrack/listeners/DiscordGuildJoinEventListener.java
View File

@ -4,16 +4,13 @@ import java.util.Date;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import net.dv8tion.jda.api.events.guild.GuildJoinEvent; import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.locusworks.discord.eighttrack.annotations.DiscordEventListener;
import net.locusworks.discord.eighttrack.database.entities.DiscordGuild; import net.locusworks.discord.eighttrack.database.entities.DiscordGuild;
import net.locusworks.discord.eighttrack.services.RepositoryService; import net.locusworks.discord.eighttrack.services.RepositoryService;
import net.locusworks.logger.ApplicationLogger; import net.locusworks.logger.ApplicationLogger;
import net.locusworks.logger.ApplicationLoggerFactory; import net.locusworks.logger.ApplicationLoggerFactory;
@Service @Service
@DiscordEventListener public class DiscordGuildJoinEventListener extends AbstractDiscordEventListener {
public class DiscordGuildJoinEventListener extends ListenerAdapter {
private ApplicationLogger logger = ApplicationLoggerFactory.getLogger(DiscordGuildJoinEventListener.class); private ApplicationLogger logger = ApplicationLoggerFactory.getLogger(DiscordGuildJoinEventListener.class);

17
src/main/java/net/locusworks/discord/eighttrack/services/EightTrackService.java
View File

@ -31,15 +31,12 @@ import java.util.List;
import javax.security.auth.login.LoginException; import javax.security.auth.login.LoginException;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.type.filter.AnnotationTypeFilter;
import org.springframework.core.type.filter.TypeFilter;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.locusworks.discord.eighttrack.annotations.DiscordEventListener; import net.locusworks.discord.eighttrack.listeners.AbstractDiscordEventListener;
import net.locusworks.discord.eighttrack.utils.BeanFinder;
import net.locusworks.logger.ApplicationLogger; import net.locusworks.logger.ApplicationLogger;
import net.locusworks.logger.ApplicationLoggerFactory; import net.locusworks.logger.ApplicationLoggerFactory;
@ -53,13 +50,15 @@ public class EightTrackService {
@Autowired @Autowired
private ConfigurationService confService; private ConfigurationService confService;
private List<AbstractDiscordEventListener> eventListeners;
@Autowired
private void setup(List<AbstractDiscordEventListener> eventListeners) {
this.eventListeners = eventListeners;
}
public void begin() throws LoginException { public void begin() throws LoginException {
try { try {
final TypeFilter serviceFilter = new AnnotationTypeFilter(Service.class);
final TypeFilter eventListenerFilter = new AnnotationTypeFilter(DiscordEventListener.class);
List<ListenerAdapter> eventListeners = BeanFinder.autowireBeans(ListenerAdapter.class, "net.locusworks.discord.eighttrack", serviceFilter, eventListenerFilter);
if (eventListeners == null ||eventListeners.size() < 1) { if (eventListeners == null ||eventListeners.size() < 1) {
throw new LoginException("No event listeners found. Exiting"); throw new LoginException("No event listeners found. Exiting");
} }

2
src/main/resources/eighttrack.properties
View File

@ -5,6 +5,6 @@ dbUserPassword=RaamWDMgA2p09R3kAiKHqauu6mmKU2HLQ4nAfEGMNOs=
dbHost=localhost dbHost=localhost
dbPort=3306 dbPort=3306
logLevel=INFO logLevel=INFO
musicDir=E:/Music musicDir=D:/Music
discordToken=NjMzMDA2ODIzNzk1OTgyMzQ0.XtLtpA.sramb2b8w4itTFPQ92HqZgyeBJU discordToken=NjMzMDA2ODIzNzk1OTgyMzQ0.XtLtpA.sramb2b8w4itTFPQ92HqZgyeBJU