Skip to content

Commit 2fd2b3e

Browse files
seratchseratch
authored
Add two admin APIs (#1136)
1 parent d50fdf3 commit 2fd2b3e

File tree

19 files changed

+263
-6
lines changed

19 files changed

+263
-6
lines changed

‎json-logs/samples/api/admin.conversations.convertToPublic.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"ok": false,
3+
"error": "",
4+
"needed": "",
5+
"provided": "",
6+
"response_metadata": {
7+
"messages": [
8+
""
9+
]
10+
}
11+
}

‎json-logs/samples/api/admin.conversations.lookup.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"ok": false,
3+
"channel_ids": [
4+
"C00000000"
5+
],
6+
"response_metadata": {
7+
"next_cursor": ""
8+
},
9+
"error": "",
10+
"needed": "",
11+
"provided": ""
12+
}

‎metadata/web-api/rate_limit_tiers.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"admin.conversations.bulkDelete": "Tier2",
2121
"admin.conversations.bulkMove": "Tier2",
2222
"admin.conversations.convertToPrivate": "Tier2",
23+
"admin.conversations.convertToPublic": "Tier2",
2324
"admin.conversations.create": "Tier2",
2425
"admin.conversations.delete": "Tier2",
2526
"admin.conversations.disconnectShared": "Tier2",
@@ -28,6 +29,7 @@
2829
"admin.conversations.getCustomRetention": "Tier2",
2930
"admin.conversations.getTeams": "Tier2",
3031
"admin.conversations.invite": "Tier2",
32+
"admin.conversations.lookup": "Tier2",
3133
"admin.conversations.removeCustomRetention": "Tier2",
3234
"admin.conversations.rename": "Tier2",
3335
"admin.conversations.restrictAccess.addGroup": "Tier2",

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@
196196
import com.slack.api.methods.response.workflows.WorkflowsStepFailedResponse;
197197
import com.slack.api.methods.response.workflows.WorkflowsUpdateStepResponse;
198198

199+
import java.io.IOException;
199200
import java.util.concurrent.CompletableFuture;
200201

