Skip to content

Commit a83adc4

Browse files
committed
Upgrade JDA, fixes #296
1 parent beb4ac5 commit a83adc4

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

bot/src/main/kotlin/ml/duncte123/skybot/entities/jda/FakeMember.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,6 @@ class FakeMember(private val name: String) : Member {
164164
override fun getDefaultChannel(): DefaultGuildChannelUnion? {
165165
TODO("Not yet implemented")
166166
}
167+
168+
override fun getFlagsRaw() = 0
167169
}

dashboard/src/main/kotlin/com/dunctebot/jda/JDARestClient.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import net.dv8tion.jda.api.entities.Member
77
import net.dv8tion.jda.api.entities.SelfUser
88
import net.dv8tion.jda.api.entities.User
99
import net.dv8tion.jda.api.requests.RestAction
10+
import net.dv8tion.jda.api.requests.Route
1011
import net.dv8tion.jda.api.utils.MiscUtil
1112
import net.dv8tion.jda.api.utils.data.DataArray
1213
import net.dv8tion.jda.api.utils.data.DataObject
1314
import net.dv8tion.jda.internal.JDAImpl
1415
import net.dv8tion.jda.internal.entities.GuildImpl
1516
import net.dv8tion.jda.internal.requests.CompletedRestAction
1617
import net.dv8tion.jda.internal.requests.RestActionImpl
17-
import net.dv8tion.jda.internal.requests.Route
1818
import net.dv8tion.jda.internal.utils.config.AuthorizationConfig
1919
import net.dv8tion.jda.internal.utils.config.MetaConfig
2020
import net.dv8tion.jda.internal.utils.config.SessionConfig
@@ -52,7 +52,7 @@ class JDARestClient(token: String) {
5252
return@newScheduledThreadPool t
5353
}, true)
5454

55-
jda = JDAImpl(authConfig, sessionConfig, threadConfig, metaConfig)
55+
jda = JDAImpl(authConfig, sessionConfig, threadConfig, metaConfig, null)
5656

5757
retrieveSelfUser().queue(jda::setSelfUser)
5858
}

dashboard/src/main/kotlin/com/dunctebot/jda/impl/MemberPaginationActionImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import net.dv8tion.jda.api.entities.Member
66
import net.dv8tion.jda.api.exceptions.ParsingException
77
import net.dv8tion.jda.api.requests.Request
88
import net.dv8tion.jda.api.requests.Response
9+
import net.dv8tion.jda.api.requests.Route
910
import net.dv8tion.jda.internal.entities.GuildImpl
10-
import net.dv8tion.jda.internal.requests.Route
1111
import net.dv8tion.jda.internal.requests.restaction.pagination.PaginationActionImpl
1212

1313
class MemberPaginationActionImpl(override val guild: Guild) :

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fun VersionCatalogBuilder.common() {
4343
library("sentry", "io.sentry", "sentry-logback").version("5.4.0")
4444
library("org-json", "org.json", "json").version("20220924")
4545

46-
library("jda", "net.dv8tion", "JDA").version("5.0.0-beta.5")
46+
library("jda", "net.dv8tion", "JDA").version("5.0.0-beta.8")
4747

4848
library("trove", "net.sf.trove4j", "trove4j").version("3.0.3")
4949

shared/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2ClientImpl.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,15 @@
3131
import com.jagrosh.jdautilities.oauth2.state.DefaultStateController;
3232
import com.jagrosh.jdautilities.oauth2.state.StateController;
3333
import net.dv8tion.jda.api.exceptions.HttpException;
34-
import net.dv8tion.jda.internal.requests.Method;
34+
import net.dv8tion.jda.api.requests.Method;
3535
import net.dv8tion.jda.internal.utils.Checks;
3636
import net.dv8tion.jda.internal.utils.EncodingUtil;
3737
import net.dv8tion.jda.internal.utils.IOUtil;
3838
import net.dv8tion.jda.internal.utils.JDALogger;
39-
import okhttp3.*;
39+
import okhttp3.Headers;
40+
import okhttp3.OkHttpClient;
41+
import okhttp3.RequestBody;
42+
import okhttp3.Response;
4043
import org.json.JSONArray;
4144
import org.json.JSONObject;
4245
import org.json.JSONTokener;

shared/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2Action.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.jagrosh.jdautilities.oauth2.requests;
1717

1818
import com.jagrosh.jdautilities.oauth2.entities.impl.OAuth2ClientImpl;
19-
import net.dv8tion.jda.internal.requests.Method;
19+
import net.dv8tion.jda.api.requests.Method;
2020
import net.dv8tion.jda.internal.utils.Checks;
2121
import okhttp3.Headers;
2222
import okhttp3.Request;

0 commit comments

Comments
 (0)