slack-ruby-client 0.14.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24883016f639f51e34aa4026ff203ef1cb6fa66abac9c0017d5653508f9169c7
-  data.tar.gz: 49bf4585f49dba526c764e018150ed9e884161c67529e442ef9e5df104d48345
+  metadata.gz: 5fa18d8339ff27661d942ef4d0cee003ff8e1146db504063a736374c5f5bf940
+  data.tar.gz: fc3bca990c3ad938a23db950b2008932a29518363360ada378856e71f2c1b477
 SHA512:
-  metadata.gz: db889eac4fbc7effec2f2f8bd319523f4e3c646ad0be8b52e2221a444d79cca38bae6fed8d0b6aac100c4869f862f6cfddb4644407d305977ad8b2a3fc1da670
-  data.tar.gz: 636f316d2e9efba1f663ccf0691fcf715b4f6a16d80bb98d8e5676d5479d6536beaa9a5c4de0452319a166ef50f9c7e6cddf451e6898600b3a57897b862472d2
+  metadata.gz: 932b6be224f16a7873a24907074944eea9ac8fcb47e35f7f9ef876d11df396197771c44727738b63267e4da45cd5c2050084972844a76fa6134fc54e2a9aa0d6
+  data.tar.gz: 8a5904155cd7b3d52fbeca8c9a0887bca7eabe4bb4b668174aa4accb5cfefb7784ec91f3e3d9182fef44d6a994168b72c4530c36a74cf2d7564eec6a0e204ea5

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [dblock]

data/.rubocop.yml

@@ -5,6 +5,8 @@ require:
   - rubocop-rspec
 
 AllCops:
+  TargetRubyVersion: 2.5
+  NewCops: enable
   DisplayCopNames: true
   Exclude:
     - bin/**/*
