Merge pull request #8 from janesth/csbot-features

version 3 bugfixes and gregflix feature

Author: janesth

src/main/java/StartUp.java

@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import services.DataService;
 import services.FaceitMatchService;
+import services.MessageService;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,7 +32,7 @@ public static void main(String[] args) {
         try {
 
             String startMessage = LocalDateTime.now().format(START_TIME) + " - Started application.";
-            System.out.println(startMessage);
+            System.out.println("[CSBot - StartUp] " + startMessage);
 
             InputStream inputStream = StartUp.class.getClassLoader().getResourceAsStream("config.properties");
             Properties properties = new Properties();
@@ -41,20 +42,21 @@ public static void main(String[] args) {
             //FYI: Locale.getDefault() returns locale of OS
             ResourceBundle resourceBundle = ResourceBundle.getBundle("localization", new Locale("en"));
             DataService dataService = null;
+            MessageService messageService = null;
             try {
                 dataService = new DataService(properties);
+                messageService = new MessageService(properties);
             } catch (SQLException ex) {
-                System.out.println("SQL Exception thrown: " + ex.getMessage());
+                System.out.println("[CSBot - StartUp] SQL Exception thrown: " + ex.getMessage());
             }
 
             FaceitMatchService faceitMatchService = new FaceitMatchService(properties, dataService);
 
             JDA jda = JDABuilder.createDefault(properties.getProperty("discord.apiToken"))
-                    .addEventListeners(new CounterStrikeBotListener(properties, dataService))
+                    .addEventListeners(new CounterStrikeBotListener(properties, dataService, messageService))
                     .setChunkingFilter(ChunkingFilter.ALL)
                     .setMemberCachePolicy(MemberCachePolicy.ALL)
-                    .enableIntents(GatewayIntent.GUILD_MEMBERS)
-                    .enableIntents(GatewayIntent.DIRECT_MESSAGES)
+                    .enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.MESSAGE_CONTENT, GatewayIntent.DIRECT_MESSAGES)
                     .build();
 
             jda.getPresence().setActivity(Activity.playing("YOINC.ch"));
@@ -80,9 +82,9 @@ public static void main(String[] args) {
                 return response;
             });
         } catch (InterruptedException ex) {
-            System.out.println("InterruptedException thrown: " + ex.getMessage());
+            System.out.println("[CSBot - StartUp] InterruptedException thrown: " + ex.getMessage());
         } catch (IOException ex) {
-            System.out.println("IOException thrown: " + ex.getMessage());
+            System.out.println("[CSBot - StartUp] IOException thrown: " + ex.getMessage());
         }
     }
 }

src/main/java/http/ConnectionBuilder.java

@@ -2,13 +2,17 @@
 
 import com.google.gson.*;
 import model.faceit.FaceitMatch;
+import model.omdb.OMDBMovieResponse;
+import model.retake.RetakePlayer;
 import model.steam.ResponseData;
 
 import java.io.IOException;
 import java.net.URI;
