Changeset 8944

Timestamp:

08/18/2014 04:51:11 PM (10 years ago)

Author:

r-a-y

Message:

Add activity meta when recording a blog post or blog comment.

This commit:

• Adds the post_title and post_url information as activity meta when recording a blog post or blog comment into the activity table.
• Updates the post_title and post_url activity meta whenever a blog post is updated.
• Adds a unit test.

This addresses issues with showing the correct blog post information in the
activity loop for blog post and blog comment activity items.

Props r-a-y, DJPaul, boonebgorges.

Fixes #5609.

Location:

trunk

Files:

• src/bp-blogs/bp-blogs-functions.php (modified) (5 diffs)
• tests/phpunit/testcases/blogs/functions.php (modified) (1 diff)

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

@@ -524 +524 @@
             $activity_content = $post->post_content;
 
-            bp_blogs_record_activity( array(
+            $activity_id = 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 ),
@@ -532 +532 @@
                 'secondary_item_id' => $post_id,
                 'recorded_time'     => $post->post_date_gmt,
-            ));
+            ) );
+
+            // save post title in activity meta
+            bp_activity_update_meta( $activity_id, 'post_title', $post->post_title );
+            bp_activity_update_meta( $activity_id, 'post_url',   $post_permalink );
         }
 
@@ -584 +588 @@
     $activity->save();
 
+    // update post title in activity meta
+    $existing_title = bp_activity_get_meta( $activity_id, 'post_title' );
+    if ( $post->post_title !== $existing_title ) {
+        bp_activity_update_meta( $activity_id, 'post_title', $post->post_title );
+
+        // now update activity meta for post comments... sigh
+        $comment_ids = get_comments( array( 'post_id' => $post->ID, 'fields' => 'ids' ) );
+
+        if ( ! empty( $comment_ids ) ) {
+            $activity_ids = array();
+
+            // setup activity args
+            $args = array(
+                'update_meta_cache' => false,
+                'show_hidden'       => true,
+                'per_page'          => 99999,
+            );
+
+            // query for old-style "new_blog_comment" activity items
+            $args['filter'] = array(
+                'object'     => buddypress()->blogs->id,
+                'action'     => 'new_blog_comment',
+                'secondary_id' => implode( ',', $comment_ids ),
+            );
+
+            $activities = bp_activity_get( $args );
+            if ( ! empty( $activities['activities'] ) ) {
+                $activity_ids = (array) wp_list_pluck( $activities['activities'], 'id' );
+            }
+
+            // query for activity comments connected to a blog post
+            unset( $args['filter'] );
+            $args['meta_query'] = array( array(
+                'key'     => 'bp_blogs_post_comment_id',
+                'value'   => $comment_ids,
+                'compare' => 'IN',
+            ) );
+            $args['type'] = 'activity_comment';
+            $args['display_comments'] = 'stream';
+
+            $activities = bp_activity_get( $args );
+            if ( ! empty( $activities['activities'] ) ) {
+                $activity_ids = array_merge( $activity_ids, (array) wp_list_pluck( $activities['activities'], 'id' ) );
+            }
+
+            // update activity meta for all found activity items
+            if ( ! empty( $activity_ids ) ) {
+                foreach ( $activity_ids as $aid ) {
+                    bp_activity_update_meta( $aid, 'post_title', $post->post_title );
+                }
+            }
+
+            unset( $activities, $activity_ids, $comment_ids );
+        }
+    }
+
     // add post comment status to activity meta if closed
     if( 'closed' == $post->comment_status ) {
@@ -681 +741 @@
 
             // record the activity entry
-            bp_blogs_record_activity( $args );
+            $activity_id = bp_blogs_record_activity( $args );
+
+            // add some post info in activity meta
+            bp_activity_update_meta( $activity_id, 'post_title', $recorded_comment->post->post_title );
+            bp_activity_update_meta( $activity_id, 'post_url',   add_query_arg( 'p', $recorded_comment->post->ID, home_url( '/' ) ) );
 
         // record comment as BP activity comment under the parent 'new_blog_post'
@@ -745 +809 @@
                     // add meta to activity comment
                     bp_activity_update_meta( $comment_activity_id, 'bp_blogs_post_comment_id', $comment_id );
+                    bp_activity_update_meta( $comment_activity_id, 'post_title', $recorded_comment->post->post_title );
+                    bp_activity_update_meta( $comment_activity_id, 'post_url', add_query_arg( 'p', $recorded_comment->post->ID, home_url( '/' ) ) );
 
                     // add meta to comment

trunk/tests/phpunit/testcases/blogs/functions.php

@@ -395 +395 @@
     }
 
