Skip to content

Commit 92d8262

Browse files
committed
Bumping version and updating the latest version of lavaplayer. Fixing an issue with the DB path. Updating the info command
1 parent 1f935e6 commit 92d8262

File tree

7 files changed

+6
-80
lines changed

7 files changed

+6
-80
lines changed

.github/workflows/version.yml

Lines changed: 0 additions & 71 deletions
This file was deleted.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ tasks.named("bootJar") {
5959

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

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
projectVersion = 3.3.3
1+
projectVersion = 3.3.4

src/main/java/net/dirtydeeds/discordsoundboard/JDABot.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import net.dv8tion.jda.api.entities.Activity;
99
import net.dv8tion.jda.api.requests.GatewayIntent;
1010
import net.dv8tion.jda.api.utils.MemberCachePolicy;
11+
import net.dv8tion.jda.api.utils.cache.CacheFlag;
1112
import org.slf4j.Logger;
1213
import org.slf4j.LoggerFactory;
1314
import org.springframework.util.ObjectUtils;
14-
import javax.security.auth.login.LoginException;
1515

1616
@Getter
1717
public class JDABot {
@@ -38,6 +38,7 @@ public JDABot(BotConfig botConfig) {
3838
jda = JDABuilder.createDefault(botToken, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MEMBERS,
3939
GatewayIntent.MESSAGE_CONTENT, GatewayIntent.DIRECT_MESSAGES,
4040
GatewayIntent.GUILD_VOICE_STATES)
41+
.disableCache(CacheFlag.EMOJI, CacheFlag.STICKER, CacheFlag.SCHEDULED_EVENTS)
4142
.setMemberCachePolicy(MemberCachePolicy.ALL)
4243
.setAutoReconnect(true)
4344
.addEventListeners(new OnReadyListener(this))
@@ -54,9 +55,6 @@ public JDABot(BotConfig botConfig) {
5455

5556
} catch (IllegalArgumentException e) {
5657
LOG.warn("The config was not populated. Please enter an email and password.");
57-
// } catch (
58-
// LoginException e) {
59-
// LOG.warn("The provided bot token was incorrect. Please provide valid details.");
6058
} catch (InterruptedException e) {
6159
LOG.error("Login Interrupted.");
6260
}

src/main/java/net/dirtydeeds/discordsoundboard/commands/InfoCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected void execute(CommandEvent event) {
6969
version = getClass().getPackage().getImplementationVersion();
7070
}
7171
if (version == null) {
72-
version = "DEVELOPMENT";
72+
version = botConfig.getApplicationVersion();
7373
}
7474

7575
long uptimeDays = TimeUnit.DAYS.convert(upTime, TimeUnit.MILLISECONDS);
@@ -85,7 +85,6 @@ protected void execute(CommandEvent event) {
8585
"\nSoundFiles: " + soundPlayer.getAvailableSoundFiles().size() +
8686
"\nCommand Prefix: " + botConfig.getCommandCharacter() +
8787
"\nSound File Path: " + botConfig.getSoundFileDir() +
88-
"\nSoundboard Version: " + botConfig.getApplicationVersion() +
8988
"\nWeb UI URL: localhost:" + soundPlayer.getApplicationContext().getWebServer().getPort() +
9089
"\nSwagger URL: localhost:" + soundPlayer.getApplicationContext().getWebServer().getPort() + "/swagger-ui/index.html" +
9190
"```");

src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ spring:
1313
hibernate:
1414
ddl-auto: update
1515
datasource:
16-
url: jdbc:h2:file:/discordDB/discordDB;DB_CLOSE_ON_EXIT=FALSE;AUTO_RECONNECT=TRUE
16+
url: jdbc:h2:file:./discordDB/discordDB;DB_CLOSE_ON_EXIT=FALSE;AUTO_RECONNECT=TRUE
1717
driver-class-name: org.h2.Driver

0 commit comments

Comments
 (0)