From 24081ca7cda9fae1374e020a5bb73d7df9c591e2 Mon Sep 17 00:00:00 2001 From: Chad Birch Date: Tue, 8 Oct 2013 15:13:55 -0600 Subject: [PATCH] Frontpage: support /gilded --- r2/r2/config/routing.py | 2 -- r2/r2/controllers/redirect.py | 3 --- r2/r2/models/subreddit.py | 6 ++++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/r2/r2/config/routing.py b/r2/r2/config/routing.py index 92c308339..db4b24e84 100644 --- a/r2/r2/config/routing.py +++ b/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') diff --git a/r2/r2/controllers/redirect.py b/r2/r2/controllers/redirect.py index c005eaafd..3333e28fa 100644 --- a/r2/r2/controllers/redirect.py +++ b/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) diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py index d6c9111d9..af5fdc8dc 100644 --- a/r2/r2/models/subreddit.py +++ b/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'