From f11838b20742a60a87124878ade2761b31828b7f Mon Sep 17 00:00:00 2001
From: Kiko Beats <josefrancisco.verdu@gmail.com>
Date: Sun, 2 Feb 2020 10:20:33 +0100
Subject: [PATCH] feat: update got

---
 packages/metascraper-iframe/package.json                    | 4 ++--
 packages/metascraper-iframe/src/from-html.js                | 6 ++++--
 packages/metascraper-iframe/src/index.js                    | 3 +--
 packages/metascraper-iframe/test/index.js                   | 2 +-
 packages/metascraper-logo-favicon/package.json              | 2 +-
 packages/metascraper-media-provider/package.json            | 2 +-
 .../src/get-media/provider/twitter.js                       | 6 ++----
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/metascraper-iframe/package.json b/packages/metascraper-iframe/package.json
index 9cd8cefb7..f76f28aef 100644
--- a/packages/metascraper-iframe/package.json
+++ b/packages/metascraper-iframe/package.json
@@ -19,9 +19,9 @@
   ],
   "dependencies": {
     "@metascraper/helpers": "^5.10.7",
-    "got": "~9.6.0",
+    "got": "~10.4.0",
     "lodash": "~4.17.15",
-    "oembed-spec": "~1.2.0",
+    "oembed-spec": "~1.3.0",
     "p-reflect": "~2.1.0"
   },
   "devDependencies": {
diff --git a/packages/metascraper-iframe/src/from-html.js b/packages/metascraper-iframe/src/from-html.js
index 55ddd7b0d..bea805ff2 100644
--- a/packages/metascraper-iframe/src/from-html.js
+++ b/packages/metascraper-iframe/src/from-html.js
@@ -14,8 +14,10 @@ const fromHTML = gotOpts => async ({ url, meta, htmlDom, ...opts }) => {
   if (!oembedUrl) return null
   const oembedUrlObj = new URL(oembedUrl)
   forEach(opts, (value, key) => oembedUrlObj.searchParams.append(key, value))
-  const { value } = await pReflect(got(oembedUrlObj.toString(), gotOpts))
-  return get(value, 'body.html', null)
+  const { value } = await pReflect(
+    got(oembedUrlObj.toString(), gotOpts).json()
+  )
+  return get(value, 'html', null)
 }
 
 fromHTML.test = $ => !!jsonOembed($)
diff --git a/packages/metascraper-iframe/src/index.js b/packages/metascraper-iframe/src/index.js
index 5753d35bc..04f3afcb8 100644
--- a/packages/metascraper-iframe/src/index.js
+++ b/packages/metascraper-iframe/src/index.js
@@ -12,8 +12,7 @@ const test = memoizeOne(
   ({ url, htmlDom: $ }) => htmlTest($) || providerTest(url)
 )
 
-module.exports = ({ gotOpts: _gotOpts } = {}) => {
-  const gotOpts = { json: true, retry: 0, ..._gotOpts }
+module.exports = ({ gotOpts } = {}) => {
   const rules = { iframe: [fromHTML(gotOpts), fromProvider(gotOpts)] }
   rules.test = test
   return rules
diff --git a/packages/metascraper-iframe/test/index.js b/packages/metascraper-iframe/test/index.js
index 571542e6b..fd306406c 100644
--- a/packages/metascraper-iframe/test/index.js
+++ b/packages/metascraper-iframe/test/index.js
@@ -61,7 +61,7 @@ describe('metascraper-iframe', () => {
   describe('opts', () => {
     it('pass custom got options', async () => {
       const cache = new Map()
-      const gotOpts = { json: true, retry: 0, cache }
+      const gotOpts = { cache }
 
       const html = await readFile(resolve(__dirname, 'fixtures/genially.html'))
       const url = 'https://view.genial.ly/5dc53cfa759d2a0f4c7db5f4'
diff --git a/packages/metascraper-logo-favicon/package.json b/packages/metascraper-logo-favicon/package.json
index dae71bd01..f2d2cd04d 100644
--- a/packages/metascraper-logo-favicon/package.json
+++ b/packages/metascraper-logo-favicon/package.json
@@ -18,7 +18,7 @@
   ],
   "dependencies": {
     "@metascraper/helpers": "^5.10.7",
-    "got": "~9.6.0",
+    "got": "~10.4.0",
     "lodash": "~4.17.15"
   },
   "devDependencies": {
diff --git a/packages/metascraper-media-provider/package.json b/packages/metascraper-media-provider/package.json
index 7b0338aa0..149390066 100644
--- a/packages/metascraper-media-provider/package.json
+++ b/packages/metascraper-media-provider/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@metascraper/helpers": "^5.10.7",
     "debug": "~4.1.1",
-    "got": "~9.6.0",
+    "got": "~10.4.0",
     "lodash": "~4.17.15",
     "luminati-tunnel": "~1.3.0",
     "p-reflect": "~2.1.0",
diff --git a/packages/metascraper-media-provider/src/get-media/provider/twitter.js b/packages/metascraper-media-provider/src/get-media/provider/twitter.js
index 17086d83f..793650a81 100644
--- a/packages/metascraper-media-provider/src/get-media/provider/twitter.js
+++ b/packages/metascraper-media-provider/src/get-media/provider/twitter.js
@@ -34,8 +34,7 @@ const createGuestToken = ({ userAgent, tunnel }) => {
         const { body } = await got.post(
           'https://api.twitter.com/1.1/guest/activate.json',
           {
-            json: true,
-            retry: 0,
+            responseType: 'json',
             agent,
             headers: {
               authorization: TWITTER_BEARER_TOKEN,
@@ -59,8 +58,7 @@ const createGetTwitterVideo = ({ userAgent, getGuestToken }) => {
   const getData = async (apiUrl, url, token) => {
     const { isFulfilled, value, reason } = await pReflect(
       got(apiUrl, {
-        retry: 0,
-        json: true,
+        responseType: 'json',
         headers: {
           referer: url,
           'x-guest-token': token,