@@ -13,18 +15,28 @@ AllCops:
     - lib/slack/web/api/endpoints/* # Auto-generated
     - lib/slack/web/api/errors.rb # Auto-generated
     - spec/slack/web/api/endpoints/* # Auto-generated
+
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
+
 Metrics/BlockLength:
-  Max: 250
+  Enabled: false
+
 Metrics/ClassLength:
   Max: 250
-Metrics/LineLength:
-  Max: 100
+
+Layout/LineLength:
+  Max: 128
+
 Style/Documentation:
   Enabled: false
+
 Style/ModuleFunction:
   Enabled: false
+
+RSpec/InstanceVariable:
+  Enabled: false
+
 Naming/FileName:
   Exclude:
     - lib/slack-ruby-client.rb # Required to match gemspec name

data/.rubocop_todo.yml

@@ -1,94 +1,166 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-12-23 15:50:03 -0500 using RuboCop version 0.73.0.
+# on 2021-12-21 14:31:33 UTC using RuboCop version 0.93.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
-# Configuration parameters: AllowComments.
-Lint/HandleExceptions:
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
   Exclude:
-    - 'lib/slack/real_time/concurrency/async.rb'
-    - 'spec/slack/real_time/concurrency/celluloid_spec.rb'
-    - 'spec/slack/real_time/concurrency/eventmachine_spec.rb'
+    - 'slack-ruby-client.gemspec'
 
-# Offense count: 10
-Metrics/AbcSize:
-  Max: 39
+# Offense count: 1
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'lib/tasks/real_time.rake'
+
+# Offense count: 2
+Lint/MissingSuper:
+  Exclude:
+    - 'lib/slack/real_time/stores/starter.rb'
+    - 'lib/slack/real_time/stores/store.rb'
 
 # Offense count: 1
+# Cop supports --auto-correct.
+Lint/NonDeterministicRequireOrder:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'lib/slack-ruby-client.rb'
+
+# Offense count: 12
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 48
+
+# Offense count: 4
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 9
+  Max: 14
 
-# Offense count: 14
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 12
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 Metrics/MethodLength:
   Max: 32
 
 # Offense count: 1
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 9
+  Max: 16
 
-# Offense count: 1
-RSpec/AnyInstance:
+# Offense count: 2
+# Cop supports --auto-correct.
+Performance/RegexpMatch:
   Exclude:
-    - 'spec/slack/real_time/concurrency/celluloid_spec.rb'
+    - 'lib/tasks/web.rake'
 
-# Offense count: 70
+# Offense count: 3
+# Cop supports --auto-correct.
+RSpec/ContextMethod:
+  Exclude:
+    - 'spec/slack/messages/formatting_spec.rb'
+    - 'spec/slack/web/api/mixins/users_spec.rb'
+
+# Offense count: 77
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 64
+# Offense count: 127
+# Cop supports --auto-correct.
+# Configuration parameters: AllowConsecutiveOneLiners.
+RSpec/EmptyLineAfterExample:
+  Enabled: false
+
+# Offense count: 62
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Enabled: false
 
-# Offense count: 17
+# Offense count: 16
 # Configuration parameters: CustomTransform, IgnoreMethods.
 RSpec/FilePath:
   Enabled: false
 
-# Offense count: 13
-# Configuration parameters: AssignmentOnly.
-RSpec/InstanceVariable:
-  Exclude:
-    - 'spec/integration/integration_spec.rb'
-    - 'spec/slack/real_time/client_spec.rb'
-    - 'spec/slack/slack_spec.rb'
-
-# Offense count: 75
+# Offense count: 65
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-# Offense count: 93
-# Configuration parameters: AggregateFailuresByDefault.
+# Offense count: 95
 RSpec/MultipleExpectations:
   Max: 5
 
-# Offense count: 34
+# Offense count: 3
+# Configuration parameters: IgnoreSharedExamples.
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/slack/web/api/mixins/conversations_list_spec.rb'
+
+# Offense count: 48
 RSpec/NestedGroups:
   Max: 6
 
-# Offense count: 3
+# Offense count: 2
 RSpec/SubjectStub:
   Exclude:
-    - 'spec/slack/web/api/mixins/channels_spec.rb'
-    - 'spec/slack/web/api/mixins/groups_spec.rb'
+    - 'spec/slack/web/api/mixins/conversations_spec.rb'
     - 'spec/slack/web/api/mixins/users_spec.rb'
 
-# Offense count: 16
+# Offense count: 12
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/slack/events/request_spec.rb'
     - 'spec/slack/real_time/client_spec.rb'
-    - 'spec/slack/real_time/concurrency/celluloid_spec.rb'
-    - 'spec/slack/real_time/concurrency/eventmachine_spec.rb'
     - 'spec/slack/web/faraday/response/raise_error_spec.rb'
     - 'spec/support/real_time/connected_client.rb'
+
+# Offense count: 4
+# Configuration parameters: .
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/GlobalStdStream:
+  Exclude:
+    - 'lib/slack/logger.rb'
+    - 'lib/tasks/real_time.rake'
+    - 'spec/integration/integration_spec.rb'
+    - 'spec/slack/web/client_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MultilineTernaryOperator:
+  Exclude:
+    - 'spec/support/vcr.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'spec/support/queue_with_timeout.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/tasks/real_time.rake'

data/.travis.yml

@@ -3,9 +3,10 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.3.8
   - 2.5.3
   - 2.6.0
+  - 2.7.1
+  - 3.0.2
   - ruby-head
   - jruby-head
 
@@ -14,10 +15,6 @@ matrix:
     - rvm: 2.4.1
       script:
         - bundle exec danger
-    - rvm: 2.4.1
-      env: CONCURRENCY=celluloid-io
-    - rvm: 2.4.1
-      env: CONCURRENCY=faye-websocket
     - rvm: 2.5.3
       env: CONCURRENCY=async-websocket
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,45 @@
+### 1.0.0 (2021/12/21)
+
+* [#394](https://github.com/slack-ruby/slack-ruby-client/pull/394): Added support for Ruby 3.0 - [@dblock](https://github.com/dblock).
+* [#394](https://github.com/slack-ruby/slack-ruby-client/pull/394): Upgraded to RuboCop 0.93.1 - [@dblock](https://github.com/dblock).
+* [#393](https://github.com/slack-ruby/slack-ruby-client/pull/393): Removed deprecated `oauth_token`, and leftover traces of `channels` and `groups` APIs - [@dblock](https://github.com/dblock).
+* [#393](https://github.com/slack-ruby/slack-ruby-client/pull/393): Added `admin_auth_policy_assignEntities`, `admin_auth_policy_getEntities` and `admin_auth_policy_removeEntities` `admin_conversations_disconnectShared`, `admin_users_session_clearSettings`, `admin_users_session_getSettings`, `admin_users_session_resetBulk`, `admin_users_session_setSettings`, `apps_manifest_create`, `apps_manifest_delete`, `apps_manifest_export`, `apps_manifest_update`, `apps_manifest_validate`, `conversations_acceptSharedInvite`, `conversations_approveSharedInvite`, `conversations_declineSharedInvite`, `conversations_inviteShared`, `conversations_listConnectInvites`, `oauth_v2_exchange`, `openid_connect_token`, `openid_connect_userInfo`, `team_billing_info`, `team_preferences_list`, `tooling_tokens_rotate` - [@dblock](https://github.com/dblock).
+* [#386](https://github.com/slack-ruby/slack-ruby-client/pull/386): Gemspec: drop unused `test_files` directive - [@olleolleolle](https://github.com/olleolleolle).
+* [#380](https://github.com/slack-ruby/slack-ruby-client/pull/380): Updates to server error classes and hierarchy - [@jmanian](https://github.com/jmanian).
+* [#387](https://github.com/slack-ruby/slack-ruby-client/pull/387): Send token in Authorization header - [@chrisbloom7](https://github.com/chrisbloom7).
+
+### 0.17.0 (2021/03/07)
+
+* [#370](https://github.com/slack-ruby/slack-ruby-client/pull/370): Removed deprecated `im_`, `mpim_`, `channels_`, and `groups_` methods - [@dblock](https://github.com/dblock).
+* [#368](https://github.com/slack-ruby/slack-ruby-client/pull/368): Removed `admin_conversations_whitelist` and `admin_conversations_disconnectShared` - [@dblock](https://github.com/dblock).
+* [#359](https://github.com/slack-ruby/slack-ruby-client/pull/359): Handle non-JSON 500 errors - [@agrobbin](https://github.com/agrobbin).
+* [#360](https://github.com/slack-ruby/slack-ruby-client/pull/360): Remove faye-websocket from the concurrency detection error message - [@dblock](https://github.com/dblock).
+* [#369](https://github.com/slack-ruby/slack-ruby-client/pull/369): Support rack requests in `Slack::Events::Request` - [@wedgex](https://github.com/wedgex).
+
+### 0.16.0 (2021/01/24)
+
+* [#350](https://github.com/slack-ruby/slack-ruby-client/pull/350): Handle server errors such as timeouts & non-JSON responses - [@ojab](https://github.com/ojab).
+* [#354](https://github.com/slack-ruby/slack-ruby-client/pull/354): Rewind body after checking request signature - [@sunny](https://github.com/sunny).
+* [#355](https://github.com/slack-ruby/slack-ruby-client/pull/355), [#357](https://github.com/slack-ruby/slack-ruby-client/pull/357): Removed `celluloid-io` and `faye-websocket` support - [@wasabigeek](https://github.com/wasabigeek).
+* [#356](https://github.com/slack-ruby/slack-ruby-client/pull/356): Added `admin_apps_clearResolution`, `admin_conversations_getCustomRetention`, `admin_conversations_removeCustomRetention`, `admin_conversations_setCustomRetention`, `admin_users_session_list` and `auth_teams_list` endpoints - [@dblock](https://github.com/dblock).
+* [#348](https://github.com/slack-ruby/slack-ruby-client/pull/348): Added `admin_conversations_archive`, `admin_conversations_convertToPrivate`, `admin_conversations_create`, `admin_conversations_delete`, `admin_conversations_disconnectShared`, `admin_conversations_getConversationPrefs`, `admin_conversations_getTeams`, `admin_conversations_invite`, `admin_conversations_rename`, `admin_conversations_search`, `admin_conversations_setConversationPrefs`, `admin_conversations_unarchive`, `admin_conversations_ekm_listOriginalConnectedChannelInfo`, `admin_users_session_invalidate`, `apps_event_authorizations_list`, `conversations_mark`, `workflows_stepCompleted`, `workflows_stepFailed` and `workflows_updateStep` endpoints - [@wasabigeek](https://github.com/wasabigeek).
+
+### 0.15.1 (2020/9/3)
+
+* [#336](https://github.com/slack-ruby/slack-ruby-client/pull/336): Fix: handle nil events - [@pyama86](https://github.com/pyama86).
+* [#339](https://github.com/slack-ruby/slack-ruby-client/pull/339): Fix: `channel_not_found` resolving channel IDs with 100+ channels - [@dblock](https://github.com/dblock).
+* [#340](https://github.com/slack-ruby/slack-ruby-client/pull/340): Added `adapter` configuration setting to change the `Faraday` HTTP adapter - [@watsonjon](https://github.com/watsonjon).
+
+### 0.15.0 (2020/7/26)
+
+* [#322](https://github.com/slack-ruby/slack-ruby-client/pull/322): Cache `Faraday::Connection` for persistent adapters - [@drbrain](https://github.com/drbrain).
+* [#324](https://github.com/slack-ruby/slack-ruby-client/pull/324): Require Faraday >= 1.0 - [@dblock](https://github.com/dblock).
+* [#324](https://github.com/slack-ruby/slack-ruby-client/pull/324): Upgrade slack-ruby-danger, rubocop, rubocop-rspec and rubocop-performance - [@dblock](https://github.com/dblock).
+* [#327](https://github.com/slack-ruby/slack-ruby-client/pull/327), [#326](https://github.com/slack-ruby/slack-ruby-client/pull/326): Added `admin_conversations_whitelist`, `admin_usergroups`, `calls` and `calls_participants` endpoints  - [@wasabigeek](https://github.com/wasabigeek).
+* [#329](https://github.com/slack-ruby/slack-ruby-client/pull/329): Log when methods are deprecated - [@wasabigeek](https://github.com/wasabigeek).
+* [#325](https://github.com/slack-ruby/slack-ruby-client/pull/325): Remove activesupport dependency - [@ianks](https://github.com/ianks).
+* [#331](https://github.com/slack-ruby/slack-ruby-client/pull/331): Use `conversations_list` instead of deprecated `channels_list`. Added `admin_conversations_restrictAccess_addGroup`, `admin_conversations_restrictAccess_listGroups` and `admin_conversations_restrictAccess_removeGroup` endpoints - [@wasabigeek](https://github.com/wasabigeek).
+
 ### 0.14.6 (2020/3/28)
 
 * [#305](https://github.com/slack-ruby/slack-ruby-client/pull/305): Added `admin_inviteRequests_approve`, `admin_inviteRequests_deny`, `admin_inviteRequests_list`, `admin_inviteRequests_approved_list`, `admin_inviteRequests_denied_list`, `admin_teams_create`, `admin_teams_list`, `admin_teams_admins_list`, `admin_teams_owners_list`, `admin_teams_settings`, `admin_teams_settings_setIcon`, `admin_teams_settings_setName`, `admin_teams_settings_setDescription`, `admin_users_assign`, `admin_users_invite`, `admin_users_remove`, `admin_users_setAdmin`, `admin_users_setOwner` and `admin_users_setRegular` endpoints - [@manuelmeurer](https://github.com/manuelmeurer).

data/CONTRIBUTING.md

@@ -29,9 +29,9 @@ bundle exec rake
 
 Sign up for Slack, create a private slack group for yourself.
 
-Create a new Bot Integration under [services/new/bot](http://slack.com/services/new/bot).
+Create a new App under [https://api.slack.com/apps](https://api.slack.com/apps).
 
-![](screenshots/register-bot.png)
+![](screenshots/create-app.png)
 
 On the next screen, note the API token.
 
@@ -68,20 +68,31 @@ Make sure that `bundle exec rake` completes without errors.
 Slack Web API is updated from https://github.com/slack-ruby/slack-api-ref, a maintained, machine-readable version of Slack API Docs, generated by scraping [api.slack.com](https://api.slack.com). To update the Web API from the latest definition run the following Rake task.
 
 ```
-rake slack:api:update
+bundle exec rake slack:api:update
 ```
 
 #### Patching Slack Web API
 
 Sometimes it's necessary to patch auto-generated Slack Web API methods. For example, we want to help clients with calling `to_json` on the `attachments` parameter sent to `chat_postMessage`. See [#20](https://github.com/slack-ruby/slack-ruby-client/issues/20).
 
-Make a change to a generated file, for example `lib/slack/web/api/endpoints/chat.rb` and generate a patch.
+The broad steps are:
+1. Run `rake slack:api:update` to check that existing patches are still valid.
+    - If you run into a `failed to apply patch` error, the auto-generated methods likely drifted from the last patch. Follow the steps [below](#resolving-patch-errors).
+    - This may add new methods if the API has updated, please split them up into multiple PRs if so.
+2. Make a change to a generated file, for example `lib/slack/web/api/endpoints/chat.rb`.
+3. Generate a patch:
+    ```
+    git diff --no-color HEAD lib/slack/web/api/endpoints/chat.rb > lib/slack/web/api/patches/chat.1.patch
+    ```
+4. Run `rake slack:api:update` to ensure that the patch is cleanly applied. Implement a test for the added or modified functionality and commit the patch file.
 
-```
-git diff --no-color HEAD lib/slack/web/api/endpoints/chat.rb > lib/slack/web/api/patches/chat.1.patch
-```
+##### Resolving Patch Errors
+
+The auto-generated method files may drift overtime e.g. new arguments may be added or descriptions changed. Since previous patches were based on the older auto-generated files, git may be unable to apply them to the new files. Resolving them requires some good ol' splicing:
+1. Run `rake slack:api:update SKIP_PATCH=true` to create the raw auto-generated files. Commit the files that you are updating, so we can run `git diff` later.
+2. Go through the old patches for the files (e.g. in `lib/slack/web/api/patches/chat.1.patch`), copying code into the new files.
+3. Continue with Step 2 [above](#patching-slack-web-api).
 
-Run `rake slack:api:update` to ensure that the patch is cleanly applied. Implement a test for the added or modified functionality and commit the patch file.
 
 ### Write Documentation
 

data/Dangerfile

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
+
 danger.import_dangerfile(gem: 'slack-ruby-danger')
-toc.check

data/Gemfile

@@ -13,6 +13,5 @@ if ENV.key?('CONCURRENCY')
 end
 
 group :test do
-  gem 'danger-toc', '~> 0.1.3', require: false
-  gem 'slack-ruby-danger', '~> 0.1.0', require: false
+  gem 'slack-ruby-danger', '~> 0.2.0', require: false
 end

data/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2015-2019 Daniel Doubrovkine, Artsy and Contributors
+Copyright (c) 2015-2021 Daniel Doubrovkine, Artsy and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,14 +2,14 @@ Slack Ruby Client
 =================
 
 [![Gem Version](https://badge.fury.io/rb/slack-ruby-client.svg)](http://badge.fury.io/rb/slack-ruby-client)
-[![Build Status](https://travis-ci.org/slack-ruby/slack-ruby-client.svg?branch=master)](https://travis-ci.org/slack-ruby/slack-ruby-client)
+[![Build Status](https://app.travis-ci.com/slack-ruby/slack-ruby-client.svg?branch=master)](https://app.travis-ci.com/slack-ruby/slack-ruby-client)
 [![Code Climate](https://codeclimate.com/github/slack-ruby/slack-ruby-client/badges/gpa.svg)](https://codeclimate.com/github/slack-ruby/slack-ruby-client)
 
 A Ruby client for the Slack [Web](https://api.slack.com/web), [RealTime Messaging](https://api.slack.com/rtm) and [Events](https://api.slack.com/events-api) APIs. Comes with a handy command-line client, too. If you are not familiar with these concepts, you might want to watch [this video](http://code.dblock.org/2016/03/11/your-first-slack-bot-service-video.html).
 
 ![](slack.png)
 
-## Table of Contents
+# Table of Contents
 
 - [Useful to Me?](#useful-to-me)
 - [Stable Release](#stable-release)
@@ -31,6 +31,7 @@ A Ruby client for the Slack [Web](https://api.slack.com/web), [RealTime Messagin
       - [Other](#other)
     - [Web Client Options](#web-client-options)
     - [Pagination Support](#pagination-support)
+    - [Character Encoding](#character-encoding)
     - [Error Handling](#error-handling)
       - [Slack Errors](#slack-errors)
       - [Rate Limiting](#rate-limiting)
@@ -46,8 +47,6 @@ A Ruby client for the Slack [Web](https://api.slack.com/web), [RealTime Messagin
   - [Large Team Considerations](#large-team-considerations)
     - [Concurrency](#concurrency)
       - [Async](#async)
-      - [Faye::Websocket with Eventmachine](#fayewebsocket-with-eventmachine)
-      - [Celluloid](#celluloid)
   - [Events API](#events-api)
     - [Configuring Slack::Events](#configuring-slackevents)
     - [Verifying the Request Signature](#verifying-the-request-signature)
@@ -71,7 +70,7 @@ A Ruby client for the Slack [Web](https://api.slack.com/web), [RealTime Messagin
 
 ## Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-client, 0.14.6. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **stable** release of slack-ruby-client, v1.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
 ## Installation
 
@@ -81,7 +80,7 @@ Add to Gemfile.
 gem 'slack-ruby-client'
 ```
 
-If you're going to be using the RealTime client, add either `async-websocket`, `eventmachine` and `faye-websocket` or `celluloid-io`. See below for more information about concurrency. We recommend you use `async-websocket`.
+If you're going to be using the RealTime client, add `async-websocket`. See below for more information about concurrency.
 
 ```
 gem 'async-websocket', '~> 0.8.0'
@@ -151,10 +150,10 @@ See a fully working example in [examples/hi_web](examples/hi_web/hi.rb).
 
 ##### List Channels
 
-List channels with [channels_list](https://api.slack.com/methods/channels.list).
+List channels with [conversations_list](https://api.slack.com/methods/conversations.list).
 
 ```ruby
-channels = client.channels_list.channels
+channels = client.conversations_list.channels
 
 general_channel = channels.detect { |c| c.name == 'general' }
 ```
@@ -176,14 +175,14 @@ client.files_upload(
 
 ##### Get Channel Info
 
-You can use a channel ID or name (prefixed with `#`) in all functions that take a `:channel` argument. Lookup by name is not supported by the Slack API and the `channels_id` method called invokes `channels_list` in order to locate the channel ID.
+You can use a channel ID or name (prefixed with `#`) in all functions that take a `:channel` argument. Lookup by name is not supported by the Slack API and the `channels_id` method called invokes `conversations_list` in order to locate the channel ID.
 
 ```ruby
-client.channels_info(channel: 'C04KB5X4D') # calls channels_info
+client.conversations_info(channel: 'C04KB5X4D') # calls conversations_info
 ```
 
 ```ruby
-client.channels_info(channel: '#general') # calls channels_list followed by channels_info
+client.conversations_info(channel: '#general') # calls conversations_list followed by conversations_info
 ```
 
 ##### Get User Info
@@ -239,11 +238,12 @@ timeout             | Optional open/read timeout in seconds.
 open_timeout        | Optional connection open timeout in seconds.
 default_page_size   | Optional page size for paginated requests, default is _100_.
 default_max_retries | Optional number of retries for paginated requests, default is _100_.
+adapter             | Optional HTTP adapter to use, defaults to `Faraday.default_adapter`.
 
 You can also pass request options, including `timeout` and `open_timeout` into individual calls.
 
 ```ruby
-client.channels_list(request: { timeout: 180 })
+client.conversations_list(request: { timeout: 180 })
 ```
 
 You can also control what proxy options are used by modifying the `http_proxy` environment variable per [Net::HTTP's documentation](https://docs.ruby-lang.org/en/2.0.0/Net/HTTP.html#class-Net::HTTP-label-Proxies).
@@ -276,6 +276,24 @@ end
 all_members # many thousands of team members retrieved 10 at a time
 ```
 
+#### Character Encoding
+
+Note that Slack expects `text` to be UTF-8 encoded. If your messages appear with text such as `BAD+11` in Slack, check `text.encoding` and `.encode(Encoding::UTF_8)` your messages before sending them to Slack.
+
+```ruby
+text = 'characters such as "Ñ", "Á", "É"'
+text.encoding
+=> #<Encoding:UTF-8>
+client.chat_postMessage(channel: '#general', text: text, as_user: true)
+# renders 'characters such as "Ñ", "Á", "É"' in Slack
+
+text = text.encode(Encoding::ISO_8859_1)
+text.encoding
+# => #<Encoding:ISO-8859-1>
+client.chat_postMessage(channel: '#general', text: text, as_user: true)
+# renders 'characters such as "BAD+11", "", "BAD+9"' in Slack
+```
+
 #### Error Handling
 
 ##### Slack Errors
@@ -306,7 +324,11 @@ If you exceed [Slack’s rate limits](https://api.slack.com/docs/rate-limits), a
 
 ##### Other Errors
 
-In any other case, a `Faraday::ClientError` will be raised. This may be the case if Slack is temporarily unavailable, for example.
+When Slack is temporarily unavailable a subclass of `Slack::Web::Api::Errors::ServerError` will be raised and the original `Faraday::Error` will be accesible via `exception.cause`. (Starting with 0.18.0 this is no longer a subclass of `Slack::Web::Api::Errors::SlackError`.)
+
+Specifically `Slack::Web::Api::Errors::ParsingError` will be raised on non-json response (i.e. 200 OK with `Slack unavailable` HTML page) and `Slack::Web::Api::Errors::HttpRequestError` subclasses for connection failures (`Slack::Web::Api::Errors::TimeoutError` for read/open timeouts & `Slack::Web::Api::Errors::UnavailableError` for 5xx HTTP responses).
+
+In any other case, a `Faraday::ClientError` will be raised.
 
 ### RealTime Client
 
@@ -471,7 +493,7 @@ See [#134](https://github.com/slack-ruby/slack-ruby-client/issues/134) for a dis
 
 #### Concurrency
 
-`Slack::RealTime::Client` needs help from a concurrency library and supports [Async](https://github.com/socketry/async), [Faye::WebSocket](https://github.com/faye/faye-websocket-ruby) with [Eventmachine](https://github.com/eventmachine/eventmachine) and [Celluloid](https://github.com/celluloid/celluloid). It will auto-detect one or the other depending on the gems in your Gemfile, but you can also set concurrency explicitly.
+`Slack::RealTime::Client` needs help from a concurrency library and supports [Async](https://github.com/socketry/async).
 
 ```ruby
 Slack::RealTime.configure do |config|
@@ -489,7 +511,7 @@ client.start_async
 
 ##### Async
 
-This is the recommended library. Add `async-websocket` to your Gemfile.
+Add `async-websocket` to your Gemfile.
 
 ```
 gem 'async-websocket'
@@ -497,26 +519,6 @@ gem 'async-websocket'
 
 See a fully working example in [examples/hi_real_time_async_async](examples/hi_real_time_async_async/hi.rb).
 
-##### Faye::Websocket with Eventmachine
-
-Add the following to your Gemfile.
-
-```
-gem 'faye-websocket'
-```
-
-See a fully working example in [examples/hi_real_time_async_eventmachine](examples/hi_real_time_async_eventmachine/hi.rb).
-
-##### Celluloid
-
-Add the following to your Gemfile.
-
-```
-gem 'celluloid-io', require: ['celluloid/current', 'celluloid/io']
-```
-
-See a fully working example in [examples/hi_real_time_async_celluloid](examples/hi_real_time_async_celluloid/hi.rb).
-
 ### Events API
 
 This library provides limited support for the [Slack Events API](https://api.slack.com/events-api).
@@ -644,6 +646,6 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 
 ## Copyright and License
 
-Copyright (c) 2015-2019, [Daniel Doubrovkine](https://twitter.com/dblockdotorg), [Artsy](https://www.artsy.net) and [Contributors](CHANGELOG.md).
+Copyright (c) 2015-2021, [Daniel Doubrovkine](https://twitter.com/dblockdotorg), [Artsy](https://www.artsy.net) and [Contributors](CHANGELOG.md).
 
 This project is licensed under the [MIT License](LICENSE.md).

data/RELEASING.md

@@ -11,7 +11,7 @@ bundle install
 rake
 ```
 
-Check that the last build succeeded in [Travis CI](https://travis-ci.org/slack-ruby/slack-ruby-client) for all supported platforms.
+Check that the last build succeeded in [Travis CI](https://app.travis-ci.com/github/slack-ruby/slack-ruby-client) for all supported platforms.
 
 Change "Next" in [CHANGELOG.md](CHANGELOG.md) to the current date.