Skip to content

Commit 6cd2da3

Browse files
authored
Merge pull request #509 from seratch/conv-mark-api-etc
Add conversations.mark API
2 parents 286d21e + 31874a0 commit 6cd2da3

21 files changed

+122
-9
lines changed

json-logs/samples/api/admin.conversations.whitelist.add.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
"response_metadata": {
55
"messages": [
66
""
7+
],
8+
"warnings": [
9+
""
710
]
811
},
12+
"warning": "",
913
"needed": "",
1014
"provided": ""
1115
}

json-logs/samples/api/admin.conversations.whitelist.listGroupsLinkedToChannel.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
"response_metadata": {
88
"messages": [
99
""
10+
],
11+
"warnings": [
12+
""
1013
]
1114
},
15+
"warning": "",
1216
"needed": "",
1317
"provided": ""
1418
}

json-logs/samples/api/admin.conversations.whitelist.remove.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
"response_metadata": {
55
"messages": [
66
""
7+
],
8+
"warnings": [
9+
""
710
]
811
},
12+
"warning": "",
913
"needed": "",
1014
"provided": ""
1115
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"ok": false,
3+
"error": "",
4+
"needed": "",
5+
"provided": ""
6+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,8 @@
574574
""
575575
]
576576
},
577-
"has_compliance_export": false
577+
"has_compliance_export": false,
578+
"workflow_extension_steps_beta_opt_in": false
578579
},
579580
"icon": {
580581
"image_34": "https://www.example.com/",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,10 @@ CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse>
574574

575575
CompletableFuture<ConversationsListResponse> conversationsList(RequestConfigurator<ConversationsListRequest.ConversationsListRequestBuilder> req);
576576

577+
CompletableFuture<ConversationsMarkResponse> conversationsMark(ConversationsMarkRequest req);
578+
579+
CompletableFuture<ConversationsMarkResponse> conversationsMark(RequestConfigurator<ConversationsMarkRequest.ConversationsMarkRequestBuilder> req);
580+
577581
CompletableFuture<ConversationsMembersResponse> conversationsMembers(ConversationsMembersRequest req);
578582

579583
CompletableFuture<ConversationsMembersResponse> conversationsMembers(RequestConfigurator<ConversationsMembersRequest.ConversationsMembersRequestBuilder> req);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ private Methods() {
255255
public static final String CONVERSATIONS_KICK = "conversations.kick";
256256
public static final String CONVERSATIONS_LEAVE = "conversations.leave";
257257
public static final String CONVERSATIONS_LIST = "conversations.list";
258+
public static final String CONVERSATIONS_MARK = "conversations.mark";
258259
public static final String CONVERSATIONS_MEMBERS = "conversations.members";
259260
public static final String CONVERSATIONS_OPEN = "conversations.open";
260261
public static final String CONVERSATIONS_RENAME = "conversations.rename";

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,10 @@ AdminUsergroupsRemoveChannelsResponse adminUsergroupsRemoveChannels(
858858

859859
ConversationsListResponse conversationsList(RequestConfigurator<ConversationsListRequest.ConversationsListRequestBuilder> req) throws IOException, SlackApiException;
860860

861+
ConversationsMarkResponse conversationsMark(ConversationsMarkRequest req) throws IOException, SlackApiException;
862+
863+
ConversationsMarkResponse conversationsMark(RequestConfigurator<ConversationsMarkRequest.ConversationsMarkRequestBuilder> req) throws IOException, SlackApiException;
864+
861865
ConversationsMembersResponse conversationsMembers(ConversationsMembersRequest req) throws IOException, SlackApiException;
862866

863867
ConversationsMembersResponse conversationsMembers(RequestConfigurator<ConversationsMembersRequest.ConversationsMembersRequestBuilder> req) throws IOException, SlackApiException;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier
230230
setRateLimitTier(CHANNELS_UNARCHIVE, Tier2);
231231
setRateLimitTier(GROUPS_UNARCHIVE, Tier2);
232232

233+
setRateLimitTier(CONVERSATIONS_MARK, Tier3);
233234
setRateLimitTier(CHANNELS_MARK, Tier3);
234235
setRateLimitTier(GROUPS_MARK, Tier3);
235236
setRateLimitTier(IM_MARK, Tier3);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,13 @@ public static FormBody.Builder toForm(ConversationsListRequest req) {
960960
return form;
961961
}
962962

963+
public static FormBody.Builder toForm(ConversationsMarkRequest req) {
964+
FormBody.Builder form = new FormBody.Builder();
965+
setIfNotNull("channel", req.getChannel(), form);
966+
setIfNotNull("ts", req.getTs(), form);
967+
return form;
968+
}
969+
963970
public static FormBody.Builder toForm(ConversationsMembersRequest req) {
964971
FormBody.Builder form = new FormBody.Builder();
965972
setIfNotNull("channel", req.getChannel(), form);

0 commit comments

Comments
 (0)