slack-ruby-client 0.16.0 → 0.17.0

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

@@ -6,108 +6,6 @@ module Slack
     module Api
       module Endpoints
         module Mpim
-          #
-          # Closes a multiparty direct message channel.
-          #
-          # @option options [channel] :channel
-          #   MPIM to close.
-          # @see https://api.slack.com/methods/mpim.close
-          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/mpim/mpim.close.json
-          def mpim_close(options = {})
-            throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
-            logger.warn('mpim.close: This method is deprecated. It will stop functioning in February 2021 and will not work with newly created apps after June 10th, 2020. Alternative methods: conversations.close.')
-            post('mpim.close', options)
-          end
-
-          #
-          # Fetches history of messages and events from a multiparty direct message.
-          #
-          # @option options [channel] :channel
-          #   Multiparty direct message to fetch history for.
-          # @option options [Object] :inclusive
-          #   Include messages with latest or oldest timestamp in results.
-          # @option options [timestamp] :latest
-          #   End of time range of messages to include in results.
-          # @option options [timestamp] :oldest
-          #   Start of time range of messages to include in results.
-          # @option options [Object] :unreads
-          #   Include unread_count_display in the output?.
-          # @see https://api.slack.com/methods/mpim.history
-          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/mpim/mpim.history.json
-          def mpim_history(options = {})
-            throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
-            logger.warn('mpim.history: This method is deprecated. It will stop functioning in February 2021 and will not work with newly created apps after June 10th, 2020. Alternative methods: conversations.history.')
-            post('mpim.history', options)
-          end
-
-          #
-          # Lists multiparty direct message channels for the calling user.
-          #
-          # @option options [Object] :cursor
-          #   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.
-          # @option options [Object] :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/mpim.list
-          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/mpim/mpim.list.json
-          def mpim_list(options = {})
-            logger.warn('mpim.list: This method is deprecated. It will stop functioning in February 2021 and will not work with newly created apps after June 10th, 2020. Alternative methods: conversations.list, users.conversations.')
-            if block_given?
-              Pagination::Cursor.new(self, :mpim_list, options).each do |page|
-                yield page
-              end
-            else
-              post('mpim.list', options)
-            end
-          end
-
-          #
-          # Sets the read cursor in a multiparty direct message 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/mpim.mark
-          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/mpim/mpim.mark.json
-          def mpim_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]
-            logger.warn('mpim.mark: This method is deprecated. It will stop functioning in February 2021 and will not work with newly created apps after June 10th, 2020. Alternative methods: conversations.mark.')
-            post('mpim.mark', options)
-          end
-
-          #
-          # This method opens a multiparty direct message.
-          #
-          # @option options [Object] :users
-          #   Comma separated lists of users.  The ordering of the users is preserved whenever a MPIM group is returned.
-          # @see https://api.slack.com/methods/mpim.open
-          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/mpim/mpim.open.json
-          def mpim_open(options = {})
-            throw ArgumentError.new('Required arguments :users missing') if options[:users].nil?
-            logger.warn('mpim.open: This method is deprecated. It will stop functioning in February 2021 and will not work with newly created apps after June 10th, 2020. Alternative methods: conversations.open.')
-            post('mpim.open', options)
-          end
-
-          #
-          # Retrieve a thread of messages posted to a direct message conversation from a multiparty direct message.
-          #
-          # @option options [channel] :channel
-          #   Multiparty direct message channel to fetch thread from.
-          # @option options [Object] :thread_ts
-          #   Unique identifier of a thread's parent message.
-          # @see https://api.slack.com/methods/mpim.replies
-          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/mpim/mpim.replies.json
-          def mpim_replies(options = {})
-            throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-            throw ArgumentError.new('Required arguments :thread_ts missing') if options[:thread_ts].nil?
-            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
-            logger.warn('mpim.replies: This method is deprecated. It will stop functioning in February 2021 and will not work with newly created apps after June 10th, 2020. Alternative methods: conversations.replies.')
-            post('mpim.replies', options)
-          end
         end
       end
     end

data/lib/slack/web/api/errors.rb

@@ -53,8 +53,6 @@ module Slack
         class CannotFindService < SlackError; end
         class CannotInstallAnOrgInstalledApp < SlackError; end
         class CannotInvalidatePrimaryOwner < SlackError; end
-        class CannotKickHomeTeam < SlackError; end
-        class CannotKickTeam < SlackError; end
         class CannotModifyPrimaryOwner < SlackError; end
         class CannotMoveLocalChannel < SlackError; end
         class CannotParse < SlackError; end
@@ -166,8 +164,8 @@ module Slack
         class FileNotYetAvailable < SlackError; end
         class FileUnderReview < SlackError; end
         class ForbiddenHandle < SlackError; end
+        class ForbiddenTeam < SlackError; end
         class GroupAlreadyLinkedToChannel < SlackError; end
-        class GroupContainsOthers < SlackError; end
         class GroupMustNotBeEmpty < SlackError; end
         class GroupNotFound < SlackError; end
         class HandleAlreadyExists < SlackError; end
@@ -187,6 +185,7 @@ module Slack
         class InvalidCallId < SlackError; end
         class InvalidChannel < SlackError; end
         class InvalidChannelId < SlackError; end
+        class InvalidChannelType < SlackError; end
         class InvalidChannelsLimit < SlackError; end
         class InvalidCharset < SlackError; end
         class InvalidClientId < SlackError; end
@@ -198,7 +197,6 @@ module Slack
         class InvalidEmail < SlackError; end
         class InvalidEventContext < SlackError; end
         class InvalidExternalId < SlackError; end
-        class InvalidForIsMpim < SlackError; end
         class InvalidFormData < SlackError; end
         class InvalidGrantType < SlackError; end
         class InvalidInputs < SlackError; end
@@ -250,12 +248,12 @@ module Slack
         class IsBot < SlackError; end
         class IsInactive < SlackError; end
         class LastMember < SlackError; end
-        class LeavingTeamNotInChannel < SlackError; end
-        class LeavingTeamRequired < SlackError; end
         class LimitRequired < SlackError; end
         class LinkNotFound < SlackError; end
         class MemberAnalyticsDisabled < SlackError; end
         class MessageNotFound < SlackError; end
+        class MetadataNotAvailable < SlackError; end
+        class MetadataOnlyDoesNotSupportDate < SlackError; end
         class MethodDeprecated < SlackError; end
         class MethodNotSupportedForChannelType < SlackError; end
         class MigrationInProgress < SlackError; end
@@ -294,13 +292,13 @@ module Slack
         class NoScopes < SlackError; end
         class NoSuchSubteam < SlackError; end
         class NoTeamIdsGiven < SlackError; end
-        class NoTeamsToDisconnect < SlackError; end
         class NoText < SlackError; end
         class NoUser < SlackError; end
         class NoUserProvided < SlackError; end
         class NoUsersProvided < SlackError; end
         class NotAdmin < SlackError; end
         class NotAllowed < SlackError; end
+        class NotAllowedForGridWorkspace < SlackError; end
         class NotAllowedTokenType < SlackError; end
         class NotAnAdmin < SlackError; end
         class NotAnEnterprise < SlackError; end
@@ -316,13 +314,13 @@ module Slack
         class NotImplemented < SlackError; end
         class NotInChannel < SlackError; end
         class NotInDnd < SlackError; end
-        class NotInGroup < SlackError; end
         class NotPinnable < SlackError; end
         class NotPinned < SlackError; end
         class NotReactable < SlackError; end
         class NotStarred < SlackError; end
         class NotSupported < SlackError; end
         class OauthAuthorizationUrlMismatch < SlackError; end
+        class OneOrMoreInvalidChannels < SlackError; end
         class OrgLevelEmailDisplayDisabled < SlackError; end
         class OrgLoginRequired < SlackError; end
         class OrgNotFound < SlackError; end
@@ -358,6 +356,7 @@ module Slack
         class SessionExpired < SlackError; end
         class SessionInvalidationFailed < SlackError; end
         class SessionNotFound < SlackError; end
+        class SlackConnectBlockedFileType < SlackError; end
         class SlackConnectFileLinkSharingBlocked < SlackError; end
         class SlackConnectFileUploadSharingBlocked < SlackError; end
         class SnoozeEndFailed < SlackError; end
@@ -473,8 +472,6 @@ module Slack
           'cannot_find_service' => CannotFindService,
           'cannot_install_an_org_installed_app' => CannotInstallAnOrgInstalledApp,
           'cannot_invalidate_primary_owner' => CannotInvalidatePrimaryOwner,
-          'cannot_kick_home_team' => CannotKickHomeTeam,
-          'cannot_kick_team' => CannotKickTeam,
           'cannot_modify_primary_owner' => CannotModifyPrimaryOwner,
           'cannot_move_local_channel' => CannotMoveLocalChannel,
           'cannot_parse' => CannotParse,
