slack-ruby-client 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55eccbfcd7f7c408f6605b53f20dccf46f46848c887866c33d871dd94c21ee31
-  data.tar.gz: 8b6e7be12e0d2760d3aa015534790133351f6bf9d063a28a408bde334e2dca10
+  metadata.gz: 46bfdecfe74d4f64a551519516ce706fbd50d7e8f512df2f10cf991f4c3d153a
+  data.tar.gz: 8f8330671c68f4937026b7bf211eb623a5a4f03ac704fb2465c5ad70833ce610
 SHA512:
-  metadata.gz: cba09001f0a0b59530218c1d65d2b6fbbd3015db955794e590d6fc471ac77a69ec60f819b84eafc7b40e5cead202903b519e935698be9e2ed71541a6b9d7b1ef
-  data.tar.gz: c513d9a277fef8323661581590a793e587c5a589fb02eb8352750dc388a38b38535b8a9fcd0ce44da431a8f847248e75e786494756a11c1b1866d2ea6f98f5aa
+  metadata.gz: b4eca0d30990e29c93ec5e2063cdfb7c9cbc9e0f4c23fe566b64af1c23dd2bc3dc2690937b43f9fb771035425fde4d023c29180592b01513a2d8a3ac4731511b
+  data.tar.gz: ca8c4a73812d77fe3b8bef823b2b7b1fa890c8efdab14a0bfa9094b5c171632f0ce33fb79493fc8444a21605397b63a38f4e890b1736afd74cfd14117a4dddcb

data/.rubocop.yml

@@ -18,7 +18,7 @@ Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
 Metrics/BlockLength:
-  Max: 250
+  Enabled: false
 
 Metrics/ClassLength:
   Max: 250

data/.rubocop_todo.yml

@@ -18,13 +18,6 @@ Lint/RedundantCopDisableDirective:
   Exclude:
     - 'lib/slack-ruby-client.rb'
 
-# Offense count: 2
-# Configuration parameters: AllowComments.
-Lint/SuppressedException:
-  Exclude:
-    - 'spec/slack/real_time/concurrency/celluloid_spec.rb'
-    - 'spec/slack/real_time/concurrency/eventmachine_spec.rb'
-
 # Offense count: 11
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
@@ -56,11 +49,6 @@ Performance/RegexpMatch:
   Exclude:
     - 'lib/tasks/web.rake'
 
-# Offense count: 1
-RSpec/AnyInstance:
-  Exclude:
-    - 'spec/slack/real_time/concurrency/celluloid_spec.rb'
-
 # Offense count: 5
 # Cop supports --auto-correct.
 RSpec/ContextMethod:
@@ -134,8 +122,6 @@ RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/slack/events/request_spec.rb'
     - 'spec/slack/real_time/client_spec.rb'
-    - 'spec/slack/real_time/concurrency/celluloid_spec.rb'
-    - 'spec/slack/real_time/concurrency/eventmachine_spec.rb'
     - 'spec/slack/web/faraday/response/raise_error_spec.rb'
     - 'spec/support/real_time/connected_client.rb'
 

data/.travis.yml

@@ -5,6 +5,7 @@ cache: bundler
 rvm:
   - 2.5.3
   - 2.6.0
+  - 2.7.1
   - ruby-head
   - jruby-head
 
@@ -13,10 +14,6 @@ matrix:
     - rvm: 2.4.1
       script:
         - bundle exec danger
