Comparing version 4.2.0 to 4.2.1
@@ -146,3 +146,3 @@ 'use strict'; | ||
value: function start() { | ||
var self, feedsFromList; | ||
var self, hasFeeds, hasFeedsFromLists, feedsFromList; | ||
return _regeneratorRuntime.async(function start$(context$2$0) { | ||
@@ -162,4 +162,7 @@ var _this = this; | ||
case 3: | ||
if (!(!this.feed() && !this.feedsFromList() || this.feed().length === 0 && this.feedsFromList().length === 0)) { | ||
context$2$0.next = 5; | ||
hasFeeds = this.feed() && this.feed().length > 0; | ||
hasFeedsFromLists = this.feedsFromList() && this.feedsFromList().length > 0; | ||
if (!(!hasFeeds && !hasFeedsFromLists)) { | ||
context$2$0.next = 7; | ||
break; | ||
@@ -170,7 +173,7 @@ } | ||
case 5: | ||
context$2$0.next = 7; | ||
case 7: | ||
context$2$0.next = 9; | ||
return _regeneratorRuntime.awrap(self.processFeedsFromList(self.feedsFromList())); | ||
case 7: | ||
case 9: | ||
feedsFromList = context$2$0.sent; | ||
@@ -180,3 +183,8 @@ | ||
context$2$0.next = 11; | ||
if (!self.feed()) { | ||
context$2$0.next = 14; | ||
break; | ||
} | ||
context$2$0.next = 14; | ||
return _regeneratorRuntime.awrap(_Promise.all(self.feed().map(function (feed) { | ||
@@ -203,7 +211,7 @@ var options = (0, _objectAssign2['default'])({}, self.options, feed.options); | ||
case 11: | ||
context$2$0.next = 13; | ||
case 14: | ||
context$2$0.next = 16; | ||
return _regeneratorRuntime.awrap(self.processFeeds(self.feeds, feedsFromList)); | ||
case 13: | ||
case 16: | ||
@@ -240,13 +248,13 @@ // Now setup the interval that will incrementally update the cache. | ||
if (!self.options.server) { | ||
context$2$0.next = 17; | ||
context$2$0.next = 20; | ||
break; | ||
} | ||
context$2$0.next = 17; | ||
context$2$0.next = 20; | ||
return _regeneratorRuntime.awrap(self.startServer()); | ||
case 17: | ||
case 20: | ||
return context$2$0.abrupt('return', _Promise.resolve(self.tweets)); | ||
case 18: | ||
case 21: | ||
case 'end': | ||
@@ -253,0 +261,0 @@ return context$2$0.stop(); |
@@ -15,3 +15,4 @@ 'use strict'; | ||
var feeds = birdwatch.feed().length; | ||
var feeds = birdwatch.feed() ? birdwatch.feed().length : 0; | ||
var feedsFromLists = birdwatch.feedsFromList() ? birdwatch.feedsFromList().length : 0; | ||
var refreshSeconds = birdwatch.options.refreshTime; | ||
@@ -26,2 +27,3 @@ var refreshMinutes = Math.round(refreshSeconds / 60); | ||
console.log(chalk.cyan('|') + ' ' + chalk.gray(' Monitoring Feeds: ') + ' ' + chalk.white(feeds)); | ||
console.log(chalk.cyan('|') + ' ' + chalk.gray(' Monitoring Twitter Lists: ') + ' ' + chalk.white(feedsFromLists)); | ||
console.log(chalk.cyan('|') + ' ' + chalk.gray(' Refresh Time: ') + ' ' + chalk.white(refreshSeconds) + ' secs (' + refreshMinutes + ' min)'); | ||
@@ -28,0 +30,0 @@ console.log(chalk.cyan('|') + ' ' + chalk.gray(' Cache File: ') + ' ' + chalk.white(cache)); |
{ | ||
"name": "birdwatch", | ||
"version": "4.2.0", | ||
"version": "4.2.1", | ||
"description": "Monitor, filter, cache and serve specific twitter feeds.", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
34685
610