senaduka/old-tellall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug with undefined variable ; improve abstraction

Browse Source
This commit is contained in:
GotPPay
2018-04-02 12:55:31 +02:00
parent 38c63e619b
commit ec3d4dcd6c
4 changed files with 270 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
backend/models/alexa.js
View File

@@ -74,47 +74,61 @@ module.exports = {
let answerPromiseProps = {
resolve: null,
reject: null
}
reject: null,
};
let answer = new Promise((resolve,reject)=>{
let answer = new Promise ((resolve, reject) => {
answerPromiseProps = {
resolve:resolve,
reject:reject
}
resolve: resolve,
reject: reject,
};
});
switch (intent.answerType){
switch (intent.answerType) {
case constants.answerType.PREDEFINED:
answerPromiseProps.resolve(intent.answer);
answerPromiseProps.resolve (intent.answer);
break;
case constants.answerType.EXTERNAL_SOURCE_WP_TITLES:
predefinedSourceHelper.getAnswerFromWP(intent.externalAnswerSource).then(answer=>{
answerPromiseProps.resolve(answer);
}).catch(error=>{
answerPromiseProps.reject(error);
});
predefinedSourceHelper
.getAnswerFromWP (
intent.externalAnswerSource,
constants.contentType.TITLES
)
.then (answer => {
answerPromiseProps.resolve (answer);
})
.catch (error => {
answerPromiseProps.reject (error);
});
break;
case constants.answerType.EXTERNAL_SOURCE_WP_NEWS:
predefinedSourceHelper.getLatestNewsFromWP(intent.externalAnswerSource).then(answer=>{
answerPromiseProps.resolve(answer);
}).catch(error=>{
answerPromiseProps.reject(error);
});
predefinedSourceHelper
.getAnswerFromWP (
intent.externalAnswerSource,
constants.contentType.NEWS
)
.then (answer => {
answerPromiseProps.resolve (answer);
})
.catch (error => {
answerPromiseProps.reject (error);
});
break;
}
answer.then(answer=>{
this.response
.speak (answer)
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE); //Phrase from listen doesn't work !!!
this.emit (':responseReady');
}).catch(error=>{
this.response
.speak (error)
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE); //Phrase from listen doesn't work !!!
this.emit (':responseReady');
});
answer
.then (answer => {
this.response
.speak (answer)
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE); //Phrase from listen doesn't work !!!
this.emit (':responseReady');
})
.catch (error => {
this.response
.speak (error)
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE); //Phrase from listen doesn't work !!!
this.emit (':responseReady');
});
};
});