From 127862df8a464a0550aa8dbe0158eb1dbbb56a3a Mon Sep 17 00:00:00 2001 From: bsimpson63 Date: Thu, 21 Mar 2013 16:07:50 -0400 Subject: [PATCH] Pass all promoted links through builder for filtering. --- r2/r2/controllers/listingcontroller.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py index 8bdccd732..261c73ed3 100755 --- a/r2/r2/controllers/listingcontroller.py +++ b/r2/r2/controllers/listingcontroller.py @@ -298,15 +298,15 @@ class HotController(FixListing, ListingController): promo_tuples, wrap=self.builder_wrapper, keep_fn=organic.keep_fresh_links, - num=n_build, skip=True, ) promoted_links, first, last, before, after = b.get_items() - if promoted_links and last: - lookup = {t.campaign: i for i, t in enumerate(promo_tuples)} - last_index = lookup[last.campaign] - stubs = promo_tuples[last_index + 1:] - promoted_links.extend(stubs) + if promoted_links: + stubs = promoted_links[n_build:] + stubs = [promote.PromoTuple(item._fullname, item.weight, + item.campaign) + for item in stubs] + promoted_links = promoted_links[:n_build] + stubs if not (organic_fullnames or promoted_links): return None