Refactor TwitterShortcode to use Guzzle for HTTP requests.

murdercode · Dec 16, 2024 · 832836e · 832836e
1 parent e96c249
commit 832836e
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 8 deletions.
diff --git a/src/LaravelShortcodePlus.php b/src/LaravelShortcodePlus.php
@@ -22,7 +22,9 @@
 
 final class LaravelShortcodePlus
 {
-    public function __construct(protected string $content = '') {}
+    public function __construct(protected string $content = '')
+    {
+    }
 
     public static function source(string $source): LaravelShortcodePlus
     {

diff --git a/src/LaravelShortcodePlusServiceProvider.php b/src/LaravelShortcodePlusServiceProvider.php
@@ -42,7 +42,9 @@ public function configurePackage(Package $package): void
             ->hasMigration('create_laravel-shortcode-plus_table');
     }
 
-    public function packageRegistered() {}
+    public function packageRegistered()
+    {
+    }
 
     public function packageBooted(): void
     {

diff --git a/src/Shortcodes/TwitterShortcode.php b/src/Shortcodes/TwitterShortcode.php
@@ -2,6 +2,10 @@
 
 namespace Murdercode\LaravelShortcodePlus\Shortcodes;
 
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Exception\RequestException;
+
 class TwitterShortcode
 {
     public function register($shortcode): string
@@ -25,15 +29,41 @@ public function register($shortcode): string
         return view('shortcode-plus::twitter', compact('html'))->render();
     }
 
+    /**
+     * Get oEmbed data from Twitter
+     * Note: Twitter sometimes returns 404 for valid URLs, so we retry a few times
+     *
+     * @throws GuzzleException
+     */
     private static function getOembed(string $url): ?string
     {
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, 'https://publish.twitter.com/oembed?url='.urlencode($url).'&omit_script=1');
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        $response = curl_exec($curl);
-        curl_close($curl);
+        $maxAttempts = 3;
+        $attempt = 0;
+        $response = null;
+
+        while ($attempt < $maxAttempts && $response === null) {
+            try {
+                $client = new Client;
+                $res = $client->request('GET', 'https://publish.twitter.com/oembed', [
+                    'query' => [
+                        'url' => $url,
+                        'omit_script' => 1,
+                    ],
+                ]);
+
+                if ($res->getStatusCode() == 200) {
+                    $response = $res->getBody()->getContents();
+                } else {
+                    usleep(100000);
+                    $attempt++;
+                }
+            } catch (RequestException $e) {
+                usleep(100000);
+                $attempt++;
+            }
+        }
 
-        if ($response === false) {
+        if ($response === null) {
             return null;
         }