Don't rely on special author_id value for /r/promos.

Siddhartha90 · Jun 11, 2015 · 2321d4b · 2321d4b
1 parent 3c1267d
commit 2321d4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py
@@ -1323,8 +1323,10 @@ def query(self):
                 reddits._sort = desc('_downs')
 
             if g.domain != 'reddit.com':
-                # don't try to render special subreddits (like promos)
-                reddits._filter(Subreddit.c.author_id != -1)
+                # don't try to render /r/promos on opensource installations
+                promo_sr_id = Subreddit.get_promote_srid()
+                if promo_sr_id:
+                    reddits._filter(Subreddit.c._id != promo_sr_id)
 
         if self.where == 'popular':
             self.render_params = {"show_interestbar": True}

diff --git a/r2/r2/lib/providers/search/cloudsearch.py b/r2/r2/lib/providers/search/cloudsearch.py
@@ -294,7 +294,7 @@ def fields(self, thing):
         return SubredditFields(thing).fields()
 
     def should_index(self, thing):
-        return getattr(thing, 'author_id', None) != -1
+        return thing._id != Subreddit.get_promote_srid()
 
 
 def chunk_xml(xml, depth=0):

diff --git a/r2/r2/lib/providers/search/solr.py b/r2/r2/lib/providers/search/solr.py
@@ -695,7 +695,7 @@ def fields(self, thing):
         return SubredditFields(thing).fields()
 
     def should_index(self, thing):
-        return getattr(thing, 'author_id', None) != -1
+        return thing._id != Subreddit.get_promote_srid()
 
 
 def _progress_key(item):