Merge pull request allbegray#37 from kirillsablin/add-threads-support

add threads support

Author: allbegray

.travis.yml

@@ -1 +1,3 @@
-language: java
+language: java
+jdk:
+  - oraclejdk8

src/main/java/allbegray/slack/type/Message.java

@@ -12,6 +12,7 @@ public class Message {
 	protected String ts;
 	protected String user;
 	protected String text;
+	protected String thread_ts;
 
 	protected Boolean is_starred;
 	protected String subtype;
@@ -52,6 +53,14 @@ public void setText(String text) {
 		this.text = text;
 	}
 
+	public String getThread_ts() {
+		return thread_ts;
+	}
+
+	public void setThread_ts(String thread_ts) {
+		this.thread_ts = thread_ts;
+	}
+
 	public String getPermalink() {
 		return permalink;
 	}

src/main/java/allbegray/slack/webapi/method/chats/ChatPostMessageMethod.java

@@ -41,6 +41,7 @@ public ChatPostMessageMethod(String channel, String text) {
 	protected boolean unfurl_media;
 	protected String icon_url;
 	protected String icon_emoji;
+	protected String thread_ts;
 
 	public String getChannel() {
 		return channel;
@@ -125,6 +126,13 @@ public void setIcon_emoji(String icon_emoji) {
 		this.icon_emoji = icon_emoji;
 	}
 
+	public String getThread_ts() {
+		return thread_ts;
+	}
+
+	public void setThread_ts(String thread_ts) {
+		this.thread_ts = thread_ts;
+	}
 	@Override
 	public String getMethodName() {
 		return SlackWebApiConstants.CHAT_POST_MESSAGE;
@@ -166,6 +174,9 @@ protected void createParameters(Map<String, String> parameters) {
 		parameters.put("unfurl_media", String.valueOf(unfurl_media));
 		parameters.put("icon_url", icon_url);
 		parameters.put("icon_emoji", icon_emoji);
+		if (thread_ts != null) {
+			parameters.put("thread_ts", thread_ts);
+		}
 	}
 
 }

src/test/java/allbegray/slack/SlackWebApiClientTest.java

@@ -8,6 +8,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import allbegray.slack.type.Authentication;
@@ -26,6 +27,7 @@
 import allbegray.slack.type.User;
 import allbegray.slack.type.UserPresence;
 import allbegray.slack.webapi.SlackWebApiClient;
+import wiremock.org.apache.commons.lang3.RandomStringUtils;
 
 public class SlackWebApiClientTest {
 
@@ -48,7 +50,6 @@ public void shutdown() {
 	public void MultipartyDirectMessageChannelTest() {
 		String user1 = "userId1";
 		String user2 = "userId2";
-
 		Group group = webApiClient.openMultipartyDirectMessageChannel(user1, user2);
 
 		List<Group> messageChannels = webApiClient.getMultipartyDirectMessageChannelList();
@@ -107,13 +108,15 @@ public void basicTest() {
 			teamAccessLogList = webApiClient.getTeamAccessLogList(1);
 			Assert.assertTrue(teamAccessLogList.getLogins().size() > 0);
 		} catch (Exception e) {
-			Assert.assertTrue(e.getMessage().equals("paid_only"));
+			Assert.assertTrue(e.getMessage().startsWith("paid_only"));
 		}
 
 		Team team = webApiClient.getTeamInfo();
 		Assert.assertTrue(team.getId() != null);
 
-		Channel channel = webApiClient.createChannel("test_channel");
+
+		String channelName = "test_channel_" + RandomStringUtils.randomAlphabetic(5).toLowerCase();
+		Channel channel = webApiClient.createChannel(channelName);
 		String channelId = channel.getId();
 
 		Assert.assertTrue(channel.getId() != null);
@@ -133,7 +136,8 @@ public void basicTest() {
 		Assert.assertTrue(channel.getId() != null);
 		channelId = channel.getId();
 
-		channel = webApiClient.renameChannel(channelId, "changed_test_channel");
+		String newChannelName = RandomStringUtils.randomAlphabetic(5).toLowerCase() + "_changed_test_channel";
+		channel = webApiClient.renameChannel(channelId, newChannelName);
 		Assert.assertTrue(channel.getId() != null);
 		channelId = channel.getId();
 
@@ -155,6 +159,11 @@ public void basicTest() {
 		String ts = webApiClient.postMessage(postMessage);
 		Assert.assertTrue(ts != null);
 
+		// threaded message
+		ChatPostMessageMethod answerMessage = new ChatPostMessageMethod(channelId, "test answer");
+		answerMessage.setThread_ts(ts);
+		String tsAnswer = webApiClient.postMessage(answerMessage);
+
 		webApiClient.addStarToMessage(channelId, ts);
 		webApiClient.addReactionToMessage("squirrel", channelId, ts);
 		webApiClient.pinMessage(channelId, ts);
@@ -198,6 +207,9 @@ public void basicTest() {
 		Message message = history.getMessages().get(0);
 		Assert.assertTrue(message.getType() != null);
 		Assert.assertTrue(message.getTs() != null);
+
+		Message answer = history.getMessages().stream().filter(mess -> mess.getTs().equals(tsAnswer)).findFirst().get();
+		Assert.assertEquals(ts, answer.getThread_ts());
 	}
 
 	@Test