-    - rvm: 2.4.1
-      env: CONCURRENCY=celluloid-io
-    - rvm: 2.4.1
-      env: CONCURRENCY=faye-websocket
     - rvm: 2.5.3
       env: CONCURRENCY=async-websocket
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.16.0 (2021/01/24)
+
+* [#350](https://github.com/slack-ruby/slack-ruby-client/pull/350): Handle server errors such as timouts & non-json responses (see [Upgrading to 0.16.0](UPGRADING.md#upgrading-to--0160)) - [@ojab](https://github.com/ojab).
+* [#354](https://github.com/slack-ruby/slack-ruby-client/pull/354): Rewind body after checking request signature - [@sunny](https://github.com/sunny).
+* [#355](https://github.com/slack-ruby/slack-ruby-client/pull/355), [#357](https://github.com/slack-ruby/slack-ruby-client/pull/357): Removed celluloid and faye-websocket support - [@wasabigeek](https://github.com/wasabigeek).
+* [#356](https://github.com/slack-ruby/slack-ruby-client/pull/356): Added `admin_apps_clearResolution`, `admin_conversations_getCustomRetention`, `admin_conversations_removeCustomRetention`, `admin_conversations_setCustomRetention` and `admin_users_session_list` endpoints - [@dblock](https://github.com/dblock).
+* [#348](https://github.com/slack-ruby/slack-ruby-client/pull/348): Added `admin_conversations_archive`, `admin_conversations_convertToPrivate`, `admin_conversations_create`, `admin_conversations_delete`, `admin_conversations_disconnectShared`, `admin_conversations_getConversationPrefs`, `admin_conversations_getTeams`, `admin_conversations_invite`, `admin_conversations_rename`, `admin_conversations_search`, `admin_conversations_setConversationPrefs`, `admin_conversations_unarchive`, `admin_conversations_ekm_listOriginalConnectedChannelInfo`, `admin_users_session_invalidate`, `apps_event_authorizations_list`, `conversations_mark`, `workflows_stepCompleted`, `workflows_stepFailed` and `workflows_updateStep` endpoints - [@wasabigeek](https://github.com/wasabigeek).
+
 ### 0.15.1 (2020/9/3)
 
 * [#336](https://github.com/slack-ruby/slack-ruby-client/pull/336): Fix: handle nil events - [@pyama86](https://github.com/pyama86).

data/CONTRIBUTING.md

@@ -89,16 +89,9 @@ The broad steps are:
 ##### Resolving Patch Errors
 
 The auto-generated method files may drift overtime e.g. new arguments may be added or descriptions changed. Since previous patches were based on the older auto-generated files, git may be unable to apply them to the new files. Resolving them requires some good ol' splicing:
-1. Comment out the patching code in `lib/tasks/web.rake`:
-    ```ruby
-    # Dir.glob("lib/slack/web/api/patches/#{group}*.patch").sort.each do |patch|
-    #   puts "- patching #{patch}"
-    #   system("git apply #{patch}") || raise('failed to apply patch')
-    # end
-    ```
-2. Run `rake slack:api:update` to create the raw auto-generated files. Commit the files that you are updating, so we can run `git diff` later.
-3. Go through the old patches for the files (e.g. in `lib/slack/web/api/patches/chat.1.patch`), copying code into the new files.
-4. Continue with Step 2 [above](#patching-slack-web-api).
+1. Run `rake slack:api:update SKIP_PATCH=true` to create the raw auto-generated files. Commit the files that you are updating, so we can run `git diff` later.
+2. Go through the old patches for the files (e.g. in `lib/slack/web/api/patches/chat.1.patch`), copying code into the new files.
+3. Continue with Step 2 [above](#patching-slack-web-api).
 
 
 ### Write Documentation

data/README.md

@@ -47,8 +47,6 @@ A Ruby client for the Slack [Web](https://api.slack.com/web), [RealTime Messagin
   - [Large Team Considerations](#large-team-considerations)
     - [Concurrency](#concurrency)
       - [Async](#async)
-      - [Faye::Websocket with Eventmachine](#fayewebsocket-with-eventmachine)
-      - [Celluloid](#celluloid)
   - [Events API](#events-api)
     - [Configuring Slack::Events](#configuring-slackevents)
     - [Verifying the Request Signature](#verifying-the-request-signature)
@@ -72,7 +70,7 @@ A Ruby client for the Slack [Web](https://api.slack.com/web), [RealTime Messagin
 
 ## Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-client, v0.15.1. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **stable** release of slack-ruby-client, 0.16.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
 ## Installation
 
@@ -82,7 +80,7 @@ Add to Gemfile.
 gem 'slack-ruby-client'
 ```
 
-If you're going to be using the RealTime client, add either `async-websocket`, `eventmachine` and `faye-websocket` or `celluloid-io`. See below for more information about concurrency. We recommend you use `async-websocket`.
+If you're going to be using the RealTime client, add `async-websocket`. See below for more information about concurrency.
 
 ```
 gem 'async-websocket', '~> 0.8.0'
@@ -326,7 +324,11 @@ If you exceed [Slack’s rate limits](https://api.slack.com/docs/rate-limits), a
 
 ##### Other Errors
 
-In any other case, a `Faraday::ClientError` will be raised. This may be the case if Slack is temporarily unavailable, for example.
+In case of Slack temporarily unavailability a `Slack::Web::Api::Errors::ServerError` (`Slack::Web::Api::Errors::SlackError` subclass) subclasses will be raised and original `Faraday::Error` will be accesible via `exception.cause`.
+
+Specifically `Slack::Web::Api::Errors::ParsingError` will be raised on non-json response (i. e. 200 OK with `Slack unavailable` HTML page) and `Slack::Web::Api::Errors::HttpRequestError` subclasses for connection failures (`Slack::Web::Api::Errors::TimeoutError` for read/open timeouts & `Slack::Web::Api::Errors::UnavailableError` for 5xx HTTP responses).
+
+In any other case, a `Faraday::ClientError` will be raised.
 
 ### RealTime Client
 
@@ -491,7 +493,7 @@ See [#134](https://github.com/slack-ruby/slack-ruby-client/issues/134) for a dis
 
 #### Concurrency
 
-`Slack::RealTime::Client` needs help from a concurrency library and supports [Async](https://github.com/socketry/async), [Faye::WebSocket](https://github.com/faye/faye-websocket-ruby) with [Eventmachine](https://github.com/eventmachine/eventmachine) and [Celluloid](https://github.com/celluloid/celluloid). It will auto-detect one or the other depending on the gems in your Gemfile, but you can also set concurrency explicitly.
+`Slack::RealTime::Client` needs help from a concurrency library and supports [Async](https://github.com/socketry/async).
 
 ```ruby
 Slack::RealTime.configure do |config|
@@ -509,7 +511,7 @@ client.start_async
 
 ##### Async
 
-This is the recommended library. Add `async-websocket` to your Gemfile.
+Add `async-websocket` to your Gemfile.
 
 ```
 gem 'async-websocket'
@@ -517,26 +519,6 @@ gem 'async-websocket'
 
 See a fully working example in [examples/hi_real_time_async_async](examples/hi_real_time_async_async/hi.rb).
 
-##### Faye::Websocket with Eventmachine
-
-Add the following to your Gemfile.
-
-```
-gem 'faye-websocket'
-```
-
-See a fully working example in [examples/hi_real_time_async_eventmachine](examples/hi_real_time_async_eventmachine/hi.rb).
-
-##### Celluloid
-
-Add the following to your Gemfile.
-
-```
-gem 'celluloid-io', require: ['celluloid/current', 'celluloid/io']
-```
-
-See a fully working example in [examples/hi_real_time_async_celluloid](examples/hi_real_time_async_celluloid/hi.rb).
-
 ### Events API
 
 This library provides limited support for the [Slack Events API](https://api.slack.com/events-api).

data/UPGRADING.md

@@ -1,6 +1,20 @@
 Upgrading Slack-Ruby-Client
 ===========================
 
+### Upgrading to >= 0.16.0
+
+#### Removed Celluloid and Faye-Websocket Concurrency Support
+
+Concurrency support for `celluloid-io` and `faye-websocket` has been removed. If you are running a RealTime bot on Celluloid or Faye, you must upgrade to `async-websocket`. Please note that RealTime bots are deprecated by Slack, and we generally recommend you [migrate your classic, RealTime bot, to granular permissions](https://code.dblock.org/2020/11/30/migrating-classic-slack-ruby-bots-to-granular-permissions.html).
+
+See [#338](https://github.com/slack-ruby/slack-ruby-client/issues/338) for more information.
+
+#### Error Handling
+
+As of 0.16.0 `Faraday::Error` exceptions sans `Faraday::ClientError` are wrapped into `Slack::Web::Api::Errors::ServerError`, so if you're rescuing `Faraday::Error` — you should adjust your code to use `Slack::Web::Api::Errors::ServerError` and use `exception.cause` if underlying `Faraday::Error` is needed.
+
+See [README#other-errors](README.md#other-errors) and [#350](https://github.com/slack-ruby/slack-ruby-client/pull/350) for more information.
+
 ### Upgrading to >= 0.15.0
 
 As of 0.15.0, `activesupport` is no longer required. Add `gem 'activesupport'` to your Gemfile if you required ActiveSupport via this library.
@@ -130,5 +144,3 @@ gem 'celluloid-io'
 When in doubt, use `faye-websocket`.
 
 See [#5](https://github.com/slack-ruby/slack-ruby-client/issues/5) for more information.
-
-

data/bin/commands.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
+require 'commands/admin_analytics'
 require 'commands/admin_apps'
 require 'commands/admin_apps_approved'
 require 'commands/admin_apps_requests'
 require 'commands/admin_apps_restricted'
+require 'commands/admin_barriers'
 require 'commands/admin_conversations'
+require 'commands/admin_conversations_ekm'
 require 'commands/admin_conversations_restrictAccess'
 require 'commands/admin_conversations_whitelist'
 require 'commands/admin_emoji'
@@ -21,11 +24,14 @@ require 'commands/admin_users'
 require 'commands/admin_users_session'
 require 'commands/api'
 require 'commands/apps'
+require 'commands/apps_connections'
+require 'commands/apps_event_authorizations'
 require 'commands/apps_permissions'
 require 'commands/apps_permissions_resources'
 require 'commands/apps_permissions_scopes'
 require 'commands/apps_permissions_users'
 require 'commands/auth'
+require 'commands/auth_teams'
 require 'commands/bots'
 require 'commands/calls'
 require 'commands/calls_participants'
@@ -60,3 +66,4 @@ require 'commands/users_admin'
 require 'commands/users_prefs'
 require 'commands/users_profile'
 require 'commands/views'
+require 'commands/workflows'

data/bin/commands/admin_analytics.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+# This file was auto-generated by lib/tasks/web.rake
+
+desc 'AdminAnalytics methods.'
+command 'admin_analytics' do |g|
+  g.desc 'Retrieve analytics data for a given date, presented as a compressed JSON file'
+  g.long_desc %( Retrieve analytics data for a given date, presented as a compressed JSON file )
+  g.command 'getFile' do |c|
+    c.flag 'type', desc: 'The type of analytics to retrieve. The options are currently limited to member.'
+    c.flag 'date', desc: 'Date to retrieve the analytics data for, expressed as YYYY-MM-DD in UTC.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_analytics_getFile(options))
+    end
+  end
+end

data/bin/commands/admin_apps.rb

@@ -7,19 +7,32 @@ command 'admin_apps' do |g|
   g.long_desc %( Approve an app for installation on a workspace. )
   g.command 'approve' do |c|
     c.flag 'app_id', desc: 'The id of the app to approve.'
+    c.flag 'enterprise_id', desc: 'The ID of the enterprise to approve the app on.'
     c.flag 'request_id', desc: 'The id of the request to approve.'
-    c.flag 'team_id', desc: '.'
+    c.flag 'team_id', desc: 'The ID of the workspace to approve the app on.'
     c.action do |_global_options, options, _args|
       puts JSON.dump($client.admin_apps_approve(options))
     end
   end
 
+  g.desc 'Clear an app resolution'
+  g.long_desc %( Clear an app resolution )
+  g.command 'clearResolution' do |c|
+    c.flag 'app_id', desc: 'The id of the app whose resolution you want to clear/undo.'
+    c.flag 'enterprise_id', desc: 'The enterprise to clear the app resolution from.'
+    c.flag 'team_id', desc: 'The workspace to clear the app resolution from.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_apps_clearResolution(options))
+    end
+  end
+
   g.desc 'Restrict an app for installation on a workspace.'
   g.long_desc %( Restrict an app for installation on a workspace. )
   g.command 'restrict' do |c|
     c.flag 'app_id', desc: 'The id of the app to restrict.'
+    c.flag 'enterprise_id', desc: 'The ID of the enterprise to approve the app on.'
     c.flag 'request_id', desc: 'The id of the request to restrict.'
-    c.flag 'team_id', desc: '.'
+    c.flag 'team_id', desc: 'The ID of the workspace to approve the app on.'
     c.action do |_global_options, options, _args|
       puts JSON.dump($client.admin_apps_restrict(options))
     end

data/bin/commands/admin_barriers.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+# This file was auto-generated by lib/tasks/web.rake
+
+desc 'AdminBarriers methods.'
+command 'admin_barriers' do |g|
+  g.desc 'Create an Information Barrier'
+  g.long_desc %( Create an Information Barrier )
+  g.command 'create' do |c|
+    c.flag 'barriered_from_usergroup_ids', desc: 'A list of IDP Groups ids that the primary usergroup is to be barriered from.'
+    c.flag 'primary_usergroup_id', desc: 'The id of the primary IDP Group.'
+    c.flag 'restricted_subjects', desc: 'What kind of interactions are blocked by this barrier? For v1, we only support a list of all 3, eg im, mpim, call.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_barriers_create(options))
+    end
+  end
+
+  g.desc 'Delete an existing Information Barrier'
+  g.long_desc %( Delete an existing Information Barrier )
+  g.command 'delete' do |c|
+    c.flag 'barrier_id', desc: "The ID of the barrier you're trying to delete."
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_barriers_delete(options))
+    end
+  end
+
+  g.desc 'Get all Information Barriers for your organization'
+  g.long_desc %( Get all Information Barriers for your organization )
+  g.command 'list' do |c|
+    c.flag 'cursor', desc: 'Set cursor to next_cursor returned by the previous call to list items in the next page.'
+    c.flag 'limit', desc: 'The maximum number of items to return. Must be between 1 - 1000 both inclusive.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_barriers_list(options))
+    end
+  end
+
+  g.desc 'Update an existing Information Barrier'
+  g.long_desc %( Update an existing Information Barrier )
+  g.command 'update' do |c|
+    c.flag 'barrier_id', desc: "The ID of the barrier you're trying to modify."
+    c.flag 'barriered_from_usergroup_ids', desc: 'A list of IDP Groups ids that the primary usergroup is to be barriered from.'
+    c.flag 'primary_usergroup_id', desc: 'The id of the primary IDP Group.'
+    c.flag 'restricted_subjects', desc: 'What kind of interactions are blocked by this barrier? For v1, we only support a list of all 3, eg im, mpim, call.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_barriers_update(options))
+    end
+  end
+end

data/bin/commands/admin_conversations.rb

@@ -3,8 +3,151 @@
 
 desc 'AdminConversations methods.'
 command 'admin_conversations' do |g|
-  g.desc 'Set the workspaces in an Enterprise grid org that connect to a channel.'
-  g.long_desc %( Set the workspaces in an Enterprise grid org that connect to a channel. )
+  g.desc 'Archive a public or private channel.'
+  g.long_desc %( Archive a public or private channel. )
+  g.command 'archive' do |c|
+    c.flag 'channel_id', desc: 'The channel to archive.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_archive(options))
+    end
+  end
+
+  g.desc 'Convert a public channel to a private channel.'
+  g.long_desc %( Convert a public channel to a private channel. )
+  g.command 'convertToPrivate' do |c|
+    c.flag 'channel_id', desc: 'The channel to convert to private.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_convertToPrivate(options))
+    end
+  end
+
+  g.desc 'Create a public or private channel-based conversation.'
+  g.long_desc %( Create a public or private channel-based conversation. )
+  g.command 'create' do |c|
+    c.flag 'is_private', desc: 'When true, creates a private channel instead of a public channel.'
+    c.flag 'name', desc: 'Name of the public or private channel to create.'
+    c.flag 'description', desc: 'Description of the public or private channel to create.'
+    c.flag 'org_wide', desc: 'When true, the channel will be available org-wide. Note: if the channel is not org_wide=true, you must specify a team_id for this channel.'
+    c.flag 'team_id', desc: 'The workspace to create the channel in. Note: this argument is required unless you set org_wide=true.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_create(options))
+    end
+  end
+
+  g.desc 'Delete a public or private channel.'
+  g.long_desc %( Delete a public or private channel. )
+  g.command 'delete' do |c|
+    c.flag 'channel_id', desc: 'The channel to delete.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_delete(options))
+    end
+  end
+
+  g.desc 'Disconnect a connected channel from one or more workspaces.'
+  g.long_desc %( Disconnect a connected channel from one or more workspaces. )
+  g.command 'disconnectShared' do |c|
+    c.flag 'channel_id', desc: 'The channel to be disconnected from some workspaces.'
+    c.flag 'leaving_team_ids', desc: 'The team to be removed from the channel. Currently only a single team id can be specified.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_disconnectShared(options))
+    end
+  end
+
+  g.desc 'Get conversation preferences for a public or private channel.'
+  g.long_desc %( Get conversation preferences for a public or private channel. )
+  g.command 'getConversationPrefs' do |c|
+    c.flag 'channel_id', desc: 'The channel to get preferences for.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_getConversationPrefs(options))
+    end
+  end
+
+  g.desc "This API endpoint can be used by any admin to get a channel's retention policy."
+  g.long_desc %( This API endpoint can be used by any admin to get a channel's retention policy. )
+  g.command 'getCustomRetention' do |c|
+    c.flag 'channel_id', desc: 'The channel to get the retention policy for.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_getCustomRetention(options))
+    end
+  end
+
+  g.desc 'Get all the workspaces a given public or private channel is connected to within this Enterprise org.'
+  g.long_desc %( Get all the workspaces a given public or private channel is connected to within this Enterprise org. )
+  g.command 'getTeams' do |c|
+    c.flag 'channel_id', desc: 'The channel to determine connected workspaces within the organization for.'
+    c.flag 'cursor', desc: 'Set cursor to next_cursor returned by the previous call to list items in the next page.'
+    c.flag 'limit', desc: 'The maximum number of items to return. Must be between 1 - 1000 both inclusive.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_getTeams(options))
+    end
+  end
+
+  g.desc 'Invite a user to a public or private channel.'
+  g.long_desc %( Invite a user to a public or private channel. )
+  g.command 'invite' do |c|
+    c.flag 'channel_id', desc: 'The channel that the users will be invited to.'
+    c.flag 'user_ids', desc: 'The users to invite.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_invite(options))
+    end
+  end
+
+  g.desc "This API endpoint can be used by any admin to remove a channel's retention policy."
+  g.long_desc %( This API endpoint can be used by any admin to remove a channel's retention policy. )
+  g.command 'removeCustomRetention' do |c|
+    c.flag 'channel_id', desc: 'The channel to set the retention policy for.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_removeCustomRetention(options))
+    end
+  end
+
+  g.desc 'Rename a public or private channel.'
+  g.long_desc %( Rename a public or private channel. )
+  g.command 'rename' do |c|
+    c.flag 'channel_id', desc: 'The channel to rename.'
+    c.flag 'name', desc: '.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_rename(options))
+    end
+  end
+
+  g.desc 'Search for public or private channels in an Enterprise organization.'
+  g.long_desc %( Search for public or private channels in an Enterprise organization. )
+  g.command 'search' do |c|
+    c.flag 'cursor', desc: 'Set cursor to next_cursor returned by the previous call to list items in the next page.'
+    c.flag 'limit', desc: 'Maximum number of items to be returned. Must be between 1 - 20 both inclusive. Default is 10.'
+    c.flag 'query', desc: 'Name of the the channel to query by.'
+    c.flag 'search_channel_types', desc: 'The type of channel to include or exclude in the search. For example private will search private channels, while private_exclude will exclude them. For a full list of types, check the Types section.'
+    c.flag 'sort', desc: 'Possible values are relevant (search ranking based on what we think is closest), name (alphabetical), member_count (number of users in the channel), and created (date channel was created). You can optionally pair this with the sort_dir arg to change how it is sorted.'
+    c.flag 'sort_dir', desc: 'Sort direction. Possible values are asc for ascending order like (1, 2, 3) or (a, b, c), and desc for descending order like (3, 2, 1) or (c, b, a).'
+    c.flag 'team_ids', desc: 'Comma separated string of team IDs, signifying the workspaces to search through.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_search(options))
+    end
+  end
+
+  g.desc 'Set the posting permissions for a public or private channel.'
+  g.long_desc %( Set the posting permissions for a public or private channel. )
+  g.command 'setConversationPrefs' do |c|
+    c.flag 'channel_id', desc: 'The channel to set the prefs for.'
+    c.flag 'prefs', desc: 'The prefs for this channel in a stringified JSON format.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_setConversationPrefs(options))
+    end
+  end
+
+  g.desc "This API endpoint can be used by any admin to set a channel's retention policy."
+  g.long_desc %( This API endpoint can be used by any admin to set a channel's retention policy. )
+  g.command 'setCustomRetention' do |c|
+    c.flag 'channel_id', desc: 'The channel to set the retention policy for.'
+    c.flag 'duration_days', desc: 'The message retention duration in days to set for this channel.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_setCustomRetention(options))
+    end
+  end
+
+  g.desc 'Set the workspaces in an Enterprise grid org that connect to a public or private channel.'
+  g.long_desc %( Set the workspaces in an Enterprise grid org that connect to a public or private channel. )
   g.command 'setTeams' do |c|
     c.flag 'channel_id', desc: 'The encoded channel_id to add or remove to workspaces.'
     c.flag 'org_channel', desc: 'True if channel has to be converted to an org channel.'
@@ -14,4 +157,13 @@ command 'admin_conversations' do |g|
       puts JSON.dump($client.admin_conversations_setTeams(options))
     end
   end
+
+  g.desc 'Unarchive a public or private channel.'
+  g.long_desc %( Unarchive a public or private channel. )
+  g.command 'unarchive' do |c|
+    c.flag 'channel_id', desc: 'The channel to unarchive.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.admin_conversations_unarchive(options))
+    end
+  end
 end