Skip to content

Commit 20ae46c

Browse files
vegerisvegeris
committed
Merge branch 'main' of https://github.com/slackapi/java-slack-sdk into feat-work-objects, and update models
2 parents 1105f3c + 9504d94 commit 20ae46c

File tree

25 files changed

+472
-17
lines changed

25 files changed

+472
-17
lines changed

‎json-logs/samples/api/chat.appendStream.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"ok": false,
3+
"error": "",
4+
"needed": "",
5+
"provided": "",
6+
"channel": "C00000000",
7+
"ts": "0000000000.000000"
8+
}

‎json-logs/samples/api/chat.startStream.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"ok": false,
3+
"ts": "0000000000.000000",
4+
"error": "",
5+
"needed": "",
6+
"provided": "",
7+
"channel": "C00000000"
8+
}

‎json-logs/samples/api/chat.stopStream.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"ok": false,
3+
"error": "",
4+
"needed": "",
5+
"provided": ""
6+
}
7+

‎metadata/web-api/rate_limit_tiers.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
"channels.setPurpose": "Tier2",
151151
"channels.setTopic": "Tier2",
152152
"channels.unarchive": "Tier2",
153+
"chat.appendStream": "Tier4",
153154
"chat.delete": "Tier3",
154155
"chat.deleteScheduledMessage": "Tier3",
155156
"chat.getPermalink": "SpecialTier_chat_getPermalink",
@@ -158,6 +159,8 @@
158159
"chat.postMessage": "SpecialTier_chat_postMessage",
159160
"chat.scheduleMessage": "Tier3",
160161
"chat.scheduledMessages.list": "Tier3",
162+
"chat.startStream": "Tier2",
163+
"chat.stopStream": "Tier2",
161164
"chat.unfurl": "Tier3",
162165
"chat.update": "Tier3",
163166
"conversations.acceptSharedInvite": "Tier1",

‎slack-api-client/src/main/java/com/slack/api/methods/AsyncMethodsClient.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -941,6 +941,10 @@ CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse>
941941
// chat
942942
// ------------------------------
943943

944+
CompletableFuture<ChatAppendStreamResponse> chatAppendStream(ChatAppendStreamRequest req);
945+
946+
CompletableFuture<ChatAppendStreamResponse> chatAppendStream(RequestConfigurator<ChatAppendStreamRequest.ChatAppendStreamRequestBuilder> req);
947+
944948
CompletableFuture<ChatGetPermalinkResponse> chatGetPermalink(ChatGetPermalinkRequest req);
945949

946950
CompletableFuture<ChatGetPermalinkResponse> chatGetPermalink(RequestConfigurator<ChatGetPermalinkRequest.ChatGetPermalinkRequestBuilder> req);
@@ -969,6 +973,14 @@ CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse>
969973

970974
CompletableFuture<ChatScheduleMessageResponse> chatScheduleMessage(RequestConfigurator<ChatScheduleMessageRequest.ChatScheduleMessageRequestBuilder> req);
971975

976+
CompletableFuture<ChatStartStreamResponse> chatStartStream(ChatStartStreamRequest req);
977+
978+
CompletableFuture<ChatStartStreamResponse> chatStartStream(RequestConfigurator<ChatStartStreamRequest.ChatStartStreamRequestBuilder> req);
979+
980+
CompletableFuture<ChatStopStreamResponse> chatStopStream(ChatStopStreamRequest req);
981+
982+
CompletableFuture<ChatStopStreamResponse> chatStopStream(RequestConfigurator<ChatStopStreamRequest.ChatStopStreamRequestBuilder> req);
983+
972984
CompletableFuture<ChatUpdateResponse> chatUpdate(ChatUpdateRequest req);
973985

974986
CompletableFuture<ChatUpdateResponse> chatUpdate(RequestConfigurator<ChatUpdateRequest.ChatUpdateRequestBuilder> req);

