Fixes brave/brave-browser#971. Fine tuning Twitch time.

Reverted fix addressed in another PR.

linting

Updated media ID split to check for delimiter existence

Author: Jason Sadler

include/bat/ledger/publisher_info.h

@@ -51,8 +51,9 @@ LEDGER_EXPORT struct PublisherInfoFilter {
   int category;
   PUBLISHER_MONTH month;
   int year;
-  std::vector<std::pair<std::string, bool>> order_by;
   PUBLISHER_EXCLUDE excluded;
+
+  std::vector<std::pair<std::string, bool>> order_by;
 };
 
 LEDGER_EXPORT struct ContributionInfo {

src/bat_get_media.cc

@@ -6,6 +6,7 @@
 #include "bat_get_media.h"
 
 #include <sstream>
+#include <cmath>
 
 #include "bat_get_media.h"
 #include "bat_helper.h"
@@ -112,12 +113,16 @@ void BatGetMedia::getPublisherInfoDataCallback(const std::string& mediaId, const
           _2,
           _3));
     } else if (TWITCH_MEDIA_TYPE == providerName) {
-      const std::string mediaUrl = getMediaURL(mediaId, providerName);
+      const std::string twitchMediaID = 
+        mediaId.find(MEDIA_DELIMITER) != std::string::npos ?
+        mediaId :
+        braveledger_bat_helper::split(mediaId, MEDIA_DELIMITER)[0];
+      const std::string mediaUrl = getMediaURL(twitchMediaID, 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:" + mediaId;
-      new_publisher_info->name = mediaId;
+      std::string id = providerName + "#author:" + twitchMediaID;
+      new_publisher_info->name = twitchMediaID;
       new_publisher_info->id = id;
 
       ledger::TwitchEventInfo oldEvent;
@@ -253,11 +258,15 @@ uint64_t BatGetMedia::getTwitchDuration(const ledger::TwitchEventInfo& oldEventI
     return 0;
   }
 
+  if (oldEventInfo.status_.empty()) { // if autoplay is off and play is pressed
+    return 0;
+  }
+  
   if (time > TWITCH_MAXIMUM_SECONDS_CHUNK) {
     time = TWITCH_MAXIMUM_SECONDS_CHUNK;
   }
 
-  return (uint64_t)time;
+  return (uint64_t)std::round(time);
 }
 
 void BatGetMedia::getPublisherFromMediaPropsCallback(const uint64_t& duration, const std::string& media_key,

src/static_values.h

@@ -51,6 +51,7 @@
 #define YOUTUBE_PROVIDER_NAME           "YouTube"
 #define TWITCH_PROVIDER_NAME           	"Twitch"
 #define YOUTUBE_PROVIDER_URL            "https://www.youtube.com/oembed"
+#define MEDIA_DELIMITER                 '_'
 
 #define SEED_LENGTH                     32
 #define SALT_LENGTH                     64