diff --git a/scripts/makeResponse.js b/scripts/makeResponse.js index c0142bd..e7d6693 100644 --- a/scripts/makeResponse.js +++ b/scripts/makeResponse.js @@ -19,9 +19,11 @@ exports.getPredicate = msg=>{ return pred.join(" ") } -exports.magnet = async searchterm=>{ + + +let magnet = async searchterm=>{ console.log(`Search for:${searchterm}`) - let result = await tsa.search(searchterm,5) + let result = await tsa.search(searchterm) let resultString='' for(let i=0;i<3;i++){ let magnet = await tsa.getMagnet(result[i]) || ' ' @@ -30,4 +32,19 @@ exports.magnet = async searchterm=>{ console.log(resultString) //console.log(await tsa.getMagnet(result[0])) return resultString +} + + +// The main function, calls the rest +exports.makeResponse = async (text)=>{ + let command = this.getCommand(text) + let pred = this.getPredicate(text) + let resultString='' + if(command=="magnet"){ + resultString = await magnet(pred); + } + else{ + resultString = pred + } + return resultString } \ No newline at end of file diff --git a/scripts/process.js b/scripts/process.js index 18dfff8..5fe7b61 100644 --- a/scripts/process.js +++ b/scripts/process.js @@ -6,7 +6,7 @@ module.exports = async (messageObject)=>{ console.log(makeResponse.getCommand(messageObject.text)) return { "chat_id": messageObject.from.id, - "text": await makeResponse.magnet( makeResponse.getPredicate(messageObject.text)), + "text": await makeResponse.makeResponse( messageObject.text ), "parse_mode": "Markdown", "reply_to_message_id": messageObject.message_id } diff --git a/scripts/respond.js b/scripts/respond.js index 43a52a8..a8aeab0 100644 --- a/scripts/respond.js +++ b/scripts/respond.js @@ -15,7 +15,7 @@ module.exports.call = async (base,updateObject)=>{ "body":responseObject },(err,res,body)=>{ if(err) console.log(err) - if(body.ok) console.log(`Successfully sent: ${body.result[0].message.text}`) + if(body.ok) console.log(`Successfully sent: ${body}`) }) } }