201202
/**
@@ -394,6 +395,14 @@ CompletableFuture<AdminConversationsRestrictAccessListGroupsResponse> adminConve
394395

395396
CompletableFuture<AdminConversationsBulkMoveResponse> adminConversationsBulkMove(RequestConfigurator<AdminConversationsBulkMoveRequest.AdminConversationsBulkMoveRequestBuilder> req);
396397

398+
CompletableFuture<AdminConversationsConvertToPublicResponse> adminConversationsConvertToPublic(AdminConversationsConvertToPublicRequest req);
399+
400+
CompletableFuture<AdminConversationsConvertToPublicResponse> adminConversationsConvertToPublic(RequestConfigurator<AdminConversationsConvertToPublicRequest.AdminConversationsConvertToPublicRequestBuilder> req);
401+
402+
CompletableFuture<AdminConversationsLookupResponse> adminConversationsLookup(AdminConversationsLookupRequest req);
403+
404+
CompletableFuture<AdminConversationsLookupResponse> adminConversationsLookup(RequestConfigurator<AdminConversationsLookupRequest.AdminConversationsLookupRequestBuilder> req);
405+
397406
// ------------------------------
398407
// admin.conversations.ekm
399408
// ------------------------------

‎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
@@ -71,6 +71,8 @@ private Methods() {
7171
public static final String ADMIN_CONVERSATIONS_BULK_ARCHIVE = "admin.conversations.bulkArchive";
7272
public static final String ADMIN_CONVERSATIONS_BULK_DELETE = "admin.conversations.bulkDelete";
7373
public static final String ADMIN_CONVERSATIONS_BULK_MOVE = "admin.conversations.bulkMove";
74+
public static final String ADMIN_CONVERSATIONS_CONVERT_TO_PUBLIC = "admin.conversations.convertToPublic";
75+
public static final String ADMIN_CONVERSATIONS_LOOKUP = "admin.conversations.lookup";
7476

7577
// ------------------------------
7678
// admin.conversations.ekm

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,14 @@ <T extends SlackApiTextResponse> T postFormWithAuthorizationHeaderAndParseRespon
448448

449449
AdminConversationsBulkMoveResponse adminConversationsBulkMove(RequestConfigurator<AdminConversationsBulkMoveRequest.AdminConversationsBulkMoveRequestBuilder> req) throws IOException, SlackApiException;
450450

451+
AdminConversationsConvertToPublicResponse adminConversationsConvertToPublic(AdminConversationsConvertToPublicRequest req) throws IOException, SlackApiException;
452+
453+
AdminConversationsConvertToPublicResponse adminConversationsConvertToPublic(RequestConfigurator<AdminConversationsConvertToPublicRequest.AdminConversationsConvertToPublicRequestBuilder> req) throws IOException, SlackApiException;
454+
455+
AdminConversationsLookupResponse adminConversationsLookup(AdminConversationsLookupRequest req) throws IOException, SlackApiException;
456+
457+
AdminConversationsLookupResponse adminConversationsLookup(RequestConfigurator<AdminConversationsLookupRequest.AdminConversationsLookupRequestBuilder> req) throws IOException, SlackApiException;
458+
451459
// ------------------------------
452460
// admin.conversations.ekm
453461
// ------------------------------

‎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
@@ -107,6 +107,8 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier
107107
ADMIN_CONVERSATIONS_BULK_ARCHIVE,
108108
ADMIN_CONVERSATIONS_BULK_DELETE,
109109
ADMIN_CONVERSATIONS_BULK_MOVE,
110+
ADMIN_CONVERSATIONS_CONVERT_TO_PUBLIC,
111+
ADMIN_CONVERSATIONS_LOOKUP,
110112

111113
ADMIN_EMOJI_ADD,
112114
ADMIN_EMOJI_ADD_ALIAS,

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,24 @@ public static FormBody.Builder toForm(AdminConversationsBulkMoveRequest req) {
475475
return form;
476476
}
477477

478+
public static FormBody.Builder toForm(AdminConversationsConvertToPublicRequest req) {
479+
FormBody.Builder form = new FormBody.Builder();
480+
setIfNotNull("channel_id", req.getChannelId(), form);
481+
return form;
482+
}
483+
484+
public static FormBody.Builder toForm(AdminConversationsLookupRequest req) {
485+
FormBody.Builder form = new FormBody.Builder();
486+
setIfNotNull("last_message_activity_before", req.getLastMessageActivityBefore(), form);
487+
if (req.getTeamIds() != null) {
488+
setIfNotNull("team_ids", req.getTeamIds().stream().collect(joining(",")), form);
489+
}
490+
setIfNotNull("cursor", req.getCursor(), form);
491+
setIfNotNull("limit", req.getLimit(), form);
492+
setIfNotNull("max_member_count", req.getMaxMemberCount(), form);
493+
return form;
494+
}
495+
478496
public static FormBody.Builder toForm(AdminConversationsEkmListOriginalConnectedChannelInfoRequest req) {
479497
FormBody.Builder form = new FormBody.Builder();
480498
if (req.getChannelIds() != null) {

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,26 @@ public CompletableFuture<AdminConversationsBulkMoveResponse> adminConversationsB
623623
return adminConversationsBulkMove(req.configure(AdminConversationsBulkMoveRequest.builder()).build());
624624
}
625625

626+
@Override
627+
public CompletableFuture<AdminConversationsConvertToPublicResponse> adminConversationsConvertToPublic(AdminConversationsConvertToPublicRequest req) {
628+
return executor.execute(ADMIN_CONVERSATIONS_CONVERT_TO_PUBLIC, toMap(req), () -> methods.adminConversationsConvertToPublic(req));
629+
}
630+
631+
@Override
632+
public CompletableFuture<AdminConversationsConvertToPublicResponse> adminConversationsConvertToPublic(RequestConfigurator<AdminConversationsConvertToPublicRequest.AdminConversationsConvertToPublicRequestBuilder> req) {
633+
return adminConversationsConvertToPublic(req.configure(AdminConversationsConvertToPublicRequest.builder()).build());
634+
}
635+
636+
@Override
637+
public CompletableFuture<AdminConversationsLookupResponse> adminConversationsLookup(AdminConversationsLookupRequest req) {
638+
return executor.execute(ADMIN_CONVERSATIONS_LOOKUP, toMap(req), () -> methods.adminConversationsLookup(req));
639+
}
640+
641+
@Override
642+
public CompletableFuture<AdminConversationsLookupResponse> adminConversationsLookup(RequestConfigurator<AdminConversationsLookupRequest.AdminConversationsLookupRequestBuilder> req) {
643+
return adminConversationsLookup(req.configure(AdminConversationsLookupRequest.builder()).build());
644+
}
645+
626646
@Override
627647
public CompletableFuture<AdminConversationsEkmListOriginalConnectedChannelInfoResponse> adminConversationsEkmListOriginalConnectedChannelInfo(AdminConversationsEkmListOriginalConnectedChannelInfoRequest req) {
628648
return executor.execute(ADMIN_CONVERSATIONS_EKM_LIST_ORIGINAL_CONNECTED_CHANNEL_INFO, toMap(req), () -> methods.adminConversationsEkmListOriginalConnectedChannelInfo(req));

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,26 @@ public AdminConversationsBulkMoveResponse adminConversationsBulkMove(RequestConf
628628
return adminConversationsBulkMove(req.configure(AdminConversationsBulkMoveRequest.builder()).build());
629629
}
630630

631+
@Override
632+
public AdminConversationsConvertToPublicResponse adminConversationsConvertToPublic(AdminConversationsConvertToPublicRequest req) throws IOException, SlackApiException {
633+
return postFormWithTokenAndParseResponse(toForm(req), Methods.ADMIN_CONVERSATIONS_CONVERT_TO_PUBLIC, getToken(req), AdminConversationsConvertToPublicResponse.class);
634+
}
635+
636+
@Override
637+
public AdminConversationsConvertToPublicResponse adminConversationsConvertToPublic(RequestConfigurator<AdminConversationsConvertToPublicRequest.AdminConversationsConvertToPublicRequestBuilder> req) throws IOException, SlackApiException {
638+
return adminConversationsConvertToPublic(req.configure(AdminConversationsConvertToPublicRequest.builder()).build());
639+
}
640+
641+
@Override
642+
public AdminConversationsLookupResponse adminConversationsLookup(AdminConversationsLookupRequest req) throws IOException, SlackApiException {
643+
return postFormWithTokenAndParseResponse(toForm(req), Methods.ADMIN_CONVERSATIONS_LOOKUP, getToken(req), AdminConversationsLookupResponse.class);
644+
}
645+
646+
@Override
647+
public AdminConversationsLookupResponse adminConversationsLookup(RequestConfigurator<AdminConversationsLookupRequest.AdminConversationsLookupRequestBuilder> req) throws IOException, SlackApiException {
648+
return adminConversationsLookup(req.configure(AdminConversationsLookupRequest.builder()).build());
649+
}
650+
631651
@Override
632652
public AdminConversationsEkmListOriginalConnectedChannelInfoResponse adminConversationsEkmListOriginalConnectedChannelInfo(AdminConversationsEkmListOriginalConnectedChannelInfoRequest req) throws IOException, SlackApiException {
633653
return postFormWithTokenAndParseResponse(toForm(req), Methods.ADMIN_CONVERSATIONS_EKM_LIST_ORIGINAL_CONNECTED_CHANNEL_INFO, getToken(req), AdminConversationsEkmListOriginalConnectedChannelInfoResponse.class);

0 commit comments

Comments
 (0)