slack-ruby-client 0.13.1 → 2.0.0

data/lib/slack/web/api/endpoints/files.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
 module Slack
@@ -5,6 +6,24 @@ module Slack
     module Api
       module Endpoints
         module Files
+          #
+          # Finishes an upload started with files.getUploadURLExternal
+          #
+          # @option options [array] :files
+          #   Array of file ids and their corresponding (optional) titles.
+          # @option options [Object] :channel_id
+          #   Channel ID where the file will be shared. If not specified the file will be private.
+          # @option options [string] :initial_comment
+          #   The message text introducing the file in specified channels.
+          # @option options [string] :thread_ts
+          #   Provide another message's ts value to upload this file as a reply. Never use a reply's ts value; use its parent instead.
+          # @see https://api.slack.com/methods/files.completeUploadExternal
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files/files.completeUploadExternal.json
+          def files_completeUploadExternal(options = {})
+            raise ArgumentError, 'Required arguments :files missing' if options[:files].nil?
+            post('files.completeUploadExternal', options)
+          end
+
           #
           # Deletes a file.
           #
@@ -13,7 +32,7 @@ module Slack
           # @see https://api.slack.com/methods/files.delete
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files/files.delete.json
           def files_delete(options = {})
-            throw ArgumentError.new('Required arguments :file missing') if options[:file].nil?
+            raise ArgumentError, 'Required arguments :file missing' if options[:file].nil?
             post('files.delete', options)
           end
 
@@ -28,25 +47,44 @@ module Slack
           #   New filetype of the file. See https://api.slack.com/types/file#file_types for a list of all supported types.
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/undocumented/files/files.edit.json
           def files_edit(options = {})
-            throw ArgumentError.new('Required arguments :file missing') if options[:file].nil?
-            throw ArgumentError.new('Required arguments :title missing') if options[:title].nil?
+            raise ArgumentError, 'Required arguments :file missing' if options[:file].nil?
+            raise ArgumentError, 'Required arguments :title missing' if options[:title].nil?
             logger.warn('The files.edit method is undocumented.')
             post('files.edit', options)
           end
 
           #
-          # Gets information about a team file.
+          # Gets a URL for an edge external file upload
+          #
+          # @option options [string] :filename
+          #   Name of the file being uploaded.
+          # @option options [integer] :length
+          #   Size in bytes of the file being uploaded.
+          # @option options [string] :alt_txt
+          #   Description of image for screen-reader.
+          # @option options [string] :snippet_type
+          #   Syntax type of the snippet being uploaded.
+          # @see https://api.slack.com/methods/files.getUploadURLExternal
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files/files.getUploadURLExternal.json
+          def files_getUploadURLExternal(options = {})
+            raise ArgumentError, 'Required arguments :filename missing' if options[:filename].nil?
+            raise ArgumentError, 'Required arguments :length missing' if options[:length].nil?
+            post('files.getUploadURLExternal', options)
+          end
+
+          #
+          # Gets information about a file.
           #
           # @option options [file] :file
           #   Specify a file by providing its ID.
-          # @option options [Object] :cursor
+          # @option options [string] :cursor
           #   Parameter for pagination. File comments are paginated for a single file. 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 of comments. See pagination for more details.
-          # @option options [Object] :limit
+          # @option options [integer] :limit
           #   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.
           # @see https://api.slack.com/methods/files.info
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files/files.info.json
           def files_info(options = {})
-            throw ArgumentError.new('Required arguments :file missing') if options[:file].nil?
+            raise ArgumentError, 'Required arguments :file missing' if options[:file].nil?
             if block_given?
               Pagination::Cursor.new(self, :files_info, options).each do |page|
                 yield page
@@ -57,34 +95,28 @@ module Slack
           end
 
           #
-          # Lists & filters team files.
+          # List for a team, in a channel, or from a user with applied filters.
           #
           # @option options [channel] :channel
           #   Filter files appearing in a specific channel, indicated by its ID.
-          # @option options [Object] :ts_from
+          # @option options [string] :files
+          #   .
+          # @option options [boolean] :show_files_hidden_by_limit
+          #   Show truncated file info for files hidden due to being too old, and the team who owns the file being over the file limit.
+          # @option options [string] :team_id
+          #   encoded team id to list files in, required if org token is used.
+          # @option options [string] :ts_from
           #   Filter files created after this timestamp (inclusive).
-          # @option options [Object] :ts_to
+          # @option options [string] :ts_to
           #   Filter files created before this timestamp (inclusive).
