slack-ruby-client 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c27d0774e9e56d2188bf8e9aea953b86821a9156
-  data.tar.gz: d4ca8180bcc3d643e5dcc0b326975086831df51f
+  metadata.gz: b4523b02fb8e41e2a529f21283e9631aca6e04bb
+  data.tar.gz: 6324f7a54941b201b7aa729178418241accf836c
 SHA512:
-  metadata.gz: '0395ba1c14c66f1f3360c71a9bb294fd33ed88775de08c933e6cb7c23aa47485a864e151a3dd41354debd266cd9d9fa1ba80d0c5260afb5f62b60c46c1784a4c'
-  data.tar.gz: bbe81ee65b8358950dc946791bb72c8e8e3c84ce6ac52fe73a9a66c2f70073394153d604fce446b3eff3590b94ff87a4236a5d447522c8e0e10af4dd54daeddd
+  metadata.gz: 958f43b8c6c3591d81761e60c310c6cf2638b26ab79b9bf56748768a2e8800fdad85733262c5a93d4272b3861f475b2cbb2f1eabb01fadb3a2848a09c82be3d7
+  data.tar.gz: 1787862cbf85c3cd762c8b044afd89d98c92ee0cd959aaf94da5b5d513cd3c24c3d8de005eece992a5f13ed76a8279231d40d8ade39dd32c4efe692c9118b79c

data/.gitignore

@@ -3,3 +3,4 @@ pkg
 Gemfile.lock
 .DS_Store
 .bundle
+.idea

data/.rubocop.yml

@@ -3,4 +3,7 @@ AllCops:
     - vendor/**/*
     - lib/slack/web/api/slack-api-ref/**/*
 
+Naming/MethodName:
+  Enabled: false
+
 inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-04-30 12:02:22 -0400 using RuboCop version 0.35.0.
+# on 2017-11-25 11:28:32 -0500 using RuboCop version 0.51.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
+# Offense count: 4
 Lint/HandleExceptions:
   Exclude:
     - 'lib/slack-ruby-client.rb'
@@ -14,61 +14,74 @@ Lint/HandleExceptions:
     - 'spec/slack/real_time/concurrency/eventmachine_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks.
-Lint/UnusedBlockArgument:
+Lint/RescueWithoutErrorClass:
   Exclude:
-    - 'lib/slack/messages/formatting.rb'
+    - 'lib/slack/real_time/concurrency/celluloid.rb'
 
-# Offense count: 14
+# Offense count: 18
 Metrics/AbcSize:
   Max: 44
 
+# Offense count: 81
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 421
+
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 165
+  Max: 166
 
-# Offense count: 3
+# Offense count: 4
 Metrics/CyclomaticComplexity:
   Max: 9
 
-# Offense count: 720
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 741
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
 Metrics/LineLength:
-  Max: 288
+  Max: 266
 
-# Offense count: 7
+# Offense count: 10
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 32
+  Max: 42
 
-# Offense count: 2
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 113
+
+# Offense count: 3
 Metrics/PerceivedComplexity:
   Max: 11
 
-# Offense count: 59
-# Configuration parameters: Exclude.
-Style/Documentation:
-  Enabled: false
-
 # Offense count: 1
-# Configuration parameters: Exclude.
-Style/FileName:
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
   Exclude:
     - 'lib/slack-ruby-client.rb'
 
-# Offense count: 116
+# Offense count: 63
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 137
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Enabled: false
 
-# Offense count: 21
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/MethodName:
-  Enabled: false
+# Offense count: 2
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/slack/real_time/stores/store.rb'
+    - 'lib/slack/web/faraday/response/raise_error.rb'
 
 # Offense count: 3
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: module_function, extend_self
 Style/ModuleFunction:
   Exclude:
     - 'lib/slack/config.rb'
@@ -79,15 +92,3 @@ Style/ModuleFunction:
 Style/MultilineTernaryOperator:
   Exclude:
     - 'spec/support/real_time/connected_client.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RescueModifier:
