thereadme/node-telegram-api
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

Fix promises getting rejected silently - Thanks to @joepie91

Browse Source 
Fix bot not working properly in groups
Fix bot not answering properly
Bump to version 0.2.2
This commit is contained in:
Mahdi Dibaiee
2015-06-29 05:30:29 +04:30
parent 75798a1a63
commit 714ffa9458
10 changed files with 105 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/types/Message.js
View File

@ -134,20 +134,21 @@ var Message = (function (_Base) {
// 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_id === messageId;
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);
this.emit('message:answer', update);
resolve(update.message);
this.emit('message:answer', update.message);
bot.removeListener('update', listener);
}
});
});
})['catch'](console.error);
}
}]);

42
build/types/Question.js
View File

@ -42,8 +42,10 @@ var Question = (function (_Message) {
_get(Object.getPrototypeOf(Question.prototype), 'constructor', this).call(this, options);
var kb = new _Keyboard2['default']().force().oneTime().selective().keys(this.properties.answers);
var kb = new _Keyboard2['default']().force().oneTime().selective();
this.keyboard(kb);
this.answers(options.answers);
}
_inherits(Question, _Message);
@ -58,7 +60,7 @@ var Question = (function (_Message) {
* @return {object} returns the question object
*/
value: function answers(_answers) {
this.answers = _answers;
this._answers = _answers;
this._keyboard.keys(_answers);
return this;
}
@ -77,29 +79,27 @@ var Question = (function (_Message) {
value: function send(bot) {
var _this = this;
var answers = this.answers;
var answers = this._answers;
return new Promise(function (resolve, reject) {
_get(Object.getPrototypeOf(Question.prototype), 'send', _this).call(_this, bot).then(function (message) {
var answer = undefined;
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) {
resolve(answer, update);
_this.emit('question:answer', answer, update);
} else {
reject(update);
_this.emit('question:invalid', update);
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 update;
}
});
}
}]);