slack-ruby-client 0.11.0 → 2.7.0

data/bin/commands/migration.rb

@@ -1,14 +1,22 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
-desc 'Migration methods.'
-command 'migration' do |g|
-  g.desc 'For Enterprise Grid workspaces, map local user IDs to global user IDs'
-  g.long_desc %( For Enterprise Grid workspaces, map local user IDs to global user IDs )
-  g.command 'exchange' do |c|
-    c.flag 'users', desc: 'A comma-separated list of user ids, up to 400 per request.'
-    c.flag 'to_old', desc: 'Specify true to convert W global user IDs to workspace-specific U IDs. Defaults to false.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.migration_exchange(options))
+module Slack
+  module Cli
+    class App
+      desc 'Migration methods.'
+      command 'migration' do |g|
+        g.desc 'For Enterprise Grid workspaces, map local user IDs to global user IDs'
+        g.long_desc %( For Enterprise Grid workspaces, map local user IDs to global user IDs )
+        g.command 'exchange' do |c|
+          c.flag 'users', desc: 'A comma-separated list of user ids, up to 400 per request.'
+          c.flag 'team_id', desc: 'Specify team_id starts with T in case of Org Token.'
+          c.flag 'to_old', desc: 'Specify true to convert W global user IDs to workspace-specific U IDs. Defaults to false.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.migration_exchange(options))
+          end
+        end
+      end
     end
   end
 end

data/bin/commands/oauth.rb

@@ -1,29 +1,24 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
-desc 'Oauth methods.'
-command 'oauth' do |g|
-  g.desc 'Exchanges a temporary OAuth code for an API token.'
-  g.long_desc %( Exchanges a temporary OAuth code for an API token. )
-  g.command 'access' do |c|
-    c.flag 'client_id', desc: 'Issued when you created your application.'
-    c.flag 'client_secret', desc: 'Issued when you created your application.'
-    c.flag 'code', desc: 'The code param returned via the OAuth callback.'
-    c.flag 'redirect_uri', desc: 'This must match the originally submitted URI (if one was sent).'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.oauth_access(options))
-    end
-  end
-
-  g.desc 'Exchanges a temporary OAuth verifier code for a workspace token.'
-  g.long_desc %( Exchanges a temporary OAuth verifier code for a workspace token. )
-  g.command 'token' do |c|
-    c.flag 'client_id', desc: 'Issued when you created your application.'
-    c.flag 'client_secret', desc: 'Issued when you created your application.'
-    c.flag 'code', desc: 'The code param returned via the OAuth callback.'
-    c.flag 'redirect_uri', desc: 'This must match the originally submitted URI (if one was sent).'
-    c.flag 'single_channel', desc: 'Request the user to add your app only to a single channel.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.oauth_token(options))
+module Slack
+  module Cli
+    class App
+      desc 'Oauth methods.'
+      command 'oauth' do |g|
+        g.desc 'Exchanges a temporary OAuth verifier code for an access token.'
+        g.long_desc %( Exchanges a temporary OAuth verifier code for an access token. )
+        g.command 'access' do |c|
+          c.flag 'client_id', desc: 'Issued when you created your application. If possible, avoid sending client_id and client_secret as parameters in your request and instead supply the Client ID and Client Secret using the HTTP Basic authentication scheme.'
+          c.flag 'client_secret', desc: 'Issued when you created your application. If possible, avoid sending client_id and client_secret as parameters in your request and instead supply the Client ID and Client Secret using the HTTP Basic authentication scheme.'
+          c.flag 'code', desc: 'The code param returned via the OAuth callback.'
+          c.flag 'redirect_uri', desc: 'This must match the originally submitted URI (if one was sent).'
+          c.flag 'single_channel', desc: 'Request the user to add your app only to a single channel. Only valid with a legacy workspace app.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.oauth_access(options))
+          end
+        end
+      end
     end
   end
 end

