Skip to content

Commit cd5c96d

Browse files
seratchseratch
authored
Merge pull request #505 from seratch/add-two-apis-2020-06
Add calls.participants.remove, admin.usergroups.addTeams API
2 parents b0443a1 + 757234a commit cd5c96d

File tree

21 files changed

+281
-5
lines changed

21 files changed

+281
-5
lines changed

‎json-logs/samples/api/admin.usergroups.addTeams.json

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/calls.participants.remove.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"ok": false,
3+
"call": {
4+
"id": "R00000000",
5+
"date_start": 12345,
6+
"external_unique_id": "",
7+
"join_url": "https://www.example.com/",
8+
"channels": [
9+
"C00000000"
10+
],
11+
"external_display_id": "",
12+
"title": "",
13+
"desktop_app_join_url": "https://www.example.com/",
14+
"users": [
15+
{
16+
"slack_id": "U00000000",
17+
"external_id": "",
18+
"avatar_url": "https://www.example.com/",
19+
"display_name": ""
20+
}
21+
]
22+
},
23+
"error": "",
24+
"needed": "",
25+
"provided": ""
26+
}

‎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
@@ -14,6 +14,7 @@
1414
import com.slack.api.methods.request.admin.teams.owners.AdminTeamsOwnersListRequest;
1515
import com.slack.api.methods.request.admin.teams.settings.*;
1616
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsAddChannelsRequest;
17+
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsAddTeamsRequest;
1718
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsListChannelsRequest;
1819
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsRemoveChannelsRequest;
1920
import com.slack.api.methods.request.admin.users.*;
@@ -27,6 +28,7 @@
2728
import com.slack.api.methods.request.calls.CallsInfoRequest;
2829
import com.slack.api.methods.request.calls.CallsUpdateRequest;
2930
import com.slack.api.methods.request.calls.participants.CallsParticipantsAddRequest;
31+
import com.slack.api.methods.request.calls.participants.CallsParticipantsRemoveRequest;
3032
import com.slack.api.methods.request.chat.*;
3133
import com.slack.api.methods.request.chat.scheduled_messages.ChatScheduledMessagesListRequest;
3234
import com.slack.api.methods.request.conversations.*;
@@ -83,6 +85,7 @@
8385
import com.slack.api.methods.response.admin.teams.owners.AdminTeamsOwnersListResponse;
8486
import com.slack.api.methods.response.admin.teams.settings.*;
8587
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsAddChannelsResponse;
88+
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsAddTeamsResponse;
8689
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsListChannelsResponse;
8790
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsRemoveChannelsResponse;
8891
import com.slack.api.methods.response.admin.users.*;
@@ -96,6 +99,7 @@
9699
import com.slack.api.methods.response.calls.CallsInfoResponse;
97100
import com.slack.api.methods.response.calls.CallsUpdateResponse;
98101
import com.slack.api.methods.response.calls.participants.CallsParticipantsAddResponse;
102+
import com.slack.api.methods.response.calls.participants.CallsParticipantsRemoveResponse;
99103
import com.slack.api.methods.response.chat.*;
100104
import com.slack.api.methods.response.chat.scheduled_messages.ChatScheduledMessagesListResponse;
101105
import com.slack.api.methods.response.conversations.*;
@@ -320,6 +324,10 @@ CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse>
320324

321325
CompletableFuture<AdminUsergroupsAddChannelsResponse> adminUsergroupsAddChannels(RequestConfigurator<AdminUsergroupsAddChannelsRequest.AdminUsergroupsAddChannelsRequestBuilder> req);
322326

327+
CompletableFuture<AdminUsergroupsAddTeamsResponse> adminUsergroupsAddTeams(AdminUsergroupsAddTeamsRequest req);
328+
329+
CompletableFuture<AdminUsergroupsAddTeamsResponse> adminUsergroupsAddTeams(RequestConfigurator<AdminUsergroupsAddTeamsRequest.AdminUsergroupsAddTeamsRequestBuilder> req);
330+
323331
CompletableFuture<AdminUsergroupsListChannelsResponse> adminUsergroupsListChannels(AdminUsergroupsListChannelsRequest req);
324332

325333
CompletableFuture<AdminUsergroupsListChannelsResponse> adminUsergroupsListChannels(RequestConfigurator<AdminUsergroupsListChannelsRequest.AdminUsergroupsListChannelsRequestBuilder> req);
@@ -436,6 +444,10 @@ CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse>
436444

437445
CompletableFuture<CallsParticipantsAddResponse> callsParticipantsAdd(RequestConfigurator<CallsParticipantsAddRequest.CallsParticipantsAddRequestBuilder> req);
438446

