Use the new API for a bunch of classes

Zomis · Zomis · commit 1c014a99a960 · 2016-02-11T23:03:27.000+01:00
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/ChatBot.java b/duga-core/src/main/java/net/zomis/duga/chat/ChatBot.java
@@ -1,17 +1,14 @@
 package net.zomis.duga.chat;
 
 import net.zomis.duga.chat.events.DugaEvent;
-import net.zomis.duga.chat.events.DugaStartedEvent;
 
 import java.util.List;
 import java.util.concurrent.Future;
 import java.util.function.Consumer;
 
 public interface ChatBot {
 
-    Future<List<ChatMessageResponse>> postChat(WebhookParameters params, List<String> messages);
-
-    void postSingle(WebhookParameters params, String message);
+    Future<List<ChatMessageResponse>> postChat(List<ChatMessage> messages);
 
     Future<ChatMessageResponse> postAsync(ChatMessage message);
 
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/StackExchangeChatBot.java b/duga-core/src/main/java/net/zomis/duga/chat/StackExchangeChatBot.java
@@ -64,14 +64,16 @@ private void login() {
         LOGGER.info("Found fkey: " + chatFKey);
     }
 
-	public Future<List<ChatMessageResponse>> postMessages(WebhookParameters params, final List<String> messages) {
-		if (params == null) {
-			throw new NullPointerException("Params cannot be null, unable to post " + messages);
-		}
-		// params.useDefaultRoom(configuration.getRoomId());
+    @Override
+    public Future<List<ChatMessageResponse>> postChat(List<ChatMessage> messages) {
 		Objects.requireNonNull(messages, "messages");
+        if (messages.isEmpty()) {
+            return null;
+        }
 		List<ChatMessage> shortenedMessages = new ArrayList<>();
-		for (String message : messages) {
+        WebhookParameters params = WebhookParameters.toRoom(messages.get(0).getRoom());
+		for (ChatMessage mess : messages) {
+            String message = mess.getMessage();
 			if (message.length() > MAX_MESSAGE_LENGTH) {
 				final List<String> messageTokens = ChatMessageHelper.splitToTokens(message);
 				for (final String reassembled : ChatMessageHelper.reassembleTokens(messageTokens, MAX_MESSAGE_LENGTH,
@@ -83,12 +85,6 @@ public Future<List<ChatMessageResponse>> postMessages(WebhookParameters params,
 				shortenedMessages.add(new ChatMessage(params, message));
 			}
 		}
-		if (!params.getPost()) {
-			for (ChatMessage message : shortenedMessages) {
-				LOGGER.info("Ignoring message for " + message.getRoom() + ": " + message.getMessage());
-			}
-			return null;
-		}
 
 		System.out.println("Adding messages to queue: " + shortenedMessages);
 		messagesQueue.add(shortenedMessages);
@@ -127,16 +123,6 @@ private ChatMessageResponse attemptPostMessageToChat(final ChatMessage message)
         return response;
 	}
 
-    @Override
-    public Future<List<ChatMessageResponse>> postChat(WebhookParameters params, List<String> messages) {
-        return postMessages(params, messages);
-    }
-
-    @Override
-    public void postSingle(WebhookParameters params, String message) {
-        postChat(params, Collections.singletonList(message));
-    }
-
     @Override
     public Future<ChatMessageResponse> postAsync(ChatMessage message) {
         this.messagesQueue.add(Collections.singletonList(message));
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/TestBot.java b/duga-core/src/main/java/net/zomis/duga/chat/TestBot.java
@@ -5,30 +5,22 @@
 import java.util.*;
 import java.util.concurrent.Future;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 public class TestBot implements ChatBot {
 
     Map<WebhookParameters, List<String>> messages = new HashMap<>();
 
-    WebhookParameters debug = WebhookParameters.toRoom("debug");
-
-    @Deprecated
-    public void postDebug(String message) {
-        this.postChat(debug, Collections.singletonList(message));
-    }
-
     @Override
-    public Future<List<ChatMessageResponse>> postChat(WebhookParameters params, List<String> messages) {
+    public Future<List<ChatMessageResponse>> postChat(List<ChatMessage> messages) {
+        WebhookParameters params = WebhookParameters.toRoom(messages.get(0).getRoom());
         this.messages.putIfAbsent(params, new ArrayList<>());
-        this.messages.get(params).addAll(messages);
+        this.messages.get(params).addAll(messages.stream()
+            .map(ChatMessage::getMessage)
+            .collect(Collectors.toList()));
         return null;
     }
 
-    @Override
-    public void postSingle(WebhookParameters params, String message) {
-        this.postChat(params, Collections.singletonList(message));
-    }
-
     @Override
     public Future<ChatMessageResponse> postAsync(ChatMessage message) {
         return null;
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/WebhookParameters.java b/duga-core/src/main/java/net/zomis/duga/chat/WebhookParameters.java
@@ -1,14 +1,13 @@
 package net.zomis.duga.chat;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class WebhookParameters {
 	
 	private String roomId;
 
-	/**
-	 * Used for webhooks that want to be in the statistics but not post to a room
-	 */
-	private Boolean post;
-	
 	public String getRoomId() {
 		return roomId;
 	}
@@ -17,17 +16,8 @@ public void setRoomId(String roomId) {
 		this.roomId = roomId;
 	}
 
-	public boolean getPost() {
-		return post == null ? true : post;
-	}
-	
-	public void setPost(Boolean post) {
-		this.post = post;
-	}
-	
 	public static WebhookParameters toRoom(String roomId) {
 		WebhookParameters params = new WebhookParameters();
-		params.setPost(true);
 		params.setRoomId(roomId);
 		return params;
 	}
@@ -40,7 +30,6 @@ public boolean equals(Object o) {
 
         WebhookParameters that = (WebhookParameters) o;
 
-        if (post != that.post) return false;
         if (!roomId.equals(that.roomId)) return false;
 
         return true;
@@ -49,7 +38,6 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         int result = roomId.hashCode();
-        result = 31 * result + (post != null ? post.hashCode() : 0);
         return result;
     }
 
@@ -61,4 +49,13 @@ public String toString() {
 	public ChatMessage message(String input) {
 		return new ChatMessage(this, input);
 	}
+
+    public List<ChatMessage> messages(String... messages) {
+        return Arrays.stream(messages).map(this::message).collect(Collectors.toList());
+    }
+
+    public List<ChatMessage> messages(List<String> messages) {
+        return messages.stream().map(this::message).collect(Collectors.toList());
+    }
+
 }
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/listen/ChatMessageIncoming.java b/duga-core/src/main/java/net/zomis/duga/chat/listen/ChatMessageIncoming.java
@@ -39,15 +39,15 @@ public class ChatMessageIncoming {
     WebhookParameters params;
 
     public void reply(String message) {
-        bot.postSingle(params, ":" + messageId + " " + message);
+        bot.postAsync(params.message(":" + messageId + " " + message));
     }
 
     public void post(String message) {
-        bot.postSingle(params, message);
+        bot.postAsync(params.message(message));
     }
 
     public void ping(String message) {
-        bot.postSingle(params, "@$user_name $message");
+        bot.postAsync(params.message("@$user_name $message"));
     }
 
     @Override
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/listen/ListenTask.java b/duga-core/src/main/java/net/zomis/duga/chat/listen/ListenTask.java
@@ -86,7 +86,7 @@ synchronized void latestMessages() {
             handler.accept(message);
         }
         if (previousId <= 0) {
-            bot.postSingle(params, "Monking! (Duga is now listening for commands)");
+            bot.postAsync(params.message("Monking! (Duga is now listening for commands)"));
         }
 /*            Root node: {"ms":4,"time":41194973,"sync":1433551091,"events":
                 [{"room_id":16134,"event_type":1,"time_stamp":1433547911,"user_id":125580,"user_name":"Duga","message_id":22039309,"content":"Loki Astari vs. Simon Andr&#233; Forsberg: 4383 diff. Year: -1368. Quarter: -69. Month: -5. Week: +60. Day: -25."}
diff --git a/grails-app/controllers/net/zomis/duga/GithubHookController.groovy b/grails-app/controllers/net/zomis/duga/GithubHookController.groovy
@@ -28,7 +28,8 @@ class GithubHookController {
         strings.forEach({ println it })
         String[] rooms = room.split(',')
         for (String postRoom : rooms) {
-            bot.postChat(WebhookParameters.toRoom(postRoom), strings)
+            WebhookParameters hookParams = WebhookParameters.toRoom(postRoom)
+            bot.postChat(hookParams.messages(strings))
         }
         render 'OK'
     }
diff --git a/grails-app/controllers/net/zomis/duga/TravisHookController.groovy b/grails-app/controllers/net/zomis/duga/TravisHookController.groovy
@@ -97,7 +97,7 @@ class TravisHookController {
 			default:
 				break;
 		}
-		chatBot.postChat(params, messages);
+		chatBot.postChat(params.messages(messages));
         render 'OK'
 	}
 	
diff --git a/grails-app/services/net/zomis/duga/DugaBotService.groovy b/grails-app/services/net/zomis/duga/DugaBotService.groovy
@@ -21,8 +21,17 @@ class DugaBotService implements ChatBot, InitializingBean {
 
     private StackExchangeChatBot bot
 
+    @Deprecated
     void postSingle(WebhookParameters params, String message) {
-        this.postChat(params, [message])
+        this.postAsync(params.message(message))
+    }
+
+    @Override
+    Future<List<ChatMessageResponse>> postChat(List<ChatMessage> messages) {
+        messages.each {
+            println "postChat $it to $it.room"
+        }
+        return bot.postChat(messages)
     }
 
     @Override
@@ -55,14 +64,6 @@ class DugaBotService implements ChatBot, InitializingBean {
         bot.registerListener(eventClass, handler)
     }
 
-    @Override
-    Future<List<ChatMessageResponse>> postChat(WebhookParameters params, List<String> messages) {
-        messages.each {
-            println "postChat $params: $it"
-        }
-        return bot.postMessages(params, messages)
-    }
-
     @Override
     void afterPropertiesSet() throws Exception {
         def config = new BotConfiguration()
diff --git a/src/main/groovy/net/zomis/duga/tasks/CommentsScanTask.groovy b/src/main/groovy/net/zomis/duga/tasks/CommentsScanTask.groovy
@@ -45,13 +45,15 @@ public class CommentsScanTask implements Runnable {
     		def comments = stackAPI.fetchComments("stackoverflow", fromDate);
     		int currentQuota = comments.quota_remaining
     		if (currentQuota > remainingQuota && fromDate != 0) {
-				chatBot.postSingle(debug, Instant.now().toString() + " Quota has been reset. Was " + remainingQuota + " is now " + currentQuota);
+				chatBot.postAsync(debug.message(Instant.now().toString() + " Quota has been reset. Was " +
+					remainingQuota + " is now " + currentQuota));
     		}
     		remainingQuota = currentQuota;
     		List items = comments.items;
     		if (items) {
     			if (items.size() >= 100) {
-    				chatBot.postSingle(debug, Instant.now().toString() + " Warning: Retrieved 100 comments. Might have missed some.");
+    				chatBot.postAsync(debug.message(Instant.now().toString() +
+                        " Warning: Retrieved 100 comments. Might have missed some."));
     			}
     			
     			long previousLastComment = lastComment;
@@ -63,33 +65,36 @@ public class CommentsScanTask implements Runnable {
     				lastComment = Math.max(comment.comment_id as long, lastComment);
     				fromDate = Math.max(comment.creation_date as long, fromDate);
     				if (isInterestingComment(comment)) {
-    					chatBot.postSingle(params, comment.link as String);
+    					chatBot.postAsync(params.message(comment.link as String));
     				}
     				float programmersCertainty = CommentClassification.calcInterestingLevelProgrammers(comment);
     				
     				if (programmersCertainty >= CommentClassification.REAL) {
-    					chatBot.postSingle(programmers, comment.link as String);
+    					chatBot.postAsync(programmers.message(comment.link as String));
     				}
     				if (programmersCertainty >= CommentClassification.DEBUG) {
-    					chatBot.postSingle(debug, "Certainty level " + programmersCertainty);
-    					chatBot.postSingle(debug, comment.link as String);
+    					chatBot.postChat(Arrays.asList(
+                                debug.message("Certainty level " + programmersCertainty),
+                                debug.message(comment.link as String)
+                        ));
     				}
     				
     				float softwareCertainty = CommentClassification.calcInterestingLevelSoftwareRecs(comment);
     				
     				if (softwareCertainty >= CommentClassification.REAL) {
-    					chatBot.postSingle(softwareRecs, comment.link as String);
+    					chatBot.postAsync(softwareRecs.message(comment.link as String));
     				}
     			}
                 items.clear();
             }
             if (comments.backoff) {
                 nextFetch = Instant.now().plusSeconds((int) comments.backoff + 10);
-                chatBot.postSingle(debug, Instant.now().toString() + " Next fetch: " + nextFetch + " because of backoff " + String.valueOf(comments.backoff));
+                chatBot.postAsync(debug.message(Instant.now().toString() +
+                    " Next fetch: " + nextFetch + " because of backoff " + String.valueOf(comments.backoff)));
             }
     	} catch (Exception e) {
     		logger.error("Error retrieving comments", e);
-    		chatBot.postSingle(debug, Instant.now().toString() + " Exception in comment task " + e);
+    		chatBot.postAsync(debug.message(Instant.now().toString() + " Exception in comment task " + e));
     	}
     }
 
diff --git a/src/main/groovy/net/zomis/duga/tasks/GithubTask.groovy b/src/main/groovy/net/zomis/duga/tasks/GithubTask.groovy
@@ -56,7 +56,6 @@ public class GithubTask implements Runnable {
     	}
 
     	WebhookParameters params = new WebhookParameters();
-    	params.setPost(true);
     	params.setRoomId(follow.getRoomIds());
 
     	Stream<Object> stream = events.stream();
@@ -89,9 +88,9 @@ public class GithubTask implements Runnable {
             event.payload.sender.html_url = event.actor.url.replaceFirst('api.github.com/users', 'www.github.com')
             try {
                 stringify."$type"(list, event.payload)
-                bot.postChat(params, list);
+                bot.postChat(params.messages(list));
             } catch (Exception ex) {
-                bot.postSingle(params, "Exception $ex when processing event $event");
+                bot.postAsync(params.message("Exception $ex when processing event $event"));
             }
 		} else {
     		System.out.println(event);
diff --git a/src/main/groovy/net/zomis/duga/tasks/ListenTask.groovy b/src/main/groovy/net/zomis/duga/tasks/ListenTask.groovy
@@ -166,7 +166,7 @@ class ListenTask implements Runnable {
 //            handler.botCommand(message)
         }
         if (previousId <= 0) {
-            bot.postSingle(params, 'Monking! (Duga is now listening for commands)')
+            bot.postAsync(params.message('Monking! (Duga is now listening for commands)'))
         }
 /*            Root node: {"ms":4,"time":41194973,"sync":1433551091,"events":
                 [{"room_id":16134,"event_type":1,"time_stamp":1433547911,"user_id":125580,"user_name":"Duga","message_id":22039309,"content":"Loki Astari vs. Simon Andr&#233; Forsberg: 4383 diff. Year: -1368. Quarter: -69. Month: -5. Week: +60. Day: -25."}
diff --git a/src/main/groovy/net/zomis/duga/tasks/qscan/AnswerInvalidationCheck.groovy b/src/main/groovy/net/zomis/duga/tasks/qscan/AnswerInvalidationCheck.groovy
@@ -31,7 +31,7 @@ class AnswerInvalidationCheck {
                     String editor = possibleInvalidations.stream()
                         .map({formatDisplayName(it.user.display_name)})
                         .collect(Collectors.joining(', '))
-                    dugaBot.postChat(params, ["*possible answer invalidation by $editor on question by $op:* $link"])
+                    dugaBot.postAsync(params.message("*possible answer invalidation by $editor on question by $op:* $link"))
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,15 @@ public class ChatMessageIncoming {`
`39`	`39`	`WebhookParameters params;`
`40`	`40`
`41`	`41`	`public void reply(String message) {`
`42`		`- bot.postSingle(params, ":" + messageId + " " + message);`
	`42`	`+ bot.postAsync(params.message(":" + messageId + " " + message));`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public void post(String message) {`
`46`		`- bot.postSingle(params, message);`
	`46`	`+ bot.postAsync(params.message(message));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public void ping(String message) {`
`50`		`- bot.postSingle(params, "@$user_name $message");`
	`50`	`+ bot.postAsync(params.message("@$user_name $message"));`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ synchronized void latestMessages() {`
`86`	`86`	`handler.accept(message);`
`87`	`87`	`}`
`88`	`88`	`if (previousId <= 0) {`
`89`		`- bot.postSingle(params, "Monking! (Duga is now listening for commands)");`
	`89`	`+ bot.postAsync(params.message("Monking! (Duga is now listening for commands)"));`
`90`	`90`	`}`
`91`	`91`	`/* Root node: {"ms":4,"time":41194973,"sync":1433551091,"events":`
`92`	`92`	`[{"room_id":16134,"event_type":1,"time_stamp":1433547911,"user_id":125580,"user_name":"Duga","message_id":22039309,"content":"Loki Astari vs. Simon André Forsberg: 4383 diff. Year: -1368. Quarter: -69. Month: -5. Week: +60. Day: -25."}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ class GithubHookController {`
`28`	`28`	`strings.forEach({ println it })`
`29`	`29`	`String[] rooms = room.split(',')`
`30`	`30`	`for (String postRoom : rooms) {`
`31`		`- bot.postChat(WebhookParameters.toRoom(postRoom), strings)`
	`31`	`+ WebhookParameters hookParams = WebhookParameters.toRoom(postRoom)`
	`32`	`+ bot.postChat(hookParams.messages(strings))`
`32`	`33`	`}`
`33`	`34`	`render 'OK'`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ class TravisHookController {`
`97`	`97`	`default:`
`98`	`98`	`break;`
`99`	`99`	`}`
`100`		`- chatBot.postChat(params, messages);`
	`100`	`+ chatBot.postChat(params.messages(messages));`
`101`	`101`	`render 'OK'`
`102`	`102`	`}`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,15 @@ public class CommentsScanTask implements Runnable {`
`45`	`45`	`def comments = stackAPI.fetchComments("stackoverflow", fromDate);`
`46`	`46`	`int currentQuota = comments.quota_remaining`
`47`	`47`	`if (currentQuota > remainingQuota && fromDate != 0) {`
`48`		`- chatBot.postSingle(debug, Instant.now().toString() + " Quota has been reset. Was " + remainingQuota + " is now " + currentQuota);`
	`48`	`+ chatBot.postAsync(debug.message(Instant.now().toString() + " Quota has been reset. Was " +`
	`49`	`+ remainingQuota + " is now " + currentQuota));`
`49`	`50`	`}`
`50`	`51`	`remainingQuota = currentQuota;`
`51`	`52`	`List items = comments.items;`
`52`	`53`	`if (items) {`
`53`	`54`	`if (items.size() >= 100) {`
`54`		`- chatBot.postSingle(debug, Instant.now().toString() + " Warning: Retrieved 100 comments. Might have missed some.");`
	`55`	`+ chatBot.postAsync(debug.message(Instant.now().toString() +`
	`56`	`+ " Warning: Retrieved 100 comments. Might have missed some."));`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`long previousLastComment = lastComment;`
`@@ -63,33 +65,36 @@ public class CommentsScanTask implements Runnable {`
`63`	`65`	`lastComment = Math.max(comment.comment_id as long, lastComment);`
`64`	`66`	`fromDate = Math.max(comment.creation_date as long, fromDate);`
`65`	`67`	`if (isInterestingComment(comment)) {`
`66`		`- chatBot.postSingle(params, comment.link as String);`
	`68`	`+ chatBot.postAsync(params.message(comment.link as String));`
`67`	`69`	`}`
`68`	`70`	`float programmersCertainty = CommentClassification.calcInterestingLevelProgrammers(comment);`
`69`	`71`
`70`	`72`	`if (programmersCertainty >= CommentClassification.REAL) {`
`71`		`- chatBot.postSingle(programmers, comment.link as String);`
	`73`	`+ chatBot.postAsync(programmers.message(comment.link as String));`
`72`	`74`	`}`
`73`	`75`	`if (programmersCertainty >= CommentClassification.DEBUG) {`
`74`		`- chatBot.postSingle(debug, "Certainty level " + programmersCertainty);`
`75`		`- chatBot.postSingle(debug, comment.link as String);`
	`76`	`+ chatBot.postChat(Arrays.asList(`
	`77`	`+ debug.message("Certainty level " + programmersCertainty),`
	`78`	`+ debug.message(comment.link as String)`
	`79`	`+ ));`
`76`	`80`	`}`
`77`	`81`
`78`	`82`	`float softwareCertainty = CommentClassification.calcInterestingLevelSoftwareRecs(comment);`
`79`	`83`
`80`	`84`	`if (softwareCertainty >= CommentClassification.REAL) {`
`81`		`- chatBot.postSingle(softwareRecs, comment.link as String);`
	`85`	`+ chatBot.postAsync(softwareRecs.message(comment.link as String));`
`82`	`86`	`}`
`83`	`87`	`}`
`84`	`88`	`items.clear();`
`85`	`89`	`}`
`86`	`90`	`if (comments.backoff) {`
`87`	`91`	`nextFetch = Instant.now().plusSeconds((int) comments.backoff + 10);`
`88`		`- chatBot.postSingle(debug, Instant.now().toString() + " Next fetch: " + nextFetch + " because of backoff " + String.valueOf(comments.backoff));`
	`92`	`+ chatBot.postAsync(debug.message(Instant.now().toString() +`
	`93`	`+ " Next fetch: " + nextFetch + " because of backoff " + String.valueOf(comments.backoff)));`
`89`	`94`	`}`
`90`	`95`	`} catch (Exception e) {`
`91`	`96`	`logger.error("Error retrieving comments", e);`
`92`		`- chatBot.postSingle(debug, Instant.now().toString() + " Exception in comment task " + e);`
	`97`	`+ chatBot.postAsync(debug.message(Instant.now().toString() + " Exception in comment task " + e));`
`93`	`98`	`}`
`94`	`99`	`}`
`95`	`100`