diff --git a/src/main/java/de/gnmyt/autoresponder/event/ResponderEvent.java b/src/main/java/de/gnmyt/autoresponder/event/ResponderEvent.java index 8f01bca..6f45e05 100644 --- a/src/main/java/de/gnmyt/autoresponder/event/ResponderEvent.java +++ b/src/main/java/de/gnmyt/autoresponder/event/ResponderEvent.java @@ -2,6 +2,7 @@ package de.gnmyt.autoresponder.event; import de.gnmyt.autoresponder.SimpleAutoResponder; import de.gnmyt.autoresponder.event.api.EventData; +import de.gnmyt.autoresponder.http.contexts.ResponderContext; import de.gnmyt.autoresponder.http.controller.HttpResponseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,6 +18,7 @@ public class ResponderEvent { private final String appPackageName; private final String messengerPackageName; + private final ResponderContext responderContext; private final HttpResponseController responseController; private final int ruleId; @@ -25,13 +27,15 @@ public class ResponderEvent { * Constructor of the {@link ResponderEvent} * * @param responder The current instance of your {@link SimpleAutoResponder} + * @param responderContext * @param appPackageName The package name of the responder app * @param messengerPackageName The package name of your whatsapp instance * @param ruleId The id of the rule that has been executed * @param responseController The response controller of the executed request */ - public ResponderEvent(SimpleAutoResponder responder, String appPackageName, String messengerPackageName, int ruleId, HttpResponseController responseController) { + public ResponderEvent(SimpleAutoResponder responder, ResponderContext responderContext, String appPackageName, String messengerPackageName, int ruleId, HttpResponseController responseController) { this.responder = responder; + this.responderContext = responderContext; this.appPackageName = appPackageName; this.messengerPackageName = messengerPackageName; this.ruleId = ruleId; @@ -82,6 +86,15 @@ public class ResponderEvent { return messengerPackageName; } + /** + * Gets the responder context + * + * @return the responder context + */ + protected ResponderContext getResponderContext() { + return responderContext; + } + /** * Gets the id of the rule provided by the responder * diff --git a/src/main/java/de/gnmyt/autoresponder/event/chat/ChatMessageReceivedEvent.java b/src/main/java/de/gnmyt/autoresponder/event/chat/ChatMessageReceivedEvent.java index 47ae7d7..6c3ec9c 100644 --- a/src/main/java/de/gnmyt/autoresponder/event/chat/ChatMessageReceivedEvent.java +++ b/src/main/java/de/gnmyt/autoresponder/event/chat/ChatMessageReceivedEvent.java @@ -2,6 +2,7 @@ package de.gnmyt.autoresponder.event.chat; import de.gnmyt.autoresponder.SimpleAutoResponder; import de.gnmyt.autoresponder.event.ResponderEvent; +import de.gnmyt.autoresponder.http.contexts.ResponderContext; import de.gnmyt.autoresponder.http.controller.HttpResponseController; public class ChatMessageReceivedEvent extends ResponderEvent { @@ -13,6 +14,7 @@ public class ChatMessageReceivedEvent extends ResponderEvent { * Constructor of the {@link ChatMessageReceivedEvent} * * @param responder The current instance of your {@link SimpleAutoResponder} + * @param context The context of the request * @param appPackageName The package name of the responder app * @param messengerPackageName The package name of your whatsapp instance * @param ruleId The id of the rule that has been executed @@ -20,9 +22,9 @@ public class ChatMessageReceivedEvent extends ResponderEvent { * @param sender The sender which sent the message * @param message The message itself */ - public ChatMessageReceivedEvent(SimpleAutoResponder responder, String appPackageName, String messengerPackageName, int ruleId, + public ChatMessageReceivedEvent(SimpleAutoResponder responder, ResponderContext context, String appPackageName, String messengerPackageName, int ruleId, HttpResponseController responseController, String sender, String message) { - super(responder, appPackageName, messengerPackageName, ruleId, responseController); + super(responder, context, appPackageName, messengerPackageName, ruleId, responseController); this.sender = sender; this.message = message; } diff --git a/src/main/java/de/gnmyt/autoresponder/event/group/GroupMessageReceivedEvent.java b/src/main/java/de/gnmyt/autoresponder/event/group/GroupMessageReceivedEvent.java index 39e5c13..013590e 100644 --- a/src/main/java/de/gnmyt/autoresponder/event/group/GroupMessageReceivedEvent.java +++ b/src/main/java/de/gnmyt/autoresponder/event/group/GroupMessageReceivedEvent.java @@ -2,6 +2,7 @@ package de.gnmyt.autoresponder.event.group; import de.gnmyt.autoresponder.SimpleAutoResponder; import de.gnmyt.autoresponder.event.ResponderEvent; +import de.gnmyt.autoresponder.http.contexts.ResponderContext; import de.gnmyt.autoresponder.http.controller.HttpResponseController; public class GroupMessageReceivedEvent extends ResponderEvent { @@ -12,6 +13,7 @@ public class GroupMessageReceivedEvent extends ResponderEvent { /** * @param responder The current instance of your {@link SimpleAutoResponder} + * @param context The context of the request * @param appPackageName The package name of the responder app * @param messengerPackageName The package name of your whatsapp instance * @param ruleId The id of the rule that has been executed @@ -20,9 +22,9 @@ public class GroupMessageReceivedEvent extends ResponderEvent { * @param message The message itself * @param sender The sender which sent the message */ - public GroupMessageReceivedEvent(SimpleAutoResponder responder, String appPackageName, String messengerPackageName, int ruleId, + public GroupMessageReceivedEvent(SimpleAutoResponder responder, ResponderContext context, String appPackageName, String messengerPackageName, int ruleId, HttpResponseController responseController, String group, String message, String sender) { - super(responder, appPackageName, messengerPackageName, ruleId, responseController); + super(responder, context, appPackageName, messengerPackageName, ruleId, responseController); this.group = group; this.message = message; this.sender = sender;