Index: src/bp-activity/bp-activity-classes.php =================================================================== --- src/bp-activity/bp-activity-classes.php +++ src/bp-activity/bp-activity-classes.php @@ -13,3 +13,8 @@ require dirname( __FILE__ ) . '/classes/class-bp-activity-activity.php'; require dirname( __FILE__ ) . '/classes/class-bp-activity-feed.php'; require dirname( __FILE__ ) . '/classes/class-bp-activity-query.php'; + +// Embeds - only applicable for WP 4.5+ +if ( bp_get_major_wp_version() >= 4.5 && bp_is_active( 'activity', 'embeds' ) ) { + require dirname( __FILE__ ) . '/classes/class-bp-activity-oembed-component.php'; +} \ No newline at end of file Index: src/bp-activity/bp-activity-embeds.php new file mode 100644 =================================================================== --- /dev/null +++ src/bp-activity/bp-activity-embeds.php @@ -0,0 +1,211 @@ += 4.5 && bp_is_active( 'activity', 'embeds' ) ) { + buddypress()->activity->oembed = new BP_Activity_oEmbed_Component; + } + + add_filter( 'bp_activity_get_embed_excerpt', 'wptexturize' ); + add_filter( 'bp_activity_get_embed_excerpt', 'convert_chars' ); + add_filter( 'bp_activity_get_embed_excerpt', 'make_clickable', 9 ); + add_filter( 'bp_activity_get_embed_excerpt', 'bp_activity_at_name_filter' ); + add_filter( 'bp_activity_get_embed_excerpt', 'convert_smilies', 20 ); + add_filter( 'bp_activity_get_embed_excerpt', 'wpautop', 30 ); +} +add_action( 'bp_loaded', 'bp_activity_setup_oembed' ); + +/** + * Add inline styles for BP activity embeds. + * + * This is subject to change or be removed entirely for a different system. + * See PHPDoc for BP_Legacy::locate_asset_in_stack(). + * + * @since 2.6.0 + * @access private + */ +function _bp_activity_embed_add_inline_styles() { + $inline_css = <<in_the_loop ) ) { + $content = $GLOBALS['activities_template']->activity->content; + + // No content, so use action value. + if ( empty( $content ) ) { + $action = bp_activity_get_action( bp_get_activity_object_name(), bp_get_activity_type() ); + $content = false !== $action ? $action['value'] : ''; + } + } + + /** + * bp_activity_truncate_entry() includes the 'Read More' link, which is why + * we're using this instead of bp_create_excerpt(). + */ + $content = html_entity_decode( $content ); + $content = bp_activity_truncate_entry( $content, array( + 'html' => false, + 'filter_shortcodes' => true, + 'strip_tags' => true, + 'force_truncate' => true + ) ); + + /** + * Filter the activity embed excerpt. + * + * @since 2.6.0 + * + * @var string $content Embed Excerpt. + * @var string $unmodified_content Unmodified activity content. + */ + return apply_filters( 'bp_activity_get_embed_excerpt', $content, $GLOBALS['activities_template']->activity->content ); + } + +/** + * Outputs the first embedded item in the activity oEmbed template. + * + * @since 2.6.0 + */ +function bp_activity_embed_response_display_media() { + // Bail if oEmbed request explicitly hides media. + if ( isset( $_REQUEST['hide_media'] ) && true == wp_validate_boolean( $_REQUEST['hide_media'] ) ) { + return; + } + + // Find all embeds for the activity item. + $embeds = bp_core_extract_media_from_content( $GLOBALS['activities_template']->activity->content, 'embeds' ); + + /** + * Should we display media in the oEmbed template? + * + * @since 2.6.0 + * + * @param bool $retval Defaults to true. + */ + $allow_embeds = apply_filters( 'bp_activity_embed_display_media', true ); + + // Only embed the first embedded item. + if ( $embeds && $allow_embeds ) { + // Call BP_Embed if it hasn't already loaded. + bp_embed_init(); + + // Autoembed first URL. + $content = buddypress()->embed->autoembed( $embeds['embeds'][0]['url'] ); + + // Wrap content around a custom DIV. + echo '
' . $content . '
'; + + // Add fluidvids.js for responsive IFRAMEs / OBJECTs. + if ( false !== strpos( $content, ' + + + + __( '…', 'buddypress' ) ) ); + // Run the text through the excerpt function. If it's too short, the original text will be returned. - $excerpt = bp_create_excerpt( $text, $excerpt_length, array( 'ending' => __( '…', 'buddypress' ) ) ); + $excerpt = bp_create_excerpt( $text, $excerpt_length, $args ); /* * If the text returned by bp_create_excerpt() is different from the original text (ie it's * been truncated), add the "Read More" link. Note that bp_create_excerpt() is stripping * shortcodes, so we have strip them from the $text before the comparison. */ - if ( $excerpt != strip_shortcodes( $text ) ) { + if ( strlen( $excerpt ) > strlen( strip_shortcodes( $text ) ) ) { $id = !empty( $activities_template->activity->current_comment->id ) ? 'acomment-read-more-' . $activities_template->activity->current_comment->id : 'activity-read-more-' . bp_get_activity_id(); $excerpt = sprintf( '%1$s%4$s', $excerpt, $id, bp_get_activity_thread_permalink(), $append_text ); Index: src/bp-activity/bp-activity-functions.php =================================================================== --- src/bp-activity/bp-activity-functions.php +++ src/bp-activity/bp-activity-functions.php @@ -3337,8 +3337,12 @@ } // Generate a text excerpt for this activity item (and remove any oEmbeds URLs). - $summary = strip_shortcodes( html_entity_decode( strip_tags( $content ) ) ); - $summary = bp_create_excerpt( preg_replace( '#^\s*(https?://[^\s"]+)\s*$#im', '', $summary ) ); + $summary = bp_create_excerpt( html_entity_decode( $content ), 225, array( + 'html' => false, + 'filter_shortcodes' => true, + 'strip_tags' => true, + 'remove_links' => true + ) ); if ( $use_media_type === 'embeds' ) { $summary .= PHP_EOL . PHP_EOL . $extracted_media['url']; Index: src/bp-activity/classes/class-bp-activity-component.php =================================================================== --- src/bp-activity/classes/class-bp-activity-component.php +++ src/bp-activity/classes/class-bp-activity-component.php @@ -32,6 +32,7 @@ array( 'adminbar_myaccount_order' => 10, 'search_query_arg' => 'activity_search', + 'features' => array( 'embeds' ) ) ); } @@ -72,6 +73,11 @@ $includes[] = 'akismet'; } + // Embeds - only applicable for WP 4.5+ + if ( bp_get_major_wp_version() >= 4.5 && bp_is_active( $this->id, 'embeds' ) ) { + $includes[] = 'embeds'; + } + if ( is_admin() ) { $includes[] = 'admin'; } Index: src/bp-activity/classes/class-bp-activity-oembed-component.php new file mode 100644 =================================================================== --- /dev/null +++ src/bp-activity/classes/class-bp-activity-oembed-component.php @@ -0,0 +1,332 @@ +plugin_dir . '/bp-core/classes/class-bp-oembed-component.php' ); + +/** + * oEmbed handler to respond and render single activity items. + * + * @since 2.6.0 + */ +class BP_Activity_oEmbed_Component extends BP_oEmbed_Component { + /** + * Custom oEmbed slug endpoint. + * + * @since 2.6.0 + * + * @var string + */ + public $slug_endpoint = 'activity'; + + /** + * Custom hooks. + * + * @since 2.6.0 + */ + protected function custom_hooks() { + add_action( 'embed_content_meta', array( $this, 'embed_comments_button' ), 5 ); + + add_filter( 'bp_activity_embed_html', array( $this, 'modify_iframe' ) ); + } + + /** + * Add custom endpoint arguments. + * + * Currently, includes 'hide_media'. + * + * @since 2.6.0 + * + * @return array + */ + protected function set_route_args() { + return array( + 'hide_media' => array( + 'default' => false, + 'sanitize_callback' => 'wp_validate_boolean' + ) + ); + } + + /** + * Output our custom embed template part. + * + * @since 2.6.0 + */ + protected function content() { + bp_get_asset_template_part( 'embeds/activity' ); + } + + /** + * Check if we're on our single activity page. + * + * @since 2.6.0 + * + * @return bool + */ + protected function is_page() { + return bp_is_single_activity(); + } + + /** + * Validates the URL to determine if the activity item is valid. + * + * @since 2.6.0 + * + * @param string $url The URL to check. + * @return int|bool Activity ID on success; boolean false on failure. + */ + protected function validate_url_to_item_id( $url ) { + if ( bp_core_enable_root_profiles() ) { + $domain = bp_get_root_domain(); + } else { + $domain = bp_get_members_directory_permalink(); + } + + // Check the URL to see if this is a single activity URL. + if ( 0 !== strpos( $url, $domain ) ) { + return false; + } + + // Check for activity slug. + if ( false === strpos( $url, '/' . bp_get_activity_slug() . '/' ) ) { + return false; + } + + // Do more checks. + $url = trim( untrailingslashit( $url ) ); + + // Grab the activity ID. + $activity_id = (int) substr( + $url, + strrpos( $url, '/' ) + 1 + ); + + if ( ! empty( $activity_id ) ) { + // Check if activity item still exists. + $activity = new BP_Activity_Activity( $activity_id ); + + // Okay, we're good to go! + if ( ! empty( $activity->component ) && 0 === (int) $activity->is_spam ) { + return $activity_id; + } + } + + return false; + } + + /** + * Sets the oEmbed response data for our activity item. + * + * @since 2.6.0 + * + * @param int $item_id The activity ID. + * @return array + */ + protected function set_oembed_response_data( $item_id ) { + $activity = new BP_Activity_Activity( $item_id ); + + return array( + 'user_id' => $activity->user_id, + 'content' => $activity->content, + 'title' => __( 'Activity', 'buddypress' ), + 'author_url' => bp_core_get_user_domain( $activity->user_id ) + ); + } + + /** + * Sets a custom
for our oEmbed fallback HTML. + * + * @since 2.6.0 + * + * @param int $item_id The activity ID. + * @return string + */ + protected function set_fallback_html( $item_id ) { + $activity = new BP_Activity_Activity( $item_id ); + $mentionname = bp_activity_do_mentions() ? ' (@' . bp_activity_get_user_mentionname( $activity->user_id ) . ')' : ''; + $date = date_i18n( get_option( 'date_format' ), strtotime( $activity->date_recorded ) ); + + // Make sure we can use some activity functions that depend on the loop. + $GLOBALS['activities_template'] = new stdClass; + $GLOBALS['activities_template']->activity = $activity; + + // 'wp-embedded-content' CSS class is necessary due to how the embed JS works. + $blockquote = sprintf( '
%1$s%2$s %3$s
', + '

' . bp_activity_get_embed_excerpt( $activity->content ) . '

', + '- ' . bp_core_get_user_displayname( $activity->user_id ) . $mentionname, + '' . $date . '' + ); + + // Clean up. + unset( $GLOBALS['activities_template'] ); + + /** + * Filters the fallback HTML used when embedding a BP activity item. + * + * @since 2.6.0 + * + * @param string $blockquote Current fallback HTML + * @param BP_Activity_Activity $activity Activity object + */ + return apply_filters( 'bp_activity_embed_fallback_html', $blockquote, $activity ); + } + + /** + * Sets a custom