Ticket #5669: 5669.patch

src/bp-activity/bp-activity-classes.php

@@ -1680 +1680 @@
 </rss><?php
         }
 }
+
+/**
+ * Activity Post Types tracking class
+ *
+ * @since BuddyPress (2.1.0)
+ */
+class BP_Activity_Tracking {
+
+        /** Properties ************************************************************/
+
+        /**
+         * post types to track.
+         *
+         * @var array
+         */
+        public $post_types = array();
+
+        /**
+         * Start.
+         */
+        public static function start() {
+                $bp = buddypress();
+
+                if ( empty( $bp->activity->tracker ) ) {
+                        $bp->activity->tracker = new self;
+                }
+
+                return $bp->activity->tracker;
+        }
+
+        /**
+         * Constructor method.
+         */
+        public function __construct() {
+                $this->setup_hooks();
+        }
+
+        /**
+         * Hooks
+         */
+        private function setup_hooks() {
+                // Register activity actions
+                add_action( 'bp_register_activity_actions', array( $this, 'register_activity_actions' ) );
+
+                // Manage tracking
+                add_action( 'transition_post_status', array( $this, 'track' ),  10, 3 );
+                add_action( 'delete_post',            array( $this, 'delete' ), 10, 1 );
+        }
+
+        /**
+         * Define activity actions.
+         */
+        public function register_activity_actions() {
+                $bp = buddypress();
+
+                $active_components = array_keys( $bp->active_components );
+
+                foreach ( $active_components as $component ) {
+                        if ( ! empty( $bp->{$component}->tracking ) ) {
+                                $post_types = array_keys( $bp->{$component}->tracking );
+                                
+                                foreach( $post_types as $post_type ) {
+
+                                        $activity_args = $bp->{$component}->tracking[ $post_type ];
+
+                                        if ( empty( $activity_args->track ) || empty( $activity_args->type ) || empty( $activity_args->description ) ) {
+                                                continue;
+                                        }
+
+                                        // for later use
+                                        $this->post_types[ $post_type ] = $component;
+
+                                        if ( empty( $activity_args->label ) ) {
+                                                $activity_args->label = $activity_args->description;
+                                        }
+
+                                        bp_activity_set_action(
+                                                $component,
+                                                $activity_args->type,
+                                                $activity_args->description,
+                                                $activity_args->format_callback,
+                                                $activity_args->label,
+                                                $activity_args->context
+                                        );
+
+                                        do_action( "bp_activity_tracking_{$component}_{$post_type}", $activity_args );
+                                }
+                        }
+                }
+
+                $this->post_types = apply_filters( 'bp_activity_tracking_post_types', $this->post_types );
+        }
+
+        /**
+         * Track post types
+         */
+        public function track( $new_status = '', $old_status = '', $post = null ) {
+                $bp = buddypress();
+                $tracked = array_keys( $this->post_types );
+
+                if ( empty( $post->post_type ) || ! in_array( $post->post_type, $tracked ) ) {
+                        return;
+                }
+
+                $component = $this->post_types[ $post->post_type ];
+
+                if ( empty( $component ) || empty( $bp->{$component}->tracking[ $post->post_type ] ) ) {
+                        return;
+                } else {
+                        $tracking_args = apply_filters( "bp_activity_tracking_{$component}_args", $bp->{$component}->tracking[ $post->post_type ] );
+                }
+
+                if ( empty( $tracking_args->track ) ) {
+                        return;
+                }
+
+                // This is an edit
+                if ( $new_status === $old_status ) {
+                        if ( $new_status == 'publish' ) {
+
+                                if ( ! empty( $tracking_args->update_callback ) && is_callable( $tracking_args->update_callback ) ) {
+                                        call_user_func_array( $tracking_args->update_callback, array( 'post' => $post ) );
+                                }
+                                return;
+                        }
+                }
+
+                // Publishing a previously unpublished post
+                if ( 'publish' === $new_status ) {
+                        // Untrashing the post
+                        if ( 'trash' == $old_status ) {
+                                if ( ! empty( $tracking_args->untrash_callback ) && is_callable( $tracking_args->untrash_callback ) ) {
+                                        call_user_func_array( $tracking_args->untrash_callback, array( 'post_id' => $post->ID, 'post' => $post ) );
+                                }
+                                return;
+                        }
+
+                        if ( ! empty( $tracking_args->publish_callback ) && is_callable( $tracking_args->publish_callback ) ) {
+                                call_user_func_array( $tracking_args->publish_callback, array( 'post_id' => $post->ID, 'post' => $post ) );
+                        } else {
+                                // Define default activity args
+                                $activity_args = array(
+                                        'action'            => '',
+                                        'content'           => bp_create_excerpt( $post->post_content ),
+                                        'component'         => $component,
+                                        'type'              => 'new_item',
+                                        'user_id'           => $post->post_author,
+                                        'item_id'           => get_current_blog_id(),
+                                        'secondary_item_id' => $post->ID,
+                                );
+
+                                if ( ! empty( $tracking_args->type ) ) {
+                                        $activity_args['type'] = $tracking_args->type;
+                                }
+                                
+                                // Default action if format callback is not set
+                                if ( empty( $tracking_args->format_callback ) ) {
+                                        $blog_id = $activity_args['item_id'];
+
+                                        // Record this in activity streams
+                                        $post_permalink = add_query_arg(
+                                                'p',
+                                                $post_id,
+                                                trailingslashit( get_home_url( $blog_id ) )
+                                        );
+
+                                        if ( is_multisite() ){
+                                                $activity_args['action']  = sprintf( __( '%1$s wrote a new item, %2$s, on the site %3$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
+                                        } else {
+                                                $activity_args['action']  = sprintf( __( '%1$s wrote a new item, %2$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+                                        }
+                                }
+                                
+                                // Add the activity
+                                bp_activity_add( $activity_args );
+                        }
+
+                // Unpublishing a previously published post
+                } else if ( 'publish' === $old_status ) {
+                        if ( ! empty( $tracking_args->unpublish_callback ) && is_callable( $tracking_args->unpublish_callback ) ) {
+                                call_user_func_array( $tracking_args->unpublish_callback, array( 'post' => $post ) );
+                        } else {
+                                // Define default activity args
+                                $activity_args = array(
+                                        'component'         => $component,
+                                        'type'              => 'new_item',
+                                        'user_id'           => $post->post_author,
+                                        'item_id'           => get_current_blog_id(),
+                                        'secondary_item_id' => $post->ID,
+                                );
+
+                                if ( ! empty( $tracking_args->type ) ) {
+                                        $activity_args['type'] = $tracking_args->type;
+                                }
+
+                                // Delete the activity
+                                bp_activity_delete( $activity_args );
+                        }
+                }
+        }
+
+        /**
+         * Remove the activity when the tracked post type is deleted
+         */
+        public function delete( $post_id = 0 ) {
+                $bp = buddypress();
+                $tracked = array_keys( $this->post_types );
+
+                if ( empty( $post_id ) ) {
+                        return;
+                }
+
+                if ( empty( $tracked ) ) {
+                        return;
+                }
+
+                $post_type = get_post_type( $post_id );
+
+                if ( ! in_array( $post_type, $tracked ) ) {
+                        return;
+                }
+
+                $component = $this->post_types[ $post_type ];
+
+                if ( empty( $component ) || empty( $bp->{$component}->tracking[ $post_type ] ) ) {
+                        return;
+                } else {
+                        $tracking_args = apply_filters( "bp_activity_tracking_{$component}_args", $bp->{$component}->tracking[ $post_type ] );
+                }
+
+                if ( empty( $tracking_args->track ) ) {
+                        return;
+                }
+
+                if ( ! empty( $tracking_args->remove_callback ) && is_callable( $tracking_args->remove_callback ) ) {
+                        call_user_func_array( $tracking_args->remove_callback, array( 'post_id' => $post_id ) );
+                } else {
+                        $activity_args = array(
+                                'type'              => 'new_item',
+                                'component'         => $component,
+                                'item_id'           => get_current_blog_id(),
+                                'secondary_item_id' => $post_id,
+                        );
+
+                        if ( ! empty( $tracking_args->type ) ) {
+                                $activity_args['type'] = $tracking_args->type;
+                        }
+
+                        bp_activity_delete( $activity_args );
+                }
+        }
+}
+add_action( 'bp_init', array( 'BP_Activity_Tracking', 'start' ), 7 );

src/bp-blogs/bp-blogs-activity.php

@@ -11 +11 @@
 if ( !defined( 'ABSPATH' ) ) exit;
 
 /**
- * Register activity actions for the blogs component.
+ * Register new blog activity action for the blogs component.
  *
  * @since BuddyPress (1.0.0)
  *
@@ -19 +19 @@
  *
  * @return bool|null Returns false if activity component is not active.
  */
-function bp_blogs_register_activity_actions() {
+function bp_blogs_register_activity_newblog_action() {
         global $bp;
 
         // Bail if activity is not active
@@ -36 +36 @@
                         __( 'New Sites', 'buddypress' )
                 );
         }
+}
+add_action( 'bp_register_activity_actions', 'bp_blogs_register_activity_newblog_action' );
 
+/**
+ * Register activity actions for the blogs component.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @uses bp_activity_set_action()
+ * @uses buddypress()
+ *
+ * @return bool|null Returns false if activity component is not active.
+ */
+function bp_blogs_register_activity_actions() {
         bp_activity_set_action(
-                $bp->blogs->id,
-                'new_blog_post',
-                __( 'New post published', 'buddypress' ),
-                'bp_blogs_format_activity_action_new_blog_post',
-                __( 'Posts', 'buddypress' ),
-                array( 'activity', 'member' )
-        );
-
-        bp_activity_set_action(
-                $bp->blogs->id,
+                buddypress()->blogs->id,
                 'new_blog_comment',
                 __( 'New post comment posted', 'buddypress' ),
                 'bp_blogs_format_activity_action_new_blog_comment',
@@ -57 +61 @@
 
         do_action( 'bp_blogs_register_activity_actions' );
 }
-add_action( 'bp_register_activity_actions', 'bp_blogs_register_activity_actions' );
+add_action( 'bp_activity_tracking_blogs_post', 'bp_blogs_register_activity_actions' );
 
 /**
  * Format 'new_blog' activity actions.

src/bp-blogs/bp-blogs-filters.php

@@ -36 +36 @@
         return apply_filters( 'bp_blogs_creation_location', trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create', $url ) );
 }
 add_filter( 'wp_signup_location', 'bp_blogs_creation_location' );
+
+/**
+ * Ensure post types tracking is respecting the blog's tracking settings.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param object $args The tracking args.
+ * @return object $args The tracking args.
+ */
+function bp_blogs_filter_tracking_args( $args = null ) {
+        if ( empty( $args->track ) )
+                return $args;
+
+        $blog_id = get_current_blog_id();
+        $is_blog_public = apply_filters( 'bp_is_blog_public', (int)get_blog_option( $blog_id, 'blog_public' ) );
+
+        if ( ( empty( $is_blog_public ) && is_multisite() ) || ! bp_blogs_is_blog_trackable( $blog_id ) ) {
+                $args->track = false;
+        }
+
+        return $args;
+}
+add_filter( 'bp_activity_tracking_blogs_args', 'bp_blogs_filter_tracking_args', 10, 1 );

src/bp-blogs/bp-blogs-functions.php

@@ -359 +359 @@
  *
  * @since BuddyPress (2.0.0)
  *
- * @todo Support untrashing better
+ * @todo deprecated
  *
  * @param string $new_status New status for the post.
  * @param string $old_status Old status for the post.
@@ -396 +396 @@
                 ) );
         }
 }
-add_action( 'transition_post_status', 'bp_blogs_catch_transition_post_status', 10, 3 );
 
 /**
  * Record a new blog post in the BuddyPress activity stream.
@@ -413 +412 @@
         $post_id = (int) $post_id;
         $blog_id = (int) $wpdb->blogid;
 
-        // If blog is not trackable, do not record the activity.
-        if ( ! bp_blogs_is_blog_trackable( $blog_id, $user_id ) )
-                return false;
-
         if ( !$user_id )
                 $user_id = (int) $post->post_author;
 
@@ -436 +431 @@
         if ( !in_array( $post->post_type, apply_filters( 'bp_blogs_record_post_post_types', array( 'post' ) ) ) )
                 return false;
 
-        $is_blog_public = apply_filters( 'bp_is_blog_public', (int)get_blog_option( $blog_id, 'blog_public' ) );
-
         if ( 'publish' == $post->post_status && empty( $post->post_password ) ) {
-                if ( $is_blog_public || !is_multisite() ) {
-
-                        // Record this in activity streams
-                        $post_permalink = add_query_arg(
-                                'p',
-                                $post_id,
-                                trailingslashit( get_home_url( $blog_id ) )
-                        );
-
-                        if ( is_multisite() )
-                                $activity_action  = sprintf( __( '%1$s wrote a new post, %2$s, on the site %3$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
-                        else
-                                $activity_action  = sprintf( __( '%1$s wrote a new post, %2$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
-
-                        // Make sure there's not an existing entry for this post (prevent bumping)
-                        if ( bp_is_active( 'activity' ) ) {
-                                $existing = bp_activity_get( array(
-                                        'filter' => array(
-                                                'action'       => 'new_blog_post',
-                                                'primary_id'   => $blog_id,
-                                                'secondary_id' => $post_id,
-                                        )
-                                ) );
-
-                                if ( !empty( $existing['activities'] ) ) {
-                                        return;
-                                }
+                // Record this in activity streams
+                $post_permalink = add_query_arg(
+                        'p',
+                        $post_id,
+                        trailingslashit( get_home_url( $blog_id ) )
+                );
+
+                if ( is_multisite() )
+                        $activity_action  = sprintf( __( '%1$s wrote a new post, %2$s, on the site %3$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
+                else
+                        $activity_action  = sprintf( __( '%1$s wrote a new post, %2$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+
+                // Make sure there's not an existing entry for this post (prevent bumping)
+                if ( bp_is_active( 'activity' ) ) {
+                        $existing = bp_activity_get( array(
+                                'filter' => array(
+                                        'action'       => 'new_blog_post',
+                                        'primary_id'   => $blog_id,
+                                        'secondary_id' => $post_id,
+                                )
+                        ) );
+
+                        if ( !empty( $existing['activities'] ) ) {
+                                return;
                         }
+                }
 
-                        $activity_content = $post->post_content;
+                $activity_content = $post->post_content;
 
-                        bp_blogs_record_activity( array(
-                                'user_id'           => (int) $post->post_author,
-                                'content'           => apply_filters( 'bp_blogs_activity_new_post_content',      $activity_content, $post, $post_permalink ),
-                                'primary_link'      => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink,   $post_id               ),
-                                'type'              => 'new_blog_post',
-                                'item_id'           => $blog_id,
-                                'secondary_item_id' => $post_id,
-                                'recorded_time'     => $post->post_date_gmt,
-                        ));
-                }
+                bp_blogs_record_activity( array(
+                        'user_id'           => (int) $post->post_author,
+                        'content'           => apply_filters( 'bp_blogs_activity_new_post_content',      $activity_content, $post, $post_permalink ),
+                        'primary_link'      => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink,   $post_id               ),
+                        'type'              => 'new_blog_post',
+                        'item_id'           => $blog_id,
+                        'secondary_item_id' => $post_id,
+                        'recorded_time'     => $post->post_date_gmt,
+                ));
 
                 // Update the blogs last activity
                 bp_blogs_update_blogmeta( $blog_id, 'last_activity', bp_core_current_time() );

src/bp-blogs/bp-blogs-loader.php

@@ -241 +241 @@
 
                 parent::setup_title();
         }
+        /**
+         * Register the post types
+         *
+         * @since BuddyPress (2.1.0)
+         */
+        public function register_post_types( $post_types = array() ) {
+                $post_types = apply_filters( 'bp_blogs_register_post_types', array(
+                        'post' => array(
+                                'buddypress' => array(
+                                        'type'             => 'new_blog_post',
+                                        'description'      => __( 'New post published', 'buddypress' ),
+                                        'format_callback'  => 'bp_blogs_format_activity_action_new_blog_post',
+                                        'label'            => __( 'Posts', 'buddypress' ),
+                                        'context'          => array( 'activity', 'member' ),
+                                        'track'            => true,
+                                        'publish_callback' => 'bp_blogs_record_post',
+                                        'update_callback'  => 'bp_blogs_update_post',
+                                        'remove_callback'  => 'bp_blogs_remove_post'
+                                )
+                        )
+                ) );
+
+                parent::register_post_types( $post_types );
+        }
 }
 
 /**

src/bp-core/bp-core-actions.php

@@ -64 +64 @@
  * The load order helps to execute code at the correct time.
  *                                                   v---Load order
  */
