improved oembed detection

oscarotero · May 30, 2020 · 2c73fb7 · NathanBaulch · Jul 15, 2022 · oscarotero
1 parent e623b6b
commit 2c73fb7
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 12 deletions.
diff --git a/src/Providers/OEmbed/Deviantart.php b/src/Providers/OEmbed/Deviantart.php
@@ -19,7 +19,7 @@ public function getEndPoint()
     {
         return Url::create(static::$endPoint)
                 ->withQueryParameters([
-                    'url' => (string) $this->response->getUrl(),
+                    'url' => (string) $this->getUrl(),
                     'format' => 'json',
                     'for' => 'embed',
                 ]);

diff --git a/src/Providers/OEmbed/Embedly.php b/src/Providers/OEmbed/Embedly.php
@@ -42,7 +42,7 @@ public function getEndPoint()
     {
         return Url::create('http://api.embed.ly/1/oembed')
                 ->withQueryParameters([
-                    'url' => (string) $this->response->getUrl(),
+                    'url' => (string) $this->getUrl(),
                     'format' => 'json',
                     'key' => $this->key,
                 ]);

diff --git a/src/Providers/OEmbed/EndPoint.php b/src/Providers/OEmbed/EndPoint.php
@@ -12,6 +12,7 @@
 abstract class EndPoint
 {
     protected $response;
+    protected $url;
     protected static $pattern;
     protected static $endPoint;
 
@@ -25,16 +26,21 @@ public static function create(Adapter $adapter)
         if ($response->getUrl()->match(static::$pattern)) {
             return new static($response);
         }
+
+        if ($response->getStartingUrl()->match(static::$pattern)) {
+            return new static($response, $response->getStartingUrl());
+        }
     }
 
     /**
      * Constructor.
      *
      * @param Response $response
      */
-    protected function __construct(Response $response)
+    protected function __construct(Response $response, Url $url = null)
     {
         $this->response = $response;
+        $this->url = $url;
     }
 
     /**
@@ -44,8 +50,13 @@ public function getEndPoint()
     {
         return Url::create(static::$endPoint)
                 ->withQueryParameters([
-                    'url' => (string) $this->response->getUrl(),
+                    'url' => (string) $this->getUrl(),
                     'format' => 'json',
                 ]);
     }
+
+    public function getUrl()
+    {
+        return $this->url ?: $this->response->getUrl();
+    }
 }
diff --git a/src/Providers/OEmbed/Facebook.php b/src/Providers/OEmbed/Facebook.php
@@ -13,14 +13,14 @@ class Facebook extends EndPoint implements EndPointInterface
      */
     public function getEndPoint()
     {
-        if ($this->response->getUrl()->match(['*/videos/*', '/video.php'])) {
+        if ($this->getUrl()->match(['*/videos/*', '/video.php'])) {
             $endPoint = Url::create('https://www.facebook.com/plugins/video/oembed.json');
         } else {
             $endPoint = Url::create('https://www.facebook.com/plugins/post/oembed.json');
         }
 
         return $endPoint->withQueryParameters([
-            'url' => (string) $this->response->getUrl(),
+            'url' => (string) $this->getUrl(),
             'format' => 'json',
         ]);
     }

diff --git a/src/Providers/OEmbed/Iframely.php b/src/Providers/OEmbed/Iframely.php
@@ -42,7 +42,7 @@ public function getEndPoint()
     {
         return Url::create('http://open.iframe.ly/api/oembed')
                 ->withQueryParameters([
-                    'url' => (string) $this->response->getUrl(),
+                    'url' => (string) $this->getUrl(),
                     'format' => 'json',
                     'api_key' => $this->key,
                 ]);

diff --git a/src/Providers/OEmbed/Infogram.php b/src/Providers/OEmbed/Infogram.php
@@ -17,7 +17,7 @@ class Infogram extends EndPoint implements EndPointInterface
      */
     public function getEndPoint()
     {
-        $url = $this->response->getUrl()->withScheme('https');
+        $url = $this->getUrl()->withScheme('https');
 
         return Url::create(static::$endPoint)
                 ->withQueryParameters([

diff --git a/src/Providers/OEmbed/Instagram.php b/src/Providers/OEmbed/Instagram.php
@@ -17,7 +17,7 @@ class Instagram extends EndPoint implements EndPointInterface
      */
     public function getEndPoint()
     {
-        $url = $this->response->getUrl()->withScheme('http');
+        $url = $this->getUrl()->withScheme('http');
 
         return Url::create(static::$endPoint)
                 ->withQueryParameters([

diff --git a/src/Providers/OEmbed/Jsbin.php b/src/Providers/OEmbed/Jsbin.php
@@ -14,7 +14,7 @@ class Jsbin extends EndPoint implements EndPointInterface
      */
     public function getEndPoint()
     {
-        $url = $this->response->getUrl()->withDirectoryPosition(2, 'embed');
+        $url = $this->getUrl()->withDirectoryPosition(2, 'embed');
 
         return Url::create(static::$endPoint)
                 ->withQueryParameters([

diff --git a/src/Providers/OEmbed/Scribd.php b/src/Providers/OEmbed/Scribd.php
@@ -17,7 +17,7 @@ class Scribd extends EndPoint implements EndPointInterface
      */
     public function getEndPoint()
     {
-        $url = $this->response->getUrl()->withDirectoryPosition(0, 'doc');
+        $url = $this->getUrl()->withDirectoryPosition(0, 'doc');
 
         return Url::create(static::$endPoint)
                 ->withQueryParameters([

diff --git a/src/Providers/OEmbed/Spotify.php b/src/Providers/OEmbed/Spotify.php
@@ -16,7 +16,7 @@ public function getEndPoint()
     {
         return Url::create(static::$endPoint)
                 ->withQueryParameters([
-                    'url' => (string) $this->response->getUrl()->withQueryParameters([]),
+                    'url' => (string) $this->getUrl()->withQueryParameters([]),
                     'format' => 'json'
                 ]);
     }