Skip to content

Commit b709d41

Browse files
topi314topi314
authored
Merge pull request #505 from KittyBot-Org/development
new release
2 parents e106b61 + 636d4aa commit b709d41

24 files changed

Lines changed: 117 additions & 276 deletions

‎Dockerfile-dev‎

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

‎build.gradle‎

Lines changed: 43 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,91 @@
11
plugins {
2-
id 'java'
3-
id 'application'
4-
id 'com.github.johnrengelman.shadow' version '7.1.0'
5-
id 'nu.studer.jooq' version '6.0.1'
2+
id "java"
3+
id "application"
4+
id "com.github.johnrengelman.shadow" version "7.1.2"
5+
id "nu.studer.jooq" version "6.0.1"
66
}
77

8-
group 'de.kittybot'
9-
mainClassName = 'de.kittybot.kittybot.main.Main'
8+
group "de.kittybot"
9+
mainClassName = "de.kittybot.kittybot.main.Main"
10+
sourceCompatibility = 1.11
11+
compileJava.options.encoding = "UTF-8"
12+
1013

1114
repositories {
12-
maven { url 'https://m2.dv8tion.net/releases' }
13-
maven { url 'https://jitpack.io' }
15+
maven { url "https://m2.dv8tion.net/releases" }
16+
maven { url "https://jitpack.io" }
1417
mavenCentral()
1518
jcenter() // this is still required because of jda utilities
1619
}
1720

1821
dependencies {
1922
// discord/jda related
20-
implementation('net.dv8tion:JDA:4.3.0_339') {
21-
exclude group: 'club.minnced', module: 'opus-java'
23+
implementation("net.dv8tion:JDA:4.4.0_352") {
24+
exclude group: "club.minnced", module: "opus-java"
2225
}
23-
implementation 'com.jagrosh:jda-utilities:3.0.5'
24-
implementation 'club.minnced:discord-webhooks:0.7.2'
25-
implementation 'dev.mlnr:BotListHandler-jda:2.0.0_11'
26+
implementation "com.jagrosh:jda-utilities:3.0.5"
27+
implementation "club.minnced:discord-webhooks:0.7.5"
28+
implementation "dev.mlnr:BotListHandler-jda:2.0.0_11"
2629

2730
// audio
28-
implementation('com.github.KittyBot-Org:Lavalink-Client:d48f1a6') {
29-
exclude group: 'com.sedmelluq', module: 'lavaplayer'
30-
}
31-
implementation 'com.sedmelluq:lavaplayer:1.3.78'
32-
implementation 'se.michaelthelin.spotify:spotify-web-api-java:6.5.4'
31+
implementation "com.github.KittyBot-Org:Lavalink-Client:1.0.0"
3332

3433
// database
35-
implementation 'com.zaxxer:HikariCP:5.0.0'
36-
implementation 'org.jooq:jooq:3.15.4'
37-
implementation 'org.postgresql:postgresql:42.3.0'
38-
jooqGenerator 'org.postgresql:postgresql:42.3.0'
39-
34+
implementation "com.zaxxer:HikariCP:5.0.0"
35+
implementation "org.jooq:jooq:3.16.0"
36+
implementation "org.postgresql:postgresql:42.3.1"
37+
jooqGenerator "org.postgresql:postgresql:42.3.1"
4038
// logging
41-
implementation 'ch.qos.logback:logback-classic:1.3.0-alpha10'
42-
implementation 'io.sentry:sentry-logback:5.2.4'
39+
implementation "ch.qos.logback:logback-classic:1.2.8"
40+
implementation "io.sentry:sentry-logback:5.5.2"
4341

4442
// eval
45-
implementation 'org.codehaus.groovy:groovy-jsr223:3.0.9'
43+
implementation "org.codehaus.groovy:groovy-jsr223:3.0.9"
4644

4745
// jjwt
48-
implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
49-
implementation 'io.jsonwebtoken:jjwt-impl:0.11.2'
50-
implementation 'io.jsonwebtoken:jjwt-jackson:0.11.2'
46+
implementation "io.jsonwebtoken:jjwt-api:0.11.2"
47+
implementation "io.jsonwebtoken:jjwt-impl:0.11.2"
48+
implementation "io.jsonwebtoken:jjwt-jackson:0.11.2"
5149

5250
// Prometheus
53-
implementation 'io.prometheus:simpleclient:0.12.0'
54-
implementation 'io.prometheus:simpleclient_hotspot:0.12.0'
55-
implementation 'io.prometheus:simpleclient_httpserver:0.12.0'
51+
implementation "io.prometheus:simpleclient:0.14.1"
52+
implementation "io.prometheus:simpleclient_hotspot:0.14.1"
53+
implementation "io.prometheus:simpleclient_httpserver:0.14.1"
5654

5755
// other
58-
implementation 'io.javalin:javalin:4.1.1'
59-
implementation 'io.github.classgraph:classgraph:4.8.129'
60-
implementation 'com.github.ben-manes.caffeine:caffeine:3.0.4'
61-
implementation 'com.squareup.okhttp3:okhttp:4.9.2'
56+
implementation "io.javalin:javalin:4.2.0"
57+
implementation "io.github.classgraph:classgraph:4.8.138"
58+
implementation "com.github.ben-manes.caffeine:caffeine:3.0.5"
59+
implementation "com.squareup.okhttp3:okhttp:4.9.3"
6260
}
6361

6462
jooq {
65-
version = '3.15.2'
63+
version = "3.15.2"
6664
configurations {
6765
main {
6866
generateSchemaSourceOnCompilation = false
6967
generationTool {
7068
logging = org.jooq.meta.jaxb.Logging.WARN
7169
jdbc {
72-
driver = 'org.postgresql.Driver'
70+
driver = "org.postgresql.Driver"
7371
url = "jdbc:postgresql://${KITTYBOT_DB_HOST}:${KITTYBOT_DB_PORT}/${KITTYBOT_DB_DATABASE}"
7472
user = KITTYBOT_DB_USER
7573
password = KITTYBOT_DB_PASSWORD
7674
}
7775
generator {
78-
name = 'org.jooq.codegen.DefaultGenerator'
76+
name = "org.jooq.codegen.DefaultGenerator"
7977
database {
80-
name = 'org.jooq.meta.postgres.PostgresDatabase'
81-
inputSchema = 'public'
82-
includes = '.*'
83-
excludes = ''
78+
name = "org.jooq.meta.postgres.PostgresDatabase"
79+
inputSchema = "public"
80+
includes = ".*"
81+
excludes = ""
8482
}
8583
generate {
8684
records = true
8785
fluentSetters = true
8886
}
8987
target {
90-
packageName = 'de.kittybot.kittybot.jooq'
88+
packageName = "de.kittybot.kittybot.jooq"
9189
directory = "src/main/jooq"
9290
}
9391
strategy.name = "org.jooq.codegen.DefaultGeneratorStrategy"
@@ -98,8 +96,5 @@ jooq {
9896
}
9997

10098
ext {
101-
moduleName = 'KittyBot'
99+
moduleName = "KittyBot"
102100
}
103-
104-
sourceCompatibility = 1.11
105-
compileJava.options.encoding = 'UTF-8'

‎src/main/java/de/kittybot/kittybot/commands/music/ForwardCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void run(Options options, GuildInteraction ia){
3232
var lavalinkPlayer = scheduler.getPlayer();
3333
var position = lavalinkPlayer.getTrackPosition();
3434
var newPos = position + forward;
35-
if(newPos > scheduler.getPlayingTrack().getDuration()){
35+
if(newPos > scheduler.getPlayingTrack().getInfo().getLength()){
3636
scheduler.next(true);
3737
ia.reply("Skipped to next track");
3838
return;

‎src/main/java/de/kittybot/kittybot/commands/music/SeekCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void run(Options options, GuildInteraction ia){
3030
}
3131
var newPos = options.getLong("seconds") * 1000;
3232
var lavalinkPlayer = scheduler.getPlayer();
33-
if(newPos > scheduler.getPlayingTrack().getDuration()){
33+
if(newPos > scheduler.getPlayingTrack().getInfo().getLength()){
3434
scheduler.next(true);
3535
ia.reply("Skipped to next track");
3636
return;

‎src/main/java/de/kittybot/kittybot/commands/roles/roles/ListCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void run(Options options, GuildInteraction ia){
5353
return;
5454
}
5555
ia.acknowledge().queue(success ->
56-
ia.getChannel().sendMessage(embed).queue(message -> {
56+
ia.getChannel().sendMessageEmbeds(embed).queue(message -> {
5757
ia.get(ReactionRoleModule.class).add(message.getGuild().getIdLong(), message.getIdLong());
5858
sortedRoles.forEach(role -> message.addReaction("test:" + role.getEmoteId()).queue());
5959
})

‎src/main/java/de/kittybot/kittybot/main/KittyBot.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ public KittyBot() throws IOException, MissingConfigValuesException, LoginExcepti
5858
.disableCache(
5959
CacheFlag.MEMBER_OVERRIDES,
6060
CacheFlag.ACTIVITY,
61-
CacheFlag.CLIENT_STATUS,
62-
CacheFlag.ROLE_TAGS
61+
CacheFlag.CLIENT_STATUS
6362
)
6463
.setMemberCachePolicy(MemberCachePolicy.VOICE)
6564
.setChunkingFilter(ChunkingFilter.NONE)

‎src/main/java/de/kittybot/kittybot/modules/AnnouncementModule.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void onGuildMessageReceived(@NotNull GuildMessageReceivedEvent event){
5353
return;
5454
}
5555
if((msg.contains("<@" + Config.BOT_ID + ">") || msg.contains("<@!" + Config.BOT_ID + ">")) && msg.contains("help")){
56-
event.getChannel().sendMessage(new EmbedBuilder()
56+
event.getChannel().sendMessageEmbeds(new EmbedBuilder()
5757
.setColor(Colors.KITTYBOT_BLUE)
5858
.setAuthor("KittyBot Slash Commands Update", event.getJDA().getSelfUser().getEffectiveAvatarUrl(), Config.ORIGIN_URL)
5959
.setDescription("KittyBot now uses the new slash commands.\n" +
@@ -92,7 +92,7 @@ public void onGuildJoin(@Nonnull GuildJoinEvent event){
9292
if(channel == null || !channel.canTalk()){
9393
return;
9494
}
95-
channel.sendMessage(embed).queue();
95+
channel.sendMessageEmbeds(embed).queue();
9696
return;
9797
}
9898
guild.retrieveAuditLogs().type(ActionType.BOT_ADD).limit(1).cache(false).queue(entries -> {
@@ -105,14 +105,14 @@ public void onGuildJoin(@Nonnull GuildJoinEvent event){
105105
return;
106106
}
107107

108-
user.openPrivateChannel().flatMap(channel -> channel.sendMessage(embed)).queue(
108+
user.openPrivateChannel().flatMap(channel -> channel.sendMessageEmbeds(embed)).queue(
109109
null,
110110
error -> {
111111
var channel = guild.getDefaultChannel();
112112
if(channel == null || !channel.canTalk()){
113113
return;
114114
}
115-
channel.sendMessage(embed).queue();
115+
channel.sendMessageEmbeds(embed).queue();
116116
}
117117
);
118118
});

‎src/main/java/de/kittybot/kittybot/modules/CommandsModule.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ public void deployCommands(long guildId, Map<String, Command> commands){
8888
LOG.info("Registering commands {}...", guildId == -1 ? "global" : "for guild " + guildId);
8989

9090
var rqBody = RequestBody.create(
91-
DataArray.fromCollection(commands.values().stream().map(Command::toJSON).collect(Collectors.toList())).toJson(),
92-
MediaType.parse("application/json")
91+
MediaType.parse("application/json"),
92+
DataArray.fromCollection(commands.values().stream().map(Command::toJSON).collect(Collectors.toList())).toJson()
9393
);
9494

9595
var route = guildId == -1L ? COMMANDS_CREATE.compile(String.valueOf(Config.BOT_ID)) : GUILD_COMMANDS_CREATE.compile(String.valueOf(Config.BOT_ID), String.valueOf(guildId));
9696
try(var resp = newCall(route, rqBody).execute()){
9797
if(!resp.isSuccessful()){
9898
var body = resp.body();
99-
LOG.error("Registering commands failed. Request Body: {}, Response Body: {}", commands.toString(), body == null ? "null" : body.string());
99+
LOG.error("Registering commands failed. Request Body: {}, Response Body: {}", commands, body == null ? "null" : body.string());
100100
}
101101
var body = resp.body();
102102
if(body == null){
@@ -142,13 +142,13 @@ public Map<Long, Command> getCommands(){
142142
}
143143

144144
public long registerGuildCommand(long guildId, DataObject command){
145-
var rqBody = RequestBody.create(command.toJson(), MediaType.parse("application/json"));
145+
var rqBody = RequestBody.create(MediaType.parse("application/json"), command.toJson());
146146

147147
var route = GUILD_COMMAND_CREATE.compile(String.valueOf(Config.BOT_ID), String.valueOf(guildId));
148148
try(var resp = newCall(route, rqBody).execute()){
149149
if(!resp.isSuccessful()){
150150
var body = resp.body();
151-
LOG.error("Registering command failed. Request Body: {}, Response Body: {}", command.toString(), body == null ? "null" : body.string());
151+
LOG.error("Registering command failed. Request Body: {}, Response Body: {}", command, body == null ? "null" : body.string());
152152
return -1L;
153153
}
154154
var body = resp.body();
@@ -182,7 +182,7 @@ public boolean deleteGuildCommand(long guildId, long commandId){
182182
}
183183

184184
public boolean editGuildCommand(long guildId, long commandId, DataObject command){
185-
var rqBody = RequestBody.create(command.toJson(), MediaType.parse("application/json"));
185+
var rqBody = RequestBody.create(MediaType.parse("application/json"), command.toJson());
186186

187187
var route = GUILD_COMMAND_EDIT.compile(String.valueOf(Config.BOT_ID), String.valueOf(guildId), String.valueOf(commandId));
188188
try(var resp = newCall(route, rqBody).execute()){
@@ -220,7 +220,7 @@ public DataArray getGuildCommands(long guildId){
220220

221221
public void deleteAllCommands(long guildId){
222222
LOG.info("Deleting commands {}...", guildId == -1 ? "global" : "for guild " + guildId);
223-
var rqBody = RequestBody.create(DataArray.empty().toString(), MediaType.parse("application/json"));
223+
var rqBody = RequestBody.create(MediaType.parse("application/json"), DataArray.empty().toString());
224224

225225
var route = guildId == -1L ? COMMANDS_CREATE.compile(String.valueOf(Config.BOT_ID)) : GUILD_COMMANDS_CREATE.compile(String.valueOf(Config.BOT_ID), String.valueOf(guildId));
226226
try(var resp = newCall(route, rqBody).execute()){

‎src/main/java/de/kittybot/kittybot/modules/GuildLoggingModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private void logEvent(GenericGuildEvent event, Color color, User user, String ev
120120
if(channel == null){
121121
return;
122122
}
123-
channel.sendMessage(new EmbedBuilder()
123+
channel.sendMessageEmbeds(new EmbedBuilder()
124124
.setColor(color)
125125
.setDescription(String.format(message, args))
126126
.setFooter(eventName, user == null ? null : user.getEffectiveAvatarUrl())

‎src/main/java/de/kittybot/kittybot/modules/InteractionsModule.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ else if(interaction.isFromGuild()){
123123
}
124124
}
125125
catch(Exception e){
126+
LOG.error("Error while executing command", e);
126127
interaction.error(e.getMessage());
127128
}
128129
return;

0 commit comments

Comments
 (0)