github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-29 16:58:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup in get_promotion_list.

Browse Source
This commit is contained in:
bsimpson63
2013-01-30 16:03:21 -05:00
parent ecea06bf90
commit f61587c7af
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
r2/r2/lib/promote.py
View File

@@ -806,17 +806,14 @@ PromoTuple = namedtuple('PromoTuple', ['link', 'weight', 'campaign'])
def get_promotion_list(user, site):
# site is specified, pick an ad from that site
if not isinstance(site, FakeSubreddit):
srids = set([site._id])
elif isinstance(site, MultiReddit):
srids = set(site.sr_ids)
# site is Fake, user is not. Pick based on their subscriptions.
elif user and not isinstance(user, FakeAccount):
srids = set(Subreddit.reverse_subscriber_ids(user) + [""])
# both site and user are "fake" -- get the default subscription list
else:
srids = set(Subreddit.user_subreddits(None, True) + [""])
srids = set(Subreddit.user_subreddits(None, ids=True) + [""])
tuples = get_promotion_list_cached(srids)
return [PromoTuple(*t) for t in tuples]