Merge pull request #43 from itteco/v1.1.0

V1.1.0
itteco · Dec 4, 2023 · eb99984 · eb99984
2 parents d3255e4 + 1dbba46
commit eb99984
Show file tree

Hide file tree

Showing 28 changed files with 15,394 additions and 12,892 deletions.
diff --git a/admin.css b/admin.css
diff --git a/app/Embed/Amp.php b/app/Embed/Amp.php
@@ -23,7 +23,7 @@ public static function is_iframely_amp($args): bool
             || (function_exists('is_amp_endpoint') && is_amp_endpoint());
     }
 
-    public static function maybe_add_iframe_amp($provider, $args, $url)
+    public static function maybe_add_iframe_amp($provider, $url, $args)
     {
         if (self::is_iframely_amp($args) && Utils::stringContains($provider, 'iframe.ly')) {
             $provider = add_query_arg('amp', '1', $provider);

diff --git a/app/Embed/Gutenberg.php b/app/Embed/Gutenberg.php
@@ -15,6 +15,10 @@ public static function run(): void
 
     public static function init(): void
     {
+        # Always extract &iframely={serialized options} that we append to URLs
+        # and add these options into the oEmbed endpoint's query-string parameters
+        add_filter('oembed_fetch_url', [self::class, 'maybe_add_iframely_url_options'], 20, 3);
+
         if (!current_user_can('edit_posts')) {
             return;
         }
@@ -31,7 +35,7 @@ public static function init(): void
     public static function iframely_flag_ajax_oembed($width)
     {
         add_filter('embed_defaults', [self::class, 'iframely_bust_gutenberg_cache'], 10, 1);
-        add_filter('oembed_fetch_url', [self::class, 'maybe_add_gutenberg_1'], 10, 3);
+        add_filter('oembed_fetch_url', [self::class, 'maybe_add_gutenberg_1'], 20, 3);
         add_filter('oembed_result', [self::class, 'inject_events_proxy_to_gutenberg'], 10, 3);
 
         # The core's code doesn't even bother to look into default values and just hardcodes 600.
@@ -44,25 +48,50 @@ public static function iframely_flag_ajax_oembed($width)
 
     public static function iframely_bust_gutenberg_cache($args)
     {
-        $args['gutenberg'] = 1;
+        $args['gutenberg'] = 2;
         return $args;
     }
 
-    public static function maybe_add_gutenberg_1($provider, $args, $url)
+    public static function maybe_add_gutenberg_1($provider, $url, $args)
     {
         if (Utils::stringContains($provider, 'iframe.ly')) {
-            if (!Utils::stringContains($provider, 'iframe=card')) {
-                $provider = add_query_arg('iframe', '1', $provider);
+            $provider = add_query_arg('iframe', '1', $provider);
+            $provider = add_query_arg('import', '0', $provider);
+            $provider = add_query_arg('ssl', '1', $provider);
+            $provider = add_query_arg('gutenberg', '2', $provider);
+        }
+        return $provider;
+    }
+
+    public static function maybe_add_iframely_url_options($provider, $url, $args)
+    {
+        # Options are added to URL the URL in utils.js this way:
+        # 'iframely=' + encodeURIComponent(window.btoa(JSON.stringify(query)));
+        if (Utils::stringContains($provider, 'iframe.ly') && Utils::stringContains($url, 'iframely=')) {
+            $parsed_url = parse_url($url);
+            if (isset($parsed_url['query'])) {
+                $params = array();
+                parse_str($parsed_url['query'], $params);
+
+                if (isset($params['iframely'])) {
+                    $options_str = base64_decode(urldecode($params['iframely']));
+                    $options_query = json_decode($options_str);
+
+                    foreach ($options_query as $key => $value) {
+                        $provider = add_query_arg($key, $value, $provider);
+                    }
+                }
             }
-            $provider = add_query_arg('gutenberg', '1', $provider);
         }
         return $provider;
     }
 
     public static function inject_events_proxy_to_gutenberg($html, $url, $args)
     {
-        if (!empty(trim($html))) { // != trims $html
-            return $html . '<script type="text/javascript">window.addEventListener("message",function(e){window.parent.postMessage(e.data,"*");},false);</script>';
+        if (!empty(trim($html))) {
+            return $html .
+                '<style>body{overflow: hidden}</style>' .
+                '<script type="text/javascript">window.addEventListener("message",function(e){window.top.postMessage(e.data,"*");},false);</script>';
         }
         return $html;
     }

diff --git a/app/Embed/Oembed.php b/app/Embed/Oembed.php
@@ -4,6 +4,7 @@
 
 use Iframely\Embed;
 use Iframely\Options;
+use Iframely\Utils;
 
 class Oembed
 {
@@ -23,6 +24,9 @@ public static function run(): void
 
         # Always add iframely as oembed provider for any iframe.ly short link
         wp_oembed_add_provider('#https?://iframe\.ly/.+#i', Embed::createApiLink(), true);
+
+        # Fix URL query-string settings by replacing &iframe=card into &iframe=1&card=1
+        add_filter('oembed_fetch_url', [self::class, 'maybe_replace_iframe_card'], 10, 3);
     }
 
     public static function maybe_remove_wp_self_embeds($result, $url, $args)
@@ -40,10 +44,17 @@ public static function maybe_reverse_oembed_providers($providers)
 
         return $providers;
     }
-}
-
-
-
-
-
 
+    public static function maybe_replace_iframe_card($provider, $url, $args)
+    {
+        if (Utils::stringContains($provider, 'iframe.ly') && Utils::stringContains($provider, 'iframe=card')) {
+            if (Utils::stringContains($provider, 'iframe=card-small')) {
+                $provider = add_query_arg('card', 'small', $provider);
+            } else {
+                $provider = add_query_arg('card', '1', $provider);
+            }
+            $provider = add_query_arg('iframe', '1', $provider);
+        }
+        return $provider;
+    }
+}
diff --git a/app/UI/Settings.php b/app/UI/Settings.php
@@ -22,12 +22,13 @@ public static function run(): void
 
         // Load assets
         add_action('admin_enqueue_scripts', [self::class, 'enqueue']);
+        add_action('enqueue_block_editor_assets', [self::class, 'enqueueEditor']);
     }
 
     public static function register(): void
     {
         if (is_multisite()) {
-            add_submenu_page('settings.php', __('Iframely', 'iframely'), __('Iframely', 'iframely'), 'install_plugins', 'iframely', [self::class, 'render']);
+            add_submenu_page('settings.php', __('Iframely', 'iframely'), __('Iframely', 'iframely'), 'manage_network_options', 'iframely', [self::class, 'render']);
         } else {
             add_options_page(__('Iframely', 'iframely'), __('Iframely', 'iframely'), 'manage_options', 'iframely', [self::class, 'render']);
         }
@@ -36,11 +37,16 @@ public static function register(): void
     public static function enqueue(): void
     {
         $screen = get_current_screen();
-        $screens = ['post', 'settings_page_iframely-network', 'settings_page_iframely'];
+        $screens = ['settings_page_iframely-network', 'settings_page_iframely'];
         if (!($screen !== null && in_array($screen->id, $screens))) {
             return;
         }
-        wp_enqueue_style('iframely-admin', Plugin::asset('index.css'), [], IFRAMELY_VERSION);
+        wp_enqueue_style('iframely-admin', Plugin::asset('admin.css'), [], IFRAMELY_VERSION);
+    }
+
+    public static function enqueueEditor(): void
+    {
+        wp_enqueue_style('iframely-options', Plugin::asset('index.css'), [], IFRAMELY_VERSION);
     }
 
     public static function render(): void

diff --git a/build/admin.asset.php b/build/admin.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array(), 'version' => 'c51082815623e6e262ce');
diff --git a/build/admin.css b/build/admin.css
diff --git a/build/admin.js b/build/admin.js
diff --git a/build/index.asset.php b/build/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-block-editor', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '2b787e75d61c1a84f7e7');
+<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => 'a4ffcff9e90dcd142020');