Merge pull request #3 from janesth/csbot-features

expanded wow feature

Author: janesth

pom.xml

@@ -43,6 +43,12 @@
             <artifactId>gson</artifactId>
             <version>2.10.1</version>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.33</version>
+        </dependency>
+
 
     </dependencies>
     <repositories>

src/main/java/services/CsFunService.java

@@ -5,23 +5,22 @@
 import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
 
+import java.sql.SQLException;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class CsFunService {
 
     private Properties properties;
+    private DataService dataService;
     ResourceBundle resourceBundle;
 
     Map<String, String> wowList;
 
     public CsFunService(Properties properties) {
         this.properties = properties;
-        wowList = new HashMap<String, String>();
-        wowList.put("jay_th", "https://cdn.discordapp.com/attachments/449281855175393280/1221510017354563674/loud.mov");
-        wowList.put("vi24ra", "https://cdn.discordapp.com/attachments/288367861515419649/1167948820525621248/Dropshot.mp4");
-        wowList.put("aatha", "https://cdn.discordapp.com/attachments/844510835241910303/1225082807110336653/Me_Is_Sorry_Janes.mp4");
+        setupWowList();
     }
 
     public String handleWowEvent(UserContextInteractionEvent event, String locale) {
@@ -31,33 +30,40 @@ public String handleWowEvent(UserContextInteractionEvent event, String locale) {
         resourceBundle = ResourceBundle.getBundle("localization", new Locale(locale));
         String targetUserName = targetUser.getName();
 
-        if("CSBot".equals(targetUserName)) {
-            //teehee.
-            return sendMessageInCorrectChannel(event,dedicatedChannel, "https://www.youtube.com/watch?v=2qTHmSyqrok");
+        if(wowList.containsKey(targetUserName)) {
+            String message = resourceBundle.getString("wow.highlightMessage").replace("%s", targetUserName) + " " + wowList.get(targetUserName);
+            return sendMessageInCorrectChannel(event, dedicatedChannel, message);
         } else if(targetUser.isBot()) {
             return sendMessageInCorrectChannel(event, dedicatedChannel, resourceBundle.getString("error.cantwowabot"));
         } else {
-            if(wowList.containsKey(targetUserName)) {
-                return sendMessageInCorrectChannel(event, dedicatedChannel, wowList.get(targetUserName));
-            } else {
-                return sendMessageInCorrectChannel(event, dedicatedChannel, resourceBundle.getString("error.hasnowow"));
-            }
+            return sendMessageInCorrectChannel(event, dedicatedChannel, resourceBundle.getString("error.hasnowow"));
+        }
+    }
+
+    private void setupWowList() {
+        wowList = new HashMap<String, String>();
+        try {
+            dataService = new DataService(properties);
+            dataService.setupConnection();
+            wowList = dataService.returnAllWowEntries();
+        } catch (SQLException exception) {
+            System.out.println("Exception thrown.");
         }
     }
 
-    private String sendMessageInCorrectChannel(GenericCommandInteractionEvent event, String dedicatedChannel, String originalMessage) {
+    private String sendMessageInCorrectChannel(GenericCommandInteractionEvent event, String dedicatedChannel, String message) {
         if(dedicatedChannel.equals(event.getMessageChannel().getId())) {
-            return originalMessage;
+            return message;
         } else {
             TextChannel dedicatedTextChannel = event.getHook().getInteraction().getGuild().getTextChannelById(dedicatedChannel);
 
             //this means no dedicated channel was found for this ID. either no dedicated channel was set or it doesn't exist on this server.
             //either way, this means that the event is going to be returned in the current active channel. that's a bit messy but hey,
             //if that's what they want..?
             if(dedicatedTextChannel == null) {
-                return originalMessage;
+                return message;
             } else {
-                dedicatedTextChannel.sendMessage(originalMessage).queue();
+                dedicatedTextChannel.sendMessage(message).queue();
                 return resourceBundle.getString("wow.messageSent");
             }
         }
@@ -76,11 +82,16 @@ public String handleAddWowEvent(GenericCommandInteractionEvent event, String loc
         Matcher ytMatcher = ytPattern.matcher(url);
         Matcher dMatcher = dPattern.matcher(url);
 
-        if(ytMatcher.find() || dMatcher.find()) {
-            wowList.put(user, url);
-            return resourceBundle.getString("wow.done");
-        } else {
-            return resourceBundle.getString("error.invalidwow");
+        try {
+            if (ytMatcher.find() || dMatcher.find()) {
+                dataService.addWowEvent(user, url);
+                wowList.put(user, url);
+                return resourceBundle.getString("wow.done");
+            } else {
+                return resourceBundle.getString("error.invalidwow");
+            }
+        } catch (SQLException ex) {
+            return resourceBundle.getString("error.majorerror");
         }
     }
 }

src/main/java/services/DataService.java

@@ -0,0 +1,38 @@
+package services;
+
+import java.sql.*;
+import java.util.HashMap;
+import java.util.Properties;
+
+public class DataService {
+    Properties properties;
+    Connection connection;
+    Statement statement;
+
+    public DataService(Properties properties) throws  SQLException {
+        this.properties = properties;
+        connection = DriverManager.getConnection(properties.getProperty("db.url"));
+        statement = connection.createStatement();
+    }
+
+    public void setupConnection() throws SQLException {
+        String query = "CREATE TABLE IF NOT EXISTS wow (wow_id int PRIMARY KEY AUTO_INCREMENT, username varchar(50) NOT NULL, url varchar(200) NOT NULL)";
+        statement.execute(query);
+    }
+
+    public void addWowEvent(String username, String url) throws SQLException {
+        String query = "INSERT INTO wow(username, url) VALUES('" + username + "', '" + url + "');";
+        statement.execute(query);
+    }
+
+    public HashMap<String, String> returnAllWowEntries() throws SQLException{
+        HashMap<String, String> returnMap = new HashMap<String, String>();
+        String query = "SELECT * FROM wow";
+        try (ResultSet resultSet = statement.executeQuery(query)) {
+            while(resultSet.next()) {
+                returnMap.put(resultSet.getString("username"), resultSet.getString("url"));
+            }
+        }
+        return returnMap;
+    }
+}

src/main/resources/config.properties

@@ -19,4 +19,7 @@ steam.api=
 
 ## Various Settings
 server.delay=
-csgo.maps=
+csgo.maps=
+
+## Database setting
+db.url=

src/main/resources/localization.properties

@@ -1,10 +1,10 @@
 error.interruptedException=Connection issues. :(
-error.ioException=Wow! Something major just broke. Sorry. :(
 error.privacySettings=No stats for %s could be loaded. (Steam Privacy Settings?)
 error.wrongQueryParameters=The players were not submitted properly.
 error.cantwowabot=You can not see the highlight of a bot.
 error.hasnowow=This user has no highlights. Add one with ``/wow url``.
-error.invalidwow=The submitted url is not valid.
+error.invalidwow=The submitted url is not valid. Only Discord or YouTube links are accepted.
+error.majorerror=Something broke. We are working on this issue.
 
 stats.title=__Stats for %s__
 stats.author=Powered by YOINC.
@@ -19,6 +19,7 @@ compare.title=__Comparison between %s and %t__
 compare.equal=%s both.
 
 wow.done=A highlight has been added.
+wow.highlightMessage=%s's wow moment: 
 wow.messageSent=A message was sent to csgo-stuff.
 
 command.map.description=Change the map

src/main/resources/localization_de.properties

@@ -1,10 +1,10 @@
 error.interruptedException=Leider gab es Verbindungsprobleme. :(
-error.ioException=Wow! Da ging etwas kaputt. Sorry. :(
 error.privacySettings=Für %s können keine Stats geladen werden. (Steam Privacy Settings?)
 error.wrongQueryParameters=Die Spieler wurden nicht korrekt mitgegeben.
 error.cantwowabot=Bots haben keine Highlights. :(
 error.hasnowow=Dieser Benutzer hat kein Highlight. Füge eines hinzu mit ``/wow url``.
-error.invalidwow=Die URL ist nicht gültig.
+error.invalidwow=Die URL ist nicht gültig. Nur Discord oder YouTube Links sind erlaubt.
+error.majorerror=Etwas lief schief. Wir arbeiten dran.
 
 stats.title=__Stats für %s__
 stats.author=Powered by YOINC.
@@ -19,6 +19,7 @@ compare.title=__Vergleich zwischen %s und %t__
 compare.equal=%s für beide.
 
 wow.done=Ein Highlight wurde hinzugefügt.
+wow.highlightMessage=%s's WOW Moment: 
 wow.messageSent=Es gibt eine neue Nachricht in csgo-stuff.
 
 command.map.description=Ändere die Map

src/main/resources/localization_en.properties

@@ -1,10 +1,10 @@
 error.interruptedException=Connection issues. :(
-error.ioException=Wow! Something major just broke. Sorry. :(
 error.privacySettings=No stats for %s could be loaded. (Steam Privacy Settings?)
 error.wrongQueryParameters=The players were not submitted properly.
 error.cantwowabot=You can not see the highlight of a bot.
 error.hasnowow=This user has no highlights. Add one with ``/wow url``.
-error.invalidwow=The submitted url is not valid.
+error.invalidwow=The submitted url is not valid. Only Discord or YouTube links are accepted.
+error.majorerror=Something broke. We are working on this issue.
 
 stats.title=__Stats for %s__
 stats.author=Powered by YOINC.
@@ -19,6 +19,7 @@ compare.title=__Comparison between %s and %t__
 compare.equal=%s both.
 
 wow.done=A highlight has been added.
+wow.highlightMessage=%s's wow moment: 
 wow.messageSent=A message was sent to csgo-stuff.
 
 command.map.description=Change the map