+    /**
+     * @group bp_blogs_catch_transition_post_status
+     */
+    public function test_update_blog_post_and_new_blog_comment_and_activity_comment_meta() {
+        // save the current user and override logged-in user
+        $old_user = get_current_user_id();
+        $u = $this->create_user();
+        $this->set_current_user( $u );
+        $userdata = get_userdata( $u );
+
+        // create the blog post
+        $post_id = $this->factory->post->create( array(
+            'post_status' => 'publish',
+            'post_type' => 'post',
+            'post_title' => 'First title',
+        ) );
+
+        // remove comment flood protection temporarily
+        add_filter( 'comment_flood_filter', '__return_false' );
+
+        // let's use activity comments instead of single "new_blog_comment" activity items
+        add_filter( 'bp_disable_blogforum_comments', '__return_false' );
+        $c1 = wp_new_comment( array(
+            'comment_post_ID'      => $post_id,
+            'comment_author'       => $userdata->user_nicename,
+            'comment_author_url'   => 'http://buddypress.org',
+            'comment_author_email' => $userdata->user_email,
+            'comment_content'      => 'this is a blog comment',
+            'comment_type'         => '',
+            'comment_parent'       => 0,
+            'user_id'              => $u,
+        ) );
+        remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
+
+        // let's also add a "new_blog_comment" activity entry
+        $c2 = wp_new_comment( array(
+            'comment_post_ID'      => $post_id,
+            'comment_author'       => $userdata->user_nicename,
+            'comment_author_url'   => 'http://buddypress.org',
+            'comment_author_email' => $userdata->user_email,
+            'comment_content'      => 'this is another blog comment',
+            'comment_type'         => '',
+            'comment_parent'       => 0,
+            'user_id'              => $u,
+        ) );
+
+        // bring back flood protection
+        remove_filter( 'comment_flood_filter', '__return_false' );
+
+        // update the initial blog post
+        wp_update_post( array(
+            'ID'        => $post_id,
+            'post_title' => 'Second title',
+        ) );
+
+        // grab the activity ID for the activity comment
+        $a1 = bp_activity_get_activity_id( array(
+            'type'              => 'activity_comment',
+            'display_comments'  => 'stream',
+            'meta_query'        => array( array(
+                'key'     => 'bp_blogs_post_comment_id',
+                'value'   => $c1,
+            ) )
+        ) );
+
+        // grab the activity ID for the blog comment
+        $a2 = bp_activity_get_activity_id( array(
+            'component'         => buddypress()->blogs->id,
+            'type'              => 'new_blog_comment',
+            'secondary_item_id' => $c2,
+        ) );
+
+        // see if blog comment activity meta matches the post items
+        $this->assertEquals( 'Second title', bp_activity_get_meta( $a1, 'post_title' ) );
+        $this->assertEquals( add_query_arg( 'p', $post_id, home_url( '/' ) ), bp_activity_get_meta( $a1, 'post_url' ) );
+
+        $this->assertEquals( 'Second title', bp_activity_get_meta( $a2, 'post_title' ) );
+        $this->assertEquals( add_query_arg( 'p', $post_id, home_url( '/' ) ), bp_activity_get_meta( $a2, 'post_url' ) );
+
+        // reset
+        $this->set_current_user( $old_user );
+    }
+
     protected function activity_exists_for_post( $post_id ) {
         $a = bp_activity_get( array(