data/bin/commands/oauth_v2.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+# This file was auto-generated by lib/tasks/web.rake
+
+module Slack
+  module Cli
+    class App
+      desc 'OauthV2 methods.'
+      command 'oauth_v2' do |g|
+        g.desc 'Exchanges a temporary OAuth verifier code for an access token.'
+        g.long_desc %( Exchanges a temporary OAuth verifier code for an access token. )
+        g.command 'access' do |c|
+          c.flag 'client_id', desc: 'Issued when you created your application. If possible, avoid sending client_id and client_secret as parameters in your request and instead supply the Client ID and Client Secret using the HTTP Basic authentication scheme.'
+          c.flag 'client_secret', desc: 'Issued when you created your application. If possible, avoid sending client_id and client_secret as parameters in your request and instead supply the Client ID and Client Secret using the HTTP Basic authentication scheme.'
+          c.flag 'code', desc: 'The code param returned via the OAuth callback.'
+          c.flag 'grant_type', desc: 'The grant_type param as described in the OAuth spec.'
+          c.flag 'redirect_uri', desc: 'This must match the originally submitted URI (if one was sent).'
+          c.flag 'refresh_token', desc: 'The refresh_token param as described in the OAuth spec.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.oauth_v2_access(options))
+          end
+        end
+
+        g.desc 'Exchanges a legacy access token for a new expiring access token and refresh token'
+        g.long_desc %( Exchanges a legacy access token for a new expiring access token and refresh token )
+        g.command 'exchange' do |c|
+          c.flag 'client_id', desc: 'Issued when you created your application.'
+          c.flag 'client_secret', desc: 'Issued when you created your application.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.oauth_v2_exchange(options))
+          end
+        end
+      end
+    end
+  end
+end

data/bin/commands/openid_connect.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+# This file was auto-generated by lib/tasks/web.rake
+
+module Slack
+  module Cli
+    class App
+      desc 'OpenidConnect methods.'
+      command 'openid_connect' do |g|
+        g.desc 'Exchanges a temporary OAuth verifier code for an access token for Sign in with Slack.'
+        g.long_desc %( Exchanges a temporary OAuth verifier code for an access token for Sign in with Slack. )
+        g.command 'token' do |c|
+          c.flag 'client_id', desc: 'Issued when you created your application.'
+          c.flag 'client_secret', desc: 'Issued when you created your application.'
+          c.flag 'code', desc: 'The code param returned via the OAuth callback.'
+          c.flag 'grant_type', desc: 'The grant_type param as described in the OAuth spec.'
+          c.flag 'redirect_uri', desc: 'This must match the originally submitted URI (if one was sent).'
+          c.flag 'refresh_token', desc: 'The refresh_token param as described in the OAuth spec.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.openid_connect_token(options))
+          end
+        end
+
+        g.desc 'Get the identity of a user who has authorized Sign in with Slack.'
+        g.long_desc %( Get the identity of a user who has authorized Sign in with Slack. )
+        g.command 'userInfo' do |c|
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.openid_connect_userInfo(options))
+          end
+        end
+      end
+    end
+  end
+end

data/bin/commands/pins.rb

@@ -1,37 +1,40 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
-desc 'Pins methods.'
-command 'pins' do |g|
-  g.desc 'Pins an item to a channel.'
-  g.long_desc %( Pins an item to a channel. )
-  g.command 'add' do |c|
-    c.flag 'channel', desc: 'Channel to pin the item in.'
-    c.flag 'file', desc: 'File to pin.'
-    c.flag 'file_comment', desc: 'File comment to pin.'
-    c.flag 'timestamp', desc: 'Timestamp of the message to pin.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.pins_add(options))
-    end
-  end
+module Slack
+  module Cli
+    class App
+      desc 'Pins methods.'
+      command 'pins' do |g|
+        g.desc 'Pins an item to a channel.'
+        g.long_desc %( Pins an item to a channel. )
+        g.command 'add' do |c|
+          c.flag 'channel', desc: 'Channel to pin the messsage to. You must also include a timestamp when pinning messages.'
+          c.flag 'timestamp', desc: 'Timestamp of the message to pin. You must also include the channel.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.pins_add(options))
+          end
+        end
 
