Mercurial > pumpbridge > pumpbridge
diff src/pumpio.coffee @ 17:a52b5b244e51
removed unnecessary underscore and replaced it with async
| author | Mathias Gebbe <mgebbe@intevation.de> |
|---|---|
| date | Fri, 13 Jun 2014 15:18:36 +0200 |
| parents | 6fd0a307850f |
| children | 3e3fa35e3ce2 |
line wrap: on
line diff
--- a/src/pumpio.coffee Thu Jun 12 20:58:06 2014 +0200 +++ b/src/pumpio.coffee Fri Jun 13 15:18:36 2014 +0200 @@ -37,9 +37,12 @@ oauth.get "https://" + server + "/api/user/"+id, token, secret, callback ], (err,result) -> #console.log 'PUMP BODY:' + result - result = JSON.parse(result) - id = result.profile.id.substr(result.profile.id.indexOf(':')+1,result.profile.id.length) - Routes.updateUserDB(id,result.profile.preferredUsername,result.profile.displayName,result.profile.url,result.profile.image.url) + try + result = JSON.parse(result) + id = result.profile.id.substr(result.profile.id.indexOf(':')+1,result.profile.id.length) + Routes.updateUserDB(id,result.profile.preferredUsername,result.profile.displayName,result.profile.url,result.profile.image.url) + catch err + console.log 'pumpio getUser error' + err return postUser = (bridgeid, to, text, callback) -> @@ -101,8 +104,12 @@ oauth.get "https://" + server + "/api/user/"+id+"/feed", token, secret, callback ], (err,result) -> #console.log 'PUMP BODY:' + result - result = JSON.parse(result) - callback null, result + try + result = JSON.parse(result) + callback null, result + catch err + console.log "pump.io Error" + callback null, null return #######################################