Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-02-17 01:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check token validity earlier & better

Browse Source
This commit is contained in:
Vankka 2023-05-19 20:30:58 +03:00
parent fbefcd9079
commit f2f5e739c4
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/com/discordsrv/common/discord/connection/jda/JDAConnectionManager.java
View File

@ -63,6 +63,7 @@ import net.dv8tion.jda.api.utils.cache.CacheFlag;
import net.dv8tion.jda.api.utils.messages.MessageRequest; import net.dv8tion.jda.api.utils.messages.MessageRequest;
import net.dv8tion.jda.internal.entities.ReceivedMessage; import net.dv8tion.jda.internal.entities.ReceivedMessage;
import net.dv8tion.jda.internal.hooks.EventManagerProxy; import net.dv8tion.jda.internal.hooks.EventManagerProxy;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.exception.ExceptionUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -283,6 +284,13 @@ public class JDAConnectionManager implements DiscordConnectionManager {
} }
private void connectInternal() { private void connectInternal() {
BotConfig botConfig = discordSRV.connectionConfig().bot;
String token = botConfig.token;
if (StringUtils.isBlank(token) || token.contains(" ")) {
invalidToken();
return;
}
discordSRV.setStatus(DiscordSRVApi.Status.ATTEMPTING_TO_CONNECT); discordSRV.setStatus(DiscordSRVApi.Status.ATTEMPTING_TO_CONNECT);
this.gatewayPool = new ScheduledThreadPoolExecutor( this.gatewayPool = new ScheduledThreadPoolExecutor(
1, 1,
@ -299,7 +307,6 @@ public class JDAConnectionManager implements DiscordConnectionManager {
TimeUnit.SECONDS TimeUnit.SECONDS
); );
BotConfig botConfig = discordSRV.connectionConfig().bot;
MemberCachingConfig memberCachingConfig = discordSRV.config().memberCaching; MemberCachingConfig memberCachingConfig = discordSRV.config().memberCaching;
DiscordConnectionDetailsImpl connectionDetails = discordSRV.discordConnectionDetails(); DiscordConnectionDetailsImpl connectionDetails = discordSRV.discordConnectionDetails();
@ -348,7 +355,7 @@ public class JDAConnectionManager implements DiscordConnectionManager {
} }
// Start with everything disabled & enable stuff that we actually need // Start with everything disabled & enable stuff that we actually need
JDABuilder jdaBuilder = JDABuilder.createLight(botConfig.token, intents); JDABuilder jdaBuilder = JDABuilder.createLight(token, intents);
jdaBuilder.enableCache(cacheFlags); jdaBuilder.enableCache(cacheFlags);
jdaBuilder.setMemberCachePolicy(member -> { jdaBuilder.setMemberCachePolicy(member -> {
if (this.memberCachePolicies.isEmpty()) { if (this.memberCachePolicies.isEmpty()) {