@@ -586,8 +583,8 @@ module Slack
           'file_not_yet_available' => FileNotYetAvailable,
           'file_under_review' => FileUnderReview,
           'forbidden_handle' => ForbiddenHandle,
+          'forbidden_team' => ForbiddenTeam,
           'group_already_linked_to_channel' => GroupAlreadyLinkedToChannel,
-          'group_contains_others' => GroupContainsOthers,
           'group_must_not_be_empty' => GroupMustNotBeEmpty,
           'group_not_found' => GroupNotFound,
           'handle_already_exists' => HandleAlreadyExists,
@@ -607,6 +604,7 @@ module Slack
           'invalid_call_id' => InvalidCallId,
           'invalid_channel' => InvalidChannel,
           'invalid_channel_id' => InvalidChannelId,
+          'invalid_channel_type' => InvalidChannelType,
           'invalid_channels_limit' => InvalidChannelsLimit,
           'invalid_charset' => InvalidCharset,
           'invalid_client_id' => InvalidClientId,
@@ -618,7 +616,6 @@ module Slack
           'invalid_email' => InvalidEmail,
           'invalid_event_context' => InvalidEventContext,
           'invalid_external_id' => InvalidExternalId,
-          'invalid_for_is_mpim' => InvalidForIsMpim,
           'invalid_form_data' => InvalidFormData,
           'invalid_grant_type' => InvalidGrantType,
           'invalid_inputs' => InvalidInputs,
@@ -670,12 +667,12 @@ module Slack
           'is_bot' => IsBot,
           'is_inactive' => IsInactive,
           'last_member' => LastMember,
-          'leaving_team_not_in_channel' => LeavingTeamNotInChannel,
-          'leaving_team_required' => LeavingTeamRequired,
           'limit_required' => LimitRequired,
           'link_not_found' => LinkNotFound,
           'member_analytics_disabled' => MemberAnalyticsDisabled,
           'message_not_found' => MessageNotFound,
+          'metadata_not_available' => MetadataNotAvailable,
+          'metadata_only_does_not_support_date' => MetadataOnlyDoesNotSupportDate,
           'method_deprecated' => MethodDeprecated,
           'method_not_supported_for_channel_type' => MethodNotSupportedForChannelType,
           'migration_in_progress' => MigrationInProgress,
@@ -714,13 +711,13 @@ module Slack
           'no_scopes' => NoScopes,
           'no_such_subteam' => NoSuchSubteam,
           'no_team_ids_given' => NoTeamIdsGiven,
-          'no_teams_to_disconnect' => NoTeamsToDisconnect,
           'no_text' => NoText,
           'no_user' => NoUser,
           'no_user_provided' => NoUserProvided,
           'no_users_provided' => NoUsersProvided,
           'not_admin' => NotAdmin,
           'not_allowed' => NotAllowed,
+          'not_allowed_for_grid_workspace' => NotAllowedForGridWorkspace,
           'not_allowed_token_type' => NotAllowedTokenType,
           'not_an_admin' => NotAnAdmin,
           'not_an_enterprise' => NotAnEnterprise,
@@ -736,13 +733,13 @@ module Slack
           'not_implemented' => NotImplemented,
           'not_in_channel' => NotInChannel,
           'not_in_dnd' => NotInDnd,
-          'not_in_group' => NotInGroup,
           'not_pinnable' => NotPinnable,
           'not_pinned' => NotPinned,
           'not_reactable' => NotReactable,
           'not_starred' => NotStarred,
           'not_supported' => NotSupported,
           'oauth_authorization_url_mismatch' => OauthAuthorizationUrlMismatch,
+          'one_or_more_invalid_channels' => OneOrMoreInvalidChannels,
           'org_level_email_display_disabled' => OrgLevelEmailDisplayDisabled,
           'org_login_required' => OrgLoginRequired,
           'org_not_found' => OrgNotFound,
@@ -778,6 +775,7 @@ module Slack
           'session_expired' => SessionExpired,
           'session_invalidation_failed' => SessionInvalidationFailed,
           'session_not_found' => SessionNotFound,
+          'slack_connect_blocked_file_type' => SlackConnectBlockedFileType,
           'slack_connect_file_link_sharing_blocked' => SlackConnectFileLinkSharingBlocked,
           'slack_connect_file_upload_sharing_blocked' => SlackConnectFileUploadSharingBlocked,
           'snooze_end_failed' => SnoozeEndFailed,

