Merge pull request #425 from kabirvirji/master

async support
Schmavery · Mar 28, 2017 · e90fb39 · e90fb39
2 parents d33a243 + a244c36
commit e90fb39
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -423,7 +423,7 @@ function loginHelper(appState, email, password, globalOptions, callback) {
 }
 
 function login(loginData, options, callback) {
-  if(utils.getType(options) === 'Function') {
+  if(utils.getType(options) === 'Function' || utils.getType(options) === 'AsyncFunction') {
     callback = options;
     options = {};
   }

diff --git a/src/addUserToGroup.js b/src/addUserToGroup.js
@@ -5,7 +5,7 @@ var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function addUserToGroup(userID, threadID, callback) {
-    if(!callback && utils.getType(threadID) === 'Function') {
+    if(!callback && (utils.getType(threadID) === 'Function' || getType(threadID) === 'AsyncFunction')) {
       throw {error: "please pass a threadID as a second argument."};
     }
 

diff --git a/src/changeGroupImage.js b/src/changeGroupImage.js
@@ -37,7 +37,7 @@ module.exports = function(defaultFuncs, api, ctx) {
   }
 
   return function changeGroupImage(image, threadID, callback) {
-    if(!callback && utils.getType(threadID) === 'Function') {
+    if(!callback && (utils.getType(threadID) === 'Function' || utils.getType(threadID) === 'AsyncFunction')) {
       throw {error: "please pass a threadID as a second argument."};
     }
 

diff --git a/src/getThreadList.js b/src/getThreadList.js
@@ -10,7 +10,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         throw {
           error: "Please pass a number as a second argument."
         };
-      } else if (utils.getType(type) === 'Function') {
+      } else if (utils.getType(type) === 'Function' || utils.getType(type) === 'AsyncFunction') {
         callback = type;
         type = 'inbox'; //default to inbox
       } else if (utils.getType(type) !== 'String') {

diff --git a/src/removeUserFromGroup.js b/src/removeUserFromGroup.js
@@ -5,7 +5,7 @@ var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function removeUserFromGroup(userID, threadID, callback) {
-    if(!callback && utils.getType(threadID) === 'Function') {
+    if(!callback && (utils.getType(threadID) === 'Function' || utils.getType(threadID) === 'AsyncFunction')) {
       throw {error: "please pass a threadID as a second argument."};
     }
     if (utils.getType(threadID) !== "Number" && utils.getType(threadID) !== "String") {

diff --git a/src/sendMessage.js b/src/sendMessage.js
@@ -237,7 +237,7 @@ module.exports = function(defaultFuncs, api, ctx) {
   }
 
   return function sendMessage(msg, threadID, callback) {
-    if(!callback && utils.getType(threadID) === 'Function') {
+    if(!callback && (utils.getType(threadID) === 'Function' || utils.getType(threadID) === 'AsyncFunction')) {
       return callback({error: "Pass a threadID as a second argument."});
     }
     if(!callback) {

diff --git a/src/setTitle.js b/src/setTitle.js
@@ -5,7 +5,7 @@ var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function setTitle(newTitle, threadID, callback) {
-    if(!callback && utils.getType(threadID) === 'Function') {
+    if(!callback && (utils.getType(threadID) === 'Function' || utils.getType(threadID) === 'AsyncFunction')) {
       throw {error: "please pass a threadID as a second argument."};
     }
 

diff --git a/utils.js b/utils.js
@@ -20,7 +20,7 @@ function getHeaders(url) {
 
 function isReadableStream(obj) {
   return obj instanceof stream.Stream &&
-    getType(obj._read) === 'Function' &&
+    (getType(obj._read) === 'Function' || getType(obj._read) === 'AsyncFunction') &&
     getType(obj._readableState) === 'Object';
 }