slackapi · DEGoodmanWilson · Jul 15, 2016 · Jun 16, 2016 · Jun 16, 2016 · Jun 17, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 node_modules/
 .idea
 coverage/
-npm-debug.log
+*.log
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,15 @@
+# [slack-hubot] Changelog
+
+### v4.0.0 (2016-06-15)
+
+  * Now uses the latest version of `node-slack-sdk` (v3.4.1 as of this writing), inheriting all the improvements therein.
+  * Better (and automatically enabled) reconnect logic. As in, it actually reconnects automatically at all.
+  * Now you can upload files!
+  * Significantly improved handling of messages with attachments, which is to say, we can deliver them.
+  * Message formatting of links, usernames and channel names is now working far better than it ever did, which is damning with faint praise, but hey.
+  * Long messages are now left for Slack to handle, bless their hearts.
+  * Slack usernames with `.` and `-` are now treated with the respect and dignity due to all usernames.
+  * Messages from bots are no longer filtered out, which is both cool and potentially terrifying, but we should never have silenced the robots in the first place.
+  * Remember how if you tried to hack on this adapter and used `npm link` to plug that into a live bot? And how that didn't work? Yeah? Well now it does. Stupid `instanceof`.
+  * Total refactoring of the functionality, exposing a slightly different interface. So watch out for that.
+  * You can now access the underlying Slack client directly, for when you really need low-level functionality therein.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,34 @@
+# Slack open source code of conduct
+
+
+## Introduction
+Diversity and inclusion make our community strong. We encourage participation from the most varied and diverse backgrounds possible and want to be very clear about where we stand.
+
+Our goal is to maintain a safe, helpful and friendly community for everyone, regardless of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other defining characteristic.
+
+This code and related procedures also apply to unacceptable behavior occurring outside the scope of community activities, in all community venues (online and in-person) as well as in all one-on-one communications, and anywhere such behavior has the potential to adversely affect the safety and well-being of community members.
+
+## Expected Behavior
+  * Be welcoming.
+  * Be kind.
+  * Look out for each other.
+
+## Unacceptable Behavior
+  * Conduct or speech which might be considered sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory or offensive in nature.
+  * Unwelcome, suggestive, derogatory or inappropriate nicknames or terms.
+  * Disrespect towards others. (Jokes, innuendo, dismissive attitudes.)
+  * Intimidation or harassment (online or in-person). Please read the [Citizen Code of Conduct](http://citizencodeofconduct.org/) for how we interpret harassment. 
+  * Disrespect towards differences of opinion.
+  * Inappropriate attention or contact. Be aware of how your actions affect others. If it makes someone uncomfortable, stop.
+  * Not understanding the differences between constructive criticism and disparagement.
+  * Sustained disruptions.
+  * Violence, threats of violence or violent language.
+
+## Enforcement 
+Understand that speech and actions have consequences, and unacceptable behavior will not be tolerated.
+
+If you are the subject of, or witness to any violations of this Code of Conduct, please contact us by submitting a form [here](https://docs.google.com/a/slack-corp.com/forms/d/1NVqj2S2Q49XVIOT5N3L6Tx1oihvk9CpMa_UX8T_6ESo/viewform), or email conduct@slack.com.
+
+If violations occur, organizers will take any action they deem appropriate for the infraction, up to and including expulsion.
+
+_Thanks to the [Django Code of Conduct](https://www.djangoproject.com/conduct/), [The Citizen Code of Conduct](http://citizencodeofconduct.org/), [The Rust Code of Conduct](https://www.rust-lang.org/conduct.html) and [The Ada Initiative](http://adainitiative.org/2014/02/18/howto-design-a-code-of-conduct-for-your-community/)._
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,32 @@
+# Contributing at Slack
+
+![Header Image](contributing_header_slack.png)
+
+## Before Contributing
+
+Before contributing, please read our [Code of Conduct](./CODE_OF_CONDUCT.md). We take it very seriously, and expect that you will as well.
+
+## New Issues
+
+Before opening a new issue, please consider:
+
+  - Reading [the documentation](./README.md) and [the changelog](./README.md) first.
+  - Searching for any related issues and avoid creating duplicated issues.
+  - Adding details, diagnoses, screenshots or any type of useful information in existing issues, even if they are marked as closed. The team will still review it.
+  - Taking the time to think of a solution and [**open a pull request**](#new-pull-requests) for either improving the documentation, fixing a bug or suggesting a feature.
+  - Finally, **[open an issue]**(https://github.com/slackhq/hubot-slack/issues/new) to report a bug, ask for help or suggest a feature. The more information you give, the better people can help you.
+
+
+## New Pull Requests
+
+We love pull requests and we are generally very receptive to contributions. Things to keep in mind:
+
+- [Fork the repository](https://github.com/slackhq/slack-hubot) and make sure to work on a branch up to date with origin master.
+- Do your thing!
+- Be mindful about doing atomic commits, adding documentation to your changes, not refactoring too much.
+- Add tests covering the new code or functionality you are adding.
+- Add a descriptive title and add any useful information for the reviewer. If your contribution is a user facing thing, please attach a screenshot and/or screencast (gif preferrably).
+- Read and agree to our [Contributor License Agreement (CLA)](https://docs.google.com/a/slack-corp.com/forms/d/1q_w8rlJG_x_xJOoSUMNl7R35rkpA7N6pUkKhfHHMD9c/viewform). _We cannot accept your PR without your agreement to our CLA_.
+- Create your pull request (yay!). If it is in relation to an existing issue, please mention it on the title or description.
+
+[Interested in knowing more about about pull requests at Slack?](https://slack.engineering/on-empathy-pull-requests-979e4257d158#.awxtvmb2z)
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1,28 @@
+* [ ] I've read and understood the [Contributing guidelines](./CONTRIBUTING.md) and have done my best effort to follow them.
+* [ ] I've read and agree to the [Code of Conduct](./CODE_OF_CONDUCT.md).
+* [ ] I've searched for any related issues and avoided creating a duplicate issue.
+
+#### Description
+> e.g. Description of the bug or feature
+
+#### Reproducible in:
+{project_name} version:
+OS version(s):
+Device(s):
+
+#### Steps to reproduce:
+
+1. 
+2. 
+3. 
+
+### Expected result:
+> e.g. What you expected to happen
+
+### Actual result:
+> e.g. What actually happened
+
+### Attachments:
+> e.g. Logs, screenshots, screencast, sample project, funny gif, etc.
+
+
diff --git a/LICENSE b/LICENSE
@@ -1,3 +1,5 @@
+MIT License
+
 Copyright (c) Slack Technologies, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -17,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+* [ ] I've read and understood the [Contributing guidelines](./CONTRIBUTING.md) and have done my best effort to follow them.
+* [ ] I've read and agree to the [Code of Conduct](./CODE_OF_CONDUCT.md).
+* [ ] I've been mindful about doing atomic commits, adding documentation to my changes, not refactoring too much.
+* [ ] I've a descriptive title and added any useful information for the reviewer. Where appropriate, I've attached a screenshot and/or screencast (gif preferrably).
+* [ ] I've written tests to cover the new code and functionality included in this PR.
+* [ ] I've read, agree to, and signed the [Contributor License Agreement (CLA)](https://docs.google.com/a/slack-corp.com/forms/d/1q_w8rlJG_x_xJOoSUMNl7R35rkpA7N6pUkKhfHHMD9c/viewform).
+
+#### PR Summary
+> e.g. New functionality for producing whatsits.
+
+#### Related Issues
+> e.g. Fixes #206 and closes #230
+
+#### Test strategy
+> e.g. Add tests around whatsit production.
diff --git a/README.md b/README.md
@@ -2,8 +2,9 @@
 
 This is a [Hubot](http://hubot.github.com/) adapter to use with [Slack](https://slack.com).
 
-[![Build Status](https://travis-ci.org/slackhq/hubot-slack.svg)](https://travis-ci.org/slackhq/hubot-slack)
-[![Coverage Status](https://coveralls.io/repos/github/slackhq/hubot-slack/badge.svg?branch=master)](https://coveralls.io/github/slackhq/hubot-slack?branch=master)
+[![Travis branch](https://img.shields.io/travis/slackhq/hubot-slack/master.svg?maxAge=2592000)]()
+[![Coveralls](https://img.shields.io/coveralls/slackhq/hubot-slack.svg?maxAge=2592000)]()
+[![npm (scoped)](https://img.shields.io/npm/v/hubot-slack.svg?maxAge=2592000)]()
 
 ## Getting Started
 
@@ -41,7 +42,7 @@ This is a modified set of instructions based on the [instructions on the Hubot w
 
 - Profit!
 
-## Upgrading from earlier versions of Hubot
+## Upgrading from version 2 or earlier of Hubot
 
 Version 3 of the hubot-slack adapter requires different server support to
 previous versions. If you have an existing "hubot" integration set up you'll
@@ -73,4 +74,4 @@ If you're using the [hubot-auth](https://github.com/hubot-scripts/hubot-auth/) s
 
 ## Copyright
 
-Copyright &copy; Slack Technologies, Inc. MIT License; see LICENSE for further details.
+Copyright &copy; 2014–2016 Slack Technologies, Inc. MIT License; see LICENSE for further details.
diff --git a/contributing_header_slack.png b/contributing_header_slack.png
diff --git a/index.coffee b/index.coffee
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "hubot-slack",
-  "version": "3.4.2",
+  "version": "4.0.0",
   "description": "A Slack adapter for hubot",
-  "main": "./index",
+  "main": "./slack",
   "scripts": {
     "test": "npm run mocha && istanbul report text-summary lcov",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
@@ -24,9 +24,11 @@
     "url": "https://github.com/slackhq/hubot-slack/issues"
   },
   "dependencies": {
-    "slack-client": "~1.5"
+    "@slack/client": "^3.4.0",
+    "lodash": "^3.10.1"
   },
   "devDependencies": {
+    "hubot": "~2.11",
     "coffee-coverage": "^1.0.1",
     "coffee-script": "~1.7.1",
     "coveralls": "^2.11.9",
@@ -35,13 +37,12 @@
     "grunt-contrib-watch": "~0.5.3",
     "grunt-release": "~0.6.0",
     "grunt-shell": "~0.5.0",
-    "hubot": "~2.11",
     "istanbul": "^0.4.3",
     "mocha": "~1.13.0",
     "should": "~2.0.2"
   },
   "engines": {
-    "node": ">=0.4.7",
+    "node": ">= 0.10.x",
     "npm": ">= 1.1.x"
   },
   "contributors": [
@@ -65,6 +66,14 @@
     {
       "name": "Eric Lindvall",
       "email": "eric@papertrailapp.com"
+    },
+    {
+      "email": "don@slack-corp.com",
+      "name": "D.E. Goodman-Wilson"
+    },
+    {
+      "email": "jagan@slack-corp.com",
+      "name": "John Agan"
     }
   ]
 }
diff --git a/slack.coffee b/slack.coffee
@@ -0,0 +1,4 @@
+SlackBot = require './src/bot'
+
+exports.use = (robot) ->
+  new SlackBot robot, token: process.env.HUBOT_SLACK_TOKEN