github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove HotController logic which is duplicated elsewhere.

Browse Source
This commit is contained in:
Jason Harvey
2014-02-24 17:34:59 -08:00
parent 3df268e116
commit 4bb9fa3e88
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
r2/r2/controllers/listingcontroller.py
View File

@@ -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: