Skip to content

Commit 524b6dd

Browse files
authored
Fix #821 emoji.list missing include_categories option (#1106)
1 parent 157e366 commit 524b6dd

File tree

5 files changed

+36
-1
lines changed

5 files changed

+36
-1
lines changed

json-logs/samples/api/emoji.list.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,14 @@
77
"cache_ts": "0000000000.000000",
88
"error": "",
99
"needed": "",
10-
"provided": ""
10+
"provided": "",
11+
"categories_version": "12345",
12+
"categories": [
13+
{
14+
"name": "",
15+
"emoji_names": [
16+
""
17+
]
18+
}
19+
]
1120
}

slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,6 +1586,7 @@ public static FormBody.Builder toForm(DndTeamInfoRequest req) {
15861586

15871587
public static FormBody.Builder toForm(EmojiListRequest req) {
15881588
FormBody.Builder form = new FormBody.Builder();
1589+
setIfNotNull("include_categories", req.getIncludeCategories(), form);
15891590
return form;
15901591
}
15911592

slack-api-client/src/main/java/com/slack/api/methods/request/emoji/EmojiListRequest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,9 @@ public class EmojiListRequest implements SlackApiRequest {
1616
*/
1717
private String token;
1818

19+
/**
20+
* Include a list of categories for Unicode emoji and the emoji in each category
21+
*/
22+
private Boolean includeCategories;
23+
1924
}

slack-api-client/src/main/java/com/slack/api/methods/response/emoji/EmojiListResponse.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,12 @@ public class EmojiListResponse implements SlackApiTextResponse {
1818

1919
private Map<String, String> emoji;
2020
private String cacheTs;
21+
private String categoriesVersion;
22+
private List<Category> categories;
23+
24+
@Data
25+
public static class Category {
26+
private String name;
27+
private List<String> emojiNames;
28+
}
2129
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ public void emojiList_bot() throws IOException, SlackApiException {
4040
assertThat(response.isOk(), is(true));
4141
assertThat(response.getEmoji(), is(notNullValue()));
4242
}
43+
{
44+
EmojiListResponse response = slack.methods().emojiList(r -> r.token(botToken).includeCategories(true));
45+
assertThat(response.getError(), is(nullValue()));
46+
assertThat(response.isOk(), is(true));
47+
assertThat(response.getEmoji(), is(notNullValue()));
48+
}
4349
}
4450

4551
@Test
@@ -51,6 +57,12 @@ public void emojiList_user() throws IOException, SlackApiException {
5157
assertThat(response.isOk(), is(true));
5258
assertThat(response.getEmoji(), is(notNullValue()));
5359
}
60+
{
61+
EmojiListResponse response = slack.methods().emojiList(r -> r.token(userToken).includeCategories(true));
62+
assertThat(response.getError(), is(nullValue()));
63+
assertThat(response.isOk(), is(true));
64+
assertThat(response.getEmoji(), is(notNullValue()));
65+
}
5466
}
5567

5668
}

0 commit comments

Comments
 (0)