Skip to content

Commit

Permalink
Bumping version and updating the latest version of lavaplayer. Fixing…
Browse files Browse the repository at this point in the history
… an issue with the DB path. Updating the info command
  • Loading branch information
Darkside138 committed Apr 1, 2023
1 parent 1f935e6 commit 92d8262
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 80 deletions.
71 changes: 0 additions & 71 deletions .github/workflows/version.yml

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ tasks.named("bootJar") {

dependencies {
implementation 'net.dv8tion:JDA:5.0.0-beta.6'
implementation 'com.github.walkyst:lavaplayer-fork:1.3.97'
implementation 'com.github.walkyst:lavaplayer-fork:1.4.0'
implementation 'com.github.aikaterna:lavaplayer-natives:original-SNAPSHOT'
implementation 'pw.chew:jda-chewtils:1.24.1'

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
projectVersion = 3.3.3
projectVersion = 3.3.4
File renamed without changes.
6 changes: 2 additions & 4 deletions src/main/java/net/dirtydeeds/discordsoundboard/JDABot.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import net.dv8tion.jda.api.entities.Activity;
import net.dv8tion.jda.api.requests.GatewayIntent;
import net.dv8tion.jda.api.utils.MemberCachePolicy;
import net.dv8tion.jda.api.utils.cache.CacheFlag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.ObjectUtils;
import javax.security.auth.login.LoginException;

@Getter
public class JDABot {
Expand All @@ -38,6 +38,7 @@ public JDABot(BotConfig botConfig) {
jda = JDABuilder.createDefault(botToken, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MEMBERS,
GatewayIntent.MESSAGE_CONTENT, GatewayIntent.DIRECT_MESSAGES,
GatewayIntent.GUILD_VOICE_STATES)
.disableCache(CacheFlag.EMOJI, CacheFlag.STICKER, CacheFlag.SCHEDULED_EVENTS)
.setMemberCachePolicy(MemberCachePolicy.ALL)
.setAutoReconnect(true)
.addEventListeners(new OnReadyListener(this))
Expand All @@ -54,9 +55,6 @@ public JDABot(BotConfig botConfig) {

} catch (IllegalArgumentException e) {
LOG.warn("The config was not populated. Please enter an email and password.");
// } catch (
// LoginException e) {
// LOG.warn("The provided bot token was incorrect. Please provide valid details.");
} catch (InterruptedException e) {
LOG.error("Login Interrupted.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ protected void execute(CommandEvent event) {
version = getClass().getPackage().getImplementationVersion();
}
if (version == null) {
version = "DEVELOPMENT";
version = botConfig.getApplicationVersion();
}

long uptimeDays = TimeUnit.DAYS.convert(upTime, TimeUnit.MILLISECONDS);
Expand All @@ -85,7 +85,6 @@ protected void execute(CommandEvent event) {
"\nSoundFiles: " + soundPlayer.getAvailableSoundFiles().size() +
"\nCommand Prefix: " + botConfig.getCommandCharacter() +
"\nSound File Path: " + botConfig.getSoundFileDir() +
"\nSoundboard Version: " + botConfig.getApplicationVersion() +
"\nWeb UI URL: localhost:" + soundPlayer.getApplicationContext().getWebServer().getPort() +
"\nSwagger URL: localhost:" + soundPlayer.getApplicationContext().getWebServer().getPort() + "/swagger-ui/index.html" +
"```");
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ spring:
hibernate:
ddl-auto: update
datasource:
url: jdbc:h2:file:/discordDB/discordDB;DB_CLOSE_ON_EXIT=FALSE;AUTO_RECONNECT=TRUE
url: jdbc:h2:file:./discordDB/discordDB;DB_CLOSE_ON_EXIT=FALSE;AUTO_RECONNECT=TRUE
driver-class-name: org.h2.Driver

0 comments on commit 92d8262

Please sign in to comment.