data/lib/slack/web/api/patches/chat.1.patch

@@ -1,5 +1,5 @@
 diff --git a/lib/slack/web/api/endpoints/chat.rb b/lib/slack/web/api/endpoints/chat.rb
-index 9de4aa9..8ed5625 100644
+index d090ae2..50186d5 100644
 --- a/lib/slack/web/api/endpoints/chat.rb
 +++ b/lib/slack/web/api/endpoints/chat.rb
 @@ -121,11 +121,22 @@ module Slack
@@ -26,12 +26,11 @@ index 9de4aa9..8ed5625 100644
 +            end
              post('chat.postEphemeral', options)
            end
-
-@@ -166,7 +177,19 @@ module Slack
+ 
+@@ -168,6 +179,19 @@ module Slack
            # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/chat/chat.postMessage.json
            def chat_postMessage(options = {})
              throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
--            throw ArgumentError.new('Required arguments :text missing') if options[:text].nil?
 +            throw ArgumentError.new('Required arguments :text, :attachments or :blocks missing') if options[:text].nil? && options[:attachments].nil? && options[:blocks].nil?
 +            # attachments must be passed as an encoded JSON string
 +            if options.key?(:attachments)
@@ -47,8 +46,8 @@ index 9de4aa9..8ed5625 100644
 +            end
              post('chat.postMessage', options)
            end
-
-@@ -254,8 +277,21 @@ module Slack
+ 
+@@ -257,8 +281,21 @@ module Slack
            # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/chat/chat.update.json
            def chat_update(options = {})
              throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?

data/lib/slack/web/faraday/connection.rb

@@ -24,10 +24,10 @@ module Slack
               ::Faraday::Connection.new(endpoint, options) do |connection|
                 connection.use ::Faraday::Request::Multipart
                 connection.use ::Faraday::Request::UrlEncoded
-                connection.use ::Slack::Web::Faraday::Response::WrapError
                 connection.use ::Slack::Web::Faraday::Response::RaiseError
                 connection.use ::FaradayMiddleware::Mashify, mash_class: Slack::Messages::Message
                 connection.use ::FaradayMiddleware::ParseJson
+                connection.use ::Slack::Web::Faraday::Response::WrapError
                 connection.response :logger, logger if logger
                 connection.adapter adapter
               end

data/lib/slack/web/faraday/response/raise_error.rb

@@ -23,12 +23,8 @@ module Slack
 
           def call(env)
             super
-          rescue Slack::Web::Api::Errors::SlackError, Slack::Web::Api::Errors::TooManyRequestsError
-            raise
           rescue ::Faraday::ParsingError
             raise Slack::Web::Api::Errors::ParsingError.new('parsing_error', env.response)
-          rescue ::Faraday::TimeoutError, ::Faraday::ConnectionFailed
-            raise Slack::Web::Api::Errors::TimeoutError.new('timeout_error', env.response)
           end
         end
       end

data/lib/slack/web/faraday/response/wrap_error.rb

@@ -3,14 +3,20 @@ module Slack
   module Web
     module Faraday
       module Response
-        class WrapError < ::Faraday::Response::RaiseError
+        class WrapError < ::Faraday::Response::Middleware
+          UNAVAILABLE_ERROR_STATUSES = (500..599).freeze
+
           def on_complete(env)
-            super
-          rescue Slack::Web::Api::Errors::SlackError
-            raise
-          rescue ::Faraday::ServerError
+            return unless UNAVAILABLE_ERROR_STATUSES.cover?(env.status)
+
             raise Slack::Web::Api::Errors::UnavailableError.new('unavailable_error', env.response)
           end
+
+          def call(env)
+            super
+          rescue ::Faraday::TimeoutError, ::Faraday::ConnectionFailed
+            raise Slack::Web::Api::Errors::TimeoutError.new('timeout_error', env.response)
+          end
         end
       end
     end

data/lib/tasks/web.rake

@@ -32,6 +32,10 @@ namespace :slack do
           parsed = JSON.parse(File.read(path))
           parsed['undocumented'] = true if path =~ /undocumented/
           JSON::Validator.validate(method_schema, parsed, insert_defaults: true)
+          if parsed['deprecated'] && parsed['deprecation']['deprecation_warning'] =~ /It will stop functioning in February 2021/
+            next
+          end
+
           result[prefix][name] = parsed
         end
 

data/spec/fixtures/slack/web/{groups_info.yml → conversations_info.yml}

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://slack.com/api/groups.list
+    uri: https://slack.com/api/conversations.list
     body:
       encoding: UTF-8
       string: token=token
