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

Adding in preference to only send full title in iOS notifications.

Browse source
This commit is contained in:
Samuel Clay 2021-02-01 14:00:04 -05:00
parent b9d22d8d12
commit 615819eff5
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/notifications/models.py
View file

@ -13,6 +13,7 @@ from apps.rss_feeds.models import MStory, Feed
from apps.reader.models import UserSubscription
from apps.analyzer.models import MClassifierTitle, MClassifierAuthor, MClassifierFeed, MClassifierTag
from apps.analyzer.models import compute_story_score
from utils.view_functions import is_true
from utils.story_functions import truncate_chars
from utils import log as logging
from utils import mongoengine_fields
@ -173,7 +174,7 @@ class MUserFeedNotification(mongo.Document):
return classifiers
def title_and_body(self, story, usersub):
def title_and_body(self, story, usersub, notification_title_only=False):
def replace_with_newlines(element):
text = ''
for elem in element.recursiveChildGenerator():
@ -188,11 +189,15 @@ class MUserFeedNotification(mongo.Document):
feed_title = usersub.user_title or usersub.feed.feed_title
# title = "%s: %s" % (feed_title, story['story_title'])
title = feed_title
subtitle = HTMLParser().unescape(story['story_title'])
# body = HTMLParser().unescape(strip_tags(story['story_content']))
soup = BeautifulSoup(story['story_content'].strip())
# print story['story_content']
body = replace_with_newlines(soup)
if notification_title_only:
subtitle = None
body = HTMLParser().unescape(story['story_title'])
else:
subtitle = HTMLParser().unescape(story['story_title'])
# body = HTMLParser().unescape(strip_tags(story['story_content']))
soup = BeautifulSoup(story['story_content'].strip())
# print story['story_content']
body = replace_with_newlines(soup)
body = truncate_chars(body.strip(), 600)
if not body:
body = " "
@ -236,7 +241,8 @@ class MUserFeedNotification(mongo.Document):
enhanced=True)
tokens = MUserNotificationTokens.get_tokens_for_user(self.user_id)
title, subtitle, body = self.title_and_body(story, usersub)
notification_title_only = is_true(user.profile.preference_value('notification_title_only'))
title, subtitle, body = self.title_and_body(story, usersub, notification_title_only)
image_url = None
if len(story['image_urls']):
image_url = story['image_urls'][0]

4
apps/profile/models.py
View file

@ -317,6 +317,10 @@ class Profile(models.Model):
(not self.premium_expire or self.premium_expire > datetime.datetime.now())):
self.activate_premium()
def preference_value(self, key, default=None):
preferences = json.decode(self.preferences)
return preferences.get(key, default)
@classmethod
def reimport_stripe_history(cls, limit=10, days=7, starting_after=None):
stripe.api_key = settings.STRIPE_SECRET