+import java.net.URLEncoder;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
 public class ConnectionBuilder {
@@ -19,6 +23,10 @@ public ConnectionBuilder(Properties properties) {
         this.properties = properties;
     }
 
+    public String fetchAssistantRetakeMessage(RetakePlayer retakePlayer) throws InterruptedException, IOException {
+        return null;
+    }
+
     public ResponseData fetchSteamUserStats(String steamID) throws InterruptedException, IOException {
 
         HttpClient client = HttpClient.newHttpClient();
@@ -51,7 +59,7 @@ public FaceitMatch fetchFaceitMatchDetails(String userId) throws IOException, In
         FaceitMatch responseData;
 
         request = HttpRequest.newBuilder()
-                .uri(URI.create("https://open.faceit.com/data/v4/matches/" + matchId))
+                .uri(URI.create(properties.getProperty("faceit.matchDetails.url") + matchId))
                 .header("Authorization", "Bearer " + properties.getProperty("faceit.api"))
                 .build();
         HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
@@ -61,12 +69,32 @@ public FaceitMatch fetchFaceitMatchDetails(String userId) throws IOException, In
         return responseData;
     }
 
+    public OMDBMovieResponse fetchMovieDetails(String title) throws IOException, InterruptedException {
+        HttpClient client = HttpClient.newHttpClient();
+
+        HttpRequest request;
+        OMDBMovieResponse responseData;
+
+        request = HttpRequest.newBuilder()
+                .uri(URI.create(properties.getProperty("omdb.search.url") + prepareTitle(title) + "&apikey=" + properties.getProperty("omdb.api")))
+                .build();
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+
+        responseData = new Gson().fromJson(response.body(), OMDBMovieResponse.class);
+
+        return responseData;
+    }
+
+    private String prepareTitle(String title) {
+        return URLEncoder.encode(title, StandardCharsets.UTF_8);
+    }
+
     private String fetchFaceitMatchId(HttpClient client, String userId) throws IOException, InterruptedException {
         HttpRequest request;
         String id = null;
 
         request = HttpRequest.newBuilder()
-                .uri(URI.create("https://www.faceit.com/api/match/v1/matches/groupByState?userId=" + userId))
+                .uri(URI.create(properties.getProperty("faceit.matchId.url") + userId))
                 .build();
         HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
 

src/main/java/listeners/CounterStrikeBotListener.java

@@ -1,8 +1,12 @@
 package listeners;
 
 import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.events.session.ReadyEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import services.*;
@@ -16,47 +20,51 @@ public class CounterStrikeBotListener extends ListenerAdapter {
     private RetakeService retakeService;
     private CsFunService csFunService;
     private DiscordService discordService;
+    private GregflixService gregflixService;
 
-    public CounterStrikeBotListener(Properties properties, DataService dataService) {
+    public CounterStrikeBotListener(Properties properties, DataService dataService, MessageService messageService) {
         csStatsService = new CsStatsService(properties, dataService);
-        csFunService = new CsFunService(properties, dataService);
-        retakeService = new RetakeService(properties, dataService);
-        discordService = new DiscordService(properties, dataService, retakeService);
+        csFunService = new CsFunService(dataService, messageService);
+        retakeService = new RetakeService(properties, dataService, messageService);
+        discordService = new DiscordService(properties, dataService, retakeService, messageService);
+        gregflixService = new GregflixService(properties, messageService, dataService);
     }
 
     @Override
     public void onSlashCommandInteraction(SlashCommandInteractionEvent event) {
 
         String locale = discordService.getUserLocale(event);
 
-        if ("stats".equals(event.getName())) {
-            event.deferReply().queue();
-            event.getHook().sendMessageEmbeds(csStatsService.handleStatsEvent(event, locale).build()).queue();
-        }
-
-        if ("compare".equals(event.getName())) {
-            event.deferReply().queue();
-            event.getHook().sendMessageEmbeds(csStatsService.handleCompareEvent(event, locale).build()).queue();
-        }
-
-        if ("map".equals(event.getName())) {
-            event.deferReply().queue();
-            event.getHook().sendMessage(retakeService.handleMapEvent(event, locale)).queue();
-        }
-
-        if("wow".equals(event.getName())) {
-            event.deferReply().queue();
-            event.getHook().sendMessage(csFunService.handleAddWowEvent(event, locale)).queue();
-        }
-
-        if("teams".equals(event.getName())) {
-            event.deferReply().queue();
-            event.getHook().sendMessageEmbeds(csFunService.handleSetTeamsEvent(event, locale).build()).queue();
-        }
-
-        if("status".equals(event.getName())) {
-            event.deferReply().queue();
-            event.getHook().sendMessageEmbeds(retakeService.handleStatusEvent(event, locale).build()).queue();
+        if(event.getGuild().getMembers().contains(event.getMember())) {
+            if ("stats".equals(event.getName())) {
+                event.deferReply().queue();
+                event.getHook().sendMessageEmbeds(csStatsService.handleStatsEvent(event, locale).build()).queue();
+            }
+
+            if ("compare".equals(event.getName())) {
+                event.deferReply().queue();
+                event.getHook().sendMessageEmbeds(csStatsService.handleCompareEvent(event, locale).build()).queue();
+            }
+
+            if ("map".equals(event.getName())) {
+                event.deferReply().queue();
+                event.getHook().sendMessage(retakeService.handleMapEvent(event, locale)).queue();
+            }
+
+            if ("wow".equals(event.getName())) {
+                event.deferReply().queue();
+                event.getHook().sendMessage(csFunService.handleAddWowEvent(event, locale)).queue();
+            }
+
+            if ("teams".equals(event.getName())) {
+                event.deferReply().queue();
+                event.getHook().sendMessageEmbeds(csFunService.handleSetTeamsEvent(event, locale).build()).queue();
+            }
+
+            if ("status".equals(event.getName())) {
+                event.deferReply().queue();
+                event.getHook().sendMessageEmbeds(retakeService.handleStatusEvent(event, locale).build()).queue();
+            }
         }
     }
 
@@ -87,4 +95,38 @@ public void onReady(ReadyEvent event){
         JDA jda = event.getJDA();
         CompletableFuture.runAsync( () -> discordService.scheduleAllTasks(jda));
     }
+
+    @Override
+    public void onMessageReceived(MessageReceivedEvent messageReceivedEvent) {
+        String locale = "en";
+
+        if(messageReceivedEvent.getChannel().getType().equals(ChannelType.PRIVATE)) {
+            if(!messageReceivedEvent.getAuthor().isBot()) {
+                messageReceivedEvent.getAuthor().openPrivateChannel().queue((privateChannel -> {
+                    gregflixService.handleGregflixEvent(messageReceivedEvent, locale, privateChannel);
+                }));
+            }
+        }
+    }
+
+    @Override
+    public void onButtonInteraction(ButtonInteractionEvent buttonInteractionEvent) {
+        String locale = "en";
+        buttonInteractionEvent.getMessageChannel().sendMessage(gregflixService.handleButtonEvent(buttonInteractionEvent, locale)).queue();
+    }
+
+    @Override
+    public void onMessageReactionAdd(MessageReactionAddEvent messageReactionAddEvent) {
+        String locale = "en";
+
+        if(messageReactionAddEvent.getChannel().getType().equals(ChannelType.PRIVATE)) {
+            if(!messageReactionAddEvent.getUser().isBot()) {
+                messageReactionAddEvent.retrieveMessage().queue((message -> {
+                    if(message.getAuthor().isBot() && message.getContentDisplay().matches("[^\\n]+?--[^\\n]+?--[^\\n]+?--[^\\n]+?")) {
+                        gregflixService.handleGregflixReactionEvent(messageReactionAddEvent, locale);
+                    }
+                }));
+            }
+        }
+    }
 }

src/main/java/model/bot/GregflixEntry.java

@@ -0,0 +1,58 @@
+package model.bot;
+
+import java.sql.Date;
+
+public class GregflixEntry {
+    private String imdbID;
+    private String title;
+    private boolean uploaded;
+    private Date uploadedDate;
+    private String showType;
+
+
+    public GregflixEntry(String imdbID, String title, boolean uploaded, Date uploadedDate, String showType) {
+        this.imdbID = imdbID;
+        this.title = title;
+        this.uploaded = uploaded;
+        this.uploadedDate = uploadedDate;
+        this.showType = showType;
+    }
+
+    public String getShowType() {
+        return showType;
+    }
+
+    public void setShowType(String showType) {
+        this.showType = showType;
+    }
+    public Date getUploadedDate() {
+        return uploadedDate;
+    }
+
+    public void setUploadedDate(Date uploadedDate) {
+        this.uploadedDate = uploadedDate;
+    }
+    public String getImdbID() {
+        return imdbID;
+    }
+
+    public void setImdbID(String imdbID) {
+        this.imdbID = imdbID;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public boolean isUploaded() {
+        return uploaded;
+    }
+
+    public void setUploaded(boolean uploaded) {
+        this.uploaded = uploaded;
+    }
+}

src/main/java/model/bot/User.java

@@ -0,0 +1,67 @@
+package model.bot;
+
+public class User {
+    private int user_id;
+    private String username;
+    private String steamID;
+    private String faceitID;
+    private String discordID;
+    private boolean hasGregflix;
+
+    public User(int user_id, String username, String steamID, String faceitID, String discordID, boolean hasGregflix) {
+        this.user_id = user_id;
+        this.username = username;
+        this.steamID = steamID;
+        this.faceitID = faceitID;
+        this.discordID = discordID;
+        this.hasGregflix = hasGregflix;
+    }
+
+    public int getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(int user_id) {
+        this.user_id = user_id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getSteamID() {
+        return steamID;
+    }
+
+    public void setSteamID(String steamID) {
+        this.steamID = steamID;
+    }
+
+    public String getFaceitID() {
+        return faceitID;
+    }
+
+    public void setFaceitID(String faceitID) {
+        this.faceitID = faceitID;
+    }
+
+    public String getDiscordID() {
+        return discordID;
+    }
+
+    public void setDiscordID(String discordID) {
+        this.discordID = discordID;
+    }
+
+    public boolean isHasGregflix() {
+        return hasGregflix;
+    }
+
+    public void setHasGregflix(boolean hasGregflix) {
+        this.hasGregflix = hasGregflix;
+    }
+}