@@ -15,14 +15,14 @@ http_interactions:
       - application/json; charset=utf-8
     body:
       encoding: ASCII-8BIT
-      string: '{"ok":true,"groups":[{"id":"G0K7EV5A7","name":"mpdm-dblock--rubybot--player1-1","is_group":true,"created":1453561861,"creator":"U04KB5WQR","is_archived":false,"is_mpim":true,"members":["U04KB5WQR","U0HLFUZLJ","U07518DTL"],"topic":{"value":"Group
+      string: '{"ok":true,"channels":[{"id":"G0K7EV5A7","name":"mpdm-dblock--rubybot--player1-1","is_group":true,"created":1453561861,"creator":"U04KB5WQR","is_archived":false,"is_mpim":true,"members":["U04KB5WQR","U0HLFUZLJ","U07518DTL"],"topic":{"value":"Group
         messaging","creator":"U04KB5WQR","last_set":1453561861},"purpose":{"value":"Group
         messaging with: @dblock @rubybot @player1","creator":"U04KB5WQR","last_set":1453561861}}]}'
     http_version:
   recorded_at: Sat, 23 Jan 2016 15:19:10 GMT
 - request:
     method: post
-    uri: https://slack.com/api/groups.info
+    uri: https://slack.com/api/conversations.info
     body:
       encoding: UTF-8
       string: channel=G0K7EV5A7&token=token
@@ -35,7 +35,7 @@ http_interactions:
       - application/json; charset=utf-8
     body:
       encoding: ASCII-8BIT
-      string: '{"ok":true,"group":{"id":"G0K7EV5A7","name":"mpdm-dblock--rubybot--player1-1","is_group":true,"created":1453561861,"creator":"U04KB5WQR","is_archived":false,"is_mpim":true,"is_open":false,"last_read":"0000000000.000000","latest":null,"unread_count":0,"unread_count_display":0,"members":["U04KB5WQR","U0HLFUZLJ","U07518DTL"],"topic":{"value":"Group
+      string: '{"ok":true,"channel":{"id":"G0K7EV5A7","name":"mpdm-dblock--rubybot--player1-1","is_group":true,"created":1453561861,"creator":"U04KB5WQR","is_archived":false,"is_mpim":true,"is_open":false,"last_read":"0000000000.000000","latest":null,"unread_count":0,"unread_count_display":0,"members":["U04KB5WQR","U0HLFUZLJ","U07518DTL"],"topic":{"value":"Group
         messaging","creator":"U04KB5WQR","last_set":1453561861},"purpose":{"value":"Group
         messaging with: @dblock @rubybot @player1","creator":"U04KB5WQR","last_set":1453561861}}}'
     http_version:

data/spec/slack/events/request_spec.rb

@@ -21,13 +21,14 @@ RSpec.describe Slack::Events::Request do
     '"P7sFXA4o3HV2hTx4zb4zcQ9yrvuQs8pDh6EacOxmMRj0tJaXfQFF","type":"url_verification"}'
   end
   let(:http_request) do
-    double(
-      headers: {
-        'X-Slack-Request-Timestamp' => timestamp,
-        'X-Slack-Signature' => signature
-      },
+    request_double = double(
       body: StringIO.new(body)
     )
+
+    allow(request_double).to receive(:get_header).with('HTTP_X_SLACK_REQUEST_TIMESTAMP') { timestamp }
+    allow(request_double).to receive(:get_header).with('HTTP_X_SLACK_SIGNATURE') { signature }
+
+    request_double
   end
 
   after do

data/spec/slack/real_time/concurrency/with_concurrency_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'with CONCURRENCY', skip: ( # rubocop:disable RSpec/DescribeClass
+  (!ENV['CONCURRENCY']) && 'missing CONCURRENCY'
+) do
+  it 'detects concurrency' do
+    expect(Slack::RealTime::Config.concurrency).to eq Slack::RealTime::Concurrency::Async
+  end
+end

data/spec/slack/real_time/concurrency/without_concurrency_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'without CONCURRENCY', skip: ( # rubocop:disable RSpec/DescribeClass
+  (ENV['CONCURRENCY']) && 'CONCURRENCY is set'
+) do
+  it 'raises NoConcurrencyError' do
+    expect { Slack::RealTime::Config.concurrency }.to raise_error Slack::RealTime::Config::NoConcurrencyError
+  end
+end