diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..781f9ea --- /dev/null +++ b/.babelrc @@ -0,0 +1,4 @@ +{ + "presets": ["es2015"], + "plugins": ["babel-plugin-add-module-exports"] +} diff --git a/lib/.eslintrc b/.eslintrc similarity index 100% rename from lib/.eslintrc rename to .eslintrc diff --git a/.gitignore b/.gitignore index f9d6ed0..047fc8f 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,8 @@ node_modules # Test file I use to test my module test.js + +.DS_Store + +build +types diff --git a/Gruntfile.js b/Gruntfile.js index d34c5ce..be67f3d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,14 +4,14 @@ module.exports = function(grunt) { scripts: { files: [{ expand: true, - cwd: 'lib', + cwd: 'src', src: '**/*.js', dest: 'build/' }] } }, eslint: { - scripts: ['lib/**/*.js'] + scripts: ['src/**/*.js'] }, copy: { classes: { @@ -25,16 +25,18 @@ module.exports = function(grunt) { }, watch: { scripts: { - files: ['lib/**/*.js'], + files: ['src/**/*.js'], tasks: ['babel'] } - } + }, + clean: ['build', 'types'] }); grunt.loadNpmTasks('grunt-babel'); grunt.loadNpmTasks('grunt-contrib-watch'); - grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-eslint'); + grunt.loadNpmTasks('grunt-contrib-copy'); + grunt.loadNpmTasks('grunt-contrib-clean'); - grunt.registerTask('default', ['babel', 'copy', 'eslint']); + grunt.registerTask('default', ['clean', 'babel', 'copy', 'eslint']); }; diff --git a/README.md b/README.md index 39b9766..5b3337b 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,11 @@ If you are looking for a real-life example of a bot written using this module, s Example ======= ```javascript -var Bot = require('telegram-api'); +// ES6: +import Bot, { Message, File } from 'telegram-api'; + +// ES5: +var Bot = require('telegram-api').default; var Message = require('telegram-api/types/Message'); var File = require('telegram-api/types/File'); diff --git a/build/api.js b/build/api.js deleted file mode 100644 index 0852b14..0000000 --- a/build/api.js +++ /dev/null @@ -1,49 +0,0 @@ -// API methods -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -var _fetch = require('./fetch'); - -var _fetch2 = _interopRequireDefault(_fetch); - -/** - * API class, has a function for each method of the Telegram API which take - * an object argument, and send request to the API server - * - * Methods: getMe, sendMessage, forwardMessage, sendPhoto, sendAudio, - * sendDocument, sendSticker, sendVideo, sendLocation, sendChatAction, - * getUserProfilePhotos, getUpdates - */ - -var API = -/** - * Create a new api object with the given token - * @param {string} token - */ -function API(token) { - _classCallCheck(this, API); - - this.token = token; -}; - -exports['default'] = API; - -API.prototype.request = function request(method, data) { - return (0, _fetch2['default'])(this.token + '/' + method, data); -}; - -var methods = ['getMe', 'sendMessage', 'forwardMessage', 'sendPhoto', 'sendAudio', 'sendDocument', 'sendSticker', 'sendVideo', 'sendLocation', 'sendChatAction', 'getUserProfilePhotos', 'getUpdates', 'setWebhook']; - -methods.forEach(function (method) { - API.prototype[method] = function (data) { - return this.request(method, data); - }; -}); -module.exports = exports['default']; diff --git a/build/fetch.js b/build/fetch.js deleted file mode 100644 index 97275ee..0000000 --- a/build/fetch.js +++ /dev/null @@ -1,49 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); -exports['default'] = fetch; -exports.getBody = getBody; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -var _restler = require('restler'); - -var _restler2 = _interopRequireDefault(_restler); - -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; - - _restler2['default'].request('https://api.telegram.org/bot' + path, { - data: data, method: method, multipart: multipart - }).on('complete', function (response) { - try { - var json = JSON.parse(response); - resolve(json); - } catch (e) { - reject(e); - } - }); - }); -} - -function getBody(stream) { - var data = ''; - - return new Promise(function (resolve, reject) { - stream.on('data', function (chunk) { - data += chunk; - }); - - stream.on('end', function () { - resolve(data); - }); - - stream.on('error', reject); - }); -} diff --git a/build/functions/api.js b/build/functions/api.js deleted file mode 100644 index 0852b14..0000000 --- a/build/functions/api.js +++ /dev/null @@ -1,49 +0,0 @@ -// API methods -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -var _fetch = require('./fetch'); - -var _fetch2 = _interopRequireDefault(_fetch); - -/** - * API class, has a function for each method of the Telegram API which take - * an object argument, and send request to the API server - * - * Methods: getMe, sendMessage, forwardMessage, sendPhoto, sendAudio, - * sendDocument, sendSticker, sendVideo, sendLocation, sendChatAction, - * getUserProfilePhotos, getUpdates - */ - -var API = -/** - * Create a new api object with the given token - * @param {string} token - */ -function API(token) { - _classCallCheck(this, API); - - this.token = token; -}; - -exports['default'] = API; - -API.prototype.request = function request(method, data) { - return (0, _fetch2['default'])(this.token + '/' + method, data); -}; - -var methods = ['getMe', 'sendMessage', 'forwardMessage', 'sendPhoto', 'sendAudio', 'sendDocument', 'sendSticker', 'sendVideo', 'sendLocation', 'sendChatAction', 'getUserProfilePhotos', 'getUpdates', 'setWebhook']; - -methods.forEach(function (method) { - API.prototype[method] = function (data) { - return this.request(method, data); - }; -}); -module.exports = exports['default']; diff --git a/build/functions/argument-parser.js b/build/functions/argument-parser.js deleted file mode 100644 index bfbde7e..0000000 --- a/build/functions/argument-parser.js +++ /dev/null @@ -1,151 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }; })(); - -exports['default'] = argumentParser; -var FORMAT_REQUIRED = /<(\W*)(\w+)\|?(\w+)?>/g; -var FORMAT_OPTIONAL = /\[(\W*)(\w+)\|?(\w+)?\]/g; -var FORMAT_REST = /\.{3}(\w+)/g; - -var ESCAPABLE = '.^$*+?()[{\\|}]'.split(''); - -var REQUIRED = 0; -var OPTIONAL = 1; -var REST = 2; - -/** - * Parses a message for arguments, based on format - * - * The format option may include '' and '[optionalParam]' and - * '...[restParam]' - * indicates a required, single-word argument - * [optionalParam] indicates an optinal, single-word argument - * ...[restParam] indicates a multi-word argument which records until end - * - * You can define a type for your arguments using pipe | sign, like this: - * [count|number] - * Supported Types are: number and word, defaults to word - * - * Example: - * format: ' [count|number] ...text' - * string 1: 'Someone Hey, wassup' - * {name: 'Someone', - * count: undefined, - * text: 'Hey, wassup'} - * - * string 2: 'Someone 5 Hey, wassup' - * {name: 'Someone', - * count: 5, - * text: 'Hey, wassup'} - * @param {string} format Format, as described above - * @param {string} string The message to parse - * @return {object} Parsed arguments - */ - -function argumentParser(format, string) { - string = string.replace(/[^\s]+/, '').trim(); - format = format.replace(/[^\s]+/, '').trim(); - - if (!format) return { args: {}, params: {} }; - - var indexes = [], - params = {}; - - format = format.replace(/\s/g, '\\s*'); - format = format.replace(FORMAT_REQUIRED, function (f, symbols, arg, type, offset) { - if (type === undefined) type = 'word'; - - indexes.push({ arg: arg, offset: offset }); - params[arg] = REQUIRED; - return (escape(symbols) + getFormat(type, 'required')).trim(); - }); - format = format.replace(FORMAT_OPTIONAL, function (f, symbols, arg, type, offset) { - if (type === undefined) type = 'word'; - - indexes.push({ arg: arg, offset: offset }); - params[arg] = OPTIONAL; - return (escape(symbols, '?') + getFormat(type, 'optional')).trim(); - }); - format = format.replace(FORMAT_REST, function (full, arg, offset) { - indexes.push({ offset: offset, arg: arg }); - params[arg] = REST; - return getFormat(null, 'rest'); - }); - - if (!string) return { args: {}, params: params }; - - indexes = indexes.sort(function (a, b) { - return a.offset < b.offset ? -1 : 1; - }); - - var regex = new RegExp(format); - - var matched = regex.exec(string).slice(1); - - var object = {}; - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; - - try { - for (var _iterator = matched.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { - var _step$value = _slicedToArray(_step.value, 2); - - var index = _step$value[0]; - var match = _step$value[1]; - - var argument = indexes[index]; - - object[argument.arg] = match; - } - } catch (err) { - _didIteratorError = true; - _iteratorError = err; - } finally { - try { - if (!_iteratorNormalCompletion && _iterator['return']) { - _iterator['return'](); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } - } - - return { args: object, params: params }; -} - -function escape(symbols) { - var append = arguments[1] === undefined ? '' : arguments[1]; - - return symbols.split('').map(function (symbol) { - return (ESCAPABLE.indexOf(symbol) ? '\\' + symbol : symbol) + append; - }).join(''); -} - -var TYPES = { - 'number': '\\d', - 'word': '\\S' -}; - -function getFormat() { - var type = arguments[0] === undefined ? 'word' : arguments[0]; - var param = arguments[1] === undefined ? 'required' : arguments[1]; - - var t = TYPES[type]; - - switch (param) { - case 'required': - return '(' + t + '+)'; - case 'optional': - return '(' + t + '+)?'; - case 'rest': - return '(.*)'; - } -} -module.exports = exports['default']; diff --git a/build/functions/fetch.js b/build/functions/fetch.js deleted file mode 100644 index d29d59d..0000000 --- a/build/functions/fetch.js +++ /dev/null @@ -1,73 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); -exports['default'] = fetch; -exports.getBody = getBody; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -var _unirest = require('unirest'); - -var _unirest2 = _interopRequireDefault(_unirest); - -function fetch(path) { - var data = arguments[1] === undefined ? {} : arguments[1]; - - return new Promise(function (resolve, reject) { - var files = {}; - - 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 { - 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 || !response.body || !response.body.ok) { - reject(response); - } else { - resolve(response.body); - } - }); - }); -} - -function getBody(stream) { - var data = ''; - - return new Promise(function (resolve, reject) { - stream.on('data', function (chunk) { - data += chunk; - }); - - stream.on('end', function () { - resolve(data); - }); - - stream.on('error', reject); - }); -} diff --git a/build/functions/poll.js b/build/functions/poll.js deleted file mode 100644 index 8a3a87d..0000000 --- a/build/functions/poll.js +++ /dev/null @@ -1,20 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); -exports['default'] = poll; - -function poll(bot) { - return bot.api.getUpdates(bot.update).then(function (response) { - if (!response.result.length) { - return poll(bot); - } - bot.emit('update', response.result); - - if (bot._stop) return null; - return poll(bot); - }); -} - -module.exports = exports['default']; diff --git a/build/functions/webhook.js b/build/functions/webhook.js deleted file mode 100644 index 859aeda..0000000 --- a/build/functions/webhook.js +++ /dev/null @@ -1,42 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); -exports['default'] = webhook; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -var _http = require('http'); - -var _http2 = _interopRequireDefault(_http); - -var _qs = require('qs'); - -var _qs2 = _interopRequireDefault(_qs); - -var _fetch = require('./fetch'); - -var DEFAULTS = { - server: {}, - port: 443 -}; - -function webhook(options, bot) { - if (options === undefined) options = {}; - - options = Object.assign(DEFAULTS, options); - - return bot.api.setWebhook(options.url).then(function () { - - bot._webhookServer = _http2['default'].createServer(options.server, function (req, res) { - return (0, _fetch.getBody)(req).then(function (data) { - bot.emit('update', _qs2['default'].parse(data).result); - - res.end('OK'); - }); - }).listen(options.port); - }); -} - -module.exports = exports['default']; diff --git a/build/index.js b/build/index.js deleted file mode 100644 index 83b8e52..0000000 --- a/build/index.js +++ /dev/null @@ -1,372 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _functionsApi = require('./functions/api'); - -var _functionsApi2 = _interopRequireDefault(_functionsApi); - -var _functionsWebhook = require('./functions/webhook'); - -var _functionsWebhook2 = _interopRequireDefault(_functionsWebhook); - -var _functionsPoll = require('./functions/poll'); - -var _functionsPoll2 = _interopRequireDefault(_functionsPoll); - -var _functionsArgumentParser = require('./functions/argument-parser'); - -var _functionsArgumentParser2 = _interopRequireDefault(_functionsArgumentParser); - -var _events = require('events'); - -var _typesMessage = require('./types/Message'); - -var _typesMessage2 = _interopRequireDefault(_typesMessage); - -var DEFAULTS = { - update: { - offset: 0, - timeout: 20, - limit: 100 - } -}; - -var REQUIRED = 0; -var OPTIONAL = 1; - -/** - * Bot class used to connect to a new bot - * Bots have an api property which gives access to all Telegram API methods, - * see API class - */ - -var Bot = (function (_EventEmitter) { - /** - * Create and connect to a new bot - * @param {object} options Bot properties. - */ - - function Bot() { - var options = arguments[0] === undefined ? { update: {} } : arguments[0]; - - _classCallCheck(this, Bot); - - _get(Object.getPrototypeOf(Bot.prototype), 'constructor', this).call(this); - - if (!options.token) { - throw new Error('Token cannot be empty'); - } - - this.token = options.token; - this.update = Object.assign(options.update || {}, DEFAULTS.update); - - this.api = new _functionsApi2['default'](this.token); - - this.msg = {}; - - // EventEmitter - this._events = {}; - this._userEvents = []; - - this.setMaxListeners(100); - } - - _inherits(Bot, _EventEmitter); - - _createClass(Bot, [{ - key: 'start', - - /** - * Gets information about the bot and then - * 1) starts polling updates from API - * 2) sets a webhook as defined by the first parameter and listens for updates - * Emits an `update` event after polling with the response from server - * Returns a promise which is resolved after the bot information is received - * and set to it's `info` property i.e. bot.info - * - * @param {object} hook An object containg options passed to webhook - * properties: - * - url: HTTPS url to listen on POST requests coming - * from the Telegram API - * - port: the port to listen to, defaults to 443 - * - server: An object passed to https.createServer - * - * @return {promise} A promise which is resolved with the response of getMe - */ - value: function start(hook) { - var _this = this; - - if (hook) { - return (0, _functionsWebhook2['default'])(hook, this); - } - return this.api.getMe().then(function (response) { - _this.info = response.result; - - _this.on('update', _this._update); - - if (hook) { - return (0, _functionsWebhook2['default'])(hook, _this); - } else { - return (0, _functionsPoll2['default'])(_this); - } - }); - } - }, { - key: 'get', - - /** - * Listens on specific message matching the pattern which can be an string - * or a regexp. - * @param {string/regex} pattern - * @param {function} listener function to call when a message matching the - * pattern is found, gets the Update - * In case of string, the message should start - * with the string i.e. /^yourString/ - * @return {object} returns the bot object - */ - value: function get(pattern, listener) { - if (typeof pattern === 'string') { - pattern = new RegExp('^' + pattern); - } - - this._userEvents.push({ - pattern: pattern, listener: listener - }); - - return this; - } - }, { - key: 'command', - - /** - * Listens on a command - * @param {string} command the command string, should not include slash (/) - * @param {function} listener function to call when the command is received, - * gets the update - * @return {object} returns the bot object - */ - value: function command(_command, listener) { - var regex = /[^\s]+/; - - var cmd = _command.match(regex)[0].trim(); - - this._userEvents.push({ - pattern: new RegExp('^/' + cmd), - parse: _functionsArgumentParser2['default'].bind(null, _command), - listener: listener - }); - - return this; - } - }, { - key: 'send', - - /** - * Sends the message provided - * @param {object} message The message to send. Gets it's send method called - * @return {unknown} returns the result of calling message's send method - */ - value: function send(message) { - return message.send(this)['catch'](console.error); - } - }, { - key: 'stop', - - /** - * Stops the bot, deattaching all listeners and polling - */ - value: function stop() { - this._stop = true; - - if (this._webhookServer) { - this._webhookServer.close(); - } - - this.removeListener('update', this._update); - this._events = {}; - } - }, { - key: '_update', - - /** - * The internal update event listener, used to parse messages and fire - * command/get events - YOU SHOULD NOT USE THIS - * - * @param {object} update - */ - value: function _update(update) { - var _this2 = this; - - if (!this.update.offset) { - var updateId = update[update.length - 1].update_id; - this.update.offset = updateId; - } - if (this.update) { - this.update.offset += 1; - } - - update.forEach(function (res) { - var marked3$0 = [getAnswer].map(regeneratorRuntime.mark); - - var text = res.message.text; - if (!text) return; - - var selfUsername = '@' + _this2.info.username; - - if (text.startsWith('/') && text.indexOf(selfUsername) > -1) { - // Commands are sent in /command@thisusername format in groups - var regex = new RegExp('(/.*)@' + _this2.info.username); - text = text.replace(regex, '$1'); - res.message.text = text; - } - - var ev = _this2._userEvents.find(function (_ref) { - var pattern = _ref.pattern; - return pattern.test(text); - }); - - if (!ev) { - _this2.emit('command-notfound', res.message); - return; - } - - if (!ev.parse) { - ev.listener(res.message); - return; - } - - var _ev$parse = ev.parse(res.message.text); - - var params = _ev$parse.params; - var args = _ev$parse.args; - - res.message.args = args; - - var requiredParams = Object.keys(params).filter(function (param) { - return params[param] === REQUIRED && !args[param]; - }); - - if (!requiredParams.length) { - ev.listener(res.message); - return; - } - - var bot = _this2; - function getAnswer() { - var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step; - - return regeneratorRuntime.wrap(function getAnswer$(context$4$0) { - var _this3 = this; - - while (1) switch (context$4$0.prev = context$4$0.next) { - case 0: - _iteratorNormalCompletion = true; - _didIteratorError = false; - _iteratorError = undefined; - context$4$0.prev = 3; - _loop = regeneratorRuntime.mark(function callee$4$0() { - var param, msg; - return regeneratorRuntime.wrap(function callee$4$0$(context$5$0) { - while (1) switch (context$5$0.prev = context$5$0.next) { - case 0: - param = _step.value; - msg = new _typesMessage2['default']().to(res.message.chat.id).text('Enter value for ' + param); - context$5$0.next = 4; - return bot.send(msg).then(function (answer) { - args[param] = answer.text; - }); - - case 4: - case 'end': - return context$5$0.stop(); - } - }, callee$4$0, _this3); - }); - _iterator = requiredParams[Symbol.iterator](); - - case 6: - if (_iteratorNormalCompletion = (_step = _iterator.next()).done) { - context$4$0.next = 11; - break; - } - - return context$4$0.delegateYield(_loop(), 't0', 8); - - case 8: - _iteratorNormalCompletion = true; - context$4$0.next = 6; - break; - - case 11: - context$4$0.next = 17; - break; - - case 13: - context$4$0.prev = 13; - context$4$0.t1 = context$4$0['catch'](3); - _didIteratorError = true; - _iteratorError = context$4$0.t1; - - case 17: - context$4$0.prev = 17; - context$4$0.prev = 18; - - if (!_iteratorNormalCompletion && _iterator['return']) { - _iterator['return'](); - } - - case 20: - context$4$0.prev = 20; - - if (!_didIteratorError) { - context$4$0.next = 23; - break; - } - - throw _iteratorError; - - case 23: - return context$4$0.finish(20); - - case 24: - return context$4$0.finish(17); - - case 25: - case 'end': - return context$4$0.stop(); - } - }, marked3$0[0], this, [[3, 13, 17, 25], [18,, 20, 24]]); - } - - var iterator = getAnswer(); - (function loop() { - var next = iterator.next(); - if (next.done) { - ev.listener(res.message); - return; - } - - next.value.then(loop); - })(); - }); - } - }]); - - return Bot; -})(_events.EventEmitter); - -exports['default'] = Bot; -module.exports = exports['default']; diff --git a/build/poll.js b/build/poll.js deleted file mode 100644 index 89e41a7..0000000 --- a/build/poll.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); -exports['default'] = poll; - -function poll(bot) { - return bot.api.getUpdates(bot.update).then(function (response) { - if (!response.result.length) { - return poll(bot); - } - bot.emit('update', response.result); - - return poll(bot); - }); -} - -module.exports = exports['default']; diff --git a/build/types/Base.js b/build/types/Base.js deleted file mode 100644 index fb2dc96..0000000 --- a/build/types/Base.js +++ /dev/null @@ -1,136 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _events = require('events'); - -var ANSWER_THRESHOLD = 10; - -/** - * Base class of all classes - */ - -var Base = (function (_EventEmitter) { - function Base(method) { - _classCallCheck(this, Base); - - _get(Object.getPrototypeOf(Base.prototype), 'constructor', this).call(this); - - this.method = method; - this.properties = {}; - } - - _inherits(Base, _EventEmitter); - - _createClass(Base, [{ - key: 'send', - - /** - * Sends the message, you should only use this method yourself if - * you are extending this class. Normally you should call bot.send(message) - * - * Events: message:sent => Emitted after sending the message to API, gets the - * API's response - * - * message:answer => Emitted when your message gets an answer from - * the contact (reply in case of groups) - * gets the Update object containing message - * - * @param {object} bot - * @return {promise} returns a promise, resolved with message:answer - */ - value: function send(bot) { - var _this = this; - - if (this._keyboard) { - var reply_markup = JSON.stringify(this._keyboard.getProperties()); - this.properties.reply_markup = reply_markup; - } - - var messageId = undefined; - return new Promise(function (resolve) { - bot.api[_this.method](_this.properties).then(function (response) { - messageId = response.result.message_id; - _this.emit('message:sent', response); - }); - - if (_this._keyboard.one_time_keyboard) { - _this._keyboard.replyMarkup = ''; - } - - var chat = _this.properties.chat_id; - var answers = 0; - bot.on('update', function listener(result) { - answers += result.length; - - var update = result.find(function (_ref) { - var message = _ref.message; - - // if in a group, there will be a reply to this message - if (chat < 0) { - return message.chat.id === chat && message.reply_to_message && message.reply_to_message.message_id === messageId; - } else { - return message.chat.id === chat; - } - }); - - if (update) { - resolve(update.message); - - this.emit('message:answer', update.message); - - bot.removeListener('update', listener); - } - - if (answers >= ANSWER_THRESHOLD) { - bot.removeListener('update', listener); - } - }); - }); - } - }, { - key: 'getProperties', - - /** - * Returns properties of the object - * @return {object} properties of object - */ - value: function getProperties() { - return this.properties; - } - }, { - key: 'setProperties', - - /** - * Set properties of the object - * @param {object} object properties to set - * @param {boolean} extend A boolean indicating if the properties should be - * extended by the object provided (Object.assign) - * or properties should be replaced by the object - * defaults to true - * @return {object} returns the properties (same as getProperties) - */ - value: function setProperties(object) { - var extend = arguments[1] === undefined ? true : arguments[1]; - - this.properties = extend ? Object.assign(this.properties, object) : object; - - return this.getProperties(); - } - }]); - - return Base; -})(_events.EventEmitter); - -exports['default'] = Base; -module.exports = exports['default']; diff --git a/build/types/BulkMessage.js b/build/types/BulkMessage.js deleted file mode 100644 index 2359ec5..0000000 --- a/build/types/BulkMessage.js +++ /dev/null @@ -1,88 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Message2 = require('./Message'); - -var _Message3 = _interopRequireDefault(_Message2); - -/** - * Message class, used to send a message to multiple chats - */ - -var BulkMessage = (function (_Message) { - /** - * Create a new message - * @param {object} properties Message properties, as defined by Telegram API - */ - - function BulkMessage() { - var properties = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, BulkMessage); - - _get(Object.getPrototypeOf(BulkMessage.prototype), 'constructor', this).call(this, properties); - - this.chats = []; - } - - _inherits(BulkMessage, _Message); - - _createClass(BulkMessage, [{ - key: 'to', - - /** - * Set multiple chat_id's for the message - * @param {number} chat - * @return {object} returns the message object - */ - value: function to() { - for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) { - args[_key] = arguments[_key]; - } - - var chats = args.reduce(function (a, b) { - return a.concat(b); - }, []); - - this.chats = chats; - return this; - } - }, { - key: 'send', - - /** - * Send the message to all chats - * @param {Bot} bot - * @return {Promise} Resolved when the message is sent to all chats - */ - value: function send(bot) { - var _this = this; - - var promises = this.chats.map(function (chat) { - var clone = Object.assign({}, _this.properties); - var message = new _Message3['default'](clone).to(chat); - return message.send(bot); - }); - - return Promise.all(promises); - } - }]); - - return BulkMessage; -})(_Message3['default']); - -exports['default'] = BulkMessage; -module.exports = exports['default']; diff --git a/build/types/File.js b/build/types/File.js deleted file mode 100644 index 30f54f4..0000000 --- a/build/types/File.js +++ /dev/null @@ -1,153 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }; })(); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Base2 = require('./Base'); - -var _Base3 = _interopRequireDefault(_Base2); - -var _mime = require('mime'); - -var _mime2 = _interopRequireDefault(_mime); - -var TYPES = ['photo', 'video', 'document', 'audio']; - -/** - * File class, used to send pictures/movies/audios/documents to chat - */ - -var File = (function (_Base) { - /** - * Create a new file instance - * @param {object} properties File properties, as defined by Telegram API - */ - - function File() { - var properties = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, File); - - _get(Object.getPrototypeOf(File.prototype), 'constructor', this).call(this, 'sendDocument'); - - this.properties = properties; - this._keyboard = new _Base3['default'](); - } - - _inherits(File, _Base); - - _createClass(File, [{ - key: 'to', - - /** - * Set chat_id of the message - * @param {number} chat - * @return {object} returns the message object - */ - value: function to(chat) { - this.properties.chat_id = chat; - return this; - } - }, { - key: 'file', - - /** - * Set file of the message - * @param {string} file File path - * @param {string} fileType (optional) if the first argument is a - * file_id string, this option indicates file type - * @return {object} returns the message object - */ - value: function file(_file, fileType) { - if (fileType) { - this.properties[fileType] = { file: _file }; - - return this; - } - - var _mime$lookup$split = _mime2['default'].lookup(_file).split('/'); - - var _mime$lookup$split2 = _slicedToArray(_mime$lookup$split, 2); - - var type = _mime$lookup$split2[0]; - var extension = _mime$lookup$split2[1]; - - if (type === 'image') { - type = 'photo'; - } - - if (extension === 'gif') { - type = 'document'; - } - - if (TYPES.indexOf(type) === -1) { - type = 'document'; - } - - this.properties[type] = { file: _file }; - - this.method = 'send' + (type[0].toUpperCase() + type.slice(1)); - - return this; - } - }, { - key: 'caption', - - /** - * Set caption for photos - * @param {string} text caption's text - * @return {object} returns the message object - */ - value: function caption(text) { - this.properties.caption = text; - return this; - } - }, { - key: 'reply', - - /** - * Set reply_to_message_id of the message - * @param {number} id message_id of the message to reply to - * @return {object} returns the message object - */ - value: function reply(id) { - this.properties.reply_to_message_id = id; - return this; - } - }, { - key: 'keyboard', - - /** - * Sets keyboard of the message - * The value of reply_markup is set to the sanitized keyboard properties - * i.e. reply_markup = JSON.stringify(kb.getProperties()) - * @param {object} kb A Keyboard instance - * @return {object} returns the message object - */ - value: function keyboard(kb) { - this._keyboard = kb; - return this; - } - - // This class inherits Base's send method - - }]); - - return File; -})(_Base3['default']); - -exports['default'] = File; -module.exports = exports['default']; diff --git a/build/types/Forward.js b/build/types/Forward.js deleted file mode 100644 index 44871c3..0000000 --- a/build/types/Forward.js +++ /dev/null @@ -1,90 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Base2 = require('./Base'); - -var _Base3 = _interopRequireDefault(_Base2); - -/** - * Forward class, used to forward messages from a chat to another - */ - -var Forward = (function (_Base) { - /** - * Create a new forward message - * @param {object} properties Forward Message properties, as defined by - * Telegram API - */ - - function Forward() { - var properties = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, Forward); - - _get(Object.getPrototypeOf(Forward.prototype), 'constructor', this).call(this, 'forwardMessage'); - - this.properties = properties; - this._keyboard = new _Base3['default'](); - } - - _inherits(Forward, _Base); - - _createClass(Forward, [{ - key: 'to', - - /** - * Set chat_id of the message - * @param {number} chat - * @return {object} returns the message object - */ - value: function to(chat) { - this.properties.chat_id = chat; - return this; - } - }, { - key: 'from', - - /** - * Set from_chat_id, source of message's chat's id - * @param {number} chat Source chat id - * @return {object} returns the message object - */ - value: function from(chat) { - this.properties.from_chat_id = chat; - return this; - } - }, { - key: 'message', - - /** - * Sets message_id, the message to forward from source to target chat - * @param {number} message ID of the message to forward - * @return {object} returns the message object - */ - value: function message(_message) { - this.properties.message_id = _message; - return this; - } - - // This class inherits Base's send method - - }]); - - return Forward; -})(_Base3['default']); - -exports['default'] = Forward; -module.exports = exports['default']; diff --git a/build/types/Keyboard.js b/build/types/Keyboard.js deleted file mode 100644 index c1fc8d0..0000000 --- a/build/types/Keyboard.js +++ /dev/null @@ -1,138 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x6, _x7, _x8) { var _again = true; _function: while (_again) { var object = _x6, property = _x7, receiver = _x8; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x6 = parent; _x7 = property; _x8 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Base2 = require('./Base'); - -var _Base3 = _interopRequireDefault(_Base2); - -/** - * Keyboard class, used to configure keyboards for messages. - * You should pass your instance of this class to message.keyboard() method - */ - -var Keyboard = (function (_Base) { - /** - * Create a new keyboard - * @param {object} properties Keyboard properties, as defined by Telegram API - * See ReplyKeyboardMarkup, ReplyKeyboardHide, - * ForceReply - */ - - function Keyboard() { - var properties = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, Keyboard); - - _get(Object.getPrototypeOf(Keyboard.prototype), 'constructor', this).call(this); - - this.properties = properties; - } - - _inherits(Keyboard, _Base); - - _createClass(Keyboard, [{ - key: 'keys', - - /** - * Set the keyboard property of reply_markup - * @param {array} keys An array of arrays, with the format of - * Column Column - * Row [['TopLeft', 'TopRight'], - * Row ['BottomLeft', 'BottomRight']] - * @return {object} returns the keyboard object - */ - value: function keys(_keys) { - this.properties.keyboard = _keys; - this.properties.hide_keyboard = false; - return this; - } - }, { - key: 'force', - - /** - * Set force_keyboard property of reply_markup - * @param {boolean} enable value of force_keyboard, defaults to true - * @return {object} returns the keyboard object - */ - value: function force() { - var enable = arguments[0] === undefined ? true : arguments[0]; - - this.properties.force_keyboard = enable; - return this; - } - }, { - key: 'resize', - - /** - * Set resize_keyboard property of reply_markup - * @param {boolean} enable value of resize_keyboard, defaults to true - * @return {object} returns the keyboard object - */ - value: function resize() { - var enable = arguments[0] === undefined ? true : arguments[0]; - - this.properties.resize_keyboard = enable; - return this; - } - }, { - key: 'oneTime', - - /** - * Set force_keyboard property of reply_markup - * @param {boolean} enable value of force_keyboard, defaults to true - * @return {object} returns the keyboard object - */ - value: function oneTime() { - var enable = arguments[0] === undefined ? true : arguments[0]; - - this.properties.one_time_keyboard = enable; - return this; - } - }, { - key: 'selective', - - /** - * Set selective property of reply_markup - * @param {boolean} enable value of force_keyboard, defaults to true - * @return {object} returns the keyboard object - */ - value: function selective() { - var enable = arguments[0] === undefined ? true : arguments[0]; - - this.properties.selective = enable; - return this; - } - }, { - key: 'hide', - - /** - * Set hide_keyboard property of reply_markup to true - * @return {object} returns the keyboard object - */ - value: function hide() { - this.properties = { - hide_keyboard: true - }; - - return this; - } - }]); - - return Keyboard; -})(_Base3['default']); - -exports['default'] = Keyboard; -module.exports = exports['default']; diff --git a/build/types/Message.js b/build/types/Message.js deleted file mode 100644 index 1f18b09..0000000 --- a/build/types/Message.js +++ /dev/null @@ -1,117 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x3, _x4, _x5) { var _again = true; _function: while (_again) { var object = _x3, property = _x4, receiver = _x5; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x3 = parent; _x4 = property; _x5 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Base2 = require('./Base'); - -var _Base3 = _interopRequireDefault(_Base2); - -/** - * Message class, used to send message to a chat - */ - -var Message = (function (_Base) { - /** - * Create a new message - * @param {object} properties Message properties, as defined by Telegram API - */ - - function Message() { - var properties = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, Message); - - _get(Object.getPrototypeOf(Message.prototype), 'constructor', this).call(this, 'sendMessage'); - - this.properties = properties; - this._keyboard = new _Base3['default'](); - } - - _inherits(Message, _Base); - - _createClass(Message, [{ - key: 'to', - - /** - * Set chat_id of the message - * @param {number} chat - * @return {object} returns the message object - */ - value: function to(chat) { - this.properties.chat_id = chat; - return this; - } - }, { - key: 'text', - - /** - * Set text of the message - * @param {string} text Message's content - * @return {object} returns the message object - */ - value: function text(_text) { - this.properties.text = _text; - return this; - } - }, { - key: 'reply', - - /** - * Set reply_to_message_id of the message - * @param {number} id message_id of the message to reply to - * @return {object} returns the message object - */ - value: function reply(id) { - this.properties.reply_to_message_id = id; - return this; - } - }, { - key: 'preview', - - /** - * Set disable_web_page_preview of the message - * @param {boolean} enable - * @return {object} returns the message object - */ - value: function preview() { - var enable = arguments[0] === undefined ? true : arguments[0]; - - this.properties.disable_web_page_preview = !enable; - return this; - } - }, { - key: 'keyboard', - - /** - * Sets keyboard of the message - * The value of reply_markup is set to the sanitized keyboard properties - * i.e. reply_markup = JSON.stringify(kb.getProperties()) - * @param {object} kb A Keyboard instance - * @return {object} returns the message object - */ - value: function keyboard(kb) { - this._keyboard = kb; - return this; - } - - // This class inherits Base's send method - - }]); - - return Message; -})(_Base3['default']); - -exports['default'] = Message; -module.exports = exports['default']; diff --git a/build/types/Question.js b/build/types/Question.js deleted file mode 100644 index 824ad40..0000000 --- a/build/types/Question.js +++ /dev/null @@ -1,111 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Message2 = require('./Message'); - -var _Message3 = _interopRequireDefault(_Message2); - -var _Keyboard = require('./Keyboard'); - -var _Keyboard2 = _interopRequireDefault(_Keyboard); - -/** - * Question class, extends Message - * Sends a message, shows a keyboard with the answers provided, and validates - * the answer - */ - -var Question = (function (_Message) { - /** - * Create a new question - * @param {object} options Options, same as Message, plus `answers` which - * is a keyboard layout, see Keyboard#keys - */ - - function Question() { - var options = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, Question); - - _get(Object.getPrototypeOf(Question.prototype), 'constructor', this).call(this, options); - - var kb = new _Keyboard2['default']().force().oneTime().selective(); - this.keyboard(kb); - - this.answers(options.answers); - } - - _inherits(Question, _Message); - - _createClass(Question, [{ - key: 'answers', - - /** - * Sets answers of the question. This is passed to Keyboard#keys, and then - * used to validate the answer given - * @param {array} answers Array of arrays of strings, same as Keyboard#keys - * @return {object} returns the question object - */ - value: function answers(_answers) { - this._answers = _answers; - this._keyboard.keys(_answers); - return this; - } - }, { - key: 'send', - - /** - * Sends the question (same as Message#send), and validates the answer given - * if the answer is one of the defined answers, resolves, else rejects - * You should not manually use this method unless you're extending this class - * You should instead use bot.send(question); - * @param {object} bot - * @return {promise} A promise which is resolved in case of valid answer, and - * rejected in case of invalid answer - */ - value: function send(bot) { - var _this = this; - - var answers = this._answers; - - return _get(Object.getPrototypeOf(Question.prototype), 'send', this).call(this, bot).then(function (message) { - var answer = undefined; - - answers.forEach(function find(a) { - if (Array.isArray(a)) { - a.forEach(find); - } - if (a === message.text) { - answer = a; - } - }); - - if (answer) { - _this.emit('question:answer', answer, message); - return message; - } else { - _this.emit('question:invalid', message); - throw message; - } - }); - } - }]); - - return Question; -})(_Message3['default']); - -exports['default'] = Question; -module.exports = exports['default']; diff --git a/build/utils.js b/build/utils.js deleted file mode 100644 index 3918c74..0000000 --- a/build/utils.js +++ /dev/null @@ -1 +0,0 @@ -"use strict"; diff --git a/build/webhook.js b/build/webhook.js deleted file mode 100644 index c00c59f..0000000 --- a/build/webhook.js +++ /dev/null @@ -1,42 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); -exports['default'] = webhook; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -var _http = require('http'); - -var _http2 = _interopRequireDefault(_http); - -var _qs = require('qs'); - -var _qs2 = _interopRequireDefault(_qs); - -var _fetch = require('./fetch'); - -var DEFAULTS = { - server: {}, - port: 443 -}; - -function webhook(options, bot) { - if (options === undefined) options = {}; - - options = Object.assign(DEFAULTS, options); - - return bot.api.setWebhook(options.url).then(function () { - - _http2['default'].createServer(options.server, function (req, res) { - return (0, _fetch.getBody)(req).then(function (data) { - bot.emit('update', _qs2['default'].parse(data).result); - - res.end('OK'); - }); - }).listen(options.port); - }); -} - -module.exports = exports['default']; diff --git a/demo.js b/demo.js index c46cac0..e0ea837 100644 --- a/demo.js +++ b/demo.js @@ -1,4 +1,4 @@ -var Bot = require('telegram-api'); +var Bot = require('telegram-api').default; // only require the message types you need, more coming soon! var Message = require('telegram-api/types/Message'); diff --git a/index.js b/index.js deleted file mode 100644 index 8ae3093..0000000 --- a/index.js +++ /dev/null @@ -1,2 +0,0 @@ -require('babel/polyfill'); -module.exports = require('./build/'); diff --git a/package.json b/package.json index d4725a9..ca2d8ee 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "telegram-api", - "version": "0.6.1", + "version": "0.7.0", "description": "Control Telegram bots easily using the new Telegram API", - "main": "index.js", + "main": "build/index.js", "scripts": { "test": "grunt test" }, @@ -23,25 +23,29 @@ }, "files": [ "types", - "build", - "index.js" + "build" ], "directories": { - "lib": "lib" + "lib": "src" }, "engines": { "node": ">=0.12.0" }, "homepage": "https://github.com/mdibaiee/node-telegram-api", "dependencies": { - "babel": "5.6.14", - "grunt": "0.4.5", - "grunt-babel": "5.0.1", - "grunt-contrib-copy": "0.8.0", - "grunt-contrib-watch": "0.6.1", - "grunt-eslint": "16.0.0", + "babel-polyfill": "^6.7.4", "mime": "1.3.4", "qs": "4.0.0", "unirest": "0.4.2" + }, + "devDependencies": { + "babel-plugin-add-module-exports": "^0.1.2", + "babel-preset-es2015": "^6.6.0", + "grunt": "^0.4.5", + "grunt-babel": "^6.0.0", + "grunt-contrib-clean": "^1.0.0", + "grunt-contrib-copy": "^1.0.0", + "grunt-contrib-watch": "^1.0.0", + "grunt-copy": "^0.1.0" } } diff --git a/lib/functions/api.js b/src/functions/api.js similarity index 100% rename from lib/functions/api.js rename to src/functions/api.js diff --git a/lib/functions/argument-parser.js b/src/functions/argument-parser.js similarity index 96% rename from lib/functions/argument-parser.js rename to src/functions/argument-parser.js index 9ed7460..48376a0 100644 --- a/lib/functions/argument-parser.js +++ b/src/functions/argument-parser.js @@ -40,7 +40,9 @@ export default function argumentParser(format, string) { string = string.replace(/[^\s]+/, '').trim(); format = format.replace(/[^\s]+/, '').trim(); - if (!format) return {args: {}, params: {}}; + if (!format) { + return {args: {}, params: {}}; + } let indexes = [], params = {}; @@ -64,7 +66,9 @@ export default function argumentParser(format, string) { return getFormat(null, 'rest'); }); - if (!string) return {args: {}, params}; + if (!string) { + return {args: {}, params}; + } indexes = indexes.sort((a, b) => { return a.offset < b.offset ? -1 : 1; diff --git a/lib/functions/fetch.js b/src/functions/fetch.js similarity index 100% rename from lib/functions/fetch.js rename to src/functions/fetch.js diff --git a/lib/functions/poll.js b/src/functions/poll.js similarity index 83% rename from lib/functions/poll.js rename to src/functions/poll.js index 669a8f5..eb71b03 100644 --- a/lib/functions/poll.js +++ b/src/functions/poll.js @@ -5,7 +5,9 @@ export default function poll(bot) { } bot.emit('update', response.result); - if (bot._stop) return null; + if (bot._stop) { + return null; + } return poll(bot); }); } diff --git a/lib/functions/webhook.js b/src/functions/webhook.js similarity index 100% rename from lib/functions/webhook.js rename to src/functions/webhook.js diff --git a/lib/index.js b/src/index.js similarity index 94% rename from lib/index.js rename to src/index.js index b32de1e..5f909ac 100644 --- a/lib/index.js +++ b/src/index.js @@ -1,9 +1,15 @@ +import 'babel-polyfill'; import API from './functions/api'; import webhook from './functions/webhook'; import poll from './functions/poll'; import argumentParser from './functions/argument-parser'; import {EventEmitter} from 'events'; import Message from './types/Message'; +import File from './types/File'; +import Keyboard from './types/Keyboard'; +import BulkMessage from './types/BulkMessage'; +import Question from './types/Question'; +import Forward from './types/Forward'; const DEFAULTS = { update: { @@ -14,7 +20,6 @@ const DEFAULTS = { }; const REQUIRED = 0; -const OPTIONAL = 1; /** * Bot class used to connect to a new bot @@ -164,7 +169,9 @@ export default class Bot extends EventEmitter { update.forEach(res => { let text = res.message.text; - if (!text) return; + if (!text) { + return; + } const selfUsername = `@${this.info.username}`; @@ -223,3 +230,12 @@ export default class Bot extends EventEmitter { }); } } + +export { + File, + Message, + BulkMessage, + Forward, + Question, + Keyboard +}; diff --git a/lib/types/Base.js b/src/types/Base.js similarity index 100% rename from lib/types/Base.js rename to src/types/Base.js diff --git a/lib/types/BulkMessage.js b/src/types/BulkMessage.js similarity index 100% rename from lib/types/BulkMessage.js rename to src/types/BulkMessage.js diff --git a/lib/types/File.js b/src/types/File.js similarity index 100% rename from lib/types/File.js rename to src/types/File.js diff --git a/lib/types/Forward.js b/src/types/Forward.js similarity index 100% rename from lib/types/Forward.js rename to src/types/Forward.js diff --git a/lib/types/Keyboard.js b/src/types/Keyboard.js similarity index 100% rename from lib/types/Keyboard.js rename to src/types/Keyboard.js diff --git a/lib/types/Message.js b/src/types/Message.js similarity index 100% rename from lib/types/Message.js rename to src/types/Message.js diff --git a/lib/types/Question.js b/src/types/Question.js similarity index 100% rename from lib/types/Question.js rename to src/types/Question.js diff --git a/types/Base.js b/types/Base.js deleted file mode 100644 index fb2dc96..0000000 --- a/types/Base.js +++ /dev/null @@ -1,136 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _events = require('events'); - -var ANSWER_THRESHOLD = 10; - -/** - * Base class of all classes - */ - -var Base = (function (_EventEmitter) { - function Base(method) { - _classCallCheck(this, Base); - - _get(Object.getPrototypeOf(Base.prototype), 'constructor', this).call(this); - - this.method = method; - this.properties = {}; - } - - _inherits(Base, _EventEmitter); - - _createClass(Base, [{ - key: 'send', - - /** - * Sends the message, you should only use this method yourself if - * you are extending this class. Normally you should call bot.send(message) - * - * Events: message:sent => Emitted after sending the message to API, gets the - * API's response - * - * message:answer => Emitted when your message gets an answer from - * the contact (reply in case of groups) - * gets the Update object containing message - * - * @param {object} bot - * @return {promise} returns a promise, resolved with message:answer - */ - value: function send(bot) { - var _this = this; - - if (this._keyboard) { - var reply_markup = JSON.stringify(this._keyboard.getProperties()); - this.properties.reply_markup = reply_markup; - } - - var messageId = undefined; - return new Promise(function (resolve) { - bot.api[_this.method](_this.properties).then(function (response) { - messageId = response.result.message_id; - _this.emit('message:sent', response); - }); - - if (_this._keyboard.one_time_keyboard) { - _this._keyboard.replyMarkup = ''; - } - - var chat = _this.properties.chat_id; - var answers = 0; - bot.on('update', function listener(result) { - answers += result.length; - - var update = result.find(function (_ref) { - var message = _ref.message; - - // if in a group, there will be a reply to this message - if (chat < 0) { - return message.chat.id === chat && message.reply_to_message && message.reply_to_message.message_id === messageId; - } else { - return message.chat.id === chat; - } - }); - - if (update) { - resolve(update.message); - - this.emit('message:answer', update.message); - - bot.removeListener('update', listener); - } - - if (answers >= ANSWER_THRESHOLD) { - bot.removeListener('update', listener); - } - }); - }); - } - }, { - key: 'getProperties', - - /** - * Returns properties of the object - * @return {object} properties of object - */ - value: function getProperties() { - return this.properties; - } - }, { - key: 'setProperties', - - /** - * Set properties of the object - * @param {object} object properties to set - * @param {boolean} extend A boolean indicating if the properties should be - * extended by the object provided (Object.assign) - * or properties should be replaced by the object - * defaults to true - * @return {object} returns the properties (same as getProperties) - */ - value: function setProperties(object) { - var extend = arguments[1] === undefined ? true : arguments[1]; - - this.properties = extend ? Object.assign(this.properties, object) : object; - - return this.getProperties(); - } - }]); - - return Base; -})(_events.EventEmitter); - -exports['default'] = Base; -module.exports = exports['default']; diff --git a/types/BulkMessage.js b/types/BulkMessage.js deleted file mode 100644 index 2359ec5..0000000 --- a/types/BulkMessage.js +++ /dev/null @@ -1,88 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Message2 = require('./Message'); - -var _Message3 = _interopRequireDefault(_Message2); - -/** - * Message class, used to send a message to multiple chats - */ - -var BulkMessage = (function (_Message) { - /** - * Create a new message - * @param {object} properties Message properties, as defined by Telegram API - */ - - function BulkMessage() { - var properties = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, BulkMessage); - - _get(Object.getPrototypeOf(BulkMessage.prototype), 'constructor', this).call(this, properties); - - this.chats = []; - } - - _inherits(BulkMessage, _Message); - - _createClass(BulkMessage, [{ - key: 'to', - - /** - * Set multiple chat_id's for the message - * @param {number} chat - * @return {object} returns the message object - */ - value: function to() { - for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) { - args[_key] = arguments[_key]; - } - - var chats = args.reduce(function (a, b) { - return a.concat(b); - }, []); - - this.chats = chats; - return this; - } - }, { - key: 'send', - - /** - * Send the message to all chats - * @param {Bot} bot - * @return {Promise} Resolved when the message is sent to all chats - */ - value: function send(bot) { - var _this = this; - - var promises = this.chats.map(function (chat) { - var clone = Object.assign({}, _this.properties); - var message = new _Message3['default'](clone).to(chat); - return message.send(bot); - }); - - return Promise.all(promises); - } - }]); - - return BulkMessage; -})(_Message3['default']); - -exports['default'] = BulkMessage; -module.exports = exports['default']; diff --git a/types/File.js b/types/File.js deleted file mode 100644 index 30f54f4..0000000 --- a/types/File.js +++ /dev/null @@ -1,153 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }; })(); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Base2 = require('./Base'); - -var _Base3 = _interopRequireDefault(_Base2); - -var _mime = require('mime'); - -var _mime2 = _interopRequireDefault(_mime); - -var TYPES = ['photo', 'video', 'document', 'audio']; - -/** - * File class, used to send pictures/movies/audios/documents to chat - */ - -var File = (function (_Base) { - /** - * Create a new file instance - * @param {object} properties File properties, as defined by Telegram API - */ - - function File() { - var properties = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, File); - - _get(Object.getPrototypeOf(File.prototype), 'constructor', this).call(this, 'sendDocument'); - - this.properties = properties; - this._keyboard = new _Base3['default'](); - } - - _inherits(File, _Base); - - _createClass(File, [{ - key: 'to', - - /** - * Set chat_id of the message - * @param {number} chat - * @return {object} returns the message object - */ - value: function to(chat) { - this.properties.chat_id = chat; - return this; - } - }, { - key: 'file', - - /** - * Set file of the message - * @param {string} file File path - * @param {string} fileType (optional) if the first argument is a - * file_id string, this option indicates file type - * @return {object} returns the message object - */ - value: function file(_file, fileType) { - if (fileType) { - this.properties[fileType] = { file: _file }; - - return this; - } - - var _mime$lookup$split = _mime2['default'].lookup(_file).split('/'); - - var _mime$lookup$split2 = _slicedToArray(_mime$lookup$split, 2); - - var type = _mime$lookup$split2[0]; - var extension = _mime$lookup$split2[1]; - - if (type === 'image') { - type = 'photo'; - } - - if (extension === 'gif') { - type = 'document'; - } - - if (TYPES.indexOf(type) === -1) { - type = 'document'; - } - - this.properties[type] = { file: _file }; - - this.method = 'send' + (type[0].toUpperCase() + type.slice(1)); - - return this; - } - }, { - key: 'caption', - - /** - * Set caption for photos - * @param {string} text caption's text - * @return {object} returns the message object - */ - value: function caption(text) { - this.properties.caption = text; - return this; - } - }, { - key: 'reply', - - /** - * Set reply_to_message_id of the message - * @param {number} id message_id of the message to reply to - * @return {object} returns the message object - */ - value: function reply(id) { - this.properties.reply_to_message_id = id; - return this; - } - }, { - key: 'keyboard', - - /** - * Sets keyboard of the message - * The value of reply_markup is set to the sanitized keyboard properties - * i.e. reply_markup = JSON.stringify(kb.getProperties()) - * @param {object} kb A Keyboard instance - * @return {object} returns the message object - */ - value: function keyboard(kb) { - this._keyboard = kb; - return this; - } - - // This class inherits Base's send method - - }]); - - return File; -})(_Base3['default']); - -exports['default'] = File; -module.exports = exports['default']; diff --git a/types/Forward.js b/types/Forward.js deleted file mode 100644 index 44871c3..0000000 --- a/types/Forward.js +++ /dev/null @@ -1,90 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Base2 = require('./Base'); - -var _Base3 = _interopRequireDefault(_Base2); - -/** - * Forward class, used to forward messages from a chat to another - */ - -var Forward = (function (_Base) { - /** - * Create a new forward message - * @param {object} properties Forward Message properties, as defined by - * Telegram API - */ - - function Forward() { - var properties = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, Forward); - - _get(Object.getPrototypeOf(Forward.prototype), 'constructor', this).call(this, 'forwardMessage'); - - this.properties = properties; - this._keyboard = new _Base3['default'](); - } - - _inherits(Forward, _Base); - - _createClass(Forward, [{ - key: 'to', - - /** - * Set chat_id of the message - * @param {number} chat - * @return {object} returns the message object - */ - value: function to(chat) { - this.properties.chat_id = chat; - return this; - } - }, { - key: 'from', - - /** - * Set from_chat_id, source of message's chat's id - * @param {number} chat Source chat id - * @return {object} returns the message object - */ - value: function from(chat) { - this.properties.from_chat_id = chat; - return this; - } - }, { - key: 'message', - - /** - * Sets message_id, the message to forward from source to target chat - * @param {number} message ID of the message to forward - * @return {object} returns the message object - */ - value: function message(_message) { - this.properties.message_id = _message; - return this; - } - - // This class inherits Base's send method - - }]); - - return Forward; -})(_Base3['default']); - -exports['default'] = Forward; -module.exports = exports['default']; diff --git a/types/Keyboard.js b/types/Keyboard.js deleted file mode 100644 index c1fc8d0..0000000 --- a/types/Keyboard.js +++ /dev/null @@ -1,138 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x6, _x7, _x8) { var _again = true; _function: while (_again) { var object = _x6, property = _x7, receiver = _x8; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x6 = parent; _x7 = property; _x8 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Base2 = require('./Base'); - -var _Base3 = _interopRequireDefault(_Base2); - -/** - * Keyboard class, used to configure keyboards for messages. - * You should pass your instance of this class to message.keyboard() method - */ - -var Keyboard = (function (_Base) { - /** - * Create a new keyboard - * @param {object} properties Keyboard properties, as defined by Telegram API - * See ReplyKeyboardMarkup, ReplyKeyboardHide, - * ForceReply - */ - - function Keyboard() { - var properties = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, Keyboard); - - _get(Object.getPrototypeOf(Keyboard.prototype), 'constructor', this).call(this); - - this.properties = properties; - } - - _inherits(Keyboard, _Base); - - _createClass(Keyboard, [{ - key: 'keys', - - /** - * Set the keyboard property of reply_markup - * @param {array} keys An array of arrays, with the format of - * Column Column - * Row [['TopLeft', 'TopRight'], - * Row ['BottomLeft', 'BottomRight']] - * @return {object} returns the keyboard object - */ - value: function keys(_keys) { - this.properties.keyboard = _keys; - this.properties.hide_keyboard = false; - return this; - } - }, { - key: 'force', - - /** - * Set force_keyboard property of reply_markup - * @param {boolean} enable value of force_keyboard, defaults to true - * @return {object} returns the keyboard object - */ - value: function force() { - var enable = arguments[0] === undefined ? true : arguments[0]; - - this.properties.force_keyboard = enable; - return this; - } - }, { - key: 'resize', - - /** - * Set resize_keyboard property of reply_markup - * @param {boolean} enable value of resize_keyboard, defaults to true - * @return {object} returns the keyboard object - */ - value: function resize() { - var enable = arguments[0] === undefined ? true : arguments[0]; - - this.properties.resize_keyboard = enable; - return this; - } - }, { - key: 'oneTime', - - /** - * Set force_keyboard property of reply_markup - * @param {boolean} enable value of force_keyboard, defaults to true - * @return {object} returns the keyboard object - */ - value: function oneTime() { - var enable = arguments[0] === undefined ? true : arguments[0]; - - this.properties.one_time_keyboard = enable; - return this; - } - }, { - key: 'selective', - - /** - * Set selective property of reply_markup - * @param {boolean} enable value of force_keyboard, defaults to true - * @return {object} returns the keyboard object - */ - value: function selective() { - var enable = arguments[0] === undefined ? true : arguments[0]; - - this.properties.selective = enable; - return this; - } - }, { - key: 'hide', - - /** - * Set hide_keyboard property of reply_markup to true - * @return {object} returns the keyboard object - */ - value: function hide() { - this.properties = { - hide_keyboard: true - }; - - return this; - } - }]); - - return Keyboard; -})(_Base3['default']); - -exports['default'] = Keyboard; -module.exports = exports['default']; diff --git a/types/Message.js b/types/Message.js deleted file mode 100644 index 1f18b09..0000000 --- a/types/Message.js +++ /dev/null @@ -1,117 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x3, _x4, _x5) { var _again = true; _function: while (_again) { var object = _x3, property = _x4, receiver = _x5; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x3 = parent; _x4 = property; _x5 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Base2 = require('./Base'); - -var _Base3 = _interopRequireDefault(_Base2); - -/** - * Message class, used to send message to a chat - */ - -var Message = (function (_Base) { - /** - * Create a new message - * @param {object} properties Message properties, as defined by Telegram API - */ - - function Message() { - var properties = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, Message); - - _get(Object.getPrototypeOf(Message.prototype), 'constructor', this).call(this, 'sendMessage'); - - this.properties = properties; - this._keyboard = new _Base3['default'](); - } - - _inherits(Message, _Base); - - _createClass(Message, [{ - key: 'to', - - /** - * Set chat_id of the message - * @param {number} chat - * @return {object} returns the message object - */ - value: function to(chat) { - this.properties.chat_id = chat; - return this; - } - }, { - key: 'text', - - /** - * Set text of the message - * @param {string} text Message's content - * @return {object} returns the message object - */ - value: function text(_text) { - this.properties.text = _text; - return this; - } - }, { - key: 'reply', - - /** - * Set reply_to_message_id of the message - * @param {number} id message_id of the message to reply to - * @return {object} returns the message object - */ - value: function reply(id) { - this.properties.reply_to_message_id = id; - return this; - } - }, { - key: 'preview', - - /** - * Set disable_web_page_preview of the message - * @param {boolean} enable - * @return {object} returns the message object - */ - value: function preview() { - var enable = arguments[0] === undefined ? true : arguments[0]; - - this.properties.disable_web_page_preview = !enable; - return this; - } - }, { - key: 'keyboard', - - /** - * Sets keyboard of the message - * The value of reply_markup is set to the sanitized keyboard properties - * i.e. reply_markup = JSON.stringify(kb.getProperties()) - * @param {object} kb A Keyboard instance - * @return {object} returns the message object - */ - value: function keyboard(kb) { - this._keyboard = kb; - return this; - } - - // This class inherits Base's send method - - }]); - - return Message; -})(_Base3['default']); - -exports['default'] = Message; -module.exports = exports['default']; diff --git a/types/Question.js b/types/Question.js deleted file mode 100644 index 824ad40..0000000 --- a/types/Question.js +++ /dev/null @@ -1,111 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } - -var _Message2 = require('./Message'); - -var _Message3 = _interopRequireDefault(_Message2); - -var _Keyboard = require('./Keyboard'); - -var _Keyboard2 = _interopRequireDefault(_Keyboard); - -/** - * Question class, extends Message - * Sends a message, shows a keyboard with the answers provided, and validates - * the answer - */ - -var Question = (function (_Message) { - /** - * Create a new question - * @param {object} options Options, same as Message, plus `answers` which - * is a keyboard layout, see Keyboard#keys - */ - - function Question() { - var options = arguments[0] === undefined ? {} : arguments[0]; - - _classCallCheck(this, Question); - - _get(Object.getPrototypeOf(Question.prototype), 'constructor', this).call(this, options); - - var kb = new _Keyboard2['default']().force().oneTime().selective(); - this.keyboard(kb); - - this.answers(options.answers); - } - - _inherits(Question, _Message); - - _createClass(Question, [{ - key: 'answers', - - /** - * Sets answers of the question. This is passed to Keyboard#keys, and then - * used to validate the answer given - * @param {array} answers Array of arrays of strings, same as Keyboard#keys - * @return {object} returns the question object - */ - value: function answers(_answers) { - this._answers = _answers; - this._keyboard.keys(_answers); - return this; - } - }, { - key: 'send', - - /** - * Sends the question (same as Message#send), and validates the answer given - * if the answer is one of the defined answers, resolves, else rejects - * You should not manually use this method unless you're extending this class - * You should instead use bot.send(question); - * @param {object} bot - * @return {promise} A promise which is resolved in case of valid answer, and - * rejected in case of invalid answer - */ - value: function send(bot) { - var _this = this; - - var answers = this._answers; - - return _get(Object.getPrototypeOf(Question.prototype), 'send', this).call(this, bot).then(function (message) { - var answer = undefined; - - answers.forEach(function find(a) { - if (Array.isArray(a)) { - a.forEach(find); - } - if (a === message.text) { - answer = a; - } - }); - - if (answer) { - _this.emit('question:answer', answer, message); - return message; - } else { - _this.emit('question:invalid', message); - throw message; - } - }); - } - }]); - - return Question; -})(_Message3['default']); - -exports['default'] = Question; -module.exports = exports['default'];