-  g.desc 'Lists items pinned to a channel.'
-  g.long_desc %( Lists items pinned to a channel. )
-  g.command 'list' do |c|
-    c.flag 'channel', desc: 'Channel to get pinned items for.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.pins_list(options))
-    end
-  end
+        g.desc 'Lists items pinned to a channel.'
+        g.long_desc %( Lists items pinned to a channel. )
+        g.command 'list' do |c|
+          c.flag 'channel', desc: 'Channel to get pinned items for.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.pins_list(options))
+          end
+        end
 
-  g.desc 'Un-pins an item from a channel.'
-  g.long_desc %( Un-pins an item from a channel. )
-  g.command 'remove' do |c|
-    c.flag 'channel', desc: 'Channel where the item is pinned to.'
-    c.flag 'file', desc: 'File to un-pin.'
-    c.flag 'file_comment', desc: 'File comment to un-pin.'
-    c.flag 'timestamp', desc: 'Timestamp of the message to un-pin.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.pins_remove(options))
+        g.desc 'Un-pins an item from a channel.'
+        g.long_desc %( Un-pins an item from a channel. )
+        g.command 'remove' do |c|
+          c.flag 'channel', desc: 'Channel where the item is pinned to.'
+          c.flag 'timestamp', desc: 'Timestamp of the message to un-pin.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.pins_remove(options))
+          end
+        end
+      end
     end
   end
 end

data/bin/commands/reactions.rb

@@ -1,53 +1,61 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
-desc 'Reactions methods.'
-command 'reactions' do |g|
-  g.desc 'Adds a reaction to an item.'
-  g.long_desc %( Adds a reaction to an item. )
-  g.command 'add' do |c|
-    c.flag 'name', desc: 'Reaction (emoji) name.'
-    c.flag 'channel', desc: 'Channel where the message to add reaction to was posted.'
-    c.flag 'file', desc: 'File to add reaction to.'
-    c.flag 'file_comment', desc: 'File comment to add reaction to.'
-    c.flag 'timestamp', desc: 'Timestamp of the message to add reaction to.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.reactions_add(options))
-    end
-  end
+module Slack
+  module Cli
+    class App
+      desc 'Reactions methods.'
+      command 'reactions' do |g|
+        g.desc 'Adds a reaction to an item.'
+        g.long_desc %( Adds a reaction to an item. )
+        g.command 'add' do |c|
+          c.flag 'channel', desc: 'Channel where the message to add reaction to was posted.'
+          c.flag 'name', desc: 'Reaction (emoji) name.'
+          c.flag 'timestamp', desc: 'Timestamp of the message to add reaction to.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.reactions_add(options))
+          end
+        end
 
-  g.desc 'Gets reactions for an item.'
-  g.long_desc %( Gets reactions for an item. )
-  g.command 'get' do |c|
-    c.flag 'channel', desc: 'Channel where the message to get reactions for was posted.'
-    c.flag 'file', desc: 'File to get reactions for.'
-    c.flag 'file_comment', desc: 'File comment to get reactions for.'
-    c.flag 'full', desc: 'If true always return the complete reaction list.'
-    c.flag 'timestamp', desc: 'Timestamp of the message to get reactions for.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.reactions_get(options))
-    end
-  end
+        g.desc 'Gets reactions for an item.'
+        g.long_desc %( Gets reactions for an item. )
+        g.command 'get' do |c|
+          c.flag 'channel', desc: 'Channel where the message to get reactions for was posted.'
+          c.flag 'file', desc: 'File to get reactions for.'
+          c.flag 'file_comment', desc: 'File comment to get reactions for.'
+          c.flag 'full', desc: 'If true always return the complete reaction list.'
+          c.flag 'timestamp', desc: 'Timestamp of the message to get reactions for.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.reactions_get(options))
+          end
+        end
 
