Merge pull request #416 from seratch/issue-415

Fix #415 attachments payload's validity issue

Author: seratch

json-logs/samples/api/im.history.json

@@ -21,7 +21,9 @@
           "ts": ""
         }
       ],
-      "subscribed": false
+      "subscribed": false,
+      "user": "U00000000",
+      "bot_link": ""
     }
   ],
   "has_more": false,

json-logs/samples/api/rtm.start.json

@@ -800,6 +800,7 @@
   "url": "",
   "is_europe": false,
   "accept_tos_url": "https://www.example.com/",
+  "channels_with_use_case": {},
   "error": "",
   "needed": "",
   "provided": ""

slack-api-client/src/test/java/test_with_remote_apis/methods/chat_Test.java

@@ -25,6 +25,11 @@
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 
+import static com.slack.api.model.Attachments.asAttachments;
+import static com.slack.api.model.Attachments.attachment;
+import static com.slack.api.model.block.Blocks.asBlocks;
+import static com.slack.api.model.block.Blocks.section;
+import static com.slack.api.model.block.composition.BlockCompositions.markdownText;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertNull;
@@ -692,4 +697,38 @@ public void scheduleMessages() throws IOException, SlackApiException {
         assertTrue(after.getScheduledMessages().size() - before.getScheduledMessages().size() == 2);
     }
 
+    // https://github.com/slackapi/java-slack-sdk/issues/415
+    @Test
+    public void attachmentsWithBlocks_issue_415() throws IOException, SlackApiException {
+        loadRandomChannelId();
+        /*
+         * {
+         *   "attachments": [
+         *     {
+         *       "color": "#00FF00",
+         *       "blocks": [
+         *         {
+         *           "type": "section",
+         *           "text": {
+         *             "type": "mrkdwn",
+         *             "text": "*I would expect this text to show*"
+         *           }
+         *         }
+         *       ]
+         *     }
+         *   ]
+         * }
+         */
+        List<Attachment> attachments = asAttachments(
+                attachment(a -> a.color("#00FF00").blocks(asBlocks(
+                        section(s -> s.text(markdownText("*I would expect this text to show*")))
+                )))
+        );
+        ChatPostMessageResponse result = slack.methods(botToken).chatPostMessage(r -> r
+                .channel(randomChannelId)
+                .attachments(attachments)
+        );
+        assertThat(result.getError(), is(nullValue()));
+    }
+
 }

slack-api-client/src/test/java/test_with_remote_apis/methods/conversations_Test.java

@@ -416,7 +416,9 @@ public void replies() throws IOException, SlackApiException {
                 List<Message> messages = response.getMessages();
                 Message firstMessage = messages.get(0);
                 assertThat(firstMessage.getReplyUsersCount(), is(1));
-                assertThat(firstMessage.getReplies().size(), is(5));
+                // NOTE: As of April 2020, this field is no longer available
+                // assertThat(firstMessage.getReplies().size(), is(5));
+                assertThat(firstMessage.getReplies(), is(nullValue()));
                 assertThat(firstMessage.getReplyCount(), is(5));
                 assertThat(firstMessage.getLatestReply(), is(messages.get(5).getTs()));
             }
@@ -433,7 +435,9 @@ public void replies() throws IOException, SlackApiException {
                 List<Message> messages = response.getMessages();
                 Message firstMessage = messages.get(0);
                 assertThat(firstMessage.getReplyUsersCount(), is(1));
-                assertThat(firstMessage.getReplies().size(), is(5));
+                // NOTE: As of April 2020, this field is no longer available
+                // assertThat(firstMessage.getReplies().size(), is(5));
+                assertThat(firstMessage.getReplies(), is(nullValue()));
                 assertThat(firstMessage.getReplyCount(), is(5));
                 assertThat(firstMessage.getLatestReply(), is(messages.get(5).getTs()));
             }

slack-api-model/src/main/java/com/slack/api/model/Attachment.java

@@ -4,7 +4,6 @@
 import com.slack.api.model.block.LayoutBlock;
 import lombok.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -190,8 +189,7 @@ public void setAppUnfurl(Boolean appUnfurl) {
     /**
      * Fields are defined as an array, and hashes contained within it will be displayed in a table inside the message attachment.
      */
-    @Builder.Default
-    private List<Field> fields = new ArrayList<>();
+    private List<Field> fields;
 
     /**
      * A valid URL to an image file that will be displayed inside a message attachment.
@@ -259,14 +257,12 @@ public void setAppUnfurl(Boolean appUnfurl) {
      * in attachments</a> are not formatted. To enable formatting on attachment fields, add the
      * name of the field (as defined in the API) in this list.
      */
-    @Builder.Default
-    private List<String> mrkdwnIn = new ArrayList<>();
+    private List<String> mrkdwnIn;
 
     /**
      * Actions are defined as an array, and hashes contained within it will be displayed in as buttons in the message attachment.
      */
-    @Builder.Default
-    private List<Action> actions = new ArrayList<>();
+    private List<Action> actions;
 
     private List<LayoutBlock> blocks;
 

slack-app-backend/src/test/java/test_locally/app_backend/outgoing_webhooks/WebhookResponseTest.java

@@ -8,6 +8,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertNull;
 
 public class WebhookResponseTest {
@@ -64,7 +65,7 @@ public void test() {
         assertThat(attachmentResponse.getTitle(), is("Slack API Documentation"));
         assertThat(attachmentResponse.getTitleLink(), is("https://api.slack.com/"));
         assertThat(attachmentResponse.getText(), is("This is an *attachment*."));
-        assertThat(attachmentResponse.getFields().size(), is(0));
+        assertThat(attachmentResponse.getFields(), is(nullValue()));
         assertNull(attachmentResponse.getImageUrl());
         assertNull(attachmentResponse.getImageWidth());
         assertNull(attachmentResponse.getImageHeight());
@@ -78,8 +79,8 @@ public void test() {
         assertThat(attachmentResponse.getFooter(), is("footer"));
         assertNull(attachmentResponse.getFooterIcon());
         assertNull(attachmentResponse.getTs());
-        assertThat(attachmentResponse.getMrkdwnIn().size(), is(0));
-        assertThat(attachmentResponse.getActions().size(), is(0));
+        assertThat(attachmentResponse.getMrkdwnIn(), is(nullValue()));
+        assertThat(attachmentResponse.getActions(), is(nullValue()));
         assertNull(attachmentResponse.getBlocks());
         assertNull(attachmentResponse.getFilename());
         assertNull(attachmentResponse.getSize());