public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into circular

Browse source 
* master:
  Upping page fill outs.
  Fixing user agent.
  Fixing PuSH by using the correct hub url. Thanks to @donmelton for finding the bug.
This commit is contained in:
Samuel Clay 2013-01-23 09:30:40 -08:00
commit feb0916495
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/push/models.py
View file

@ -73,8 +73,8 @@ class PushSubscriptionManager(models.Manager):
subscription = self.subscribe(extracted_topic.group(1),
feed=feed, hub=hub, force_retry=True)
else:
logging.debug(u' ---> [%-30s] ~FR~BKFeed failed to subscribe to push: %s' % (
unicode(subscription.feed)[:30], error))
logging.debug(u' ---> [%-30s] ~FR~BKFeed failed to subscribe to push: %s (code: %s)' % (
unicode(subscription.feed)[:30], error, response and response.status_code))
subscription.save()
feed.setup_push()

4
media/js/newsblur/reader/reader.js
View file

@ -74,8 +74,8 @@
this.layout = {};
this.constants = {
FEED_REFRESH_INTERVAL: (1000 * 60) * 1, // 1 minute
FILL_OUT_PAGES: 50,
FIND_NEXT_UNREAD_STORY_TRIES: 50,
FILL_OUT_PAGES: 100,
FIND_NEXT_UNREAD_STORY_TRIES: 100,
RIVER_STORIES_FOR_STANDARD_ACCOUNT: 5,
MIN_FEED_LIST_SIZE: 206
};

2
utils/feed_fetcher.py
View file

@ -231,7 +231,7 @@ class ProcessFeed:
hub_url = None
self_url = self.feed.feed_address
for link in self.fpf.feed.links:
if link['rel'] == 'hub':
if link['rel'] == 'hub' and not hub_url:
hub_url = link['href']
elif link['rel'] == 'self':
self_url = link['href']