-          # @option options [Object] :types
-          #   Filter files by type:
-          #
-          #   all - All files
-          #   spaces - Posts
-          #   snippets - Snippets
-          #   images - Image files
-          #   gdocs - Google docs
-          #   zips - Zip files
-          #   pdfs - PDF files
-          #
-          #
-          #   You can pass multiple values in the types argument, like types=spaces,snippets.The default value is all, which does not filter the list.
-          #   .
+          # @option options [string] :types
+          #   Filter files by type (see below). You can pass multiple values in the types argument, like types=spaces,snippets.The default value is all, which does not filter the list.
           # @option options [user] :user
           #   Filter files created by a single user.
           # @see https://api.slack.com/methods/files.list
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files/files.list.json
           def files_list(options = {})
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             options = options.merge(user: users_id(options)['user']['id']) if options[:user]
             post('files.list', options)
           end
@@ -97,7 +129,7 @@ module Slack
           # @see https://api.slack.com/methods/files.revokePublicURL
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files/files.revokePublicURL.json
           def files_revokePublicURL(options = {})
-            throw ArgumentError.new('Required arguments :file missing') if options[:file].nil?
+            raise ArgumentError, 'Required arguments :file missing' if options[:file].nil?
             post('files.revokePublicURL', options)
           end
 
@@ -110,9 +142,9 @@ module Slack
           #   Channel to share the file in. Works with both public (channel ID) and private channels (group ID).
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/undocumented/files/files.share.json
           def files_share(options = {})
-            throw ArgumentError.new('Required arguments :file missing') if options[:file].nil?
-            throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            raise ArgumentError, 'Required arguments :file missing' if options[:file].nil?
+            raise ArgumentError, 'Required arguments :channel missing' if options[:channel].nil?
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             logger.warn('The files.share method is undocumented.')
             post('files.share', options)
           end
@@ -125,28 +157,28 @@ module Slack
           # @see https://api.slack.com/methods/files.sharedPublicURL
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files/files.sharedPublicURL.json
           def files_sharedPublicURL(options = {})
-            throw ArgumentError.new('Required arguments :file missing') if options[:file].nil?
+            raise ArgumentError, 'Required arguments :file missing' if options[:file].nil?
             post('files.sharedPublicURL', options)
           end
 
           #
           # Uploads or creates a file.
           #
-          # @option options [Object] :channels
+          # @option options [string] :channels
           #   Comma-separated list of channel names or IDs where the file will be shared.
-          # @option options [Object] :content
+          # @option options [string] :content
           #   File contents via a POST variable. If omitting this parameter, you must provide a file.
           # @option options [file] :file
           #   File contents via multipart/form-data. If omitting this parameter, you must submit content.
-          # @option options [Object] :filename
+          # @option options [string] :filename
           #   Filename of file.
-          # @option options [Object] :filetype
+          # @option options [string] :filetype
           #   A file type identifier.
-          # @option options [Object] :initial_comment
+          # @option options [string] :initial_comment
           #   The message text introducing the file in specified channels.
-          # @option options [Object] :thread_ts
+          # @option options [string] :thread_ts
           #   Provide another message's ts value to upload this file as a reply. Never use a reply's ts value; use its parent instead.
-          # @option options [Object] :title
+          # @option options [string] :title
           #   Title of file.
           # @see https://api.slack.com/methods/files.upload
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files/files.upload.json

data/lib/slack/web/api/endpoints/files_comments.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
 module Slack
@@ -5,53 +6,20 @@ module Slack
     module Api
       module Endpoints
         module FilesComments
-          #
-          # Add a comment to an existing file.
-          #
-          # @option options [Object] :comment
-          #   Text of the comment to add.
-          # @option options [file] :file
-          #   File to add a comment to.
-          # @see https://api.slack.com/methods/files.comments.add
-          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files.comments/files.comments.add.json
-          def files_comments_add(options = {})
-            throw ArgumentError.new('Required arguments :comment missing') if options[:comment].nil?
-            throw ArgumentError.new('Required arguments :file missing') if options[:file].nil?
-            post('files.comments.add', options)
-          end
-
           #
           # Deletes an existing comment on a file.
           #
           # @option options [file] :file
           #   File to delete a comment from.
-          # @option options [Object] :id
+          # @option options [string] :id
           #   The comment to delete.
           # @see https://api.slack.com/methods/files.comments.delete
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files.comments/files.comments.delete.json
           def files_comments_delete(options = {})
