Send email to feed owner when entries are aggregated

diff --git a/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py b/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py
index e95b8349e0fb5ca3ac07b58e86a6a0237b902cba..85d354738977ce55f973365203feff13a1450bba 100644 (file)
--- a/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py
+++ b/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py
@@ -68,6 +68,7 @@ class Command(BaseCommand):
                                                else:
                                                        had_entries = feed.has_entries
                                                entries = 0
+                                               titles = []
 
                                                for entry in results:
                                                        self.trace("Found entry at %s" % entry.link)
@@ -81,10 +82,24 @@ class Command(BaseCommand):
                                                                                          success=True,
                                                                                          info="Fetched entry at '%s'" % entry.link).save()
                                                                entries += 1
+                                                               titles.append(entry.title)
                                                                total_entries += 1
                                                # Save an update to when the feed was last scanned
                                                feed.save()
 
+                                               if entries > 0 and feed.approved:
+                                                       # Email a notification that they were picked up
+                                                       send_simple_mail(settings.EMAIL_SENDER,
+                                                                                        feed.user.email,
+                                                                                        "Posts found at your blog at Planet PostgreSQL",
+                                                                                        u"The blog aggregator at Planet PostgreSQL has just picked up the following\nposts from your blog at {0}:\n\n{1}\n\nIf these entries are correct, you don't have to do anything.\nIf any entry should not be there, head over to\n\nhttps://planet.postgresql.org/register/edit/{2}/\n\nand click the 'Hide' button for those entries as soon\nas possible.\n\nThank you!\n\n".format(
+                                                                                                feed.blogurl,
+                                                                                                "\n".join(["* " + t for t in titles]),
+                                                                                                feed.id),
+                                                                                        sendername="Planet PostgreSQL",
+                                                                                        receivername=u"{0} {1}".format(feed.user.first_name, feed.user.last_name),
+                                                                                        )
+
                                                if entries > 0 and not had_entries:
                                                        # Entries showed up on a blog that was previously empty
                                                        send_simple_mail(settings.EMAIL_SENDER,

diff --git a/hamnadmin/hamnadmin/register/views.py b/hamnadmin/hamnadmin/register/views.py
index 5e51c2c1852e137f3b8bf3fbcba1062e093a5a1b..f00728851b09782a52150b6adda564a3db773e23 100644 (file)
--- a/hamnadmin/hamnadmin/register/views.py
+++ b/hamnadmin/hamnadmin/register/views.py
@@ -167,6 +167,13 @@ def blogpost_unhide(request, blogid, postid):
 def blogpost_delete(request, blogid, postid):
        post = __getvalidblogpost(request, blogid, postid)
        title = post.title
+
+       # Update the feed last fetched date to be just before this entry, so that we end up
+       # re-fetching it if necessary.
+       post.feed.lastget = post.dat - timedelta(minutes=1)
+       post.feed.save()
+
+       # Now actually delete it
        post.delete()
        AuditEntry(request.user.username, 'Deleted post %s from blog %s' % (postid, blogid)).save()
        messages.info(request, 'Deleted post "%s". It will be reloaded on the next scheduled crawl.' % title)