Fixes brave/brave-browser#1277

linting Correcting build (initialization order) linting
brave-intl · Sep 26, 2018 · 6b2796a · 6b2796a
1 parent 745ddbb
commit 6b2796a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/include/bat/ledger/publisher_info.h b/include/bat/ledger/publisher_info.h
@@ -51,9 +51,8 @@ LEDGER_EXPORT struct PublisherInfoFilter {
   int category;
   PUBLISHER_MONTH month;
   int year;
-  PUBLISHER_EXCLUDE excluded;
-
   std::vector<std::pair<std::string, bool>> order_by;
+  PUBLISHER_EXCLUDE excluded;
 };
 
 LEDGER_EXPORT struct ContributionInfo {

diff --git a/src/bat_get_media.cc b/src/bat_get_media.cc
@@ -95,14 +95,8 @@ void BatGetMedia::getPublisherInfoDataCallback(const std::string& mediaId, const
     return;
   }
 
-  std::vector<std::string> split = braveledger_bat_helper::split(mediaId, '_');
-  std::string new_media_id = mediaId;
-  if (!split.empty()) {
-    new_media_id = split[0];
-  }
-
   if (!publisher_info.get()) {
-    std::string mediaURL = getMediaURL(new_media_id, providerName);
+    std::string mediaURL = getMediaURL(mediaId, providerName);
     if (YOUTUBE_MEDIA_TYPE == providerName) {
       auto request = ledger_->LoadURL((std::string)YOUTUBE_PROVIDER_URL + "?format=json&url=" + ledger_->URIEncode(mediaURL),
         std::vector<std::string>(), "", "", ledger::URL_METHOD::GET, &handler_);
@@ -118,12 +112,12 @@ void BatGetMedia::getPublisherInfoDataCallback(const std::string& mediaId, const
           _2,
           _3));
     } else if (TWITCH_MEDIA_TYPE == providerName) {
-      const std::string mediaUrl = getMediaURL(new_media_id, providerName);
+      const std::string mediaUrl = getMediaURL(mediaId, providerName);
       std::unique_ptr<ledger::PublisherInfo> new_publisher_info(new ledger::PublisherInfo());
       new_publisher_info->favicon_url = "";
       new_publisher_info->url = mediaUrl + "/videos";
-      std::string id = providerName + "#author:" + new_media_id;
-      new_publisher_info->name = new_media_id;
+      std::string id = providerName + "#author:" + mediaId;
+      new_publisher_info->name = mediaId;
       new_publisher_info->id = id;
 
       ledger::TwitchEventInfo oldEvent;

diff --git a/src/bat_helper.cc b/src/bat_helper.cc
@@ -1852,7 +1852,7 @@ static bool ignore_ = false;
 
   uint64_t getMediaDuration(const std::map<std::string, std::string>& data, const std::string& media_key, const std::string& type) {
     uint64_t duration = 0;
-    
+
     if (YOUTUBE_MEDIA_TYPE == type) {
       std::map<std::string, std::string>::const_iterator iterSt = data.find("st");
       std::map<std::string, std::string>::const_iterator iterEt = data.find("et");