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

Reloading user feeds when receiving a new newsletter.

Browse source
This commit is contained in:
Samuel Clay 2016-05-19 20:38:53 -07:00
parent 1043fa45aa
commit db2dbcd053
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/newsletters/models.py
View file

@ -53,9 +53,14 @@ class EmailNewsletter:
feed_address=feed_address, feed_address=feed_address,
folder='Newsletters' folder='Newsletters'
) )
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
r.publish(user.username, 'reload:feeds')
story_hash = MStory.ensure_story_hash(params['signature'], feed.pk) story_hash = MStory.ensure_story_hash(params['signature'], feed.pk)
story_content = self.get_content(params) story_content = self.get_content(params)
plain_story_content = self.get_content(params, force_plain=True)
if len(plain_story_content) > len(story_content):
story_content = plain_story_content
story_content = self.clean_content(story_content) story_content = self.clean_content(story_content)
story_params = { story_params = {
"story_feed_id": feed.pk, "story_feed_id": feed.pk,
@ -116,8 +121,10 @@ class EmailNewsletter:
return sender_name, sender_username, sender_domain return sender_name, sender_username, sender_domain
def get_content(self, params): def get_content(self, params, force_plain=False):
if 'body-html' in params: if 'body-enriched' in params and not force_plain:
return params['body-enriched']
if 'body-html' in params and not force_plain:
return params['body-html'] return params['body-html']
if 'stripped-html' in params: if 'stripped-html' in params:
return linkify(linebreaks(params['stripped-html'])) return linkify(linebreaks(params['stripped-html']))

6
apps/newsletters/views.py
View file

@ -36,13 +36,15 @@ def newsletter_receive(request):
# 'Content-Type':'multipart/mixed; boundary="------------020601070403020003080006"', # 'Content-Type':'multipart/mixed; boundary="------------020601070403020003080006"',
# 'Subject':'Test Newsletter #1' # 'Subject':'Test Newsletter #1'
# } # }
params = request.REQUEST
response = HttpResponse('OK') response = HttpResponse('OK')
if settings.DEBUG: if settings.DEBUG:
logging.debug(" ---> Email newsletter: %s" % pprint(request.REQUEST)) logging.debug(" ---> Email newsletter: %s" % pprint(params))
email_newsletter = EmailNewsletter() email_newsletter = EmailNewsletter()
story = email_newsletter.receive_newsletter(request.REQUEST) story = email_newsletter.receive_newsletter(params)
if not story: if not story:
raise Http404 raise Http404