Remove unused lastSearchTime, searchActivity, searchUrl, lastShopTime…

…, shopActivity and shopUrl from locally persisted Brave Ads state
brave · Apr 5, 2020 · 2e6aafd · 2e6aafd
1 parent b4ce576
commit 2e6aafd
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 162 deletions.
diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ads_impl.cc b/vendor/bat-native-ads/src/bat/ads/internal/ads_impl.cc
@@ -480,9 +480,6 @@ void AdsImpl::OnTabUpdated(
     previous_tab_url_ = active_tab_url_;
     active_tab_url_ = url;
 
-    TestShoppingData(url);
-    TestSearchState(url);
-
     const Reports reports(this);
     FocusInfo focus_info;
     focus_info.tab_id = tab_id;
@@ -700,13 +697,11 @@ void AdsImpl::OnPageLoaded(
     return;
   }
 
-  if (TestSearchState(url)) {
+  if (SearchProviders::IsSearchEngine(url)) {
     BLOG(INFO) << "Site visited " << url << ", URL is a search engine";
     return;
   }
 
-  TestShoppingData(url);
-
   MaybeClassifyPage(url, content);
 
   CheckEasterEgg(url);
@@ -721,7 +716,7 @@ void AdsImpl::ExtractPurchaseIntentSignal(
     return;
   }
 
-  if (!TestSearchState(url) &&
+  if (!SearchProviders::IsSearchEngine(url) &&
       helper::Uri::MatchesDomainOrHost(url, previous_tab_url_)) {
     return;
   }
@@ -919,37 +914,6 @@ AdsImpl::GetWinningPurchaseIntentCategories() {
   return winning_categories;
 }
 
-void AdsImpl::TestShoppingData(
-    const std::string& url) {
-  if (!IsInitialized()) {
-    BLOG(WARNING) << "TestShoppingData failed as not initialized";
-    return;
-  }
-
-  if (helper::Uri::MatchesDomainOrHost(url, kShoppingStateUrl)) {
-    client_->FlagShoppingState(url, 1.0);
-  } else {
-    client_->UnflagShoppingState();
-  }
-}
-
-bool AdsImpl::TestSearchState(
-    const std::string& url) {
-  if (!IsInitialized()) {
-    BLOG(WARNING) << "TestSearchState failed as not initialized";
-    return false;
-  }
-
-  auto is_search_engine = SearchProviders::IsSearchEngine(url);
-  if (is_search_engine) {
-    client_->FlagSearchState(url, 1.0);
-  } else {
-    client_->UnflagSearchState(url);
-  }
-
-  return is_search_engine;
-}
-
 void AdsImpl::ServeSampleAd() {
   if (!IsInitialized()) {
     BLOG(WARNING) << "ServeSampleAd failed as not initialized";

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ads_impl.h b/vendor/bat-native-ads/src/bat/ads/internal/ads_impl.h
@@ -182,11 +182,6 @@ class AdsImpl : public Ads {
       const std::vector<double>& page_score);
   const std::map<std::string, std::vector<double>>& GetPageScoreCache() const;
 
-  void TestShoppingData(
-      const std::string& url);
-  bool TestSearchState(
-      const std::string& url);
-
   void ServeSampleAd() override;
   void OnLoadSampleBundle(
       const Result result,

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ads_tabs_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ads_tabs_unittest.cc
@@ -216,7 +216,7 @@ TEST_F(AdsTabsTest, TabUpdated_Active) {
   auto last_user_activity = ads_->client_->GetLastUserActivity();
 
   EXPECT_CALL(*mock_ads_client_, Save(_, _, _))
-      .Times(3);
+      .Times(1);
 
   EXPECT_CALL(*mock_ads_client_, EventLog(_))
       .Times(1);

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/client.cc b/vendor/bat-native-ads/src/bat/ads/internal/client.cc
@@ -453,54 +453,6 @@ bool Client::GetAvailable() const {
   return client_state_->available;
 }
 
-void Client::FlagShoppingState(
-    const std::string& url,
-    const uint64_t score) {
-  client_state_->shop_activity = true;
-  client_state_->shop_url = url;
-  client_state_->score = score;
-  client_state_->last_shop_time = Time::NowInSeconds();
-
-  SaveState();
-}
-
-void Client::UnflagShoppingState() {
-  client_state_->shop_activity = false;
-
-  SaveState();
-}
-
-bool Client::GetShoppingState() {
-  return client_state_->shop_activity;
-}
-
-void Client::FlagSearchState(
-    const std::string& url,
-    const uint64_t score) {
-  client_state_->search_activity = true;
-  client_state_->search_url = url;
-  client_state_->score = score;
-  client_state_->last_search_time = Time::NowInSeconds();
-
-  SaveState();
-}
-
-void Client::UnflagSearchState(
-    const std::string& url) {
-  if (client_state_->search_url == url) {
-    return;
-  }
-
-  client_state_->search_activity = false;
-  client_state_->last_search_time = Time::NowInSeconds();
-
-  SaveState();
-}
-
-bool Client::GetSearchState() {
-  return client_state_->search_activity;
-}
-
 void Client::UpdateLastUserActivity() {
   client_state_->last_user_activity = Time::NowInSeconds();
 

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/client.h b/vendor/bat-native-ads/src/bat/ads/internal/client.h
@@ -87,17 +87,6 @@ class Client {
       const bool available);
 
   bool GetAvailable() const;
-  void FlagShoppingState(
-      const std::string& url,
-      const uint64_t score);
-  void UnflagShoppingState();
-  bool GetShoppingState();
-  void FlagSearchState(
-      const std::string& url,
-      const uint64_t score);
-  void UnflagSearchState(
-      const std::string& url);
-  bool GetSearchState();
   void UpdateLastUserActivity();
   uint64_t GetLastUserActivity();
   void UpdateLastUserIdleStopTime();

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/client_state.cc b/vendor/bat-native-ads/src/bat/ads/internal/client_state.cc
@@ -117,18 +117,6 @@ Result ClientState::FromJson(
     available = client["available"].GetBool();
   }
 
-  if (client.HasMember("lastSearchTime")) {
-    auto migrated_timestamp_in_seconds = Time::MigrateTimestampToDoubleT(
-        client["lastSearchTime"].GetUint64());
-    last_search_time = migrated_timestamp_in_seconds;
-  }
-
-  if (client.HasMember("lastShopTime")) {
-    auto migrated_timestamp_in_seconds = Time::MigrateTimestampToDoubleT(
-        client["lastShopTime"].GetUint64());
-    last_shop_time = migrated_timestamp_in_seconds;
-  }
-
   if (client.HasMember("lastUserActivity")) {
     auto migrated_timestamp_in_seconds = Time::MigrateTimestampToDoubleT(
         client["lastUserActivity"].GetUint64());
@@ -214,22 +202,6 @@ Result ClientState::FromJson(
     score = client["score"].GetDouble();
   }
 
-  if (client.HasMember("searchActivity")) {
-    search_activity = client["searchActivity"].GetBool();
-  }
-
-  if (client.HasMember("searchUrl")) {
-    search_url = client["searchUrl"].GetString();
-  }
-
-  if (client.HasMember("shopActivity")) {
-    shop_activity = client["shopActivity"].GetBool();
-  }
-
-  if (client.HasMember("shopUrl")) {
-    shop_url = client["shopUrl"].GetString();
-  }
-
   if (client.HasMember("version_code")) {
     version_code = client["version_code"].GetString();
   }
@@ -288,12 +260,6 @@ void SaveToJson(JsonWriter* writer, const ClientState& state) {
   writer->String("available");
   writer->Bool(state.available);
 
-  writer->String("lastSearchTime");
-  writer->Uint64(state.last_search_time);
-
-  writer->String("lastShopTime");
-  writer->Uint64(state.last_shop_time);
-
   writer->String("lastUserActivity");
   writer->Uint64(state.last_user_activity);
 
@@ -363,18 +329,6 @@ void SaveToJson(JsonWriter* writer, const ClientState& state) {
   writer->String("score");
   writer->Double(state.score);
 
-  writer->String("searchActivity");
-  writer->Bool(state.search_activity);
-
-  writer->String("searchUrl");
-  writer->String(state.search_url.c_str());
-
-  writer->String("shopActivity");
-  writer->Bool(state.shop_activity);
-
-  writer->String("shopUrl");
-  writer->String(state.shop_url.c_str());
-
   writer->String("version_code");
   writer->String(state.version_code.c_str());
 

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/client_state.h b/vendor/bat-native-ads/src/bat/ads/internal/client_state.h
@@ -39,8 +39,6 @@ struct ClientState {
   std::map<std::string, uint64_t> seen_advertisers;
   uint64_t next_check_serve_ad_timestamp_in_seconds = 0;
   bool available = false;
-  uint64_t last_search_time = 0;
-  uint64_t last_shop_time = 0;
   uint64_t last_user_activity = 0;
   uint64_t last_user_idle_stop_time = 0;
   std::string user_model_language = kDefaultUserModelLanguage;
@@ -51,10 +49,6 @@ struct ClientState {
   std::map<std::string, std::deque<uint64_t>> ad_conversion_history;
   std::map<std::string, std::deque<uint64_t>> campaign_history;
   double score = 0.0;
-  bool search_activity = false;
-  std::string search_url;
-  bool shop_activity = false;
-  std::string shop_url;
   std::string version_code;
   PurchaseIntentSignalSegmentHistoryMap purchase_intent_signal_history;
 };

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/reports.cc b/vendor/bat-native-ads/src/bat/ads/internal/reports.cc
@@ -6,6 +6,7 @@
 #include "bat/ads/internal/reports.h"
 #include "bat/ads/internal/time.h"
 #include "bat/ads/internal/ads_impl.h"
+#include "bat/ads/internal/search_providers.h"
 #include "bat/ads/ad_notification_info.h"
 
 #include "rapidjson/document.h"
@@ -159,7 +160,7 @@ std::string Reports::GenerateLoadEventReport(
   writer.Int(info.tab_id);
 
   writer.String("tabType");
-  if (ads_->get_client()->GetSearchState()) {
+  if (SearchProviders::IsSearchEngine(info.tab_url)) {
     writer.String("search");
   } else {
     writer.String("click");

diff --git a/vendor/bat-native-ads/test/data/client.json b/vendor/bat-native-ads/test/data/client.json
@@ -5,7 +5,6 @@
   "adConversionHistory": {
   },
   "nextCheckServeAd": 0,
-  "lastShopTime": 0,
   "campaignHistory": {
   },
   "last_page_classification": "",
@@ -21,12 +20,7 @@
   "adUUID": "",
   "locale": "en",
   "lastUserActivity": 0,
-  "searchActivity": false,
-  "searchUrl": "",
-  "lastSearchTime": 0,
-  "shopActivity": false,
   "available": true,
-  "shopUrl": "",
   "adsShownHistory": [
   ],
   "score": 0