-  Exclude:
-    - 'lib/slack/real_time/concurrency/celluloid.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/SpecialGlobalVars:
-  Exclude:
-    - 'lib/slack/messages/formatting.rb'

data/.travis.yml

@@ -5,9 +5,7 @@ cache: bundler
 rvm:
   - 2.2
   - 2.1
-  - 2.0
-  - rbx-2
-  - jruby-19mode
+  - 2.3.4
   - ruby-head
   - jruby-head
 
@@ -20,15 +18,9 @@ matrix:
       env: CONCURRENCY=celluloid-io
     - rvm: 2.4.1
       env: CONCURRENCY=faye-websocket
-    - rvm: 2.3.4
-      env: CONCURRENCY=celluloid-io
-    - rvm: 2.3.4
-      env: CONCURRENCY=faye-websocket
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: jruby-19mode
-    - rvm: rbx-2
 
 git:
   submodules: false

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 0.11.0 (11/25/2017)
+
+* [#173](https://github.com/slack-ruby/slack-ruby-client/issues/173): Added dialog support - [@alexagranov](https://github.com/alexagranov).
+* [#176](https://github.com/slack-ruby/slack-ruby-client/issues/176): Drop dependency on `json` gem - [@seuros](https://github.com/seuros).
+* [#177](https://github.com/slack-ruby/slack-ruby-client/pull/177): Fix api ref repo - [@manuelmeurer](https://github.com/manuelmeurer).
+* [#180](https://github.com/slack-ruby/slack-ruby-client/pull/180): Upgraded RuboCop 0.51.0 - [@dblock](https://github.com/dblock).
+* [#181](https://github.com/slack-ruby/slack-ruby-client/pull/181): Added `chat_getPermalink`, `migration_exchange` - [@dblock](https://github.com/dblock).
+* [#182](https://github.com/slack-ruby/slack-ruby-client/pull/182): Added undocumented methods support with `channels_delete`, `chat_command`, `files_edit`, `files_share`, `users_admin_invite`, `users_admin_setInactive` and `users_prefs_get` - [@dblock](https://github.com/dblock).
+
+### 0.10.0 (9/19/2017)
+
+* [#169](https://github.com/slack-ruby/slack-ruby-client/pull/169): Added [Conversations API](https://api.slack.com/docs/conversations-api) - [@jmanian](https://github.com/jmanian).
+* [#169](https://github.com/slack-ruby/slack-ruby-client/pull/169): Added `include_locale` parameter to several methods (`channels_info`, `groups_info`, `im_open`, `rtm_start`, `users_info`, `users_list`) - [@jmanian](https://github.com/jmanian).
+* [#169](https://github.com/slack-ruby/slack-ruby-client/pull/169): Removed `groups_close` - [@jmanian](https://github.com/jmanian).
+* [#167](https://github.com/slack-ruby/slack-ruby-client/pull/167): Added support for pausing between paginated requests that can cause Slack rate limiting - [@jmanian](https://github.com/jmanian).
+* [#163](https://github.com/slack-ruby/slack-ruby-client/pull/164): Use `OpenSSL::X509::DEFAULT_CERT_DIR` and `OpenSSL::X509::DEFAULT_CERT_FILE` for default ca_cert and ca_file - [@leifcr](https://github.com/leifcr).
+* [#161](https://github.com/slack-ruby/slack-ruby-client/pull/161): Added support for cursor pagination - [@dblock](https://github.com/dblock).
+* [#162](https://github.com/slack-ruby/slack-ruby-client/pull/162): Gracefully close websocket on `Errno::EPIPE` - [@johanoskarsson](https://github.com/johanoskarsson).
+* [#172](https://github.com/slack-ruby/slack-ruby-client/pull/172): Use `rtm.start` when store is a subclass of `Slack::RealTime::Stores::Store` (default) - [@kstole](https://github.com/kstole).
+
+### 0.9.1 (8/24/2017)
+
+* [#158](https://github.com/slack-ruby/slack-ruby-client/issues/158): Updated to latest slack-api-ref; Updated chat.3.update patch to reflect argument reordering; Added chat.4.postEphemeral patch to apply the attachments JSON fix (whitespace last line of diff matters! ;-) - [@alexagranov](https://github.com/alexagranov).
+
 ### 0.9.0 (8/6/2017)
 
 * [#146](https://github.com/slack-ruby/slack-ruby-client/issues/146): Fix: `undefined method running?` and `ThreadError: Target thread must not be current thread` with `Celluloid::IO` - [@dblock](https://github.com/dblock).

data/CONTRIBUTING.md

@@ -65,7 +65,7 @@ Make sure that `bundle exec rake` completes without errors.
 
 ### Update Slack Web API
 
-Slack Web API is updated from https://github.com/dblock/slack-api-ref, a maintained, machine-readable version of Slack API Docs, generated by scraping [api.slack.com](https://api.slack.com). To update the Web API from the latest definition run the following Rake task.
+Slack Web API is updated from https://github.com/slack-ruby/slack-api-ref, a maintained, machine-readable version of Slack API Docs, generated by scraping [api.slack.com](https://api.slack.com). To update the Web API from the latest definition run the following Rake task.
 
 ```
 rake slack:api:update
@@ -78,7 +78,7 @@ Sometimes it's necessary to patch auto-generated Slack Web API methods. For exam
 Make a change to a generated file, for example `lib/slack/web/api/endpoints/chat.rb` and generate a patch.
 
 ```
-git diff HEAD lib/slack/web/api/endpoints/chat.rb > lib/slack/web/api/patches/chat.1.patch
+git diff --no-color HEAD lib/slack/web/api/endpoints/chat.rb > lib/slack/web/api/patches/chat.1.patch
 ```
 
 Run `rake slack:api:update` to ensure that the patch is cleanly applied. Implement a test for the added or modified functionality and commit the patch file.

data/Gemfile

@@ -3,8 +3,10 @@ source 'http://rubygems.org'
 gemspec
 
 gem ENV['CONCURRENCY'], require: false if ENV.key?('CONCURRENCY')
-gem 'picky' unless RUBY_PLATFORM == 'java'
+# rubocop:enable Bundler/OrderedGems
+
 gem 'activesupport', '~> 4.0'
+gem 'picky' unless RUBY_PLATFORM == 'java'
 
 group :test do
   gem 'slack-ruby-danger', '~> 0.1.0', require: false

data/README.md

@@ -18,7 +18,7 @@ A Ruby client for the Slack [Web](https://api.slack.com/web) and [RealTime Messa
 
 ## Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-client, 0.9.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **stable** release of slack-ruby-client, 0.11.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
 ## Installation
 
@@ -164,17 +164,19 @@ client = Slack::Web::Client.new(user_agent: 'Slack Ruby Client/1.0')
 
 The following settings are supported.
 
-setting      | description
--------------|-------------------------------------------------------------------------------------------------
-token        | Slack API token.
-user_agent   | User-agent, defaults to _Slack Ruby Client/version_.
-proxy        | Optional HTTP proxy.
-ca_path      | Optional SSL certificates path.
-ca_file      | Optional SSL certificates file.
-endpoint     | Slack endpoint, default is _https://slack.com/api_.
-logger       | Optional `Logger` instance that logs HTTP requests.
-timeout      | Optional open/read timeout in seconds.
-open_timeout | Optional connection open timeout in seconds.
+setting             | description
+--------------------|-------------------------------------------------------------------------------------------------
+token               | Slack API token.
+user_agent          | User-agent, defaults to _Slack Ruby Client/version_.
+proxy               | Optional HTTP proxy.
+ca_path             | Optional SSL certificates path.
+ca_file             | Optional SSL certificates file.
+endpoint            | Slack endpoint, default is _https://slack.com/api_.
+logger              | Optional `Logger` instance that logs HTTP requests.
+timeout             | Optional open/read timeout in seconds.
+open_timeout        | Optional connection open timeout in seconds.
+default_page_size   | Optional page size for paginated requests, default is _100_.
+default_max_retries | Optional number of retries for paginated requests, default is _100_.
 
 You can also pass request options, including `timeout` and `open_timeout` into individual calls.
 
@@ -182,6 +184,32 @@ You can also pass request options, including `timeout` and `open_timeout` into i
 client.channels_list(request: { timeout: 180 })
 ```
 
+#### Pagination Support
+
+The Web client natively supports [cursor pagination](https://api.slack.com/docs/pagination#cursors) for methods that allow it, such as `users_list`. Supply a block and the client will make repeated requests adjusting the value of `cursor` with every response. The default limit is set to 100 and can be adjusted via `Slack::Web::Client.config.default_page_size` or by passing it directly into the API call.
+
+```ruby
+all_members = []
+client.users_list(presence: true, limit: 10) do |response|
+  all_members.concat(response.members)
+end
+all_members # many thousands of team members retrieved 10 at a time
+```
+
+When using cursor pagination the client will automatically pause and then retry the request if it runs into Slack rate limiting. (It will pause according to the `Retry-After` header in the 429 response before retrying the request.) If it receives too many rate-limited responses in a row it will give up and raise an error. The default number of retries is 100 and can be adjusted via `Slack::Web::Client.config.default_max_retries` or by passing it directly into the method as `max_retries`.
+
+You can also proactively avoid rate limiting by adding a pause between every paginated request with the `sleep_interval` parameter, which is given in seconds.
+
+```ruby
+all_members = []
+client.users_list(presence: true, limit: 10, sleep_interval: 5, max_retries: 20) do |response|
+  # pauses for 5 seconds between each request
+  # gives up after 20 consecutive rate-limited responses
+  all_members.concat(response.members)
+end
+all_members # many thousands of team members retrieved 10 at a time
+```
+
 ### RealTime Client
 
 The Real Time Messaging API is a WebSocket-based API that allows you to receive events from Slack in real time and send messages as user.

data/Rakefile

@@ -14,7 +14,7 @@ end
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
-task default: [:rubocop, :spec]
+task default: %i[rubocop spec]
 
 load 'tasks/git.rake'
 load 'tasks/web.rake'

data/UPGRADING.md

@@ -5,7 +5,7 @@ Upgrading Slack-Ruby-Client
 
 #### Changes in How the RTM Client Connects
 
-The RealTime client now automatically chooses either [rtm.start](https://api.slack.com/methods/rtm.start) or [rtm.connect](https://api.slack.com/methods/rtm.connect) to open a connection. The former retrieves a lot of team information while the latter only serves connection purposes and is newer and preferred, while the latter is required to use the full `Slack::RealTime::Stores::Store` storage class.
+The RealTime client now automatically chooses either [rtm.start](https://api.slack.com/methods/rtm.start) or [rtm.connect](https://api.slack.com/methods/rtm.connect) to open a connection. The `rtm.connect` method is a newer, preferred method, which serves connection purposes and returns some basic team info. The `rtm.start` method additionally returns a lot of data about the team, its channels, and members, and is required to use the full `Slack::RealTime::Stores::Store` storage class.
 
 Prior versions always used `rtm.start`, to restore this behavior, configure `start_method`.
 

data/bin/commands/api.rb

@@ -2,8 +2,8 @@
 
 desc 'Api methods.'
 command 'api' do |g|
-  g.desc 'This method helps you test your calling code.'
-  g.long_desc %( This method helps you test your calling code. )
+  g.desc 'Checks API calling code.'
+  g.long_desc %( Checks API calling code. )
   g.command 'test' do |c|
     c.flag 'error', desc: 'Error response to return.'
     c.flag 'foo', desc: 'example property to return.'

data/bin/commands/apps_permissions.rb

@@ -0,0 +1,22 @@
+# This file was auto-generated by lib/tasks/web.rake
+
+desc 'AppsPermissions methods.'
+command 'apps_permissions' do |g|
+  g.desc 'Returns list of permissions this app has on a team.'
+  g.long_desc %( Returns list of permissions this app has on a team. )
+  g.command 'info' do |c|
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.apps_permissions_info(options))
+    end
+  end
+
+  g.desc 'Allows an app to request additional scopes'
+  g.long_desc %( Allows an app to request additional scopes )
+  g.command 'request' do |c|
+    c.flag 'scopes', desc: 'A comma separated list of scopes to request for.'
+    c.flag 'trigger_id', desc: 'Token used to trigger the permissions API.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.apps_permissions_request(options))
+    end
+  end
+end

data/bin/commands/auth.rb

@@ -2,8 +2,8 @@
 
 desc 'Auth methods.'
 command 'auth' do |g|
-  g.desc 'This method revokes an access token. Use it when you no longer need a token. For example, with a Sign In With Slack app, call this to log a user out.'
-  g.long_desc %( This method revokes an access token. Use it when you no longer need a token. For example, with a Sign In With Slack app, call this to log a user out. )
+  g.desc 'Revokes a token.'
+  g.long_desc %( Revokes a token. )
   g.command 'revoke' do |c|
     c.flag 'test', desc: 'Setting this parameter to 1 triggers a testing mode where the specified token will not actually be revoked.'
     c.action do |_global_options, options, _args|
@@ -11,8 +11,8 @@ command 'auth' do |g|
     end
   end
 
-  g.desc 'This method checks authentication and tells you who you are.'
-  g.long_desc %( This method checks authentication and tells you who you are. )
+  g.desc 'Checks authentication & identity.'
+  g.long_desc %( Checks authentication & identity. )
   g.command 'test' do |c|
     c.action do |_global_options, options, _args|
       puts JSON.dump($client.auth_test(options))

data/bin/commands/bots.rb

@@ -2,8 +2,8 @@
 
 desc 'Bots methods.'
 command 'bots' do |g|
-  g.desc 'This method returns information about a bot user.'
-  g.long_desc %( This method returns information about a bot user. )
+  g.desc 'Gets information about a bot user.'
+  g.long_desc %( Gets information about a bot user. )
   g.command 'info' do |c|
     c.flag 'bot', desc: 'Bot user to get info on.'
     c.action do |_global_options, options, _args|

data/bin/commands/channels.rb

@@ -2,8 +2,8 @@
 
 desc "Get info on your team's Slack channels, create or archive channels, invite users, set the topic and purpose, and mark a channel as read."
 command 'channels' do |g|
-  g.desc 'This method archives a channel.'
-  g.long_desc %( This method archives a channel. )
+  g.desc 'Archives a channel.'
+  g.long_desc %( Archives a channel. )
   g.command 'archive' do |c|
     c.flag 'channel', desc: 'Channel to archive.'
     c.action do |_global_options, options, _args|
@@ -11,8 +11,8 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method is used to create a channel.'
-  g.long_desc %( This method is used to create a channel. )
+  g.desc 'Creates a channel.'
+  g.long_desc %( Creates a channel. )
   g.command 'create' do |c|
     c.flag 'name', desc: 'Name of channel to create.'
     c.flag 'validate', desc: 'Whether to return errors on invalid channel name instead of modifying it to meet the specified criteria.'
@@ -21,30 +21,49 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method returns a portion of message events from the specified channel.'
-  g.long_desc %( This method returns a portion of message events from the specified channel. )
+  g.desc 'Delete a channel (undocumented)'
+  g.long_desc %( Delete a channel )
+  g.command 'delete' do |c|
+    c.flag 'channel', desc: 'Channel to delete.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.channels_delete(options))
+    end
+  end
+
+  g.desc 'Fetches history of messages and events from a channel.'
+  g.long_desc %( Fetches history of messages and events from a channel. )
   g.command 'history' do |c|
     c.flag 'channel', desc: 'Channel to fetch history for.'
+    c.flag 'inclusive', desc: 'Include messages with latest or oldest timestamp in results.'
     c.flag 'latest', desc: 'End of time range of messages to include in results.'
     c.flag 'oldest', desc: 'Start of time range of messages to include in results.'
-    c.flag 'inclusive', desc: 'Include messages with latest or oldest timestamp in results.'
     c.flag 'unreads', desc: 'Include unread_count_display in the output?.'
     c.action do |_global_options, options, _args|
       puts JSON.dump($client.channels_history(options))
     end
   end
 
-  g.desc 'This method returns information about a team channel.'
-  g.long_desc %( This method returns information about a team channel. )
+  g.desc 'This method returns the ID of a team channel.'
+  g.long_desc %( This method returns the ID of a team channel. )
+  g.command 'id' do |c|
+    c.flag 'channel', desc: 'Channel to get ID for, prefixed with #.'
+    c.action do |_global_options, options, _args|
+      puts JSON.dump($client.channels_id(options))
+    end
+  end
+
+  g.desc 'Gets information about a channel.'
+  g.long_desc %( Gets information about a channel. )
   g.command 'info' do |c|
     c.flag 'channel', desc: 'Channel to get info on.'
+    c.flag 'include_locale', desc: 'Set this to true to receive the locale for this channel. Defaults to false.'
     c.action do |_global_options, options, _args|
       puts JSON.dump($client.channels_info(options))
     end
   end
 
-  g.desc 'This method is used to invite a user to a channel. The calling user must be a member of the channel.'
-  g.long_desc %( This method is used to invite a user to a channel. The calling user must be a member of the channel. )
+  g.desc 'Invites a user to a channel.'
+  g.long_desc %( Invites a user to a channel. )
   g.command 'invite' do |c|
     c.flag 'channel', desc: 'Channel to invite user to.'
     c.flag 'user', desc: 'User to invite to channel.'
@@ -53,8 +72,8 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method is used to join a channel. If the channel does not exist, it is'
-  g.long_desc %( This method is used to join a channel. If the channel does not exist, it is created. )
+  g.desc 'Joins a channel, creating it if needed.'
+  g.long_desc %( Joins a channel, creating it if needed. )
   g.command 'join' do |c|
     c.flag 'name', desc: 'Name of channel to join.'
     c.flag 'validate', desc: 'Whether to return errors on invalid channel name instead of modifying it to meet the specified criteria.'
@@ -63,8 +82,8 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method allows a user to remove another member from a team channel.'
-  g.long_desc %( This method allows a user to remove another member from a team channel. )
+  g.desc 'Removes a user from a channel.'
+  g.long_desc %( Removes a user from a channel. )
   g.command 'kick' do |c|
     c.flag 'channel', desc: 'Channel to remove user from.'
     c.flag 'user', desc: 'User to remove from channel.'
@@ -73,8 +92,8 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method is used to leave a channel.'
-  g.long_desc %( This method is used to leave a channel. )
+  g.desc 'Leaves a channel.'
+  g.long_desc %( Leaves a channel. )
   g.command 'leave' do |c|
     c.flag 'channel', desc: 'Channel to leave.'
     c.action do |_global_options, options, _args|
@@ -82,18 +101,20 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method returns a list of all channels in the team. This includes channels the caller is in, channels they are not currently in, and archived channels but does not include private channels. The number of (non-deactivated) members in each channel is also returned.'
-  g.long_desc %( This method returns a list of all channels in the team. This includes channels the caller is in, channels they are not currently in, and archived channels but does not include private channels. The number of (non-deactivated) members in each channel is also returned. )
+  g.desc 'Lists all channels in a Slack team.'
+  g.long_desc %( Lists all channels in a Slack team. )
   g.command 'list' do |c|
+    c.flag 'cursor', desc: "Paginate through collections of data by setting the cursor parameter to a next_cursor attribute returned by a previous request's response_metadata. Default value fetches the first 'page' of the collection. See pagination for more detail."
     c.flag 'exclude_archived', desc: 'Exclude archived channels from the list.'
     c.flag 'exclude_members', desc: 'Exclude the members collection from each channel.'
+    c.flag 'limit', desc: "The maximum number of items to return. Fewer than the requested number of items may be returned, even if the end of the users list hasn't been reached."
     c.action do |_global_options, options, _args|
       puts JSON.dump($client.channels_list(options))
     end
   end
 
-  g.desc 'This method moves the read cursor in a channel.'
-  g.long_desc %( This method moves the read cursor in a channel. )
+  g.desc 'Sets the read cursor in a channel.'
+  g.long_desc %( Sets the read cursor in a channel. )
   g.command 'mark' do |c|
     c.flag 'channel', desc: 'Channel to set reading cursor in.'
     c.flag 'ts', desc: 'Timestamp of the most recently seen message.'
@@ -102,8 +123,8 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method renames a team channel.'
-  g.long_desc %( This method renames a team channel. )
+  g.desc 'Renames a channel.'
+  g.long_desc %( Renames a channel. )
   g.command 'rename' do |c|
     c.flag 'channel', desc: 'Channel to rename.'
     c.flag 'name', desc: 'New name for channel.'
@@ -113,8 +134,8 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method returns an entire thread (a message plus all the messages in reply to it).'
-  g.long_desc %( This method returns an entire thread (a message plus all the messages in reply to it). )
+  g.desc 'Retrieve a thread of messages posted to a channel'
+  g.long_desc %( Retrieve a thread of messages posted to a channel )
   g.command 'replies' do |c|
     c.flag 'channel', desc: 'Channel to fetch thread from.'
     c.flag 'thread_ts', desc: "Unique identifier of a thread's parent message."
@@ -123,8 +144,8 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method is used to change the purpose of a channel. The calling user must be a member of the channel.'
-  g.long_desc %( This method is used to change the purpose of a channel. The calling user must be a member of the channel. )
+  g.desc 'Sets the purpose for a channel.'
+  g.long_desc %( Sets the purpose for a channel. )
   g.command 'setPurpose' do |c|
     c.flag 'channel', desc: 'Channel to set the purpose of.'
     c.flag 'purpose', desc: 'The new purpose.'
@@ -133,8 +154,8 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method is used to change the topic of a channel. The calling user must be a member of the channel.'
-  g.long_desc %( This method is used to change the topic of a channel. The calling user must be a member of the channel. )
+  g.desc 'Sets the topic for a channel.'
+  g.long_desc %( Sets the topic for a channel. )
   g.command 'setTopic' do |c|
     c.flag 'channel', desc: 'Channel to set the topic of.'
     c.flag 'topic', desc: 'The new topic.'
@@ -143,21 +164,12 @@ command 'channels' do |g|
     end
   end
 
-  g.desc 'This method unarchives a channel. The calling user is added to the channel.'
-  g.long_desc %( This method unarchives a channel. The calling user is added to the channel. )
+  g.desc 'Unarchives a channel.'
+  g.long_desc %( Unarchives a channel. )
   g.command 'unarchive' do |c|
     c.flag 'channel', desc: 'Channel to unarchive.'
     c.action do |_global_options, options, _args|
       puts JSON.dump($client.channels_unarchive(options))
     end
   end
-
-  g.desc 'This method returns the ID of a team channel.'
-  g.long_desc %( This method returns the ID of a team channel. )
-  g.command 'id' do |c|
-    c.flag 'channel', desc: 'Channel to get ID for, prefixed with #.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.channels_id(options))
-    end
-  end
 end