+add_action( 'bp_init', 'bp_register_post_types',     1  );
 add_action( 'bp_init', 'bp_core_set_uri_globals',    2  );
 add_action( 'bp_init', 'bp_setup_globals',           4  );
 add_action( 'bp_init', 'bp_setup_nav',               6  );

src/bp-core/bp-core-component.php

@@ -532 +532 @@
          *
          * @uses do_action() Calls 'bp_{@link bp_Component::name}_register_post_types'.
          */
-        public function register_post_types() {
+        public function register_post_types( $post_types = array() ) {
+
+                if ( ! empty( $post_types ) ) {
+                        $this->tracking = array();
+
+                        foreach ( $post_types as $post_type => $args ) {
+
+                                if ( ! empty( $args['buddypress'] ) ) {
+                                        $activity_args = wp_parse_args( $args['buddypress'], array(
+                                                'type'            => '',
+                                                'description'     => '',
+                                                'format_callback' => '',
+                                                'label'           => '',
+                                                'context'         => array(),
+                                                'track'           => false
+                                        ) );
+                                        $this->tracking[ $post_type ] = (object) $activity_args;
+                                        unset( $args['buddypress'] );
+                                }
+
+                                if ( ! post_type_exists( $post_type ) && ! empty( $args ) && bp_is_root_blog() ) {
+                                        register_post_type( $post_type, $args );
+                                }
+                        }
+                }
+
                 do_action( 'bp_' . $this->id . '_register_post_types' );
         }
 

src/bp-core/bp-core-dependency.php

@@ -61 +61 @@
 }
 
 /**
+ * Fire the 'bp_setup_components' action, where plugins should initialize components.
+ */
+function bp_register_post_types() {
+        do_action( 'bp_register_post_types' );
+}
+
+/**
  * Fire the 'bp_register_widgets' action, where plugins should register widgets.
  */
 function bp_setup_widgets() {