Changes

Author: kosmodrey

examples/inline-query.js

@@ -10,13 +10,13 @@ const TeleBot = require('../');
 const bot = new TeleBot('-PASTEYOURTELEGRAMBOTAPITOKENHERE-');
 
 // On inline query
-bot.on('inlineQuery', data => {
+bot.on('inlineQuery', msg => {
 
-  let query = data.query;
+  let query = msg.query;
   console.log(`inline query: ${ query }`);
 
   // Create a new answer list object
-  const answers = bot.answerList(data.id);
+  const answers = bot.answerList(msg.id);
 
   // Cache time in seconds (defaults to 300)
   answers.cacheTime = 60;

examples/message-types.js

@@ -9,7 +9,9 @@ bot.on(['*', '/*'], (msg, self) => {
   let reply = msg.message_id;
   let type = self.type;
   let parse = 'html';
-  return bot.sendMessage(id, `This is a <b>${ type }</b>.`, { reply, parse });
+  return bot.sendMessage(
+    id, `This is a <b>${ type }</b> message.`, { reply, parse }
+  );
 });
 
 bot.connect();

examples/text-mod.js examples/mod-text.js

@@ -434,7 +434,7 @@ TeleBot.addMethods(standardMethods);
 function eventPromiseError(type, fired, error) {
   return new Promise((resolve, reject) => {
     console.error('[bot.error.event]', error.stack || error);
-    if (type != 'error.event') {
+    if (type != 'error' && type != 'error.event') {
       this.event(['error', 'error.event'], { error, data: fired.data })
         .then(resolve).catch(reject);
     } else {

lib/telebot.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // Command regexp
-const reCMD = /^\/([а-я\w\d]+)/;
+const reCMD = /^\/([0-9а-я\w\d\_\-]+)/;
 
 // Message types
 const MESSAGE_TYPES = [
@@ -47,11 +47,8 @@ module.exports = {
         const match = reCMD.exec(update.text);
         if (!match) continue;
 
-        // Set type
-        props.type = 'command';
-
         // Command found
-        props.cmd = update.text.split(' ');
+        props.type = 'command';
         promise = promise.then(x => {
           return this.event(['/*', '/' + match[1]], update, props);
         });

lib/updates.js

@@ -9,17 +9,18 @@
 
 'use strict';
 
-module.exports = (bot, cfg) {
+module.exports = (bot, cfg) => {
 
   // Check AppMetrika key
   const TOKEN = cfg.botan;
+
+  // On no token
   if (!TOKEN) return console.error('[botan] no token key');
 
+  // Require botanio
   const botan = require('botanio')(TOKEN);
 
   // Track every type of message
-  bot.on('*', msg => {
-    botan.track(msg, this.type);
-  });
+  bot.on('*', (msg, props) => botan.track(msg, props.type));
 
 };

modules/botan.js

@@ -34,7 +34,7 @@ module.exports = (bot, cfg) => {
     return console.error('[report] no event list');
 
   // Create events handler
-  bot.on(eventList, (event={}, self, info) => {
+  bot.on(eventList, (event={}, props, info) => {
 
     // Skip event with "skipReport: true" option key
     if (