-  g.desc 'Lists reactions made by a user.'
-  g.long_desc %( Lists reactions made by a user. )
-  g.command 'list' do |c|
-    c.flag 'full', desc: 'If true always return the complete reaction list.'
-    c.flag 'user', desc: 'Show reactions made by this user. Defaults to the authed user.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.reactions_list(options))
-    end
-  end
+        g.desc 'Lists reactions made by a user.'
+        g.long_desc %( Lists reactions made by a user. )
+        g.command 'list' do |c|
+          c.flag 'cursor', desc: "Parameter for pagination. Set cursor equal to the next_cursor attribute returned by the previous request's response_metadata. This parameter is optional, but pagination is mandatory: the default value simply fetches the first 'page' of the collection. See pagination for more details."
+          c.flag 'full', desc: 'If true always return the complete reaction list.'
+          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 list hasn't been reached."
+          c.flag 'team_id', desc: 'encoded team id to list reactions in, required if org token is used.'
+          c.flag 'user', desc: 'Show reactions made by this user. Defaults to the authed user.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.reactions_list(options))
+          end
+        end
 
-  g.desc 'Removes a reaction from an item.'
-  g.long_desc %( Removes a reaction from an item. )
-  g.command 'remove' do |c|
-    c.flag 'name', desc: 'Reaction (emoji) name.'
-    c.flag 'channel', desc: 'Channel where the message to remove reaction from was posted.'
-    c.flag 'file', desc: 'File to remove reaction from.'
-    c.flag 'file_comment', desc: 'File comment to remove reaction from.'
-    c.flag 'timestamp', desc: 'Timestamp of the message to remove reaction from.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.reactions_remove(options))
+        g.desc 'Removes a reaction from an item.'
+        g.long_desc %( Removes a reaction from an item. )
+        g.command 'remove' do |c|
+          c.flag 'name', desc: 'Reaction (emoji) name.'
+          c.flag 'channel', desc: 'Channel where the message to remove reaction from was posted.'
+          c.flag 'file', desc: 'File to remove reaction from.'
+          c.flag 'file_comment', desc: 'File comment to remove reaction from.'
+          c.flag 'timestamp', desc: 'Timestamp of the message to remove reaction from.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.reactions_remove(options))
+          end
+        end
+      end
     end
   end
 end

data/bin/commands/reminders.rb

@@ -1,50 +1,63 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
-desc 'Reminders methods.'
-command 'reminders' do |g|
-  g.desc 'Creates a reminder.'
-  g.long_desc %( Creates a reminder. )
-  g.command 'add' do |c|
-    c.flag 'text', desc: 'The content of the reminder.'
-    c.flag 'time', desc: 'When this reminder should happen: the Unix timestamp (up to five years from now), the number of seconds until the reminder (if within 24 hours), or a natural language description (Ex. "in 15 minutes," or "every Thursday").'
-    c.flag 'user', desc: 'The user who will receive the reminder. If no user is specified, the reminder will go to user who created it.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.reminders_add(options))
-    end
-  end
+module Slack
+  module Cli
+    class App
+      desc 'Reminders methods.'
+      command 'reminders' do |g|
+        g.desc 'Creates a reminder.'
+        g.long_desc %( Creates a reminder. )
+        g.command 'add' do |c|
+          c.flag 'text', desc: 'The content of the reminder.'
+          c.flag 'time', desc: 'Can also take a type of integer. When this reminder should happen: the Unix timestamp (up to five years from now), the number of seconds until the reminder (if within 24 hours), or a natural language description (Ex. "in 15 minutes," or "every Thursday").'
+          c.flag 'recurrence', desc: 'Specify the repeating behavior of a reminder. Available options: daily, weekly, monthly, or yearly. If weekly, may further specify the days of the week.'
+          c.flag 'team_id', desc: 'Encoded team id, required if org token is used.'
+          c.flag 'user', desc: 'No longer supported - reminders cannot be set for other users. Previously, was the user who would receive the reminder.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.reminders_add(options))
+          end
+        end
 
-  g.desc 'Marks a reminder as complete.'
-  g.long_desc %( Marks a reminder as complete. )
-  g.command 'complete' do |c|
-    c.flag 'reminder', desc: 'The ID of the reminder to be marked as complete.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.reminders_complete(options))
-    end
-  end
+        g.desc 'Marks a reminder as complete.'
+        g.long_desc %( Marks a reminder as complete. )
+        g.command 'complete' do |c|
+          c.flag 'reminder', desc: 'The ID of the reminder to be marked as complete.'
+          c.flag 'team_id', desc: 'Encoded team id, required if org token is used.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.reminders_complete(options))
+          end
+        end
 
