Merge pull request #1328 from brave/youtube-url-59

Adds support for different watch youtube urls
brave · Jan 14, 2019 · 17168e4 · 17168e4
2 parents 1c8462a + 8b7bbbc
commit 17168e4
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@
 /components/brave_sync/extension/brave-sync/
 /dist/
 /out/
-/vendor
+/vendor/*
 !/vendor/bat-native-ledger
 node_modules/
 *.xcodeproj

diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -85,6 +85,7 @@ test("brave_unit_tests") {
 
   if (brave_rewards_enabled) {
     sources += [
+      "//brave/vendor/bat-native-ledger/src/bat_get_media_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/test/niceware_partial_unittest.cc",
       "//brave/vendor/bat-native-usermodel/test/usermodel_unittest.cc",
       "//brave/components/brave_rewards/browser/rewards_service_impl_unittest.cc",

diff --git a/vendor/bat-native-ledger/src/bat_get_media.cc b/vendor/bat-native-ledger/src/bat_get_media.cc
@@ -7,6 +7,7 @@
 
 #include <sstream>
 #include <cmath>
+#include <vector>
 
 #include "bat_get_media.h"
 #include "bat_helper.h"
@@ -758,11 +759,28 @@ std::string BatGetMedia::parseChannelId(const std::string& data) {
   return id;
 }
 
+// static
 std::string BatGetMedia::getYoutubeMediaIdFromUrl(const ledger::VisitData& visit_data) {
-  std::vector<std::string> m_url =
-    braveledger_bat_helper::split(visit_data.url, '=');
-  if (m_url.size() > 1) {
-    return m_url[1];
+  std::vector<std::string> first_split =
+    braveledger_bat_helper::split(visit_data.url, '?');
+
+  if (first_split.size() < 2) {
+    return std::string();
+  }
+
+  std::vector<std::string> and_split =
+    braveledger_bat_helper::split(first_split[1], '&');
+
+  for (const auto& item : and_split) {
+    std::vector<std::string> m_url = braveledger_bat_helper::split(item, '=');
+
+    if (m_url.size() < 2) {
+      continue;
+    }
+
+    if (m_url[0] == "v") {
+      return m_url[1];
+    }
   }
 
   return std::string();

diff --git a/vendor/bat-native-ledger/src/bat_get_media.h b/vendor/bat-native-ledger/src/bat_get_media.h
@@ -45,6 +45,8 @@ class BatGetMedia {
                                const ledger::VisitData& visit_data,
                                const std::string& providerType);
 
+  static std::string getYoutubeMediaIdFromUrl(const ledger::VisitData& visit_data);
+
  private:
   std::string getMediaURL(const std::string& mediaId, const std::string& providerName);
   void getPublisherFromMediaPropsCallback(const uint64_t& duration,
@@ -171,8 +173,6 @@ class BatGetMedia {
 
   std::string parseChannelId(const std::string& data);
 
-  std::string getYoutubeMediaIdFromUrl(const ledger::VisitData& visit_data);
-
   std::string getYoutubeMediaKeyFromUrl(const std::string& provider_type, const std::string& media_id);
 
   std::string getYoutubePublisherKeyFromUrl(const ledger::VisitData& visit_data);

diff --git a/vendor/bat-native-ledger/src/bat_get_media_unittest.cc b/vendor/bat-native-ledger/src/bat_get_media_unittest.cc
@@ -0,0 +1,52 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/vendor/bat-native-ledger/include/bat/ledger/ledger.h"
+#include "brave/vendor/bat-native-ledger/src/bat_get_media.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+TEST(BatGetMediaTest, GetYoutubeMediaIdFromUrl) {
+  //BatGetMedia media = new BatGetMedia(nullptr);
+
+  // missing video id
+  ledger::VisitData data;
+  data.url = "https://www.youtube.com/watch";
+
+  std::string media =
+      braveledger_bat_get_media::BatGetMedia::getYoutubeMediaIdFromUrl(data);
+
+  ASSERT_EQ(media, "");
+
+  // single element in the url
+  data.url = "https://www.youtube.com/watch?v=44444444";
+
+  media =
+      braveledger_bat_get_media::BatGetMedia::getYoutubeMediaIdFromUrl(data);
+
+  ASSERT_EQ(media, "44444444");
+
+  // single element in the url with & appended
+  data.url = "https://www.youtube.com/watch?v=44444444&";
+
+  media =
+      braveledger_bat_get_media::BatGetMedia::getYoutubeMediaIdFromUrl(data);
+
+  ASSERT_EQ(media, "44444444");
+
+  // multiple elements in the url (id first)
+  data.url = "https://www.youtube.com/watch?v=44444444&time_continue=580";
+
+  media =
+      braveledger_bat_get_media::BatGetMedia::getYoutubeMediaIdFromUrl(data);
+
+  ASSERT_EQ(media, "44444444");
+
+  // multiple elements in the url
+  data.url = "https://www.youtube.com/watch?time_continue=580&v=44444444";
+
+  media =
+      braveledger_bat_get_media::BatGetMedia::getYoutubeMediaIdFromUrl(data);
+
+  ASSERT_EQ(media, "44444444");
+}