Merge pull request #214 from slackhq/fix_dm_facet

Removes the legacy dm facet file and fixes the IM / DM aliasing code …

CHANGELOG.md

@@ -1,3 +1,8 @@
+### v3.1.1 (2016-05-19)
+
+  * Removes the DM facet
+  * Updates the aliasing approach for IM / DM to correctly alias DM to the IM Facet
+
 ### v3.1.0 (2016-05-01)
 
   * Updates the [`lib/clients/web/facets/index.js`](/lib/clients/web/facets/index.js) to reference the new facets added in the 3.0.0 update, thanks @ekmartin

lib/clients/web/client.js

@@ -40,8 +40,9 @@ WebAPIClient.prototype._createFacets = function _createFacets() {
     this[newFacet.name] = newFacet;
   }, this);
 
-  // Alias the DM facet, so that it matches the docs
-  this.im = this.dm;
+  // Add a dm alias for the im and mpim facets
+  this.dm = this.im;
+  this.mpdm = this.mpim;
 };
 
 

lib/clients/web/facets/index.js

@@ -3,12 +3,12 @@ module.exports = {
   AuthFacet: require('./auth.js'),
   ChannelsFacet: require('./channels.js'),
   ChatFacet: require('./chat.js'),
-  DmFacet: require('./dm.js'),
   DndFacet: require('./dnd.js'),
   EmojiFacet: require('./emoji.js'),
   FilesFacet: require('./files.js'),
   FilesCommentsFacet: require('./files.comments.js'),
   GroupsFacet: require('./groups.js'),
+  ImFacet: require('./im'),
   MpimFacet: require('./mpim.js'),
   OauthFacet: require('./oauth.js'),
   PinsFacet: require('./pins.js'),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slack/client",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "A library for creating a Slack client",
   "main": "./index",
   "scripts": {

test/clients/web/client.js

@@ -30,8 +30,8 @@ describe('Web API Client', function () {
     facets.forEach(function (Facet) {
       var name = new Facet().name;
       // The 'im' facet is aliased to dm:
-      if (name === 'im') {
-        expect(client[name].name).to.equal('dm');
+      if (name === 'dm') {
+        expect(client[name].name).to.equal('im');
       } else {
         expect(client[name].name).to.equal(name);
       }