Merge pull request #10 from TosoxDev/development

fix: Scramble and Hangman
Tosox · Jul 13, 2023 · 362c6b5 · 362c6b5
2 parents bba7131 + a4dc6c7
commit 362c6b5
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/src/main/java/de/tosoxdev/tosoxjr/commands/hangman/Hangman.java b/src/main/java/de/tosoxdev/tosoxjr/commands/hangman/Hangman.java
@@ -250,7 +250,7 @@ private String createDescription() {
 
     private EmbedBuilder createGameEmbed(GameState state) {
         EmbedBuilder gameEmbed = new EmbedBuilder();
-        gameEmbed.setTitle((coop ? "[CO-OP] " : "") + state.getTitle());
+        gameEmbed.setTitle(String.format("%s[%s] %s", coop ? "[CO-OP]" : "", language.isBlank() ? "EN" : language.toUpperCase(), state.getTitle()));
         gameEmbed.setColor(Color.BLUE);
         gameEmbed.setDescription(createDescription());
         gameEmbed.addField("Word", "```" + (state == GameState.ONGOING ? showWord() : revealWord()) + "```", false);
@@ -267,6 +267,7 @@ private EmbedBuilder createGameEmbed(GameState state) {
                     - React with the stop sign (🛑) to end the game
                     """, false);
         }
+        gameEmbed.setFooter("Request made by @" + player, null);
         return gameEmbed;
     }
 }
diff --git a/src/main/java/de/tosoxdev/tosoxjr/commands/joke/JokeCmd.java b/src/main/java/de/tosoxdev/tosoxjr/commands/joke/JokeCmd.java
@@ -41,7 +41,7 @@ public void handle(SlashCommandInteractionEvent event) {
             String randomCategory = (String) categories.keySet().toArray()[randomIdx];
             Callable<String> callable = categories.get(randomCategory);
 
-            String joke = Utils.getStringFromCallable(callable);
+            String joke = Utils.getFromCallable(callable);
             if (joke == null) {
                 Main.getLogger().error("The callable didn't return a value when trying to run 'joke'");
                 return;
@@ -63,7 +63,7 @@ public void handle(SlashCommandInteractionEvent event) {
             return;
         }
 
-        String joke = Utils.getStringFromCallable(callable);
+        String joke = Utils.getFromCallable(callable);
         if (joke == null) {
             Main.getLogger().error("The callable didn't return a value when trying to run 'joke'");
             return;

diff --git a/src/main/java/de/tosoxdev/tosoxjr/commands/quote/QuoteCmd.java b/src/main/java/de/tosoxdev/tosoxjr/commands/quote/QuoteCmd.java
@@ -42,7 +42,7 @@ public void handle(SlashCommandInteractionEvent event) {
             String randomCategory = (String) categories.keySet().toArray()[randomIdx];
             Callable<String> callable = categories.get(randomCategory);
 
-            String quote = Utils.getStringFromCallable(callable);
+            String quote = Utils.getFromCallable(callable);
             if (quote == null) {
                 Main.getLogger().error("The callable didn't return a value when trying to run 'quote'");
                 return;
@@ -64,7 +64,7 @@ public void handle(SlashCommandInteractionEvent event) {
             return;
         }
 
-        String quote = Utils.getStringFromCallable(callable);
+        String quote = Utils.getFromCallable(callable);
         if (quote == null) {
             Main.getLogger().error("The callable didn't return a value when trying to run 'quote'");
             return;

diff --git a/src/main/java/de/tosoxdev/tosoxjr/commands/scramble/Scramble.java b/src/main/java/de/tosoxdev/tosoxjr/commands/scramble/Scramble.java
@@ -29,7 +29,7 @@ public class Scramble {
         }
     }
 
-    private static final int TIMEOUT_MS = 2 * 60 * 1000;
+    private static final int TIMEOUT_MS = 10 * 60 * 1000;
     private static final int STOP_SIGN_CP = 0x1F6D1;
 
     private final MessageChannel channel;
@@ -40,7 +40,6 @@ public class Scramble {
     private Timer tmTimeout = new Timer();
     private String embedMessageId;
     private long timer;
-    private int attempts;
     private String word;
     private String scrambledWord;
 
@@ -58,8 +57,15 @@ public boolean initialize() {
             return false;
         }
 
+        // Bugfix for the words with spaces ("Ansicht")
+        word = word.replaceAll("\\s+","");
+
         // Shuffle word
-        List<String> chars = new ArrayList<>(word.chars().mapToObj(c -> String.valueOf((char) c)).toList());
+        List<String> chars = new ArrayList<>(word
+                .toLowerCase()
+                .chars()
+                .mapToObj(c -> String.valueOf((char) c))
+                .toList());
         Collections.shuffle(chars);
         scrambledWord = String.join("", chars);
 
@@ -113,8 +119,6 @@ private void handleMessageReceivedEvent(MessageReceivedEvent event) {
         // Reset timeout timer
         resetTimer();
 
-        attempts++;
-
         if (event.getMessage().getContentDisplay().equalsIgnoreCase(word)) {
             endGame(GameState.WIN, sender.getName());
         }
@@ -146,14 +150,14 @@ private String generateWord() {
 
     private EmbedBuilder createGameEmbed(GameState state, String sender) {
         EmbedBuilder gameEmbed = new EmbedBuilder();
-        gameEmbed.setTitle((coop ? "[CO-OP] " : "") + state.getTitle());
+        gameEmbed.setTitle(String.format("%s[%s] %s", coop ? "[CO-OP]" : "", language.isBlank() ? "EN" : language.toUpperCase(), state.getTitle()));
         gameEmbed.setColor(Color.CYAN);
         gameEmbed.addField(state == GameState.ONGOING ? "Word" : "The word was", state == GameState.ONGOING ? scrambledWord : word, false);
         if (state == GameState.WIN) {
             double time = (double)(System.currentTimeMillis() - timer) / 1000;
             String results = coop
                     ? String.format("%s guessed the word first after %.2fs", sender, time)
-                    : String.format("You guessed the word after %.2fs and %d attempts", time, attempts);
+                    : String.format("You guessed the word after %.2fs", time);
             gameEmbed.addField("Results", results, false);
         }
         if (state == GameState.ONGOING) {
@@ -165,6 +169,7 @@ private EmbedBuilder createGameEmbed(GameState state, String sender) {
                     - React with the stop sign (🛑) to end the game
                     """, false);
         }
+        gameEmbed.setFooter("Request made by @" + player, null);
         return gameEmbed;
     }
 }