447+
CompletableFuture<CallsParticipantsRemoveResponse> callsParticipantsRemove(CallsParticipantsRemoveRequest req);
448+
449+
CompletableFuture<CallsParticipantsRemoveResponse> callsParticipantsRemove(RequestConfigurator<CallsParticipantsRemoveRequest.CallsParticipantsRemoveRequestBuilder> req);
450+
439451
// ------------------------------
440452
// chat
441453
// ------------------------------

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ private Methods() {
9090
// ------------------------------
9191

9292
public static final String ADMIN_USERGROUPS_ADD_CHANNELS = "admin.usergroups.addChannels";
93+
public static final String ADMIN_USERGROUPS_ADD_TEAMS = "admin.usergroups.addTeams";
9394
public static final String ADMIN_USERGROUPS_LIST_CHANNELS = "admin.usergroups.listChannels";
9495
public static final String ADMIN_USERGROUPS_REMOVE_CHANNELS = "admin.usergroups.removeChannels";
9596

@@ -173,6 +174,7 @@ private Methods() {
173174
// ------------------------------
174175

175176
public static final String CALLS_PARTICIPANTS_ADD = "calls.participants.add";
177+
public static final String CALLS_PARTICIPANTS_REMOVE = "calls.participants.remove";
176178

177179
// ------------------------------
178180
// channels

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.slack.api.methods.request.admin.teams.owners.AdminTeamsOwnersListRequest;
1515
import com.slack.api.methods.request.admin.teams.settings.*;
1616
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsAddChannelsRequest;
17+
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsAddTeamsRequest;
1718
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsListChannelsRequest;
1819
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsRemoveChannelsRequest;
1920
import com.slack.api.methods.request.admin.users.*;
@@ -33,6 +34,7 @@
3334
import com.slack.api.methods.request.calls.CallsInfoRequest;
3435
import com.slack.api.methods.request.calls.CallsUpdateRequest;
3536
import com.slack.api.methods.request.calls.participants.CallsParticipantsAddRequest;
37+
import com.slack.api.methods.request.calls.participants.CallsParticipantsRemoveRequest;
3638
import com.slack.api.methods.request.channels.*;
3739
import com.slack.api.methods.request.chat.*;
3840
import com.slack.api.methods.request.chat.scheduled_messages.ChatScheduledMessagesListRequest;
@@ -96,6 +98,7 @@
9698
import com.slack.api.methods.response.admin.teams.owners.AdminTeamsOwnersListResponse;
9799
import com.slack.api.methods.response.admin.teams.settings.*;
98100
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsAddChannelsResponse;
101+
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsAddTeamsResponse;
99102
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsListChannelsResponse;
100103
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsRemoveChannelsResponse;
101104
import com.slack.api.methods.response.admin.users.*;
@@ -115,6 +118,7 @@
115118
import com.slack.api.methods.response.calls.CallsInfoResponse;
116119
import com.slack.api.methods.response.calls.CallsUpdateResponse;
117120
import com.slack.api.methods.response.calls.participants.CallsParticipantsAddResponse;
121+
import com.slack.api.methods.response.calls.participants.CallsParticipantsRemoveResponse;
118122
import com.slack.api.methods.response.channels.*;
119123
import com.slack.api.methods.response.chat.*;
120124
import com.slack.api.methods.response.chat.scheduled_messages.ChatScheduledMessagesListResponse;
@@ -399,6 +403,12 @@ AdminUsergroupsAddChannelsResponse adminUsergroupsAddChannels(
399403
RequestConfigurator<AdminUsergroupsAddChannelsRequest.AdminUsergroupsAddChannelsRequestBuilder> req)
400404
throws IOException, SlackApiException;
401405

406+
AdminUsergroupsAddTeamsResponse adminUsergroupsAddTeams(AdminUsergroupsAddTeamsRequest req) throws IOException, SlackApiException;
407+
408+
AdminUsergroupsAddTeamsResponse adminUsergroupsAddTeams(
409+
RequestConfigurator<AdminUsergroupsAddTeamsRequest.AdminUsergroupsAddTeamsRequestBuilder> req)
410+
throws IOException, SlackApiException;
411+
402412
AdminUsergroupsListChannelsResponse adminUsergroupsListChannels(AdminUsergroupsListChannelsRequest req) throws IOException, SlackApiException;
403413

404414
AdminUsergroupsListChannelsResponse adminUsergroupsListChannels(
@@ -591,6 +601,10 @@ AdminUsergroupsRemoveChannelsResponse adminUsergroupsRemoveChannels(
591601

592602
CallsParticipantsAddResponse callsParticipantsAdd(RequestConfigurator<CallsParticipantsAddRequest.CallsParticipantsAddRequestBuilder> req) throws IOException, SlackApiException;
593603

604+
CallsParticipantsRemoveResponse callsParticipantsRemove(CallsParticipantsRemoveRequest req) throws IOException, SlackApiException;
605+
606+
CallsParticipantsRemoveResponse callsParticipantsRemove(RequestConfigurator<CallsParticipantsRemoveRequest.CallsParticipantsRemoveRequestBuilder> req) throws IOException, SlackApiException;
607+
594608
// ------------------------------
595609
// channels
596610
// ------------------------------

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier
8888

8989
ADMIN_USERS_SESSION_RESET,
9090

91+
ADMIN_USERGROUPS_ADD_TEAMS,
9192
ADMIN_USERGROUPS_LIST_CHANNELS,
9293
ADMIN_USERGROUPS_REMOVE_CHANNELS
9394
);
@@ -141,6 +142,7 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier
141142
setRateLimitTier(CALLS_INFO, Tier2);
142143
setRateLimitTier(CALLS_UPDATE, Tier2);
143144
setRateLimitTier(CALLS_PARTICIPANTS_ADD, Tier2);
145+
setRateLimitTier(CALLS_PARTICIPANTS_REMOVE, Tier2);
144146

145147
setRateLimitTier(CHAT_DELETE, Tier3);
146148
setRateLimitTier(CHAT_DELETE_SCHEDULED_MESSAGE, Tier3);

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.slack.api.methods.request.admin.teams.owners.AdminTeamsOwnersListRequest;
1515
import com.slack.api.methods.request.admin.teams.settings.*;
1616
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsAddChannelsRequest;
17+
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsAddTeamsRequest;
1718
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsListChannelsRequest;
1819
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsRemoveChannelsRequest;
1920
import com.slack.api.methods.request.admin.users.*;
@@ -33,6 +34,7 @@
3334
import com.slack.api.methods.request.calls.CallsInfoRequest;
3435
import com.slack.api.methods.request.calls.CallsUpdateRequest;
3536
import com.slack.api.methods.request.calls.participants.CallsParticipantsAddRequest;
37+
import com.slack.api.methods.request.calls.participants.CallsParticipantsRemoveRequest;
3638
import com.slack.api.methods.request.channels.*;
3739
import com.slack.api.methods.request.chat.*;
3840
import com.slack.api.methods.request.chat.scheduled_messages.ChatScheduledMessagesListRequest;
@@ -340,6 +342,14 @@ public static FormBody.Builder toForm(AdminUsergroupsAddChannelsRequest req) {
340342
return form;
341343
}
342344

345+
public static FormBody.Builder toForm(AdminUsergroupsAddTeamsRequest req) {
346+
FormBody.Builder form = new FormBody.Builder();
347+
setIfNotNull("team_ids", req.getTeamIds().stream().collect(joining(",")), form);
348+
setIfNotNull("usergroup_id", req.getUsergroupId(), form);
349+
setIfNotNull("auto_provision", req.getAutoProvision(), form);
350+
return form;
351+
}
352+
343353
public static FormBody.Builder toForm(AdminUsergroupsListChannelsRequest req) {
344354
FormBody.Builder form = new FormBody.Builder();
345355
setIfNotNull("team_id", req.getTeamId(), form);
@@ -542,6 +552,16 @@ public static FormBody.Builder toForm(CallsParticipantsAddRequest req) {
542552
return form;
543553
}
544554

555+
public static FormBody.Builder toForm(CallsParticipantsRemoveRequest req) {
556+
FormBody.Builder form = new FormBody.Builder();
557+
setIfNotNull("id", req.getId(), form);
558+
if (req.getUsers() != null && req.getUsers().size() > 0) {
559+
String usersJson = GSON.toJson(req.getUsers());
560+
setIfNotNull("users", usersJson, form);
561+
}
562+
return form;
563+
}
564+
545565
public static FormBody.Builder toForm(ChannelsArchiveRequest req) {
546566
FormBody.Builder form = new FormBody.Builder();
547567
setIfNotNull("channel", req.getChannel(), form);

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.slack.api.methods.request.admin.teams.owners.AdminTeamsOwnersListRequest;
1919
import com.slack.api.methods.request.admin.teams.settings.*;
2020
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsAddChannelsRequest;
21+
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsAddTeamsRequest;
2122
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsListChannelsRequest;
2223
import com.slack.api.methods.request.admin.usergroups.AdminUsergroupsRemoveChannelsRequest;
2324
import com.slack.api.methods.request.admin.users.*;
@@ -31,6 +32,7 @@
3132
import com.slack.api.methods.request.calls.CallsInfoRequest;
3233
import com.slack.api.methods.request.calls.CallsUpdateRequest;
3334
import com.slack.api.methods.request.calls.participants.CallsParticipantsAddRequest;
35+
import com.slack.api.methods.request.calls.participants.CallsParticipantsRemoveRequest;
3436
import com.slack.api.methods.request.chat.*;
3537
import com.slack.api.methods.request.chat.scheduled_messages.ChatScheduledMessagesListRequest;
3638
import com.slack.api.methods.request.conversations.*;
@@ -87,6 +89,7 @@
8789
import com.slack.api.methods.response.admin.teams.owners.AdminTeamsOwnersListResponse;
8890
import com.slack.api.methods.response.admin.teams.settings.*;
8991
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsAddChannelsResponse;
92+
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsAddTeamsResponse;
9093
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsListChannelsResponse;
9194
import com.slack.api.methods.response.admin.usergroups.AdminUsergroupsRemoveChannelsResponse;
9295
import com.slack.api.methods.response.admin.users.*;
@@ -100,6 +103,7 @@
100103
import com.slack.api.methods.response.calls.CallsInfoResponse;
101104
import com.slack.api.methods.response.calls.CallsUpdateResponse;
102105
import com.slack.api.methods.response.calls.participants.CallsParticipantsAddResponse;
106+
import com.slack.api.methods.response.calls.participants.CallsParticipantsRemoveResponse;
103107
import com.slack.api.methods.response.chat.*;
104108
import com.slack.api.methods.response.chat.scheduled_messages.ChatScheduledMessagesListResponse;
105109
import com.slack.api.methods.response.conversations.*;
@@ -487,6 +491,16 @@ public CompletableFuture<AdminUsergroupsAddChannelsResponse> adminUsergroupsAddC
487491
return adminUsergroupsAddChannels(req.configure(AdminUsergroupsAddChannelsRequest.builder()).build());
488492
}
489493

494+
@Override
495+
public CompletableFuture<AdminUsergroupsAddTeamsResponse> adminUsergroupsAddTeams(AdminUsergroupsAddTeamsRequest req) {
496+
return executor.execute(ADMIN_USERGROUPS_ADD_TEAMS, toMap(req), () -> methods.adminUsergroupsAddTeams(req));
497+
}
498+
499+
@Override
500+
public CompletableFuture<AdminUsergroupsAddTeamsResponse> adminUsergroupsAddTeams(RequestConfigurator<AdminUsergroupsAddTeamsRequest.AdminUsergroupsAddTeamsRequestBuilder> req) {
501+
return adminUsergroupsAddTeams(req.configure(AdminUsergroupsAddTeamsRequest.builder()).build());
502+
}
503+
490504
@Override
491505
public CompletableFuture<AdminUsergroupsListChannelsResponse> adminUsergroupsListChannels(AdminUsergroupsListChannelsRequest req) {
492506
return executor.execute(ADMIN_USERGROUPS_LIST_CHANNELS, toMap(req), () -> methods.adminUsergroupsListChannels(req));
@@ -697,6 +711,16 @@ public CompletableFuture<CallsParticipantsAddResponse> callsParticipantsAdd(Requ
697711
return callsParticipantsAdd(req.configure(CallsParticipantsAddRequest.builder()).build());
698712
}
699713

714+
@Override
715+
public CompletableFuture<CallsParticipantsRemoveResponse> callsParticipantsRemove(CallsParticipantsRemoveRequest req) {
716+
return executor.execute(CALLS_PARTICIPANTS_REMOVE, toMap(req), () -> methods.callsParticipantsRemove(req));
717+
}
718+
719+
@Override
720+
public CompletableFuture<CallsParticipantsRemoveResponse> callsParticipantsRemove(RequestConfigurator<CallsParticipantsRemoveRequest.CallsParticipantsRemoveRequestBuilder> req) {
721+
return callsParticipantsRemove(req.configure(CallsParticipantsRemoveRequest.builder()).build());
722+
}
723+
700724
@Override
701725
public CompletableFuture<ChatGetPermalinkResponse> chatGetPermalink(ChatGetPermalinkRequest req) {
702726
return executor.execute(CHAT_GET_PERMALINK, toMap(req), () -> methods.chatGetPermalink(req));

0 commit comments

Comments
 (0)