Merge branch 'crisbal-master'

src/telegram.js

@@ -68,8 +68,11 @@ TelegramBot.prototype.initPolling = function() {
 TelegramBot.prototype._processUpdate = function (update) {
   debug('Process Update %j', update);
   var message = update.message;
-  debug('Process Update message %j', message);
+  var inline_query = update.inline_query;
+  var chosen_inline_result = update.chosen_inline_result;
+  
   if (message) {
+    debug('Process Update message %j', message);
     this.emit('message', message);
     var processMessageType = function (messageType) {
       if (message[messageType]) {
@@ -89,6 +92,12 @@ TelegramBot.prototype._processUpdate = function (update) {
         }
       });
     }
+  } else if(inline_query) {
+    debug('Process Update inline_query %j', inline_query);
+    this.emit('inline_query', inline_query);
+  } else if(chosen_inline_result) {
+    debug('Process Update chosen_inline_result %j', chosen_inline_result);
+    this.emit('chosen_inline_result', chosen_inline_result);
   }
 };
 
@@ -206,6 +215,22 @@ TelegramBot.prototype.sendMessage = function (chatId, text, options) {
   return this._request('sendMessage', {form: form});
 };
 
+/**
+ * Send answers to an inline query.
+ * @param  {String} queryId Unique identifier of the query
+ * @param  {Array of InlineQueryResult} results An array of results for the inline query
+ * @param  {Object} [options] Additional Telegram query options
+ * @return {Promise}
+ * @see https://core.telegram.org/bots/api#answerinlinequery
+ */
+TelegramBot.prototype.answerInlineQuery = function (inline_query_id, results, options) {
+  var form = options || {};
+  form.inline_query_id = inline_query_id;
+  form.results = JSON.stringify(results);
+  return this._request('answerInlineQuery', {form: form});
+};
+
+
 /**
  * Forward messages of any kind.
  * @param  {Number|String} chatId     Unique identifier for the message recipient