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 darkmode

Browse source 
* master:
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
This commit is contained in:
Samuel Clay 2020-06-23 13:24:23 -04:00
commit a2b93d2de4
6 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/rss_feeds/models.py
View file

@ -170,7 +170,7 @@ class Feed(models.Model):
@property
def is_newsletter(self):
return self.feed_address.startswith('newsletter:')
return self.feed_address.startswith('newsletter:') or self.feed_address.startswith('http://newsletter:')
def canonical(self, full=False, include_favicon=True):
feed = {

4
config/requirements.txt
View file

@ -14,7 +14,7 @@ django-mailgun==0.9.1
django-oauth-toolkit==0.7.2
django-qurl==0.1.1
django-redis-cache==1.5.5
django-redis-sessions==0.5.6
django-redis-sessions==0.6.1
django-ses==0.7.1
django-subdomains==2.1.0
django-timezone-field==2.0
@ -23,7 +23,7 @@ dnspython==1.15.0
Fabric==1.14.0
gunicorn==19.7
hiredis==0.2.0
httplib2==0.18.0
httplib2==0.17.4
image==1.5.27
isodate==0.5.4
lxml==3.6.4

1
config/rssbridge_whitelist.txt Normal file
View file

@ -0,0 +1 @@
*

10
media/js/newsblur/reader/reader_intro.js
View file

@ -355,7 +355,7 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, {
this.post_connect({});
}
}, this), 1000);
_gaq.push(['_trackEvent', 'reader_intro', 'Connect to ' + service.name + ' attempt']);
// _gaq.push(['_trackEvent', 'reader_intro', 'Connect to ' + service.name + ' attempt']);
NEWSBLUR.assets.preference('has_found_friends', true);
NEWSBLUR.reader.check_hide_getting_started();
@ -364,7 +364,7 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, {
disconnect: function(service) {
var $service = $('.NB-friends-service-'+service, this.$modal);
$('.NB-friends-service-connect', $service).text('Disconnecting...');
_gaq.push(['_trackEvent', 'reader_intro', 'Disconnect from ' + service.name]);
// _gaq.push(['_trackEvent', 'reader_intro', 'Disconnect from ' + service.name]);
NEWSBLUR.assets.disconnect_social_service(service, _.bind(function(data) {
this.services = data.services;
this.make_find_friends_and_services();
@ -386,10 +386,10 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, {
$('.NB-intro-services', this.$modal).append($error);
$error.animate({'opacity': 1}, {'duration': 1000});
this.resize();
_gaq.push(['_trackEvent', 'reader_intro', 'Connect to service error']);
// _gaq.push(['_trackEvent', 'reader_intro', 'Connect to service error']);
} else {
this.fetch_friends();
_gaq.push(['_trackEvent', 'reader_intro', 'Connect to service success']);
// _gaq.push(['_trackEvent', 'reader_intro', 'Connect to service success']);
}
},
@ -455,7 +455,7 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, {
clearTimeout(this.sync_interval);
NEWSBLUR.assets.preference('intro_page', page_number);
_gaq.push(['_trackEvent', 'reader_intro', 'Page ' + this.page_number]);
// _gaq.push(['_trackEvent', 'reader_intro', 'Page ' + this.page_number]);
},
advance_import_carousel: function(page, options) {

19
settings.py
View file

@ -690,9 +690,16 @@ MONGOANALYTICSDB = connect(MONGO_ANALYTICS_DB.pop('name'), **MONGO_ANALYTICS_DB)
BROKER_BACKEND = "redis"
BROKER_URL = "redis://%s:6379/%s" % (REDIS['host'], CELERY_REDIS_DB_NUM)
CELERY_RESULT_BACKEND = BROKER_URL
SESSION_REDIS_HOST = REDIS_SESSIONS['host']
SESSION_REDIS_RETRY_ON_TIMEOUT = True
SESSION_REDIS_SOCKET_TIMEOUT = 10
SESSION_REDIS = {
'host': REDIS_SESSIONS['host'],
'port': 6379,
'db': SESSION_REDIS_DB,
# 'password': 'password',
'prefix': '',
'socket_timeout': 10,
'retry_on_timeout': True
}
CACHES = {
'default': {
@ -713,9 +720,9 @@ REDIS_FEED_UPDATE_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379,
REDIS_STORY_HASH_TEMP_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=10)
# REDIS_CACHE_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=6) # Duped in CACHES
REDIS_STORY_HASH_POOL = redis.ConnectionPool(host=REDIS_STORY['host'], port=6379, db=1)
REDIS_FEED_READ_POOL = redis.ConnectionPool(host=SESSION_REDIS_HOST, port=6379, db=1)
REDIS_FEED_SUB_POOL = redis.ConnectionPool(host=SESSION_REDIS_HOST, port=6379, db=2)
REDIS_SESSION_POOL = redis.ConnectionPool(host=SESSION_REDIS_HOST, port=6379, db=5)
REDIS_FEED_READ_POOL = redis.ConnectionPool(host=REDIS_SESSIONS['host'], port=6379, db=1)
REDIS_FEED_SUB_POOL = redis.ConnectionPool(host=REDIS_SESSIONS['host'], port=6379, db=2)
REDIS_SESSION_POOL = redis.ConnectionPool(host=REDIS_SESSIONS['host'], port=6379, db=5)
REDIS_PUBSUB_POOL = redis.ConnectionPool(host=REDIS_PUBSUB['host'], port=6379, db=0)
# ==========

18
templates/social/social_page.xhtml
View file

@ -93,16 +93,16 @@
{% if not debug %}
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-8371683-2']);
_gaq.push(['_setDomainName', "{{ social_profile.username }}.newsblur.com"]);
_gaq.push(['_trackPageview']);
// var _gaq = _gaq || [];
// _gaq.push(['_setAccount', 'UA-8371683-2']);
// _gaq.push(['_setDomainName', "{{ social_profile.username }}.newsblur.com"]);
// _gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
// (function() {
// var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
// ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
// var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
// })();
</script>
{% endif %}