From 1617540e0a4cf738ea9b109cb3dde2882298c8c3 Mon Sep 17 00:00:00 2001
From: mathias <germannewsmaker@gmail.com>
Date: Sat, 2 Oct 2021 20:17:32 +0200
Subject: [PATCH] Integrated the controller into the ChatCommand & the
 GroupCommand

---
 .../{ChatCommandData.java => ChatCommand.java}  | 17 +++++++++++++----
 ...{GroupCommandData.java => GroupCommand.java} | 10 ++++++----
 2 files changed, 19 insertions(+), 8 deletions(-)
 rename src/main/java/de/gnmyt/autoresponder/entities/{ChatCommandData.java => ChatCommand.java} (54%)
 rename src/main/java/de/gnmyt/autoresponder/entities/{GroupCommandData.java => GroupCommand.java} (73%)

diff --git a/src/main/java/de/gnmyt/autoresponder/entities/ChatCommandData.java b/src/main/java/de/gnmyt/autoresponder/entities/ChatCommand.java
similarity index 54%
rename from src/main/java/de/gnmyt/autoresponder/entities/ChatCommandData.java
rename to src/main/java/de/gnmyt/autoresponder/entities/ChatCommand.java
index 706e8ea..af58cd5 100644
--- a/src/main/java/de/gnmyt/autoresponder/entities/ChatCommandData.java
+++ b/src/main/java/de/gnmyt/autoresponder/entities/ChatCommand.java
@@ -1,12 +1,17 @@
 package de.gnmyt.autoresponder.entities;
 
-public class ChatCommandData extends CommandData {
+import de.gnmyt.autoresponder.event.chat.ChatMessageReceivedEvent;
+import de.gnmyt.autoresponder.http.controller.HttpResponseController;
+
+import java.util.function.Consumer;
+
+public class ChatCommand extends Command {
 
     private final String sender;
     private final String message;
 
     /**
-     * Constructor of the {@link ChatCommandData}
+     * Constructor of the {@link ChatCommand}
      *
      * @param appPackageName       The package name of the responder app
      * @param messengerPackageName The package name of the messenger
@@ -14,12 +19,16 @@ public class ChatCommandData extends CommandData {
      * @param sender               The sender of the message
      * @param message              The message itself
      */
-    public ChatCommandData(String appPackageName, String messengerPackageName, int ruleId, String sender, String message) {
-        super(appPackageName, messengerPackageName, ruleId);
+    public ChatCommand(HttpResponseController controller, String appPackageName, String messengerPackageName, int ruleId, String sender, String message) {
+        super(controller, appPackageName, messengerPackageName, ruleId);
         this.sender = sender;
         this.message = message;
     }
 
+    public void awaitAnswer(Consumer<ChatMessageReceivedEvent> then) {
+        then.accept(new ChatMessageReceivedEvent(null, null, null, 1, null, null, null));
+    }
+
     /**
      * Gets the sender
      *
diff --git a/src/main/java/de/gnmyt/autoresponder/entities/GroupCommandData.java b/src/main/java/de/gnmyt/autoresponder/entities/GroupCommand.java
similarity index 73%
rename from src/main/java/de/gnmyt/autoresponder/entities/GroupCommandData.java
rename to src/main/java/de/gnmyt/autoresponder/entities/GroupCommand.java
index a1456f0..e3c0f67 100644
--- a/src/main/java/de/gnmyt/autoresponder/entities/GroupCommandData.java
+++ b/src/main/java/de/gnmyt/autoresponder/entities/GroupCommand.java
@@ -1,13 +1,15 @@
 package de.gnmyt.autoresponder.entities;
 
-public class GroupCommandData extends CommandData {
+import de.gnmyt.autoresponder.http.controller.HttpResponseController;
+
+public class GroupCommand extends Command {
 
     private final String group;
     private final String message;
     private final String sender;
 
     /**
-     * Constructor of the {@link GroupCommandData}
+     * Constructor of the {@link GroupCommand}
      *
      * @param appPackageName       The package name of the responder app
      * @param messengerPackageName The package name of the messenger
@@ -16,8 +18,8 @@ public class GroupCommandData extends CommandData {
      * @param message              The message itself
      * @param sender               The sender that sent the message
      */
-    public GroupCommandData(String appPackageName, String messengerPackageName, int ruleId, String group, String message, String sender) {
-        super(appPackageName, messengerPackageName, ruleId);
+    public GroupCommand(HttpResponseController controller, String appPackageName, String messengerPackageName, int ruleId, String group, String message, String sender) {
+        super(controller, appPackageName, messengerPackageName, ruleId);
         this.group = group;
         this.message = message;
         this.sender = sender;