diff --git a/synclets/facebook/friends.js b/synclets/facebook/friends.js index 5d738d361..1dadde2a1 100644 --- a/synclets/facebook/friends.js +++ b/synclets/facebook/friends.js @@ -17,7 +17,6 @@ exports.sync = function(processInfo, cb) { if (err) console.error(err); var responseObj = {data : {}}; responseObj.data.contact = contacts; - console.error("sending "+contacts.length); cb(err, responseObj); }); }; @@ -25,6 +24,5 @@ exports.sync = function(processInfo, cb) { exports.syncFriends = function(callback) { fb.getFriends({id:"me"},function(friend){ contacts.push({'obj' : friend, timestamp: new Date(), type : 'new'}); - console.error("friend: "+friend.id); },callback); } diff --git a/synclets/facebook/photos.js b/synclets/facebook/photos.js index 9657a2644..7dd7e607f 100644 --- a/synclets/facebook/photos.js +++ b/synclets/facebook/photos.js @@ -8,21 +8,28 @@ */ var fb = require('../../Connectors/Facebook/lib.js') - , contacts = [] + , async = require('async') + , photos = [] ; exports.sync = function(processInfo, cb) { fb.init(processInfo.auth); - exports.syncFriends(function(err) { + exports.syncPhotos(function(err) { if (err) console.error(err); var responseObj = {data : {}}; - responseObj.data.contact = contacts; + responseObj.data.photo = photos; cb(err, responseObj); }); }; -exports.syncFriends = function(callback) { - fb.getFriends({id:"me"},function(friend){ - contacts.push({'obj' : friend, timestamp: new Date(), type : 'new'}); - },callback); +exports.syncPhotos = function(callback) { + // use a queue so we know when all the albums are done individually async'ly processing + var albums = []; + fb.getAlbums({id:"me"},function(album){albums.push(album);},function(){ + async.forEach(albums,function(album,cbDone){ + fb.getAlbum({id:album.id},function(photo){ + photos.push({'obj' : photo, timestamp: new Date(), type : 'new'}); + },cbDone); + },callback); + }); } \ No newline at end of file