-  g.desc 'Deletes a reminder.'
-  g.long_desc %( Deletes a reminder. )
-  g.command 'delete' do |c|
-    c.flag 'reminder', desc: 'The ID of the reminder.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.reminders_delete(options))
-    end
-  end
+        g.desc 'Deletes a reminder.'
+        g.long_desc %( Deletes a reminder. )
+        g.command 'delete' do |c|
+          c.flag 'reminder', desc: 'The ID of the reminder.'
+          c.flag 'team_id', desc: 'Encoded team id, required if org token is used.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.reminders_delete(options))
+          end
+        end
 
-  g.desc 'Gets information about a reminder.'
-  g.long_desc %( Gets information about a reminder. )
-  g.command 'info' do |c|
-    c.flag 'reminder', desc: 'The ID of the reminder.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.reminders_info(options))
-    end
-  end
+        g.desc 'Gets information about a reminder.'
+        g.long_desc %( Gets information about a reminder. )
+        g.command 'info' do |c|
+          c.flag 'reminder', desc: 'The ID of the reminder.'
+          c.flag 'team_id', desc: 'Encoded team id, required if org token is passed.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.reminders_info(options))
+          end
+        end
 
-  g.desc 'Lists all reminders created by or for a given user.'
-  g.long_desc %( Lists all reminders created by or for a given user. )
-  g.command 'list' do |c|
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.reminders_list(options))
+        g.desc 'Lists all reminders created by or for a given user.'
+        g.long_desc %( Lists all reminders created by or for a given user. )
+        g.command 'list' do |c|
+          c.flag 'team_id', desc: 'Encoded team id, required if org token is passed.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.reminders_list(options))
+          end
+        end
+      end
     end
   end
 end

data/bin/commands/rtm.rb

@@ -1,27 +1,21 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
-desc 'Rtm methods.'
-command 'rtm' do |g|
-  g.desc 'Starts a Real Time Messaging session.'
-  g.long_desc %( Starts a Real Time Messaging session. )
-  g.command 'connect' do |c|
-    c.flag 'batch_presence_aware', desc: 'Only deliver presence events when requested by subscription. See presence subscriptions.'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.rtm_connect(options))
-    end
-  end
-
-  g.desc 'Starts a Real Time Messaging session.'
-  g.long_desc %( Starts a Real Time Messaging session. )
-  g.command 'start' do |c|
-    c.flag 'batch_presence_aware', desc: 'Only deliver presence events when requested by subscription. See presence subscriptions.'
-    c.flag 'include_locale', desc: 'Set this to true to receive the locale for users and channels. Defaults to false.'
-    c.flag 'mpim_aware', desc: 'Returns MPIMs to the client in the API response.'
-    c.flag 'no_latest', desc: 'Exclude latest timestamps for channels, groups, mpims, and ims. Automatically sets no_unreads to 1.'
-    c.flag 'no_unreads', desc: 'Skip unread counts for each channel (improves performance).'
-    c.flag 'simple_latest', desc: 'Return timestamp only for latest message object of each channel (improves performance).'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.rtm_start(options))
+module Slack
+  module Cli
+    class App
+      desc 'Rtm methods.'
+      command 'rtm' do |g|
+        g.desc 'Starts a Real Time Messaging session.'
+        g.long_desc %( Starts a Real Time Messaging session. )
+        g.command 'connect' do |c|
+          c.flag 'batch_presence_aware', desc: 'Batch presence deliveries via subscription. Enabling changes the shape of presence_change events. See batch presence.'
+          c.flag 'presence_sub', desc: 'Only deliver presence events when requested by subscription. See presence subscriptions.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.rtm_connect(options))
+          end
+        end
+      end
     end
   end
 end

data/bin/commands/search.rb