diff --git a/src/main/java/de/tosoxdev/tosoxjr/utils/APIRequest.java b/src/main/java/de/tosoxdev/tosoxjr/utils/APIRequest.java
@@ -2,7 +2,6 @@
 
 import de.tosoxdev.tosoxjr.Main;
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
@@ -49,15 +48,14 @@ public static Object getJson(String query) {
             return null;
         }
 
-        try {
+        char fistChar = body.charAt(0);
+        if (fistChar == '{') {
             return new JSONObject(body);
-        } catch (JSONException e) {
-            try {
-                return new JSONArray(body);
-            } catch (JSONException f) {
-                Main.getLogger().error("The json body for request '{}' is malformed", query);
-                return null;
-            }
+        } else if (fistChar == '[')
+            return new JSONArray(body);
+        else {
+            Main.getLogger().error("The json body for request '{}' is malformed", query);
+            return null;
         }
     }
 }
diff --git a/src/main/java/de/tosoxdev/tosoxjr/utils/Utils.java b/src/main/java/de/tosoxdev/tosoxjr/utils/Utils.java
@@ -3,7 +3,7 @@
 import java.util.concurrent.Callable;
 
 public class Utils {
-    public static String getStringFromCallable(Callable<String> callable) {
+    public static <T> T getFromCallable(Callable<T> callable) {
         try {
             return callable.call();
         } catch (Exception e) {