Merge pull request #10 from yoinc-development/csbot-features

version 3.4 removed gregflix

Author: janesth

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>ch.yoinc</groupId>
     <artifactId>CounterStrikeBot</artifactId>
-    <version>3.3</version>
+    <version>3.4</version>
 
     <name>CounterStrikeBot</name>
     <url>https://github.com/yoinc-development/CounterStrikeBot</url>

src/main/java/StartUp.java

@@ -26,13 +26,10 @@
 
 public class StartUp {
 
-    private static final DateTimeFormatter START_TIME = DateTimeFormatter.ofPattern("dd.MM.yyyy - HH:mm:ss");
-
     public static void main(String[] args) {
         try {
 
-            String startMessage = LocalDateTime.now().format(START_TIME) + " - Started application.";
-            System.out.println("[CSBot - StartUp] " + startMessage);
+            System.out.println("[CSBot - StartUp - " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("dd.MM.yyyy - HH:mm:ss")) + "] - Application Started");
 
             InputStream inputStream = StartUp.class.getClassLoader().getResourceAsStream("config.properties");
             Properties properties = new Properties();
@@ -47,7 +44,7 @@ public static void main(String[] args) {
                 dataService = new DataService(properties);
                 messageService = new MessageService(properties);
             } catch (SQLException ex) {
-                System.out.println("[CSBot - StartUp] SQL Exception thrown: " + ex.getMessage());
+                System.out.println("[CSBot - StartUp - " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("dd.MM.yyyy - HH:mm:ss")) + "] SQL Exception thrown: " + ex.getMessage());
             }
 
             FaceitMatchService faceitMatchService = new FaceitMatchService(properties, dataService);
@@ -82,9 +79,9 @@ public static void main(String[] args) {
                 return response;
             });
         } catch (InterruptedException ex) {
-            System.out.println("[CSBot - StartUp] InterruptedException thrown: " + ex.getMessage());
+            System.out.println("[CSBot - StartUp - " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("dd.MM.yyyy - HH:mm:ss")) + "] InterruptedException thrown: " + ex.getMessage());
         } catch (IOException ex) {
-            System.out.println("[CSBot - StartUp] IOException thrown: " + ex.getMessage());
+            System.out.println("[CSBot - StartUp - " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("dd.MM.yyyy - HH:mm:ss")) + "] IOException thrown: " + ex.getMessage());
         }
     }
 }

src/main/java/http/ConnectionBuilder.java

@@ -2,17 +2,14 @@
 
 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 {
@@ -69,26 +66,6 @@ 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;

src/main/java/listeners/CounterStrikeBotListener.java

@@ -20,14 +20,12 @@ public class CounterStrikeBotListener extends ListenerAdapter {
     private RetakeService retakeService;
     private CsFunService csFunService;
     private DiscordService discordService;
-    private GregflixService gregflixService;
 
     public CounterStrikeBotListener(Properties properties, DataService dataService, MessageService messageService) {
         csStatsService = new CsStatsService(properties, dataService);
         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
@@ -97,38 +95,4 @@ 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 = discordService.getUserLocale(buttonInteractionEvent);
-        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

@@ -12,6 +12,8 @@
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 
 import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -99,7 +101,7 @@ public String handleAddWowEvent(GenericCommandInteractionEvent event, String loc
                 return resourceBundle.getString("error.invalidwow");
             }
         } catch (SQLException ex) {
-            System.out.println("[CSBot - CsStatsService] SQLException thrown: " + ex.getMessage());
+            System.out.println("[CSBot - CsStatsService - " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("dd.MM.yyyy - HH:mm:ss")) + "] SQLException thrown: " + ex.getMessage());
             return resourceBundle.getString("error.majorerror");
         }
     }
@@ -119,7 +121,7 @@ private void setupWowList() {
         try {
             wowList.putAll(dataService.getAllWowEntries());
         } catch (SQLException ex) {
-            System.out.println("[CSBot - CsStatsService] SQLException thrown: " + ex.getMessage());
+            System.out.println("[CSBot - CsStatsService - " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("dd.MM.yyyy - HH:mm:ss")) + "] SQLException thrown: " + ex.getMessage());
         }
     }