@@ -1,40 +1,51 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
-desc "Search your team's files and messages."
-command 'search' do |g|
-  g.desc 'Searches for messages and files matching a query.'
-  g.long_desc %( Searches for messages and files matching a query. )
-  g.command 'all' do |c|
-    c.flag 'query', desc: 'Search query. May contains booleans, etc.'
-    c.flag 'highlight', desc: 'Pass a value of true to enable query highlight markers (see below).'
-    c.flag 'sort', desc: 'Return matches sorted by either score or timestamp.'
-    c.flag 'sort_dir', desc: 'Change sort direction to ascending (asc) or descending (desc).'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.search_all(options))
-    end
-  end
+module Slack
+  module Cli
+    class App
+      desc 'Search methods.'
+      command 'search' do |g|
+        g.desc 'Searches for messages and files matching a query.'
+        g.long_desc %( Searches for messages and files matching a query. )
+        g.command 'all' do |c|
+          c.flag 'query', desc: 'Search query. May contains booleans, etc.'
+          c.flag 'highlight', desc: 'Pass a value of true to enable query highlight markers (see below).'
+          c.flag 'sort', desc: 'Return matches sorted by either score or timestamp.'
+          c.flag 'sort_dir', desc: 'Change sort direction to ascending (asc) or descending (desc).'
+          c.flag 'team_id', desc: 'encoded team id to search in, required if org token is used.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.search_all(options))
+          end
+        end
 
-  g.desc 'Searches for files matching a query.'
-  g.long_desc %( Searches for files matching a query. )
-  g.command 'files' do |c|
-    c.flag 'query', desc: 'Search query. May contain booleans, etc.'
-    c.flag 'highlight', desc: 'Pass a value of true to enable query highlight markers (see below).'
-    c.flag 'sort', desc: 'Return matches sorted by either score or timestamp.'
-    c.flag 'sort_dir', desc: 'Change sort direction to ascending (asc) or descending (desc).'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.search_files(options))
-    end
-  end
+        g.desc 'Searches for files matching a query.'
+        g.long_desc %( Searches for files matching a query. )
+        g.command 'files' do |c|
+          c.flag 'query', desc: 'Search query.'
+          c.flag 'highlight', desc: 'Pass a value of true to enable query highlight markers (see below).'
+          c.flag 'sort', desc: 'Return matches sorted by either score or timestamp.'
+          c.flag 'sort_dir', desc: 'Change sort direction to ascending (asc) or descending (desc).'
+          c.flag 'team_id', desc: 'encoded team id to search in, required if org token is used.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.search_files(options))
+          end
+        end
 
-  g.desc 'Searches for messages matching a query.'
-  g.long_desc %( Searches for messages matching a query. )
-  g.command 'messages' do |c|
-    c.flag 'query', desc: 'Search query. May contains booleans, etc.'
-    c.flag 'highlight', desc: 'Pass a value of true to enable query highlight markers (see below).'
-    c.flag 'sort', desc: 'Return matches sorted by either score or timestamp.'
-    c.flag 'sort_dir', desc: 'Change sort direction to ascending (asc) or descending (desc).'
-    c.action do |_global_options, options, _args|
-      puts JSON.dump($client.search_messages(options))
+        g.desc 'Searches for messages matching a query.'
+        g.long_desc %( Searches for messages matching a query. )
+        g.command 'messages' do |c|
+          c.flag 'query', desc: 'Search query.'
+          c.flag 'cursor', desc: "Use this when getting results with cursormark pagination. For first call send * for subsequent calls, send the value of next_cursor returned in the previous call's results."
+          c.flag 'highlight', desc: 'Pass a value of true to enable query highlight markers (see below).'
+          c.flag 'sort', desc: 'Return matches sorted by either score or timestamp.'
+          c.flag 'sort_dir', desc: 'Change sort direction to ascending (asc) or descending (desc).'
+          c.flag 'team_id', desc: 'encoded team id to search in, required if org token is used.'
+          c.action do |_global_options, options, _args|
+            puts JSON.dump(@client.search_messages(options))
+          end
+        end
+      end
     end
   end
 end