Now that we have the admin schema up, only show feeds that are approved, and only...

posts that are not hidden.

diff --git a/generator.py b/generator.py
index 0e46d3c23696002a9bae60b73af0d7d5daf5beea..ee61051db9b32b0b3824c8256aa3e7632f925ee5 100755 (executable)
--- a/generator.py
+++ b/generator.py
@@ -59,7 +59,7 @@ class Generator:
                self.db.set_client_encoding('UTF8')
                c = self.db.cursor()
                c.execute("SET TIMEZONE=GMT")
-               c.execute("SELECT guid,link,dat,title,txt,name,blogurl,guidisperma FROM planet.posts INNER JOIN planet.feeds ON planet.feeds.id=planet.posts.feed ORDER BY dat DESC LIMIT 30")
+               c.execute("SELECT guid,link,dat,title,txt,name,blogurl,guidisperma FROM planet.posts INNER JOIN planet.feeds ON planet.feeds.id=planet.posts.feed WHERE planet.feeds.approved AND NOT planet.posts.hidden ORDER BY dat DESC LIMIT 30")
                for post in c.fetchall():
                        desc = self.TruncateAndCleanDescription(post[4])
                        rss.items.append(PyRSS2Gen.RSSItem(