Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gather conversation methods first to prevent these from using as event methods #175

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions jbot/src/main/java/me/ramswaroop/jbot/core/common/BaseBot.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,26 @@ public abstract class BaseBot {
*/
public BaseBot() {
Method[] methods = this.getClass().getMethods();

// Gather conversation methods first to prevent these from using as event methods
for (Method method : methods) {
if (method.isAnnotationPresent(Controller.class)) {
Controller controller = method.getAnnotation(Controller.class);
EventType[] eventTypes = controller.events();
String pattern = controller.pattern();
int patternFlags = controller.patternFlags();
String next = controller.next();

if (!StringUtils.isEmpty(next)) {
conversationMethodNames.add(next);
}
}
}

for (Method method : methods) {
if (method.isAnnotationPresent(Controller.class)) {
Controller controller = method.getAnnotation(Controller.class);
EventType[] eventTypes = controller.events();
String pattern = controller.pattern();
int patternFlags = controller.patternFlags();
String next = controller.next();

MethodWrapper methodWrapper = new MethodWrapper();
methodWrapper.setMethod(method);
Expand Down