Changeset 1729512

Timestamp:

09/13/2017 05:42:06 PM (8 years ago)

Author:

ivanp

Message:

Iframely WP v0.5.0

Location:

iframely/trunk

Files:

• iframely.php (modified) (7 diffs)
• readme.txt (modified) (8 diffs)

iframely/trunk/iframely.php

@@ -5 +5 @@
 Description: Iframely for WordPress. Embed anything, with responsive widgets.
 Author: Itteco Corp.
-Version: 0.4.0
+Version: 0.5.0
 Author URI: https://iframely.com/?from=wp
 */
@@ -30 +30 @@
 wp_oembed_add_provider( '#https?://iframe\.ly/.+#i', iframely_create_api_link(), true );
 
-function maybe_remove_wp_self_embeds( $result, $url, $args ) { 
-        
+function maybe_remove_wp_self_embeds( $result, $url, $args ) {
+
     return get_site_option( 'publish_iframely_cards') ? null : $result;
 }
@@ -45 +45 @@
     }
 }
+
+# Make compatible with Automatic AMP-WP plugin: https://github.com/Automattic/amp-wp
+function is_iframely_amp ( $args ) {
+    return 
+        (is_array($args) && array_key_exists('iframely', $args) && $args['iframely'] == 'amp') 
+        || (is_string($args) && strpos($args, 'iframely=amp') !== false)
+        || (function_exists('is_amp_endpoint') && is_amp_endpoint());
+}
+
+# Make WP cache &iframe=amp oEmbed requests separately
+add_filter( 'embed_defaults', 'iframely_amp_embed_defaults' );
+function iframely_amp_embed_defaults( $args ) {
+    if (is_iframely_amp($args)) {
+        // args are included in cache key. Bust it for amp
+        $args['iframely'] = 'amp';
+    }
+    return $args;
+}
+
+add_filter( 'oembed_fetch_url', 'maybe_add_iframe_amp', 10, 3 );
+function maybe_add_iframe_amp( $provider, $args, $url ) {
+    
+    if (is_iframely_amp( $args ) && strpos($provider, '//iframe.ly') !== false) {
+        $provider = add_query_arg( 'iframe', 'amp', $provider );
+    }
+    return $provider;
+}
+
+
+add_filter( 'embed_oembed_html', 'iframely_filter_oembed_result', 10, 3 ); 
+function iframely_filter_oembed_result( $html, $url, $args ) {
+
+    if (strpos($html, '<amp-iframe') !== false || strpos($html, '<amp-facebook') !== false ) {        
+        add_action( 'amp_post_template_head', strpos($html, '<amp-iframe') !== false ? 'iframely_add_amp_iframe_js' : 'iframely_add_amp_facebook_js');
+        // Avoid corrupted amp-iframe overflow div as a result of wpautop
+        remove_filter( 'the_content', 'wpautop' );
+        // Restore wpautop if it was disabled
+        add_filter( 'the_content', 'iframely_autop_on_amp', 1000);
+    }
+    return $html;
+};
+
+add_filter( 'amp_content_embed_handlers', 'maybe_unregister_default_embed_handlers', 10, 2 );
+function maybe_unregister_default_embed_handlers($embed_handler_classes, $post ) {
+
+    if ( get_site_option( 'iframely_disable_default_amp_embeds' ) ) {
+        unset ($embed_handler_classes ['AMP_Twitter_Embed_Handler']);
+        unset ($embed_handler_classes ['AMP_Dailymotion_Embed_Handler']);
+        unset ($embed_handler_classes ['AMP_Facebook_Embed_Handler']);
+        unset ($embed_handler_classes ['AMP_Instagram_Embed_Handler']);
+        unset ($embed_handler_classes ['AMP_Vimeo_Embed_Handler']);
+        unset ($embed_handler_classes ['AMP_YouTube_Embed_Handler']);
+        unset ($embed_handler_classes ['AMP_Pinterest_Embed_Handler']);
+    }
+    return $embed_handler_classes;
+};
+
+
+function iframely_autop_on_amp( $content ) {
+
+    // Logic is taken from wpautop itself re <pre>
+    if ( strpos($content, '<amp-iframe') !== false ) {
+        $chunks = explode( '</amp-iframe>', $content );
+        $content = '';
+ 
+        foreach ( $chunks as $chunk ) {
+            $start = strpos($chunk, '<amp-iframe'); 
+            // Malformed html?
+            if ( $start === false ) {
+                $content .= $chunk;
+                continue;
+            }
+ 
+            $iframe = substr($chunk, $start) . '</amp-iframe>';
+            $p = wpautop(substr( $chunk, 0, $start));
+
+            $content .= $p . $iframe;
+        }
+    } else {
+        $content = wpautop($content);
+    }
+
+    return $content;
+}
+
+function iframely_add_amp_iframe_js( $amp_template ) {
+    ?>
+    <script custom-element="amp-iframe" src="https://cdn.ampproject.org/v0/amp-iframe-0.1.js" async></script>
+    <?php
+}
+
+function iframely_add_amp_facebook_js( $amp_template ) {
+    ?>
+    <script custom-element="amp-facebook" src="https://cdn.ampproject.org/v0/amp-facebook-0.1.js" async></script>
+    <?php
+}
+
+
 
 # fix cache ttl
