Merge branch 'release' into dev

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.clementraynaud</groupId>
     <artifactId>skoice</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <packaging>jar</packaging>
 
     <name>skoice</name>
@@ -22,7 +22,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.11.0</version>
+                <version>5.11.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -222,7 +222,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.3</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>net.dv8tion</groupId>

src/main/java/net/clementraynaud/skoice/lang/DiscordLang.java

@@ -34,6 +34,7 @@ protected void loadFormatter() {
         super.formatter.set("open-collective-url", "https://opencollective.com/skoice");
         super.formatter.set("github-url", "https://github.com/Skoice/skoice");
         super.formatter.set("crowdin-url", "https://crowdin.com/project/skoice");
+        super.formatter.set("creation-guide-url", "https://github.com/Skoice/skoice/wiki/Creating-a-Discord-Bot-for-Skoice");
 
         super.formatter.set("link-minecraft-command", "/skoice link");
     }

src/main/java/net/clementraynaud/skoice/listeners/session/ReadyListener.java

@@ -85,8 +85,8 @@ private void setDefaultFailure() {
                         || error.getErrorCode() == ErrorResponse.MFA_NOT_ENABLED.getCode()) {
                     this.plugin.getListenerManager().update();
                     return;
-                } else if (error.getErrorResponse() == ErrorResponse.INTERACTION_ALREADY_ACKNOWLEDGED
-                        || error.getErrorResponse() == ErrorResponse.UNKNOWN_INTERACTION) {
+                }
+                if (error.getErrorCode() == ErrorResponse.INTERACTION_ALREADY_ACKNOWLEDGED.getCode() || (error.getErrorCode() == ErrorResponse.UNKNOWN_INTERACTION.getCode() && error.getMessage().startsWith("10062: Failed to acknowledge this interaction, this can be due to 2 reasons"))) {
                     this.plugin.log(Level.WARNING, "logger.warning.shared-bot");
                     return;
                 }

src/main/java/net/clementraynaud/skoice/menus/MenuEmoji.java

@@ -60,6 +60,7 @@ public enum MenuEmoji {
     QUESTION("U+2753"),
     REPEAT("U+1F501"),
     REPEAT_ONE("U+1F502"),
+    ROBOT("U+1F916"),
     SCREWDRIVER("U+1FA9B"),
     SKULL("U+1F480"),
     SOUND("U+1F509"),

src/main/resources/discord/lang/EN.yml

@@ -216,6 +216,9 @@ field:
   proximity-channel-deleted:
     title: "Proximity Channel Deleted"
     description: "You have deleted a channel used by the proximity voice chat. These channels are automatically deleted when they are no longer needed. You should not be doing it manually."
+  shared-bot:
+    title: "Shared Bot"
+    description: "It seems like your bot is running multiple programs. However, it must be dedicated to Skoice in order to work properly. You can create a new one by [following these instructions]({creation-guide-url}). Once you have retrieved its token, type `{token-minecraft-command}` followed by the token on your Minecraft server. If your bot is not running multiple programs, please ask for help on our Discord server by pressing the button below."
 button-label:
   back: "Back"
   configure-now: "Configure Now"

src/main/resources/discord/menus/fields.yml

@@ -83,4 +83,7 @@ illegal-value:
   inline: false
 proximity-channel-deleted:
   emoji: x
+  inline: false
+shared-bot:
+  emoji: robot
   inline: false

src/main/resources/discord/menus/menus.yml

@@ -84,6 +84,10 @@ error:
     type: error
     fields:
       - proximity-channel-deleted
+  shared-bot:
+    type: error
+    fields:
+      - shared-bot
 
 voice-chat:
   emoji: speaking_head