Update JDA version to 4.4.0_352

Author: Vampire

buildSrc/src/main/kotlin/net/kautler/javadoc.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 Bjoern Kautler
+ * Copyright 2019-2022 Bjoern Kautler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ tasks.withType<Javadoc>().configureEach {
             add("https://static.javadoc.io/javax.enterprise/cdi-api/${versions["cdi"]}/")
             add("https://static.javadoc.io/javax.inject/javax.inject/${versions["javax.inject"]}/")
             add("https://static.javadoc.io/org.javacord/javacord-api/${messageFrameworkVersions.safeGet("javacord").first()}/")
-            add("https://static.javadoc.io/net.dv8tion/JDA/${messageFrameworkVersions.safeGet("jda").first()}/")
+            add("https://ci.dv8tion.net/job/JDA/javadoc/")
         }
         isUse = true
         isVersion = true

buildSrc/src/main/kotlin/net/kautler/versions.gradle.kts

@@ -34,11 +34,12 @@ repositories {
     // have both in case JCenter is again refusing to work properly and Maven Central first
     mavenCentral()
     jcenter()
+    maven("https://m2.dv8tion.net/releases")
 }
 
 val messageFrameworkVersions by extra(mapOf(
         "javacord" to listOf("3.4.0"),
-        "jda" to listOf("4.2.0_214")
+        "jda" to listOf("4.4.0_352")
 ))
 
 val versions by extra(mapOf(

examples/simplePingBotJda/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 Björn Kautler
+ * Copyright 2019-2022 Björn Kautler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ plugins {
 repositories {
     mavenCentral()
     jcenter()
+    maven("https://m2.dv8tion.net/releases")
 }
 
 dependencies {
@@ -30,7 +31,7 @@ dependencies {
     runtimeOnly("org.jboss.weld.se:weld-se-core:3.1.2.Final") { because("CDI implementation") }
     runtimeOnly("org.jboss:jandex:2.1.1.Final") { because("faster CDI bean scanning") }
 
-    implementation("net.dv8tion:JDA:4.2.0_214") {
+    implementation("net.dv8tion:JDA:4.4.0_352") {
         exclude("club.minnced", "opus-java")
         exclude("com.google.code.findbugs", "jsr305")
     }

src/main/java/net/kautler/command/api/restriction/jda/RegularUserJda.java

@@ -34,7 +34,7 @@ public class RegularUserJda implements Restriction<Message> {
     @Override
     public boolean allowCommand(CommandContext<? extends Message> commandContext) {
         return Optional.of(commandContext.getMessage().getAuthor())
-                .filter(author -> !author.isFake())
+                .filter(author -> !author.isSystem())
                 .map(author -> !author.isBot())
                 .orElse(FALSE);
     }

src/main/java/net/kautler/command/api/restriction/jda/UserJda.java

@@ -198,7 +198,6 @@ public boolean allowCommand(CommandContext<? extends Message> commandContext) {
      */
     private boolean allowCommandByUserId(Message message) {
         return Optional.of(message.getAuthor())
-                .filter(author -> !author.isFake())
                 .map(ISnowflake::getIdLong)
                 .map(authorId -> authorId == userId)
                 .orElse(FALSE);
@@ -212,7 +211,6 @@ private boolean allowCommandByUserId(Message message) {
      */
     private boolean allowCommandByUserName(Message message) {
         return Optional.of(message.getAuthor())
-                .filter(author -> !author.isFake())
                 .map(User::getName)
                 .map(authorName -> {
                     if (this.userName == null) {

src/test/groovy/net/kautler/command/api/restriction/jda/RegularUserJdaTest.groovy

@@ -16,6 +16,8 @@
 
 package net.kautler.command.api.restriction.jda
 
+import javax.inject.Inject
+
 import net.dv8tion.jda.api.entities.Message
 import net.dv8tion.jda.api.entities.User
 import net.kautler.command.api.CommandContext
@@ -24,8 +26,6 @@ import org.junit.Rule
 import spock.lang.Specification
 import spock.lang.Subject
 
-import javax.inject.Inject
-
 class RegularUserJdaTest extends Specification {
     @Rule
     WeldInitiator weld = WeldInitiator
@@ -43,19 +43,19 @@ class RegularUserJdaTest extends Specification {
         }
     }
 
-    def 'fake author #fake and regular user author #regularUser should #be allowed'() {
+    def 'system user author #systemUser and bot user author #botUser should #be allowed'() {
         given:
             commandContext.message.author.with {
-                it.fake >> fake
-                it.bot >> !regularUser
+                it.system >> systemUser
+                it.bot >> botUser
             }
 
         expect:
             regularUserJda.allowCommand(commandContext) == allowed
 
         where:
-            [fake, regularUser] << ([[true, false]] * 2).combinations()
-            allowed = !fake && regularUser
+            [systemUser, botUser] << ([[true, false]] * 2).combinations()
+            allowed = !systemUser && !botUser
             be = allowed ? 'be' : 'not be'
     }
 }

src/test/groovy/net/kautler/command/api/restriction/jda/UserJdaTest.groovy

@@ -16,6 +16,8 @@
 
 package net.kautler.command.api.restriction.jda
 
+import java.util.regex.Pattern
+
 import net.dv8tion.jda.api.entities.Message
 import net.dv8tion.jda.api.entities.User
 import net.kautler.command.api.CommandContext
@@ -25,23 +27,11 @@ import spock.lang.Specification
 import spock.lang.Subject
 import spock.util.mop.Use
 
-import java.util.regex.Pattern
-
 @Subject(UserJda)
 class UserJdaTest extends Specification {
-    CommandContext<Message> commandContextByFakeUser = Stub {
-        it.message >> Stub(Message) {
-            it.author >> Stub(User) {
-                it.fake >> true
-            }
-        }
-    }
-
     CommandContext<Message> commandContext = Stub {
         it.message >> Stub(Message) {
-            it.author >> Stub(User) {
-                it.fake >> false
-            }
+            it.author >> Stub(User)
         }
     }
 
@@ -50,12 +40,9 @@ class UserJdaTest extends Specification {
             UserJda userJda = Spy(constructorArgs: [expectedUserId])
 
         and:
-            [commandContext, commandContextByFakeUser].each {
-                it.message.author.idLong >> actualUserId
-            }
+            commandContext.message.author.idLong >> actualUserId
 
         expect:
-            !userJda.allowCommand(commandContextByFakeUser)
             userJda.allowCommand(commandContext) == allowed
 
         where:
@@ -70,12 +57,9 @@ class UserJdaTest extends Specification {
             UserJda userJda = Spy(constructorArgs: [expectedUserName])
 
         and:
-            [commandContext, commandContextByFakeUser].each {
-                it.message.author.name >> actualUserName
-            }
+            commandContext.message.author.name >> actualUserName
 
         expect:
-            !userJda.allowCommand(commandContextByFakeUser)
             userJda.allowCommand(commandContext) == allowed
 
         where:
@@ -90,12 +74,9 @@ class UserJdaTest extends Specification {
             UserJda userJda = Spy(constructorArgs: [expectedUserName, false])
 
         and:
-            [commandContext, commandContextByFakeUser].each {
-                it.message.author.name >> actualUserName
-            }
+            commandContext.message.author.name >> actualUserName
 
         expect:
-            !userJda.allowCommand(commandContextByFakeUser)
             userJda.allowCommand(commandContext) == allowed
 
         where:
@@ -110,12 +91,9 @@ class UserJdaTest extends Specification {
             UserJda userJda = Spy(constructorArgs: [expectedUserPattern])
 
         and:
-            [commandContext, commandContextByFakeUser].each {
-                it.message.author.name >> actualUserName
-            }
+            commandContext.message.author.name >> actualUserName
 
         expect:
-            !userJda.allowCommand(commandContextByFakeUser)
             userJda.allowCommand(commandContext) == allowed
 
         where: