Beginning the process of getting anonymous users able to read social feeds. Also setting up unread counts for new machines.

This commit is contained in:
Samuel Clay 2012-03-29 17:24:23 -07:00
parent cd589951c9
commit 6e29d85c57
4 changed files with 9 additions and 6 deletions

View file

@ -127,8 +127,6 @@ def get_classifiers_for_user(user, feed_id=None, social_user_id=None, classifier
params['feed_id__in'] = feed_id
if social_user_id:
params['social_user_id'] = int(social_user_id.replace('social:', ''))
else:
params['social_user_id'] = None
if classifier_feeds is None:
classifier_feeds = list(MClassifierFeed.objects(**params))

View file

@ -156,6 +156,7 @@ def load_social_page(request, user_id, username=None):
social_profile = MSocialProfile.objects.get(user_id=social_user_id)
params = {
'user': user,
'social_user': social_user,
'stories': stories,
'social_profile': social_profile.page(),
@ -278,7 +279,7 @@ def profile(request):
user_id = request.GET.get('user_id', request.user.pk)
user_profile = MSocialProfile.objects.get(user_id=user_id)
current_profile = MSocialProfile.objects.get(user_id=request.user.pk)
current_profile, _ = MSocialProfile.objects.get_or_create(user_id=request.user.pk)
followers_youknow, followers_everybody = current_profile.common_follows(user_id, direction='followers')
following_youknow, following_everybody = current_profile.common_follows(user_id, direction='following')
profile_ids = set(followers_youknow + followers_everybody + following_youknow + following_everybody)
@ -298,7 +299,7 @@ def profile(request):
def save_profile(request):
data = request.POST
profile = MSocialProfile.objects.get(user_id=request.user.pk)
profile, _ = MSocialProfile.objects.get_or_create(user_id=request.user.pk)
profile.location = data['location']
profile.bio = data['bio']
profile.website = data['website']
@ -314,7 +315,7 @@ def save_profile(request):
@ajax_login_required
@json.json_view
def follow(request):
profile = MSocialProfile.objects.get(user_id=request.user.pk)
profile, _ = MSocialProfile.objects.get_or_create(user_id=request.user.pk)
try:
follow_user_id = int(request.POST['user_id'])
except ValueError:

View file

@ -7,3 +7,4 @@ autorestart=true
#redirect_stderr=True
priority=991
stopsignal=HUP
stdout_logfile = /home/sclay/newsblur/logs/unread_counts.log

5
fabfile.py vendored
View file

@ -229,6 +229,7 @@ def setup_app():
setup_app_motd()
setup_gunicorn(supervisor=True)
update_gunicorn()
setup_node()
def setup_db():
setup_common()
@ -466,11 +467,13 @@ def setup_staging():
def setup_node():
sudo('add-apt-repository ppa:chris-lea/node.js')
sudo('apt-get update')
sudo('apt-get install nodejs')
sudo('apt-get install -y nodejs')
run('curl http://npmjs.org/install.sh | sudo sh')
sudo('npm install -g supervisor')
sudo('ufw allow 8888')
put('config/supervisor_node.conf', '/etc/supervisor/conf.d/node.conf', use_sudo=True)
sudo('supervisorctl reload')
sudo('supervisorctl start node')
def copy_certificates():
# with cd(env.NEWSBLUR_PATH):