‎slack-api-client/src/main/java/com/slack/api/methods/Methods.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,13 +378,16 @@ private Methods() {
378378
// chat
379379
// ------------------------------
380380

381+
public static final String CHAT_APPEND_STREAM = "chat.appendStream";
381382
public static final String CHAT_DELETE = "chat.delete";
382383
public static final String CHAT_DELETE_SCHEDULED_MESSAGE = "chat.deleteScheduledMessage";
383384
public static final String CHAT_GET_PERMALINK = "chat.getPermalink";
384385
public static final String CHAT_ME_MESSAGE = "chat.meMessage";
385386
public static final String CHAT_POST_EPHEMERAL = "chat.postEphemeral";
386387
public static final String CHAT_POST_MESSAGE = "chat.postMessage";
387388
public static final String CHAT_SCHEDULE_MESSAGE = "chat.scheduleMessage";
389+
public static final String CHAT_START_STREAM = "chat.startStream";
390+
public static final String CHAT_STOP_STREAM = "chat.stopStream";
388391
public static final String CHAT_UNFURL = "chat.unfurl";
389392
public static final String CHAT_UPDATE = "chat.update";
390393

‎slack-api-client/src/main/java/com/slack/api/methods/MethodsClient.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,6 +1568,10 @@ ChannelsUnarchiveResponse channelsUnarchive(
15681568
// chat
15691569
// ------------------------------
15701570

1571+
ChatAppendStreamResponse chatAppendStream(ChatAppendStreamRequest req) throws IOException, SlackApiException;
1572+
1573+
ChatAppendStreamResponse chatAppendStream(RequestConfigurator<ChatAppendStreamRequest.ChatAppendStreamRequestBuilder> req) throws IOException, SlackApiException;
1574+
15711575
ChatGetPermalinkResponse chatGetPermalink(ChatGetPermalinkRequest req) throws IOException, SlackApiException;
15721576

15731577
ChatGetPermalinkResponse chatGetPermalink(
@@ -1610,6 +1614,14 @@ ChatScheduleMessageResponse chatScheduleMessage(
16101614
RequestConfigurator<ChatScheduleMessageRequest.ChatScheduleMessageRequestBuilder> req)
16111615
throws IOException, SlackApiException;
16121616

1617+
ChatStartStreamResponse chatStartStream(ChatStartStreamRequest req) throws IOException, SlackApiException;
1618+
1619+
ChatStartStreamResponse chatStartStream(RequestConfigurator<ChatStartStreamRequest.ChatStartStreamRequestBuilder> req) throws IOException, SlackApiException;
1620+
1621+
ChatStopStreamResponse chatStopStream(ChatStopStreamRequest req) throws IOException, SlackApiException;
1622+
1623+
ChatStopStreamResponse chatStopStream(RequestConfigurator<ChatStopStreamRequest.ChatStopStreamRequestBuilder> req) throws IOException, SlackApiException;
1624+
16131625
ChatUpdateResponse chatUpdate(ChatUpdateRequest req) throws IOException, SlackApiException;
16141626

16151627
ChatUpdateResponse chatUpdate(RequestConfigurator<ChatUpdateRequest.ChatUpdateRequestBuilder> req)

‎slack-api-client/src/main/java/com/slack/api/methods/MethodsRateLimits.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* The comprehensive list of Slack Web API rate limits.
1717
*
18-
* @see <a href="https://docs.slack.dev/apis/web-api/rate-limits">api.slack.com document</a>
18+
* @see <a href="https://docs.slack.dev/apis/web-api/rate-limits">API reference</a>
1919
*/
2020
@Slf4j
2121
public class MethodsRateLimits {
@@ -257,13 +257,16 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier
257257
setRateLimitTier(CANVASES_SECTIONS_LOOKUP, Tier3);
258258
setRateLimitTier(CONVERSATIONS_CANVASES_CREATE, Tier2);
259259

260+
setRateLimitTier(CHAT_APPEND_STREAM, Tier4);
260261
setRateLimitTier(CHAT_DELETE, Tier3);
261262
setRateLimitTier(CHAT_DELETE_SCHEDULED_MESSAGE, Tier3);
262263
setRateLimitTier(CHAT_GET_PERMALINK, SpecialTier_chat_getPermalink);
263264
setRateLimitTier(CHAT_ME_MESSAGE, Tier3);
264265
setRateLimitTier(CHAT_POST_EPHEMERAL, Tier4);
265266
setRateLimitTier(CHAT_POST_MESSAGE, SpecialTier_chat_postMessage);
266267
setRateLimitTier(CHAT_SCHEDULE_MESSAGE, Tier3);
268+
setRateLimitTier(CHAT_START_STREAM, Tier2);
269+
setRateLimitTier(CHAT_STOP_STREAM, Tier2);
267270
setRateLimitTier(CHAT_UNFURL, Tier3);
268271
setRateLimitTier(CHAT_UPDATE, Tier3);
269272
setRateLimitTier(CHAT_SCHEDULED_MESSAGES_LIST, Tier3);

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

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,10 +1454,11 @@ public static FormBody.Builder toForm(ChannelsUnarchiveRequest req) {
14541454
return form;
14551455
}
14561456

1457-
public static FormBody.Builder toForm(ChatGetPermalinkRequest req) {
1457+
public static FormBody.Builder toForm(ChatAppendStreamRequest req) {
14581458
FormBody.Builder form = new FormBody.Builder();
14591459
setIfNotNull("channel", req.getChannel(), form);
1460-
setIfNotNull("message_ts", req.getMessageTs(), form);
1460+
setIfNotNull("ts", req.getTs(), form);
1461+
setIfNotNull("markdown_text", req.getMarkdownText(), form);
14611462
return form;
14621463
}
14631464

@@ -1477,6 +1478,13 @@ public static FormBody.Builder toForm(ChatDeleteScheduledMessageRequest req) {
14771478
return form;
14781479
}
14791480

1481+
public static FormBody.Builder toForm(ChatGetPermalinkRequest req) {
1482+
FormBody.Builder form = new FormBody.Builder();
1483+
setIfNotNull("channel", req.getChannel(), form);
1484+
setIfNotNull("message_ts", req.getMessageTs(), form);
1485+
return form;
1486+
}
1487+
14801488
public static FormBody.Builder toForm(ChatMeMessageRequest req) {
14811489
FormBody.Builder form = new FormBody.Builder();
14821490
setIfNotNull("channel", req.getChannel(), form);
@@ -1632,6 +1640,40 @@ public static FormBody.Builder toForm(ChatPostMessageRequest req) {
16321640
return form;
16331641
}
16341642

1643+
public static FormBody.Builder toForm(ChatStartStreamRequest req) {
1644+
FormBody.Builder form = new FormBody.Builder();
1645+
setIfNotNull("channel", req.getChannel(), form);
1646+
setIfNotNull("thread_ts", req.getThreadTs(), form);
1647+
setIfNotNull("markdown_text", req.getMarkdownText(), form);
1648+
setIfNotNull("recipient_user_id", req.getRecipientUserId(), form);
1649+
setIfNotNull("recipient_team_id", req.getRecipientTeamId(), form);
1650+
return form;
1651+
}
1652+
1653+
public static FormBody.Builder toForm(ChatStopStreamRequest req) {
1654+
FormBody.Builder form = new FormBody.Builder();
1655+
setIfNotNull("channel", req.getChannel(), form);
1656+
setIfNotNull("ts", req.getTs(), form);
1657+
setIfNotNull("markdown_text", req.getMarkdownText(), form);
1658+
1659+
if (req.getMetadataAsString() != null) {
1660+
form.add("metadata", req.getMetadataAsString());
1661+
} else if (req.getMetadata() != null) {
1662+
String json = GSON.toJson(req.getMetadata());
1663+
form.add("metadata", json);
1664+
}
1665+
if (req.getBlocksAsString() != null) {
1666+
form.add("blocks", req.getBlocksAsString());
1667+
} else if (req.getBlocks() != null) {
1668+
String json = getJsonWithGsonAnonymInnerClassHandling(req.getBlocks());
1669+
form.add("blocks", json);
1670+
}
1671+
if (req.getBlocksAsString() != null && req.getBlocks() != null) {
1672+
log.warn("Although you set both blocksAsString and blocks, only blocksAsString was used.");
1673+
}
1674+
return form;
1675+
}
1676+
16351677
public static FormBody.Builder toForm(ChatUpdateRequest req) {
16361678
warnIfEitherTextOrAttachmentFallbackIsMissing(
16371679
"chat.update",

‎slack-api-client/src/main/java/com/slack/api/methods/impl/AsyncMethodsClientImpl.java‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,13 +1597,13 @@ public CompletableFuture<CanvasesSectionsLookupResponse> canvasesSectionsLookup(
15971597
}
15981598

15991599
@Override
1600-
public CompletableFuture<ChatGetPermalinkResponse> chatGetPermalink(ChatGetPermalinkRequest req) {
1601-
return executor.execute(CHAT_GET_PERMALINK, toMap(req), () -> methods.chatGetPermalink(req));
1600+
public CompletableFuture<ChatAppendStreamResponse> chatAppendStream(ChatAppendStreamRequest req) {
1601+
return executor.execute(CHAT_APPEND_STREAM, toMap(req), () -> methods.chatAppendStream(req));
16021602
}
16031603

16041604
@Override
1605-
public CompletableFuture<ChatGetPermalinkResponse> chatGetPermalink(RequestConfigurator<ChatGetPermalinkRequest.ChatGetPermalinkRequestBuilder> req) {
1606-
return chatGetPermalink(req.configure(ChatGetPermalinkRequest.builder()).build());
1605+
public CompletableFuture<ChatAppendStreamResponse> chatAppendStream(RequestConfigurator<ChatAppendStreamRequest.ChatAppendStreamRequestBuilder> req) {
1606+
return chatAppendStream(req.configure(ChatAppendStreamRequest.builder()).build());
16071607
}
16081608

16091609
@Override
@@ -1626,6 +1626,16 @@ public CompletableFuture<ChatDeleteScheduledMessageResponse> chatDeleteScheduled
16261626
return chatDeleteScheduledMessage(req.configure(ChatDeleteScheduledMessageRequest.builder()).build());
16271627
}
16281628

1629+
@Override
1630+
public CompletableFuture<ChatGetPermalinkResponse> chatGetPermalink(ChatGetPermalinkRequest req) {
1631+
return executor.execute(CHAT_GET_PERMALINK, toMap(req), () -> methods.chatGetPermalink(req));
1632+
}
1633+
1634+
@Override
1635+
public CompletableFuture<ChatGetPermalinkResponse> chatGetPermalink(RequestConfigurator<ChatGetPermalinkRequest.ChatGetPermalinkRequestBuilder> req) {
1636+
return chatGetPermalink(req.configure(ChatGetPermalinkRequest.builder()).build());
1637+
}
1638+
16291639
@Override
16301640
public CompletableFuture<ChatMeMessageResponse> chatMeMessage(ChatMeMessageRequest req) {
16311641
return executor.execute(CHAT_ME_MESSAGE, toMap(req), () -> methods.chatMeMessage(req));
@@ -1669,6 +1679,26 @@ public CompletableFuture<ChatScheduleMessageResponse> chatScheduleMessage(Reques
16691679
return chatScheduleMessage(req.configure(ChatScheduleMessageRequest.builder()).build());
16701680
}
16711681

1682+
@Override
1683+
public CompletableFuture<ChatStartStreamResponse> chatStartStream(ChatStartStreamRequest req) {
1684+
return executor.execute(CHAT_START_STREAM, toMap(req), () -> methods.chatStartStream(req));
1685+
}
1686+
1687+
@Override
1688+
public CompletableFuture<ChatStartStreamResponse> chatStartStream(RequestConfigurator<ChatStartStreamRequest.ChatStartStreamRequestBuilder> req) {
1689+
return chatStartStream(req.configure(ChatStartStreamRequest.builder()).build());
1690+
}
1691+
1692+
@Override
1693+
public CompletableFuture<ChatStopStreamResponse> chatStopStream(ChatStopStreamRequest req) {
1694+
return executor.execute(CHAT_STOP_STREAM, toMap(req), () -> methods.chatStopStream(req));
1695+
}
1696+
1697+
@Override
1698+
public CompletableFuture<ChatStopStreamResponse> chatStopStream(RequestConfigurator<ChatStopStreamRequest.ChatStopStreamRequestBuilder> req) {
1699+
return chatStopStream(req.configure(ChatStopStreamRequest.builder()).build());
1700+
}
1701+
16721702
@Override
16731703
public CompletableFuture<ChatUpdateResponse> chatUpdate(ChatUpdateRequest req) {
16741704
return executor.execute(CHAT_UPDATE, toMap(req), () -> methods.chatUpdate(req));

0 commit comments

Comments
 (0)