Merge branch 'main' of https://github.com/slackapi/java-slack-sdk into feat-work-objects

Author: vegeris

json-logs/samples/api/views.open.json

@@ -382,6 +382,7 @@ class RichTextBlockTest {
 										"strike": false,
 										"highlight": false,
 										"client_highlight": true,
+										"underline": false,
 										"unlink": false
 									}
 								}
@@ -474,6 +475,7 @@ class RichTextBlockTest {
 								"strike": true,
 								"highlight": false,
 								"client_highlight": true,
+								"underline": false,
 								"unlink": false,
 								"code": true
 							}

json-logs/samples/api/views.publish.json

@@ -87,6 +87,12 @@ public static InputBlock input(ModelConfigurator<InputBlock.InputBlockBuilder> c
         return configurator.configure(InputBlock.builder()).build();
     }
 
+    // MarkdownBlock
+
+    public static MarkdownBlock markdown(ModelConfigurator<MarkdownBlock.MarkdownBlockBuilder> configurator) {
+        return configurator.configure(MarkdownBlock.builder()).build();
+    }
+
     // RichTextBlock
 
     public static RichTextBlock richText(ModelConfigurator<RichTextBlock.RichTextBlockBuilder> configurator) {

json-logs/samples/api/views.push.json

@@ -0,0 +1,30 @@
+package com.slack.api.model.block;
+
+import com.slack.api.model.File;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * https://docs.slack.dev/reference/block-kit/blocks/markdown-block
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MarkdownBlock implements LayoutBlock {
+    public static final String TYPE = "markdown";
+    /**
+     * The type of block. For a markdown block, type is always markdown.
+     */
+    private final String type = TYPE;
+    /**
+     * The standard markdown-formatted text. Limit 12,000 characters max.
+     */
+    private String text;
+    /**
+     * The block_id is ignored in markdown blocks and will not be retained.
+     */
+    private String blockId;
+}

json-logs/samples/api/views.update.json

@@ -162,6 +162,7 @@ public static class TextStyle {
         private boolean strike;
         private boolean highlight;
         private boolean clientHighlight;
+        private boolean underline;
         private boolean unlink;
         private boolean code;
     }
@@ -176,6 +177,7 @@ public static class LimitedTextStyle {
         private boolean strike;
         private boolean highlight;
         private boolean clientHighlight;
+        private boolean underline;
         private boolean unlink;
     }
 

slack-api-model-kotlin-extension/src/test/kotlin/test_locally/block/RichTextBlockTest.kt

@@ -51,6 +51,8 @@ private Class<? extends LayoutBlock> getLayoutClassInstance(String typeName) {
                 return InputBlock.class;
             case HeaderBlock.TYPE:
                 return HeaderBlock.class;
+            case MarkdownBlock.TYPE:
+                return MarkdownBlock.class;
             case VideoBlock.TYPE:
                 return VideoBlock.class;
             case RichTextBlock.TYPE:

slack-api-model/src/main/java/com/slack/api/model/block/Blocks.java

@@ -55,6 +55,20 @@ public void parseInputOnes() {
         assertThat(inputBlock.getHint(), is(notNullValue()));
     }
 
+    @Test
+    public void parseMarkdownBlock() {
+        String blocks = "[{\n" +
+                "  \"type\": \"markdown\",\n" +
+                "  \"text\": \"**this is bold**\"\n" +
+                "}]";
+        String json = "{blocks: " + blocks + "}";
+        Message message = GsonFactory.createSnakeCase().fromJson(json, Message.class);
+        assertThat(message, is(notNullValue()));
+        assertThat(message.getBlocks().size(), is(1));
+        MarkdownBlock markdownBlock = (MarkdownBlock) message.getBlocks().get(0);
+        assertThat(markdownBlock.getText(), is("**this is bold**"));
+    }
+
     @Test
     public void parseMultiSelectOnes() {
         String blocks = "[\n" +
@@ -265,6 +279,7 @@ public void parseRichTextOnes() {
         assertThat(text.getStyle().isBold(), is(true));
         assertThat(text.getStyle().isItalic(), is(false));
         assertThat(text.getStyle().isStrike(), is(false));
+        assertThat(text.getStyle().isUnderline(), is(false));
     }
 
     @Test
@@ -617,6 +632,56 @@ public void parseRichTextOnes4() {
         assertThat(view.getBlocks().size(), is(1));
     }
 
+    @Test
+    public void parseRichTextOnes5() {
+        // https://docs.slack.dev/changelog/2019/09/01/what-they-see-is-what-you-get-and-more-and-less
+        String json = "{\n" +
+                "  \"user\": \"U111\",\n" +
+                "  \"type\": \"message\",\n" +
+                "  \"ts\": \"1761165621.982069\",\n" +
+                "  \"client_msg_id\": \"d0b7fc31-7456-4e54-9094-b5b1833fca8c\",\n" +
+                "  \"text\": \"this is underline\",\n" +
+                "  \"team\": \"T111\",\n" +
+                "  \"blocks\": [\n" +
+                "    {\n" +
+                "      \"type\": \"rich_text\",\n" +
+                "      \"block_id\": \"sfvOa\",\n" +
+                "      \"elements\": [\n" +
+                "        {\n" +
+                "          \"type\": \"rich_text_section\",\n" +
+                "          \"elements\": [\n" +
+                "            {\n" +
+                "              \"type\": \"text\",\n" +
+                "              \"text\": \"this is underline\",\n" +
+                "              \"style\": {\n" +
+                "                \"underline\": true\n" +
+                "              }\n" +
+                "            }\n" +
+                "          ]\n" +
+                "        }\n" +
+                "      ]\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}";
+
+        Message view = GsonFactory.createSnakeCase().fromJson(json, Message.class);
+        assertThat(view.getBlocks().size(), is(1));
+
+        RichTextBlock richTextBlock = (RichTextBlock) view.getBlocks().get(0);
+        assertThat(richTextBlock.getElements().size(), is(1));
+
+        RichTextSectionElement richTextSection = (RichTextSectionElement) richTextBlock.getElements().get(0);
+        assertThat(richTextSection.getElements().size(), is(1));
+
+        RichTextSectionElement.Text text = (RichTextSectionElement.Text) richTextSection.getElements().get(0);
+        assertThat(text.getType(), is("text"));
+        assertThat(text.getText(), is("this is underline"));
+        assertThat(text.getStyle().isBold(), is(false));
+        assertThat(text.getStyle().isItalic(), is(false));
+        assertThat(text.getStyle().isStrike(), is(false));
+        assertThat(text.getStyle().isUnderline(), is(true));
+    }
+
     @Test
     public void parseRadioButtons() {
         String json = "{" +