Return Subreddit objects from subreddit_facets().

reddit-archive · Aug 21, 2012 · ca2a05f · ca2a05f
1 parent 7dbb0ad
commit ca2a05f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/r2/r2/lib/cloudsearch.py b/r2/r2/lib/cloudsearch.py
@@ -496,11 +496,18 @@ def subreddit_facets(self):
         if not self._subreddits and 'reddit' in self._facets:
             sr_facets = [(sr['value'], sr['count']) for sr in
                          self._facets['reddit']]
-            srs_by_name = Subreddit._by_name([sr[0] for sr in sr_facets])
-            self._subreddits = [sr for sr in sr_facets
-                                if sr[0] in srs_by_name and
-                                srs_by_name[sr[0]].can_view(c.user)]
-
+
+            # look up subreddits
+            srs_by_name = Subreddit._by_name([name for name, count
+                                              in sr_facets])
+
+            sr_facets = [(srs_by_name[name], count) for name, count
+                         in sr_facets if name in srs_by_name]
+
+            # filter by can_view
+            self._subreddits = [(sr, count) for sr, count in sr_facets
+                                if sr.can_view(c.user)]
+
         return self._subreddits
 
 

diff --git a/r2/r2/templates/searchbar.html b/r2/r2/templates/searchbar.html
@@ -78,10 +78,9 @@ <h4 style="color:gray">${thing.header}</h4>
 <div class="searchfacets">
   <h4 class="title">${_("too many results? narrow it down to a subreddit!")}</h4>
   <ol class="list">
-  %for facet in thing.facets:
-    <% subreddit, count = facet %>
+  %for subreddit, count in thing.facets:
     <li class="searchfacet reddit">
-      <a class="facet title word" href="${search_url(thing.prev_search, subreddit, restrict_sr='on', sort=thing.sort)}">/r/${subreddit}</a>&nbsp;
+      <a class="facet title word" href="${search_url(thing.prev_search, subreddit.name, restrict_sr='on', sort=thing.sort)}">/r/${subreddit.name}</a>&nbsp;
       <span class="facet count number">(${count})</span>
     </li>&nbsp;
   %endfor