@@ -69 +167 @@
                 $wp_embed->usecache = false;
                 delete_post_meta( $post_ID, $cachekey_time);
+                // delete_post_meta( $post_ID, $cachekey);
                 return $iframely_ttl;
             } else {
@@ -84 +183 @@
 # rewrite oembed discovery
 add_filter( 'oembed_endpoint_url', 'publish_embeds_via_iframely', 10, 2) ;
-
 function publish_embeds_via_iframely($url, $permalink, $format = 'json') {
 
@@ -227 +325 @@
             iframely_update_option('iframely_api_params', trim($_POST['iframely_api_params']));
             iframely_update_option('iframely_cache_ttl', (isset($_POST['iframely_cache_ttl'])) ? (int)trim($_POST['iframely_cache_ttl']) : 0);
+            iframely_update_option('iframely_disable_default_amp_embeds', (isset($_POST['iframely_disable_default_amp_embeds'])) ? (int)trim($_POST['iframely_disable_default_amp_embeds']) : 0);
         }
 
@@ -259 +358 @@
             Although, we should support the same providers and output the same code, just make it responsive.<br>
             Iframely shortcode will still process such URLs regardless of this setting.
+        </p>
+        </li>        
+
+        <li>
+            <p><input type="checkbox" name="iframely_disable_default_amp_embeds" value="1" <?php if (get_site_option('iframely_disable_default_amp_embeds')) { ?> checked="checked" <?php } ?> /> For AMP pages, replace default embeds with Iframely.</p>
+            <p>Iframely works nicely with <a href="https://wordpress.org/plugins/amp/" target="_blank_">AMP WordPress</a> plugin for Google AMP support. 
+            It catches all missing embeds and follow your Iframely settings.<br>
+            But you can also choose Iframely for all embeds, including default AMP embeds too.<br>
+            For example, Facebook video will be indeed a nice video without user's text message.
         </p>
         </li>

iframely/trunk/readme.txt

@@ -1 +1 @@
 === Iframely Responsive Embeds ===
 Contributors: psergeev, ivanp
-Tags: iframely, oembed, embed, responsive, video, youtube, vimeo, instagram, gist, vine, gif, giphy, google maps, facebook, mu, streamable, gfycat, vidme, Reddit, Tableau, spotify, prezi
+Tags: iframely, oembed, embed, responsive, video, amp, youtube, vimeo, instagram, gist, vine, gif, giphy, google maps, facebook, mu, streamable, gfycat, vidme, Reddit, Tableau, spotify, prezi, apester, qzzr, tidal, mlb,
 Requires at least: 3.5.1
-Tested up to: 4.7.4
+Tested up to: 4.8.1
 Stable tag: trunk
 License: MIT
 
 
-Iframely converts URLs in your posts into responsive embed widgets for over 2000 domains and summary cards for others.
+Iframely converts URLs in your posts into responsive embed widgets for over 2000 domains and summary cards for others. Also works with AMP.
 
 == Description ==
 
 
-[Iframely](https://iframely.com?from=wp) brings you the responsive embeds and support of over 2000 domains. It means the embeds will resize, if possible, if you are on responsive theme. 
-
-
-Iframely will detect URLs in your posts and replace it with responsive embed codes. Supports all usual suspects such as YouTube, Vimeo, Instagram, Facebook, Giphy, GfyCat, Imgur, Google +, GitHub Gists, Storify, SlideShare, Streamable, Vidme, Reddit, Dailymotion, Spotify, Tableau, Prezi, well, you know, over two thousand of them and keeps growing. [Test some URLs here](https://iframely.com/embed).
+[Iframely](https://iframely.com?from=wp) brings you the responsive embeds and support of over 2000 domains. Iframely also works with AMP.
+
+
+Iframely will detect URLs in your posts and replace it with responsive embed codes. Supports all usual suspects such as YouTube, Vimeo, Instagram, Facebook, Giphy, GfyCat, Imgur, Google +, GitHub Gists, Storify, SlideShare, Streamable, Vidme, Reddit, Dailymotion, Spotify, Tableau, Prezi, Apester, QZZR, Tidal, MLB, well, you know, over two thousand of them and keeps growing. [Test some URLs here](https://iframely.com/embed).
 
 Iframely will also generate and host summary cards for general articles. It includes your own site, and Iframely can replace the default embed cards that your publish via WordPress for other sites to use.
 
-Iframely is powered by server API. API Key is required. Get one at [iframely.com](https://iframely.com)
+Iframely is powered by server API. API Key is required. Get one at [iframely.com](https://iframely.com). Get help at support at iframely.com.
 
 
@@ -58 +58 @@
 Just choose this option in your settings. It will essentially put Iframely to be the last in the list, be "a catcher", rather then "an interceptor".
 
+= AMP support = 
+
+Iframely works nicely with [AMP WP plugin](https://wordpress.org/plugins/amp/). It catches all missing embeds and follow your Iframely settings. But you can also opt to have Iframely for all embeds, including default AMP embeds too. For example, Facebook video will be indeed a nice video without user's text message.
 
 
@@ -63 +66 @@
 == Installation ==
 
-The installation is pretty standard:
+The installation is standard:
 
 1. Upload the package contents to to the `/wp-content/plugins/` directory
@@ -86 +89 @@
 == Frequently Asked Questions ==
 
-= Oh, the Facebook! = 
-
-Yes, Iframely knows the embed codes for Facebook posts, photos and videos. However, some of the posts can be private and not accesssible to our parsers. For those, we can not convert the URL into embed code. Also, Facebook events don't have native embed codes and so Iframely doesn't support these too. 
-
 = I thought Iframely would wrap my URL into iframe? =
 
@@ -98 +97 @@
 Well, that's the point of responsive embeds. You don't have to. 
 
-Iframely widgets will take 100% available width. If you need to limit it, just define your CSS styles for `iframely-widget-container`.
-
-Please, note that not all the embeds codes will be responsive. Some of hosting domains can not be converted responsively. In those cases, Iframely will left-align the embeds. You might want to consider padding and alignment styles, if you don't have generic ones for `iframes` and `images` yet.
+Iframely widgets will take 100% available width. If you need to customize CSS, add '&omit_css=1' as "Optional API query-string param" on Iframely config page and follow [this guide](https://iframely.com/docs/omit-css).
+
+Please, note that not all the embeds codes will be responsive. Embeds from a tiny number of less frequent publishers cannot be converted responsively without ruining their content. 
 
 = Is it compatible with other embeds plugins I have? =
@@ -107 +106 @@
 * Since default WordPress embeds are not responsive, Iframely can disable the standard code and replaces it with the responsive embeds. Otherwise, you might be wondering why is some widgets are not responsive 
 * You can conifugure Iframely to only work in its own shortcode, thus leaving other plugins intact.
+* Iframely plays well with [AMP](https://wordpress.org/plugins/amp/).
 
 = What about embeds in my previous posts? =
@@ -112 +112 @@
 Iframely works in native WordPress embeds framework. All your new posts should start seeing responsive widgets. The older posts will be re-cached via WordPress logic itself (usually when you edit and save the post), and should granually get the new embeds code too. However, we do not interfere into this default process and do not re-cache older posts upon install. 
 
+To change this logic, define "Cache the embed codes for this number of days" on Iframely options page.
+
 If there's a specific post you'd like to update, just go to Edit and Save it again. It should re-cache it and trigger Iframely.
 
@@ -122 +124 @@
 Iframely will work well with multisite installations. Iframely options page is available for super admins only, and the settings will be the same for all blogs on your WPMU setup. 
 
+= Oh, the Facebook! = 
+
+Yes, Iframely knows the embed codes for Facebook posts, photos and videos. However, some of the posts can be private and not accesssible to our parsers. For those, we can not convert the URL into embed code. Also, Facebook events don't have native embed codes and so Iframely doesn't support these too. 
 
 == Changelog ==
+
+= 0.5.0 =
+
+Making Iframely to work nicely with [AMP WP plugin](https://wordpress.org/plugins/amp/). Iframely now catches all missing embeds and follow your Iframely settings. But you can also opt to have Iframely for all embeds.
+
 
 = 0.4.0 =