diff --git a/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/ad_notifications/eligible_ad_notifications.cc b/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/ad_notifications/eligible_ad_notifications.cc index 84d314ed5a0e..43fd0e0bbb11 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/ad_notifications/eligible_ad_notifications.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/ad_notifications/eligible_ad_notifications.cc @@ -243,17 +243,17 @@ CreativeAdNotificationList EligibleAds::FilterIneligibleAds( CreativeAdNotificationList eligible_ads = ads; + eligible_ads = ApplyFrequencyCapping( + eligible_ads, + ShouldCapLastServedAd(ads) ? last_served_creative_ad_ : CreativeAdInfo(), + ad_events, browsing_history); + eligible_ads = FilterSeenAdvertisersAndRoundRobinIfNeeded( eligible_ads, AdType::kAdNotification); eligible_ads = FilterSeenAdsAndRoundRobinIfNeeded(eligible_ads, AdType::kAdNotification); - eligible_ads = ApplyFrequencyCapping( - eligible_ads, - ShouldCapLastServedAd(ads) ? last_served_creative_ad_ : CreativeAdInfo(), - ad_events, browsing_history); - eligible_ads = PaceAds(eligible_ads); eligible_ads = PrioritizeAds(eligible_ads); diff --git a/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/inline_content_ads/eligible_inline_content_ads.cc b/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/inline_content_ads/eligible_inline_content_ads.cc index 3d86394dfe33..4fe27585e56a 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/inline_content_ads/eligible_inline_content_ads.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/inline_content_ads/eligible_inline_content_ads.cc @@ -254,17 +254,17 @@ CreativeInlineContentAdList EligibleAds::FilterIneligibleAds( CreativeInlineContentAdList eligible_ads = ads; + eligible_ads = ApplyFrequencyCapping( + eligible_ads, + ShouldCapLastServedAd(ads) ? last_served_creative_ad_ : CreativeAdInfo(), + ad_events, browsing_history); + eligible_ads = FilterSeenAdvertisersAndRoundRobinIfNeeded( eligible_ads, AdType::kInlineContentAd); eligible_ads = FilterSeenAdsAndRoundRobinIfNeeded(eligible_ads, AdType::kInlineContentAd); - eligible_ads = ApplyFrequencyCapping( - eligible_ads, - ShouldCapLastServedAd(ads) ? last_served_creative_ad_ : CreativeAdInfo(), - ad_events, browsing_history); - eligible_ads = PaceAds(eligible_ads); eligible_ads = PrioritizeAds(eligible_ads); diff --git a/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/round_robin_ads.h b/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/round_robin_ads.h index 881f71cd2290..1a62a4560fbe 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/round_robin_ads.h +++ b/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/round_robin_ads.h @@ -10,7 +10,6 @@ #include #include "bat/ads/internal/bundle/creative_ad_info.h" -#include "bat/ads/internal/frequency_capping/exclusion_rules/split_test_frequency_cap.h" namespace ads { @@ -18,12 +17,12 @@ template T FilterSeenAds(const T& ads, const std::map& seen_ads) { T unseen_ads = ads; - const auto iter = std::remove_if( - unseen_ads.begin(), unseen_ads.end(), [&seen_ads](CreativeAdInfo& ad) { - SplitTestFrequencyCap frequency_cap; - return frequency_cap.ShouldExclude(ad) || - seen_ads.find(ad.creative_instance_id) != seen_ads.end(); - }); + const auto iter = + std::remove_if(unseen_ads.begin(), unseen_ads.end(), + [&seen_ads](const CreativeAdInfo& creative_ad) { + return seen_ads.find(creative_ad.creative_instance_id) != + seen_ads.end(); + }); unseen_ads.erase(iter, unseen_ads.end()); diff --git a/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/round_robin_advertisers.h b/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/round_robin_advertisers.h index 8b6592d7fc4c..0dae6470c85d 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/round_robin_advertisers.h +++ b/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/round_robin_advertisers.h @@ -10,7 +10,6 @@ #include #include "bat/ads/internal/bundle/creative_ad_info.h" -#include "bat/ads/internal/frequency_capping/exclusion_rules/split_test_frequency_cap.h" namespace ads { @@ -19,14 +18,12 @@ T FilterSeenAdvertisers(const T& ads, const std::map& seen_advertisers) { T unseen_advertisers = ads; - const auto iter = - std::remove_if(unseen_advertisers.begin(), unseen_advertisers.end(), - [&seen_advertisers](CreativeAdInfo& ad) { - SplitTestFrequencyCap frequency_cap; - return frequency_cap.ShouldExclude(ad) || - seen_advertisers.find(ad.advertiser_id) != - seen_advertisers.end(); - }); + const auto iter = std::remove_if( + unseen_advertisers.begin(), unseen_advertisers.end(), + [&seen_advertisers](const CreativeAdInfo& creative_ad) { + return seen_advertisers.find(creative_ad.advertiser_id) != + seen_advertisers.end(); + }); unseen_advertisers.erase(iter, unseen_advertisers.end());