Frontpage: support /gilded

r2/r2/config/routing.py

@@ -144,8 +144,6 @@ def make_map():
     mc('/about/sticky', controller='front', action='sticky')
     mc('/about/flair', controller='front', action='flairlisting')
     mc('/about', controller='front', action='about')
-    mc('/comments/gilded', controller='redirect', action='gilded_comments',
-       conditions={'function': not_in_sr})
     for connect in (mc,) + multi_prefixes:
        connect('/about/message/:where', controller='message',
           action='listing')

r2/r2/controllers/redirect.py

@@ -50,6 +50,3 @@ class RedirectController(BaseController):
         else:
             rest = ''
         return redirect_to("/r/t:%s/%s" % (tr_name, rest), _code=301)
-
-    def GET_gilded_comments(self):
-        return redirect_to("/r/all/comments/gilded", _code=301)

r2/r2/models/subreddit.py

@@ -1174,6 +1174,12 @@ class DefaultSR(_DefaultSR):
     def stylesheet_hash(self):
         return self._base.stylesheet_hash if self._base else ""
 
+    def get_gilded_comments(self):
+        from r2.lib.db.queries import get_gilded_comments
+        srs = Subreddit.user_subreddits(c.user)
+        queries = [get_gilded_comments(sr_id) for sr_id in srs]
+        return MergedCachedQuery(queries)
+
 
 class MultiReddit(FakeSubreddit):
     name = 'multi'