Changeset 2038

Timestamp:

11/04/2015 10:01:23 PM (9 years ago)

Author:

iandunn

Message:

WordPress.tv: Embed MP4 videos in Facebook posts instead of Flash.

Fixes #1375
Props kraftbj

Location:

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2

Files:

• functions.php (modified) (1 diff)
• plugins/wordpresstv-open-graph (moved) (moved from sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-twitter-cards)
• plugins/wordpresstv-open-graph/wordpresstv-open-graph.php (copied) (copied from sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-twitter-cards/wordpresstv-twitter-cards.php) (3 diffs)
• plugins/wordpresstv-open-graph/wordpresstv-twitter-cards.php (deleted)

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php

@@ -14 +14 @@
             require_once get_template_directory() . '/plugins/wordpresstv-anon-upload/anon-upload.php';
             require_once get_template_directory() . '/plugins/wordpresstv-upload-subtitles/wordpresstv-upload-subtitles.php';
-            require_once get_template_directory() . '/plugins/wordpresstv-twitter-cards/wordpresstv-twitter-cards.php';
+            require_once get_template_directory() . '/plugins/wordpresstv-open-graph/wordpresstv-open-graph.php';
 
             add_action( 'after_setup_theme', array( $this, 'setup' ) );

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-open-graph/wordpresstv-open-graph.php

@@ -1 +1 @@
 <?php
 
-namespace WordPressTV\TwitterCards;
+namespace WordPressTV\OpenGraph;
 
 /*
  * Register hook callbacks
  */
-add_filter( 'jetpack_open_graph_tags', __NAMESPACE__ . '\add_player_tags', 11 ); // after wpcom_twitter_cards_tags
+add_filter( 'jetpack_open_graph_tags', __NAMESPACE__ . '\customize_open_graph_tags', 11 ); // after wpcom_twitter_cards_tags
 
 /**
- * Add tags that are necessary for videos to be embedded into tweets
+ * Customize each post's Open Graph tags for WPTV
  */
-function add_player_tags( $og_tags ) {
+function customize_open_graph_tags( $og_tags ) {
     global $post;
 
@@ -25 +25 @@
     }
 
-    // Add the tags necessary for the player
+    // Make WPTV videos embeddable in Twitter player cards
     $video_info = video_get_info_by_guid( $video_id[0] );
     list( $width, $height ) = wp_expand_dimensions( $video_info->width, $video_info->height, 560, 315 );
+    $mp4_url = set_url_scheme( wp_get_attachment_url( $video_info->post_id ), 'https' );
 
     $og_tags['twitter:card']                       = 'player';
@@ -33 +34 @@
     $og_tags['twitter:player:width']               = $width;
     $og_tags['twitter:player:height']              = $height;
-    $og_tags['twitter:player:stream']              = wp_get_attachment_url( $video_info->post_id );
+    $og_tags['twitter:player:stream']              = $mp4_url;
     $og_tags['twitter:player:stream:content_type'] = 'video/mp4';
+
+    /*
+     * Embed MP4 videos in Facebook posts instead of the Flash player
+     *
+     * @todo: This can be removed once https://github.com/Automattic/jetpack/issues/2950 is fixed
+     */
+    $og_tags['og:video:type']                      = 'video/mp4';
+    $og_tags['og:video']                           = $mp4_url;
+    $og_tags['og:video:secure_url']                = $mp4_url;
 
     return $og_tags;