Merge pull request #7 from janesth/csbot-features

version 3 bugfixes

Author: janesth

src/main/java/services/CsFunService.java

@@ -35,11 +35,11 @@ public String handleWowEvent(UserContextInteractionEvent event, String locale) {
 
         if (wowList.containsKey(targetUserName)) {
             String message = resourceBundle.getString("wow.highlightMessage").replace("%s", targetUserName) + " " + wowList.get(targetUserName);
-            return messageService.sendMessageInCorrectChannel(event, message);
+            return messageService.sendMessageInCorrectChannel(event, message, locale);
         } else if (targetUser.isBot()) {
-            return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.cantwowabot"));
+            return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.cantwowabot"), locale);
         } else {
-            return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.hasnowow"));
+            return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.hasnowow"), locale);
         }
     }
 
@@ -115,7 +115,7 @@ private EmbedBuilder buildEmbed(String teams[]) {
     private void setupWowList() {
         wowList = new HashMap<String, String>();
         try {
-            wowList = dataService.getAllWowEntries();
+            wowList.putAll(dataService.getAllWowEntries());
         } catch (SQLException ex) {
             System.out.println("SQLException thrown: " + ex.getMessage());
         }

src/main/java/services/DataService.java

@@ -53,15 +53,28 @@ public void updateWowEvent(String username, String url) throws SQLException {
 
     public void addUserToDatabase(String username, String discordID) {
         try {
-            PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO users(username, discordID) VALUES(?,?)");
-            preparedStatement.setString(1, username);
-            preparedStatement.setString(2, discordID);
-            preparedStatement.executeUpdate();
+            if(!isUsernameInDatabase(username)) {
+                PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO users(username, discordID) VALUES(?,?)");
+                preparedStatement.setString(1, username);
+                preparedStatement.setString(2, discordID);
+                preparedStatement.executeUpdate();
+            }
         } catch (SQLException ex) {
             System.out.println("Can't add " + username + " with discordID " + discordID);
         }
     }
 
+    private boolean isUsernameInDatabase(String username) throws SQLException{
+        PreparedStatement preparedStatement = connection.prepareStatement("SELECT u.username FROM users AS u WHERE u.username = ?");
+        preparedStatement.setString(1, username);
+        ResultSet resultSet = preparedStatement.executeQuery();
+
+        while (resultSet.next()) {
+            return true;
+        }
+        return false;
+    }
+
     public String getUsernameForFaceitID(String faceitID) throws SQLException {
         PreparedStatement preparedStatement = connection.prepareStatement("SELECT u.username FROM users AS u WHERE u.faceitID = ?");
         preparedStatement.setString(1, faceitID);
@@ -84,7 +97,7 @@ public HashMap<String, String> getAllWowEntries() throws SQLException {
         return returnMap;
     }
 
-    public RankStats getRanksStatsForUsername(String username) throws SQLException {
+    public RankStats getRanksStatsForUsername(String username) throws SQLException, NumberFormatException {
         String steamId64 = getSteamIDForUsername(username);
         String steamId = SteamUIDConverter.getSteamId(Long.parseLong(steamId64));
 

src/main/java/services/MessageService.java

@@ -37,7 +37,9 @@ public EmbedBuilder sendEmbedMessageInCorrectChannel(GenericCommandInteractionEv
     }
 
 
-    public String sendMessageInCorrectChannel(GenericCommandInteractionEvent event, String message) {
+    public String sendMessageInCorrectChannel(GenericCommandInteractionEvent event, String message, String locale) {
+        resourceBundle = ResourceBundle.getBundle("localization", new Locale(locale));
+
         if(event.getGuild().getId().equals(properties.getProperty("discord.thisIsMyHome"))) {
             if(!event.getMessageChannel().getId().equals(HOME_CHANNEL)) {
                 event.getHook().getInteraction().getGuild().getTextChannelById(HOME_CHANNEL).sendMessage(message).queue();

src/main/java/services/RetakeService.java

@@ -51,23 +51,23 @@ public String handleMapEvent(SlashCommandInteractionEvent event, String locale)
                     if (endTime == null || currentTime.isAfter(endTime)) {
                         rcon.command("changelevel " + event.getOption("map").getAsString());
                         endTime = LocalTime.now().plusSeconds(delay);
-                        return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("map.changed").replace("%s", event.getOption("map").getAsString()));
+                        return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("map.changed").replace("%s", event.getOption("map").getAsString()), locale);
                     } else {
                         int missingTime = endTime.toSecondOfDay() - currentTime.toSecondOfDay();
-                        return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("map.cooldown").replace("%s", String.valueOf(missingTime)));
+                        return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("map.cooldown").replace("%s", String.valueOf(missingTime)), locale);
                     }
                 } else {
-                    return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.invalidmap"));
+                    return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.invalidmap"), locale);
                 }
             } else {
-                return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.mapnotallowed"));
+                return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.mapnotallowed"), locale);
             }
         } catch (AuthenticationException ex) {
             System.out.println("AuthenticationException thrown: " + ex.getMessage());
-            return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.majorerror"));
+            return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.majorerror"), locale);
         } catch (IOException ex) {
             System.out.println("IOException thrown: " + ex.getMessage());
-            return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.majorerror"));
+            return messageService.sendMessageInCorrectChannel(event, resourceBundle.getString("error.majorerror"), locale);
         }
     }
 
@@ -77,10 +77,12 @@ public EmbedBuilder handleStatsEvent(UserContextInteractionEvent event, String l
         try {
             RankStats rankStats = dataService.getRanksStatsForUsername(user.getName());
             if (rankStats != null) {
-                return RankStats.getRankStatsMessage(resourceBundle, rankStats);
+                return messageService.sendEmbedMessageInCorrectChannel(event, RankStats.getRankStatsMessage(resourceBundle, rankStats), locale);
             }
         } catch (SQLException ex) {
             System.out.println("SQLException thrown: " + ex.getMessage());
+        } catch (NumberFormatException ex) {
+            System.out.println("NumberFormatException thrown: " + ex.getMessage());
         }
         return new EmbedBuilder().setTitle(resourceBundle.getString("error.majorerror"));
     }