-            throw ArgumentError.new('Required arguments :file missing') if options[:file].nil?
-            throw ArgumentError.new('Required arguments :id missing') if options[:id].nil?
+            raise ArgumentError, 'Required arguments :file missing' if options[:file].nil?
+            raise ArgumentError, 'Required arguments :id missing' if options[:id].nil?
             post('files.comments.delete', options)
           end
-
-          #
-          # Edit an existing file comment.
-          #
-          # @option options [Object] :comment
-          #   Text of the comment to edit.
-          # @option options [file] :file
-          #   File containing the comment to edit.
-          # @option options [Object] :id
-          #   The comment to edit.
-          # @see https://api.slack.com/methods/files.comments.edit
-          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files.comments/files.comments.edit.json
-          def files_comments_edit(options = {})
-            throw ArgumentError.new('Required arguments :comment missing') if options[:comment].nil?
-            throw ArgumentError.new('Required arguments :file missing') if options[:file].nil?
-            throw ArgumentError.new('Required arguments :id missing') if options[:id].nil?
-            post('files.comments.edit', options)
-          end
         end
       end
     end

data/lib/slack/web/api/endpoints/files_remote.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+# This file was auto-generated by lib/tasks/web.rake
+
+module Slack
+  module Web
+    module Api
+      module Endpoints
+        module FilesRemote
+          #
+          # Adds a file from a remote service
+          #
+          # @option options [string] :external_id
+          #   Creator defined GUID for the file.
+          # @option options [string] :external_url
+          #   URL of the remote file.
+          # @option options [string] :title
+          #   Title of the file being shared.
+          # @option options [string] :filetype
+          #   type of file.
+          # @option options [Object] :indexable_file_contents
+          #   A text file (txt, pdf, doc, etc.) containing textual search terms that are used to improve discovery of the remote file.
+          # @option options [Object] :preview_image
+          #   Preview of the document via multipart/form-data.
+          # @see https://api.slack.com/methods/files.remote.add
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files.remote/files.remote.add.json
+          def files_remote_add(options = {})
+            raise ArgumentError, 'Required arguments :external_id missing' if options[:external_id].nil?
+            raise ArgumentError, 'Required arguments :external_url missing' if options[:external_url].nil?
+            raise ArgumentError, 'Required arguments :title missing' if options[:title].nil?
+            post('files.remote.add', options)
+          end
+
+          #
+          # Retrieve information about a remote file added to Slack
+          #
+          # @option options [string] :external_id
+          #   Creator defined GUID for the file.
+          # @option options [file] :file
+          #   Specify a file by providing its ID.
+          # @see https://api.slack.com/methods/files.remote.info
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files.remote/files.remote.info.json
+          def files_remote_info(options = {})
+            post('files.remote.info', options)
+          end
+
+          #
+          # Retrieve information about a remote file added to Slack
+          #
+          # @option options [channel] :channel
+          #   Filter files appearing in a specific channel, indicated by its ID.
+          # @option options [string] :cursor
+          #   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.
+          # @option options [integer] :limit
+          #   The maximum number of items to return.
+          # @option options [string] :ts_from
+          #   Filter files created after this timestamp (inclusive).
+          # @option options [string] :ts_to
+          #   Filter files created before this timestamp (inclusive).
+          # @see https://api.slack.com/methods/files.remote.list
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files.remote/files.remote.list.json
+          def files_remote_list(options = {})
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
+            if block_given?
+              Pagination::Cursor.new(self, :files_remote_list, options).each do |page|
+                yield page
+              end
+            else
+              post('files.remote.list', options)
+            end
+          end
+
+          #
+          # Remove a remote file.
+          #
+          # @option options [string] :external_id
+          #   Creator defined GUID for the file.
+          # @option options [file] :file
+          #   Specify a file by providing its ID.
+          # @see https://api.slack.com/methods/files.remote.remove
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files.remote/files.remote.remove.json
+          def files_remote_remove(options = {})
+            post('files.remote.remove', options)
+          end
+
+          #
+          # Share a remote file into a channel.
+          #
+          # @option options [string] :channels
+          #   Comma-separated list of channel IDs where the file will be shared.
+          # @option options [string] :external_id
+          #   The globally unique identifier (GUID) for the file, as set by the app registering the file with Slack.  Either this field or file or both are required.
+          # @option options [file] :file
+          #   Specify a file registered with Slack by providing its ID. Either this field or external_id or both are required.
+          # @see https://api.slack.com/methods/files.remote.share
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files.remote/files.remote.share.json
+          def files_remote_share(options = {})
+            raise ArgumentError, 'Required arguments :channels missing' if options[:channels].nil?
+            post('files.remote.share', options)
+          end
+
+          #
+          # Updates an existing remote file.
+          #
+          # @option options [string] :external_id
+          #   Creator defined GUID for the file.
+          # @option options [string] :external_url
+          #   URL of the remote file.
+          # @option options [file] :file
+          #   Specify a file by providing its ID.
+          # @option options [string] :filetype
+          #   type of file.
+          # @option options [Object] :indexable_file_contents
+          #   File containing contents that can be used to improve searchability for the remote file.
+          # @option options [Object] :preview_image
+          #   Preview of the document via multipart/form-data.
+          # @option options [string] :title
+          #   Title of the file being shared.
+          # @see https://api.slack.com/methods/files.remote.update
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/files.remote/files.remote.update.json
+          def files_remote_update(options = {})
+            post('files.remote.update', options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/slack/web/api/endpoints/migration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
 module Slack
@@ -8,14 +9,16 @@ module Slack
           #
           # For Enterprise Grid workspaces, map local user IDs to global user IDs
           #
-          # @option options [Object] :users
+          # @option options [array] :users
           #   A comma-separated list of user ids, up to 400 per request.
-          # @option options [Object] :to_old
+          # @option options [string] :team_id
+          #   Specify team_id starts with T in case of Org Token.
+          # @option options [boolean] :to_old
           #   Specify true to convert W global user IDs to workspace-specific U IDs. Defaults to false.
           # @see https://api.slack.com/methods/migration.exchange
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/migration/migration.exchange.json
           def migration_exchange(options = {})
-            throw ArgumentError.new('Required arguments :users missing') if options[:users].nil?
+            raise ArgumentError, 'Required arguments :users missing' if options[:users].nil?
             post('migration.exchange', options)
           end
         end

data/lib/slack/web/api/endpoints/oauth.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
 module Slack
@@ -8,46 +9,21 @@ module Slack
           #
           # Exchanges a temporary OAuth verifier code for an access token.
           #
-          # @option options [Object] :client_id
+          # @option options [string] :client_id
           #   Issued when you created your application.
-          # @option options [Object] :client_secret
+          # @option options [string] :client_secret
           #   Issued when you created your application.
-          # @option options [Object] :code
+          # @option options [string] :code
           #   The code param returned via the OAuth callback.
-          # @option options [Object] :redirect_uri
+          # @option options [string] :redirect_uri
           #   This must match the originally submitted URI (if one was sent).
-          # @option options [Object] :single_channel
-          #   Request the user to add your app only to a single channel.
+          # @option options [boolean] :single_channel
+          #   Request the user to add your app only to a single channel. Only valid with a legacy workspace app.
           # @see https://api.slack.com/methods/oauth.access
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/oauth/oauth.access.json
           def oauth_access(options = {})
-            throw ArgumentError.new('Required arguments :client_id missing') if options[:client_id].nil?
-            throw ArgumentError.new('Required arguments :client_secret missing') if options[:client_secret].nil?
-            throw ArgumentError.new('Required arguments :code missing') if options[:code].nil?
             post('oauth.access', options)
           end
-
-          #
-          # Exchanges a temporary OAuth verifier code for a workspace token.
-          #
-          # @option options [Object] :client_id
-          #   Issued when you created your application.
-          # @option options [Object] :client_secret
-          #   Issued when you created your application.
-          # @option options [Object] :code
-          #   The code param returned via the OAuth callback.
-          # @option options [Object] :redirect_uri
-          #   This must match the originally submitted URI (if one was sent).
-          # @option options [Object] :single_channel
-          #   Request the user to add your app only to a single channel.
-          # @see https://api.slack.com/methods/oauth.token
-          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/oauth/oauth.token.json
-          def oauth_token(options = {})
-            throw ArgumentError.new('Required arguments :client_id missing') if options[:client_id].nil?
-            throw ArgumentError.new('Required arguments :client_secret missing') if options[:client_secret].nil?
-            throw ArgumentError.new('Required arguments :code missing') if options[:code].nil?
-            post('oauth.token', options)
-          end
         end
       end
     end

data/lib/slack/web/api/endpoints/oauth_v2.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+# This file was auto-generated by lib/tasks/web.rake
+
+module Slack
+  module Web
+    module Api
+      module Endpoints
+        module OauthV2
+          #
+          # Exchanges a temporary OAuth verifier code for an access token.
+          #
+          # @option options [string] :client_id
+          #   Issued when you created your application.
+          # @option options [string] :client_secret
+          #   Issued when you created your application.
+          # @option options [string] :code
+          #   The code param returned via the OAuth callback.
+          # @option options [string] :grant_type
+          #   The grant_type param as described in the OAuth spec.
+          # @option options [string] :redirect_uri
+          #   This must match the originally submitted URI (if one was sent).
+          # @option options [string] :refresh_token
+          #   The refresh_token param as described in the OAuth spec.
+          # @see https://api.slack.com/methods/oauth.v2.access
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/oauth.v2/oauth.v2.access.json
+          def oauth_v2_access(options = {})
+            post('oauth.v2.access', options)
+          end
+
+          #
+          # Exchanges a legacy access token for a new expiring access token and refresh token
+          #
+          # @option options [string] :client_id
+          #   Issued when you created your application.
+          # @option options [string] :client_secret
+          #   Issued when you created your application.
+          # @see https://api.slack.com/methods/oauth.v2.exchange
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/oauth.v2/oauth.v2.exchange.json
+          def oauth_v2_exchange(options = {})
+            raise ArgumentError, 'Required arguments :client_id missing' if options[:client_id].nil?
+            raise ArgumentError, 'Required arguments :client_secret missing' if options[:client_secret].nil?
+            post('oauth.v2.exchange', options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/slack/web/api/endpoints/openid_connect.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+# This file was auto-generated by lib/tasks/web.rake
+
+module Slack
+  module Web
+    module Api
+      module Endpoints
+        module OpenidConnect
+          #
+          # Exchanges a temporary OAuth verifier code for an access token for Sign in with Slack.
+          #
+          # @option options [string] :client_id
+          #   Issued when you created your application.
+          # @option options [string] :client_secret
+          #   Issued when you created your application.
+          # @option options [string] :code
+          #   The code param returned via the OAuth callback.
+          # @option options [string] :grant_type
+          #   The grant_type param as described in the OAuth spec.
+          # @option options [string] :redirect_uri
+          #   This must match the originally submitted URI (if one was sent).
+          # @option options [string] :refresh_token
+          #   The refresh_token param as described in the OAuth spec.
+          # @see https://api.slack.com/methods/openid.connect.token
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/openid.connect/openid.connect.token.json
+          def openid_connect_token(options = {})
+            post('openid.connect.token', options)
+          end
+
+          #
+          # Get the identity of a user who has authorized Sign in with Slack.
+          #
+          # @see https://api.slack.com/methods/openid.connect.userInfo
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/openid.connect/openid.connect.userInfo.json
+          def openid_connect_userInfo(options = {})
+            post('openid.connect.userInfo', options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/slack/web/api/endpoints/pins.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
 module Slack
@@ -9,18 +10,14 @@ module Slack
           # Pins an item to a channel.
           #
           # @option options [channel] :channel
-          #   Channel to pin the item in.
-          # @option options [file] :file
-          #   File to pin.
-          # @option options [Object] :file_comment
-          #   File comment to pin.
-          # @option options [Object] :timestamp
-          #   Timestamp of the message to pin.
+          #   Channel to pin the messsage to. You must also include a timestamp when pinning messages.
+          # @option options [string] :timestamp
+          #   Timestamp of the message to pin. You must also include the channel.
           # @see https://api.slack.com/methods/pins.add
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/pins/pins.add.json
           def pins_add(options = {})
-            throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            raise ArgumentError, 'Required arguments :channel missing' if options[:channel].nil?
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('pins.add', options)
           end
 
@@ -32,8 +29,8 @@ module Slack
           # @see https://api.slack.com/methods/pins.list
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/pins/pins.list.json
           def pins_list(options = {})
-            throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            raise ArgumentError, 'Required arguments :channel missing' if options[:channel].nil?
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('pins.list', options)
           end
 
@@ -42,17 +39,13 @@ module Slack
           #
           # @option options [channel] :channel
           #   Channel where the item is pinned to.
-          # @option options [file] :file
-          #   File to un-pin.
-          # @option options [Object] :file_comment
-          #   File comment to un-pin.
-          # @option options [Object] :timestamp
+          # @option options [string] :timestamp
           #   Timestamp of the message to un-pin.
           # @see https://api.slack.com/methods/pins.remove
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/pins/pins.remove.json
           def pins_remove(options = {})
-            throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            raise ArgumentError, 'Required arguments :channel missing' if options[:channel].nil?
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('pins.remove', options)
           end
         end