From 4bb9fa3e88222884c299400078b4456465f273ea Mon Sep 17 00:00:00 2001 From: Jason Harvey Date: Mon, 24 Feb 2014 17:34:59 -0800 Subject: [PATCH] Remove HotController logic which is duplicated elsewhere. --- r2/r2/controllers/listingcontroller.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py index 3474f0a93..313fd015b 100755 --- a/r2/r2/controllers/listingcontroller.py +++ b/r2/r2/controllers/listingcontroller.py @@ -314,19 +314,10 @@ class HotController(ListingWithPromos): show_organic = True def query(self): + if isinstance(c.site, DefaultSR): - if c.user_is_loggedin: - srlimit = Subreddit.DEFAULT_LIMIT - over18 = c.user.has_subscribed and c.over18 - else: - srlimit = g.num_default_reddits - over18 = False - - sr_ids = Subreddit.user_subreddits(c.user, - limit=srlimit, - over18=over18) + sr_ids = Subreddit.user_subreddits(c.user) return normalized_hot(sr_ids) - elif isinstance(c.site, MultiReddit): return normalized_hot(c.site.kept_sr_ids, obey_age_limit=False) else: