slack-ruby-client 0.14.6 → 1.0.0

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

@@ -6,6 +6,42 @@ module Slack
     module Api
       module Endpoints
         module Conversations
+          #
+          # Accepts an invitation to a Slack Connect channel.
+          #
+          # @option options [string] :channel_name
+          #   Name of the channel. If the channel does not exist already in your workspace, this name is the one that the channel will take.
+          # @option options [Object] :channel_id
+          #   ID of the channel that you'd like to accept. Must provide either invite_id or channel_id.
+          # @option options [boolean] :free_trial_accepted
+          #   Whether you'd like to use your workspace's free trial to begin using Slack Connect.
+          # @option options [Object] :invite_id
+          #   See the shared_channel_invite_received event payload for more details on how to retrieve the ID of the invitation.
+          # @option options [boolean] :is_private
+          #   Whether the channel should be private.
+          # @option options [string] :team_id
+          #   The ID of the workspace to accept the channel in. If an org-level token is used to call this method, the team_id argument is required.
+          # @see https://api.slack.com/methods/conversations.acceptSharedInvite
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.acceptSharedInvite.json
+          def conversations_acceptSharedInvite(options = {})
+            throw ArgumentError.new('Required arguments :channel_name missing') if options[:channel_name].nil?
+            post('conversations.acceptSharedInvite', options)
+          end
+
+          #
+          # Approves an invitation to a Slack Connect channel
+          #
+          # @option options [Object] :invite_id
+          #   ID of the shared channel invite to approve.
+          # @option options [Object] :target_team
+          #   The team or enterprise id of the other party involved in the invitation you are approving.
+          # @see https://api.slack.com/methods/conversations.approveSharedInvite
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.approveSharedInvite.json
+          def conversations_approveSharedInvite(options = {})
+            throw ArgumentError.new('Required arguments :invite_id missing') if options[:invite_id].nil?
+            post('conversations.approveSharedInvite', options)
+          end
+
           #
           # Archives a conversation.
           #
