Switch from restler to unirest

restler is buggy and doesn't support utf8 multipart requests

build/functions/argument-parser.js

@@ -43,8 +43,13 @@ var ESCAPABLE = '.^$*+?()[{\\|}]'.split('');
  */
 
 function argumentParser(format, string) {
-  string = string.replace(/[^\s]+/, '');
-  format = format.replace(/[^\s]+/, '');
+  string = string.replace(/[^\s]+/, '').trim();
+  format = format.replace(/[^\s]+/, '').trim();
+
+  if (!string || !format) {
+    return {};
+  }
+
   var indexes = [];
 
   format = format.replace(/\s/g, '\\s*');

build/functions/fetch.js

@@ -8,25 +8,49 @@ exports.getBody = getBody;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var _restler = require('restler');
+var _unirest = require('unirest');
 
-var _restler2 = _interopRequireDefault(_restler);
+var _unirest2 = _interopRequireDefault(_unirest);
 
 function fetch(path) {
   var data = arguments[1] === undefined ? {} : arguments[1];
 
   return new Promise(function (resolve, reject) {
-    var method = Object.keys(data).length ? 'POST' : 'GET';
-    var multipart = method === 'POST' ? true : false;
+    var files = {};
 
-    _restler2['default'].request('https://api.telegram.org/bot' + path, {
-      data: data, method: method, multipart: multipart
-    }).on('complete', function (response) {
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = Object.keys(data)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var key = _step.value;
+
+        if (data[key].file) {
+          files[key] = data[key].file;
+          delete data[key];
+        }
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
       try {
-        var json = JSON.parse(response);
-        resolve(json);
-      } catch (e) {
-        reject(e);
+        if (!_iteratorNormalCompletion && _iterator['return']) {
+          _iterator['return']();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+
+    _unirest2['default'].post('https://api.telegram.org/bot' + path).field(data).attach(files).end(function (response) {
+      if (response.statusType === 4 || response.statusType === 5) {
+        reject(response);
+      } else {
+        resolve(response.body);
       }
     });
   });

build/index.js

@@ -154,7 +154,7 @@ var Bot = (function (_EventEmitter) {
     value: function command(_command, listener) {
       var regex = /[^\s]+/;
 
-      var cmd = _command.match(regex)[0];
+      var cmd = _command.match(regex)[0].trim();
 
       this._userEvents.push({
         pattern: new RegExp('^/' + cmd),

build/types/File.js

@@ -24,18 +24,6 @@ var _mime = require('mime');
 
 var _mime2 = _interopRequireDefault(_mime);
 
-var _fs = require('fs');
-
-var _fs2 = _interopRequireDefault(_fs);
-
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-var _restler = require('restler');
-
-var _restler2 = _interopRequireDefault(_restler);
-
 var TYPES = ['photo', 'video', 'document', 'audio'];
 
 /**
@@ -85,14 +73,11 @@ var File = (function (_Base) {
      */
     value: function file(_file, fileType) {
       if (fileType) {
-        this.properties[fileType] = _file;
+        this.properties[fileType] = { file: _file };
 
         return this;
       }
 
-      var stat = _fs2['default'].statSync(_file);
-      var name = _path2['default'].basename(_file);
-
       var _mime$lookup$split = _mime2['default'].lookup(_file).split('/');
 
       var _mime$lookup$split2 = _slicedToArray(_mime$lookup$split, 2);
@@ -112,7 +97,7 @@ var File = (function (_Base) {
         type = 'document';
       }
 
-      this.properties[type] = _restler2['default'].file(_file, name, stat.size, 'utf-8');
+      this.properties[type] = { file: _file };
 
       this.method = 'send' + (type[0].toUpperCase() + type.slice(1));