From 256f724328869cb6e37975f8ec683d90080ed400 Mon Sep 17 00:00:00 2001 From: Chad Birch Date: Wed, 3 Apr 2013 13:50:33 -0600 Subject: [PATCH] Remove limit on /r/all- and add info to gold page --- r2/r2/models/subreddit.py | 4 +--- r2/r2/templates/goldinfopage.html | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py index fe2fcc28d..49155feba 100644 --- a/r2/r2/models/subreddit.py +++ b/r2/r2/models/subreddit.py @@ -1042,9 +1042,7 @@ class AllMinus(AllSR): from r2.lib.db.operators import not_ q = AllSR.get_links(self, sort, time) if c.user.gold: - excluded_ids = self.random_reddits(c.user.name, self.sr_ids, - self.gold_limit) - q._filter(not_(Link.c.sr_id.in_(excluded_ids))) + q._filter(not_(Link.c.sr_id.in_(self.sr_ids))) return q class _DefaultSR(FakeSubreddit): diff --git a/r2/r2/templates/goldinfopage.html b/r2/r2/templates/goldinfopage.html index 0409ef532..126d16ad4 100644 --- a/r2/r2/templates/goldinfopage.html +++ b/r2/r2/templates/goldinfopage.html @@ -58,7 +58,7 @@ ${feature_item(static('gold/sample-filterall.png'), _( "# Filter specific subreddits from /r/all.\n" - "Are there subreddits you don't want to see? Customize /r/all by removing them." + "Are there subreddits you don't want to see? Customize /r/all by removing them with a url like /r/all-operative-badger (up to ~300 removals - limited by maximum url length)." ), 'new')} ${feature_item(static('gold/sample-morecomments.png'), _(