Fixes brave-browser/issues#2365, filters 0% publishers

brave · Dec 12, 2018 · f664f12 · f664f12
1 parent 99aecec
commit f664f12
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/components/brave_rewards/browser/publisher_info_database.cc b/components/brave_rewards/browser/publisher_info_database.cc
@@ -483,6 +483,10 @@ std::string PublisherInfoDatabase::BuildClauses(int start,
     ledger::PUBLISHER_EXCLUDE_FILTER::FILTER_ALL_EXCEPT_EXCLUDED)
     clauses += " AND pi.excluded != ?";
 
+  if (filter.percent == ledger::PUBLISHER_PERCENT_FILTER::FILTER_ZERO) {
+    clauses += " AND ai.percent != ?";
+  }
+
   for (const auto& it : filter.order_by) {
     clauses += " ORDER BY " + it.first;
     clauses += (it.second ? " ASC" : " DESC");
@@ -528,6 +532,9 @@ void PublisherInfoDatabase::BindFilter(sql::Statement& statement,
   if (filter.excluded ==
     ledger::PUBLISHER_EXCLUDE_FILTER::FILTER_ALL_EXCEPT_EXCLUDED)
     statement.BindInt(column++, ledger::PUBLISHER_EXCLUDE::EXCLUDED);
+
+  if (filter.percent == ledger::PUBLISHER_PERCENT_FILTER::FILTER_ZERO)
+    statement.BindInt(column++, filter.percent);
 }
 
 bool PublisherInfoDatabase::InsertContributionInfo(const brave_rewards::ContributionInfo& info) {

diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -360,6 +360,7 @@ void RewardsServiceImpl::GetCurrentContributeList(
   filter.reconcile_stamp = ledger_->GetReconcileStamp();
   filter.excluded =
     ledger::PUBLISHER_EXCLUDE_FILTER::FILTER_ALL_EXCEPT_EXCLUDED;
+  filter.percent = ledger::PUBLISHER_PERCENT_FILTER::FILTER_ZERO;
 
   ledger_->GetPublisherInfoList(
       start,

diff --git a/vendor/bat-native-ledger/include/bat/ledger/publisher_info.h b/vendor/bat-native-ledger/include/bat/ledger/publisher_info.h
@@ -52,6 +52,11 @@ LEDGER_EXPORT enum PUBLISHER_EXCLUDE_FILTER {
   FILTER_ALL_EXCEPT_EXCLUDED = 3
 };
 
+LEDGER_EXPORT enum PUBLISHER_PERCENT_FILTER {
+  FILTER_ALL_PERCENT = -1,
+  FILTER_ZERO = 0
+};
+
 LEDGER_EXPORT struct PublisherInfoFilter {
   PublisherInfoFilter();
   PublisherInfoFilter(const PublisherInfoFilter& filter);
@@ -62,6 +67,7 @@ LEDGER_EXPORT struct PublisherInfoFilter {
   PUBLISHER_MONTH month;
   int year;
   PUBLISHER_EXCLUDE_FILTER excluded;
+  PUBLISHER_PERCENT_FILTER percent;
   std::vector<std::pair<std::string, bool>> order_by;
   unsigned int min_duration;
   uint64_t reconcile_stamp;

diff --git a/vendor/bat-native-ledger/src/bat/ledger/ledger.cc b/vendor/bat-native-ledger/src/bat/ledger/ledger.cc
@@ -88,6 +88,7 @@ PublisherInfoFilter::PublisherInfoFilter() :
     month(PUBLISHER_MONTH::ANY),
     year(-1),
     excluded(PUBLISHER_EXCLUDE_FILTER::FILTER_DEFAULT),
+    percent(PUBLISHER_PERCENT_FILTER::FILTER_ALL_PERCENT),
     min_duration(0),
     reconcile_stamp(0) {}
 PublisherInfoFilter::PublisherInfoFilter(const PublisherInfoFilter& filter) :
@@ -96,6 +97,7 @@ PublisherInfoFilter::PublisherInfoFilter(const PublisherInfoFilter& filter) :
     month(filter.month),
     year(filter.year),
     excluded(filter.excluded),
+    percent(filter.percent),
     order_by(filter.order_by),
     min_duration(filter.min_duration),
     reconcile_stamp(filter.reconcile_stamp) {}