@@ -15,7 +51,7 @@ module Slack
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.archive.json
           def conversations_archive(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('conversations.archive', options)
           end
 
@@ -28,19 +64,19 @@ module Slack
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.close.json
           def conversations_close(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('conversations.close', options)
           end
 
           #
           # Initiates a public or private channel-based conversation
           #
-          # @option options [Object] :name
+          # @option options [string] :name
           #   Name of the public or private channel to create.
-          # @option options [Object] :is_private
+          # @option options [boolean] :is_private
           #   Create a private channel instead of a public one.
-          # @option options [Object] :user_ids
-          #   Required for workspace apps. A list of between 1 and 30 human users that will be added to the newly-created conversation. This argument has no effect when used by classic Slack apps.
+          # @option options [string] :team_id
+          #   encoded team id to create the channel in, required if org token is used.
           # @see https://api.slack.com/methods/conversations.create
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.create.json
           def conversations_create(options = {})
@@ -48,18 +84,32 @@ module Slack
             post('conversations.create', options)
           end
 
+          #
+          # Declines a Slack Connect channel invite.
+          #
+          # @option options [Object] :invite_id
+          #   ID of the Slack Connect invite to decline. Subscribe to the shared_channel_invite_accepted event to receive IDs of Slack Connect channel invites that have been accepted and are awaiting approval.
+          # @option options [Object] :target_team
+          #   The team or enterprise id of the other party involved in the invitation you are declining.
+          # @see https://api.slack.com/methods/conversations.declineSharedInvite
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.declineSharedInvite.json
+          def conversations_declineSharedInvite(options = {})
+            throw ArgumentError.new('Required arguments :invite_id missing') if options[:invite_id].nil?
+            post('conversations.declineSharedInvite', options)
+          end
+
           #
           # Fetches a conversation's history of messages and events.
           #
           # @option options [channel] :channel
           #   Conversation ID to fetch history for.
-          # @option options [Object] :cursor
+          # @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 [Object] :inclusive
+          # @option options [boolean] :inclusive
           #   Include messages with latest or oldest timestamp in results only when either timestamp is specified.
           # @option options [timestamp] :latest
-          #   End of time range of messages to include in results.
-          # @option options [Object] :limit
+          #   End of time range of messages to include in results. Default is the current time.
+          # @option options [number] :limit
           #   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.
           # @option options [timestamp] :oldest
           #   Start of time range of messages to include in results.
@@ -67,7 +117,7 @@ module Slack
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.history.json
           def conversations_history(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             if block_given?
               Pagination::Cursor.new(self, :conversations_history, options).each do |page|
                 yield page
@@ -82,15 +132,15 @@ module Slack
           #
           # @option options [channel] :channel
           #   Conversation ID to learn more about.
-          # @option options [Object] :include_locale
+          # @option options [boolean] :include_locale
           #   Set this to true to receive the locale for this conversation. Defaults to false.
-          # @option options [Object] :include_num_members
+          # @option options [boolean] :include_num_members
           #   Set to true to include the member count for the specified conversation. Defaults to false.
           # @see https://api.slack.com/methods/conversations.info
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.info.json
           def conversations_info(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('conversations.info', options)
           end
 
@@ -99,17 +149,36 @@ module Slack
           #
           # @option options [channel] :channel
           #   The ID of the public or private channel to invite user(s) to.
-          # @option options [Object] :users
+          # @option options [string] :users
           #   A comma separated list of user IDs. Up to 1000 users may be listed.
           # @see https://api.slack.com/methods/conversations.invite
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.invite.json
           def conversations_invite(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
             throw ArgumentError.new('Required arguments :users missing') if options[:users].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('conversations.invite', options)
           end
 
+          #
+          # Sends an invitation to a Slack Connect channel
+          #
+          # @option options [channel] :channel
+          #   ID of the channel on your team that you'd like to share.
+          # @option options [array] :emails
+          #   Optional email to receive this invite. Either emails or user_ids must be provided.
+          # @option options [boolean] :external_limited
+          #   Optional boolean on whether invite is to a external limited member. Defaults to true.
+          # @option options [array] :user_ids
+          #   Optional user_id to receive this invite. Either emails or user_ids must be provided.
+          # @see https://api.slack.com/methods/conversations.inviteShared
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.inviteShared.json
+          def conversations_inviteShared(options = {})
+            throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
+            post('conversations.inviteShared', options)
+          end
+
           #
           # Joins an existing conversation.
           #
@@ -119,7 +188,7 @@ module Slack
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.join.json
           def conversations_join(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('conversations.join', options)
           end
 
@@ -135,7 +204,7 @@ module Slack
           def conversations_kick(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
             throw ArgumentError.new('Required arguments :user missing') if options[:user].nil?
-            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('conversations.kick', options)
           end
@@ -149,20 +218,22 @@ module Slack
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.leave.json
           def conversations_leave(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('conversations.leave', options)
           end
 
           #
           # Lists all channels in a Slack team.
           #
-          # @option options [Object] :cursor
+          # @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 [Object] :exclude_archived
+          # @option options [boolean] :exclude_archived
           #   Set to true to exclude archived channels from the list.
-          # @option options [Object] :limit
+          # @option options [number] :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. Must be an integer no larger than 1000.
-          # @option options [Object] :types
+          # @option options [string] :team_id
+          #   encoded team id to list channels in, required if token belongs to org-wide app.
+          # @option options [string] :types
           #   Mix and match channel types by providing a comma-separated list of any combination of public_channel, private_channel, mpim, im.
           # @see https://api.slack.com/methods/conversations.list
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.list.json
@@ -176,20 +247,55 @@ module Slack
             end
           end
 
+          #
+          # Lists shared channel invites that have been generated or received but have not been approved by all parties
+          #
+          # @option options [string] :cursor
+          #   Set to next_cursor returned by previous call to list items in subsequent page.
+          # @option options [string] :team_id
+          #   Encoded team id for the workspace to retrieve invites for, required if org token is used.
+          # @see https://api.slack.com/methods/conversations.listConnectInvites
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.listConnectInvites.json
+          def conversations_listConnectInvites(options = {})
+            if block_given?
+              Pagination::Cursor.new(self, :conversations_listConnectInvites, options).each do |page|
+                yield page
+              end
+            else
+              post('conversations.listConnectInvites', options)
+            end
+          end
+
+          #
+          # Sets the read cursor in a channel.
+          #
+          # @option options [channel] :channel
+          #   Channel or conversation to set the read cursor for.
+          # @option options [timestamp] :ts
+          #   Unique identifier of message you want marked as most recently seen in this conversation.
+          # @see https://api.slack.com/methods/conversations.mark
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.mark.json
+          def conversations_mark(options = {})
+            throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
+            throw ArgumentError.new('Required arguments :ts missing') if options[:ts].nil?
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
+            post('conversations.mark', options)
+          end
+
           #
           # Retrieve members of a conversation.
           #
           # @option options [channel] :channel
           #   ID of the conversation to retrieve members for.
-          # @option options [Object] :cursor
+          # @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 [Object] :limit
+          # @option options [number] :limit
           #   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.
           # @see https://api.slack.com/methods/conversations.members
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.members.json
           def conversations_members(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             if block_given?
               Pagination::Cursor.new(self, :conversations_members, options).each do |page|
                 yield page
@@ -204,14 +310,16 @@ module Slack
           #
           # @option options [channel] :channel
           #   Resume a conversation by supplying an im or mpim's ID. Or provide the users field instead.
-          # @option options [Object] :return_im
+          # @option options [boolean] :prevent_creation
+          #   Do not create a direct message or multi-person direct message. This is used to see if there is an existing dm or mpdm.
+          # @option options [boolean] :return_im
           #   Boolean, indicates you want the full IM channel definition in the response.
-          # @option options [Object] :users
+          # @option options [string] :users
           #   Comma separated lists of users. If only one user is included, this creates a 1:1 DM.  The ordering of the users is preserved whenever a multi-person direct message is returned. Supply a channel when not supplying users.
           # @see https://api.slack.com/methods/conversations.open
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.open.json
           def conversations_open(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]
             post('conversations.open', options)
           end
 
@@ -220,14 +328,14 @@ module Slack
           #
           # @option options [channel] :channel
           #   ID of conversation to rename.
-          # @option options [Object] :name
+          # @option options [string] :name
           #   New name for conversation.
           # @see https://api.slack.com/methods/conversations.rename
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.rename.json
           def conversations_rename(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
             throw ArgumentError.new('Required arguments :name missing') if options[:name].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('conversations.rename', options)
           end
 
@@ -237,14 +345,14 @@ module Slack
           # @option options [channel] :channel
           #   Conversation ID to fetch thread from.
           # @option options [timestamp] :ts
-          #   Unique identifier of a thread's parent message.
-          # @option options [Object] :cursor
+          #   Unique identifier of either a thread's parent message or a message in the thread. ts must be the timestamp of an existing message with 0 or more replies. If there are no replies then just the single message referenced by ts will return - it is just an ordinary, unthreaded message.
+          # @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 [Object] :inclusive
+          # @option options [boolean] :inclusive
           #   Include messages with latest or oldest timestamp in results only when either timestamp is specified.
           # @option options [timestamp] :latest
           #   End of time range of messages to include in results.
-          # @option options [Object] :limit
+          # @option options [number] :limit
           #   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.
           # @option options [timestamp] :oldest
           #   Start of time range of messages to include in results.
@@ -253,7 +361,7 @@ module Slack
           def conversations_replies(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
             throw ArgumentError.new('Required arguments :ts missing') if options[:ts].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             if block_given?
               Pagination::Cursor.new(self, :conversations_replies, options).each do |page|
                 yield page
@@ -268,14 +376,14 @@ module Slack
           #
           # @option options [channel] :channel
           #   Conversation to set the purpose of.
-          # @option options [Object] :purpose
+          # @option options [string] :purpose
           #   A new, specialer purpose.
           # @see https://api.slack.com/methods/conversations.setPurpose
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.setPurpose.json
           def conversations_setPurpose(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
             throw ArgumentError.new('Required arguments :purpose missing') if options[:purpose].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('conversations.setPurpose', options)
           end
 
@@ -284,14 +392,14 @@ module Slack
           #
           # @option options [channel] :channel
           #   Conversation to set the topic of.
-          # @option options [Object] :topic
+          # @option options [string] :topic
           #   The new topic string. Does not support formatting or linkification.
           # @see https://api.slack.com/methods/conversations.setTopic
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.setTopic.json
           def conversations_setTopic(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
             throw ArgumentError.new('Required arguments :topic missing') if options[:topic].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('conversations.setTopic', options)
           end
 
@@ -304,7 +412,7 @@ module Slack
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/conversations/conversations.unarchive.json
           def conversations_unarchive(options = {})
             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
             post('conversations.unarchive', options)
           end
         end

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

@@ -9,9 +9,9 @@ module Slack
           #
           # Open a dialog with a user
           #
-          # @option options [Object] :dialog
+          # @option options [string] :dialog
           #   The dialog definition. This must be a JSON-encoded string.
-          # @option options [Object] :trigger_id
+          # @option options [string] :trigger_id
           #   Exchange a trigger to post to the user.
           # @see https://api.slack.com/methods/dialog.open
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/dialog/dialog.open.json

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

@@ -27,6 +27,8 @@ module Slack
           #
           # Retrieves a user's current Do Not Disturb status.
           #
+          # @option options [string] :team_id
+          #   Encoded team id where passed in user param belongs, required if org token is used. If no user param is passed, then a team which has access to the app should be passed.
           # @option options [user] :user
           #   User to fetch status for (defaults to current user).
           # @see https://api.slack.com/methods/dnd.info
@@ -39,20 +41,21 @@ module Slack
           #
           # Turns on Do Not Disturb mode for the current user, or changes its duration.
           #
-          # @option options [Object] :num_minutes
+          # @option options [string] :num_minutes
           #   Number of minutes, from now, to snooze until.
           # @see https://api.slack.com/methods/dnd.setSnooze
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/dnd/dnd.setSnooze.json
           def dnd_setSnooze(options = {})
-            throw ArgumentError.new('Required arguments :num_minutes missing') if options[:num_minutes].nil?
             post('dnd.setSnooze', options)
           end
 
           #
           # Retrieves the Do Not Disturb status for up to 50 users on a team.
           #
-          # @option options [Object] :users
+          # @option options [string] :users
           #   Comma-separated list of users to fetch Do Not Disturb status for.
+          # @option options [string] :team_id
+          #   Encoded team id where passed in users belong, required if org token is used.
           # @see https://api.slack.com/methods/dnd.teamInfo
           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/dnd/dnd.teamInfo.json
           def dnd_teamInfo(options = {})

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

@@ -36,13 +36,13 @@ module Slack
           end
 
           #
-          # Gets information about a team file.
+          # 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
@@ -58,24 +58,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] :show_files_hidden_by_limit
+          # @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 [Object] :ts_from
+          # @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
+          # @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
@@ -103,7 +107,7 @@ module Slack
           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]
+            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
@@ -123,21 +127,21 @@ module Slack
           #
           # 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

@@ -11,7 +11,7 @@ module Slack
           #
           # @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