mirror of
https://github.com/viq/NewsBlur.git
synced 2025-08-05 16:49:45 +00:00
Adding android token on server side.
This commit is contained in:
parent
b3aba908d7
commit
df2b749360
5 changed files with 28 additions and 6 deletions
|
@ -200,7 +200,7 @@ class MUserFeedNotification(mongo.Document):
|
||||||
tokens = MUserNotificationTokens.get_tokens_for_user(self.user_id)
|
tokens = MUserNotificationTokens.get_tokens_for_user(self.user_id)
|
||||||
feed_title = usersub.user_title or usersub.feed.feed_title
|
feed_title = usersub.user_title or usersub.feed.feed_title
|
||||||
title = "%s: %s" % (feed_title, story['story_title'])
|
title = "%s: %s" % (feed_title, story['story_title'])
|
||||||
body = HTMLParser().unescape(strip_tags(story['story_content'])).strip()[:500]
|
body = HTMLParser().unescape(strip_tags(story['story_content'])).strip()[:2048]
|
||||||
|
|
||||||
for token in tokens.ios_tokens:
|
for token in tokens.ios_tokens:
|
||||||
logging.user(user, '~BMStory notification by iOS: ~FY~SB%s~SN~BM~FY/~SB%s' %
|
logging.user(user, '~BMStory notification by iOS: ~FY~SB%s~SN~BM~FY/~SB%s' %
|
||||||
|
|
|
@ -6,4 +6,5 @@ urlpatterns = patterns('',
|
||||||
url(r'^$', views.notifications_by_feed, name='notifications-by-feed'),
|
url(r'^$', views.notifications_by_feed, name='notifications-by-feed'),
|
||||||
url(r'^feed/?$', views.set_notifications_for_feed, name='set-notifications-for-feed'),
|
url(r'^feed/?$', views.set_notifications_for_feed, name='set-notifications-for-feed'),
|
||||||
url(r'^apns_token/?$', views.set_apns_token, name='set-apns-token'),
|
url(r'^apns_token/?$', views.set_apns_token, name='set-apns-token'),
|
||||||
|
url(r'^android_token/?$', views.set_android_token, name='set-android-token'),
|
||||||
)
|
)
|
|
@ -67,4 +67,19 @@ def set_apns_token(request):
|
||||||
tokens.save()
|
tokens.save()
|
||||||
return {'message': 'Token saved.'}
|
return {'message': 'Token saved.'}
|
||||||
|
|
||||||
return {'message': 'Token already saved.'}
|
return {'message': 'Token already saved.'}
|
||||||
|
|
||||||
|
@ajax_login_required
|
||||||
|
@json.json_view
|
||||||
|
def set_android_token(request):
|
||||||
|
user = get_user(request)
|
||||||
|
tokens = MUserNotificationTokens.get_tokens_for_user(user.pk)
|
||||||
|
token = request.REQUEST['token']
|
||||||
|
|
||||||
|
logging.user(user, "~FCUpdating Android push token")
|
||||||
|
if token not in tokens.android_tokens:
|
||||||
|
tokens.android_tokens.append(token)
|
||||||
|
tokens.save()
|
||||||
|
return {'message': 'Token saved.'}
|
||||||
|
|
||||||
|
return {'message': 'Token already saved.'}
|
||||||
|
|
8
fabfile.py
vendored
8
fabfile.py
vendored
|
@ -991,6 +991,14 @@ def copy_postgres_to_standby(master='db01'):
|
||||||
def setup_mongo():
|
def setup_mongo():
|
||||||
MONGODB_VERSION = "3.2.10"
|
MONGODB_VERSION = "3.2.10"
|
||||||
pull()
|
pull()
|
||||||
|
sudo('echo "#!/bin/sh -e\n\nif test -f /sys/kernel/mm/transparent_hugepage/enabled; then\n\
|
||||||
|
echo never > /sys/kernel/mm/transparent_hugepage/enabled\n\
|
||||||
|
fi\n\
|
||||||
|
if test -f /sys/kernel/mm/transparent_hugepage/defrag; then\n\
|
||||||
|
echo never > /sys/kernel/mm/transparent_hugepage/defrag\n\
|
||||||
|
fi\n\n\
|
||||||
|
exit 0" | sudo tee /etc/rc.local')
|
||||||
|
return
|
||||||
sudo('apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10')
|
sudo('apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10')
|
||||||
# sudo('echo "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" | sudo tee /etc/apt/sources.list.d/mongodb.list')
|
# sudo('echo "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" | sudo tee /etc/apt/sources.list.d/mongodb.list')
|
||||||
# sudo('echo "\ndeb http://downloads-distro.mongodb.org/repo/debian-sysvinit dist 10gen" | sudo tee -a /etc/apt/sources.list')
|
# sudo('echo "\ndeb http://downloads-distro.mongodb.org/repo/debian-sysvinit dist 10gen" | sudo tee -a /etc/apt/sources.list')
|
||||||
|
|
|
@ -186,14 +186,12 @@
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
}
|
}
|
||||||
.footer-logo {
|
.footer-logo {
|
||||||
text-align: center;
|
|
||||||
width: 100%;
|
|
||||||
float: none;
|
|
||||||
}
|
}
|
||||||
.optout {
|
.optout {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
float: none;
|
float: left;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue