Changeset 2328

Timestamp:

01/18/2010 11:35:50 AM (15 years ago)

Author:

apeatling

Message:

Fixes #1563 - duplication of blog and comments on activity stream. Added support for trashing of comments and blogs posts.

File:

• trunk/bp-blogs.php (modified) (5 diffs)

trunk/bp-blogs.php

@@ -263 +263 @@
 
 function bp_blogs_delete_activity( $args = true ) {
+    global $bp;
+
     if ( function_exists('bp_activity_delete_by_item_id') ) {
-        extract($args);
+        $defaults = array(
+            'item_id' => false,
+            'component_name' => $bp->blogs->id,
+            'component_action' => false,
+            'user_id' => false,
+            'secondary_item_id' => false
+        );
+
+        $params = wp_parse_args( $args, $defaults );
+        extract( $params, EXTR_SKIP );
 
         bp_activity_delete_by_item_id( array(
@@ -424 +435 @@
                 'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
                 'component_action' => 'new_blog_post',
-                'item_id' => $existing_post->id,
+                'item_id' => $blog_id,
+                'secondary_item_id' => $existing_post->id,
                 'recorded_time' => strtotime( $post->post_date_gmt )
             ) );
@@ -490 +502 @@
 add_action( 'comment_post', 'bp_blogs_record_comment', 10, 2 );
 
-function bp_blogs_approve_comment( $comment_id, $comment_status ) {
-    global $bp, $wpdb;
-
-    if ( 'approve' != $comment_status )
-        return false;
-
-    $recorded_comment = bp_blogs_record_comment( $comment_id, true );
-    $comment = get_comment($comment_id);
-    $comment->post = get_post( $comment->comment_post_ID );
-
-    bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
-
-    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
-        /* Record in activity streams */
-        $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
-        $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
-        $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
-
-        /* Record this in activity streams */
-        bp_blogs_record_activity( array(
-            'user_id' => $recorded_comment->user_id,
-            'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ),
-            'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
-            'component_action' => 'new_blog_comment',
-            'item_id' => $comment_id,
-            'secondary_item_id' => $recorded_comment->blog_id,
-            'recorded_time' =>  $recorded_comment->date_created
-        ) );
-    }
-}
-add_action( 'wp_set_comment_status', 'bp_blogs_approve_comment', 10, 2 );
-
-function bp_blogs_unapprove_comment( $comment_id, $comment_status ) {
-    if ( 'spam' == $comment_status || 'hold' == $comment_status || 'delete' == $comment_status )
-        bp_blogs_remove_comment( $comment_id );
-}
-add_action( 'wp_set_comment_status', 'bp_blogs_unapprove_comment', 10, 2 );
+function bp_blogs_manage_comment( $comment_id, $comment_status ) {
+    if ( 'spam' == $comment_status || 'hold' == $comment_status || 'delete' == $comment_status || 'trash' == $comment_status )
+        return bp_blogs_remove_comment( $comment_id );
+
+    return bp_blogs_record_comment( $comment_id, true );
+}
+add_action( 'wp_set_comment_status', 'bp_blogs_manage_comment', 10, 2 );
 
 function bp_blogs_add_user_to_blog( $user_id, $role, $blog_id ) {
@@ -584 +566 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $existing_post->id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_post' ) );
+    bp_blogs_delete_activity( array( 'item_id' => $wpdb->blogid, 'component_name' => $existing_post->id, 'component_action' => 'new_blog_post' ) );
 
     do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $post->user_id );
@@ -597 +579 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
+    bp_blogs_delete_activity( array( 'item_id' => $wpdb->blogid, 'secondary_item_id' => $comment_id, 'component_action' => 'new_blog_comment' ) );
 
     do_action( 'bp_blogs_remove_comment', $blog_id, $comment_id, $bp->loggedin_user->id );