Changeset 6036

Timestamp:

05/30/2016 10:28:36 AM (9 years ago)

Author:

netweb

Message:

General Performance: Introduce increase/decrease helper count functions

Previously when a new topic or reply was created, a bunch of queries to recalculate the topic and reply counts for topics and forums were ran. Now these have been replaced with more efficient increase/decrease helper functions to get the current value and just "bump" the count based on the action (new topic-reply/split-topic/move-topic/spam-trash-topic/etc...)

Props thebrandonallen, tharsheblows, netweb
See #1799

Location:

trunk

Files:

• src/includes/core/actions.php (modified) (2 diffs)
• src/includes/forums/functions.php (modified) (10 diffs)
• src/includes/replies/functions.php (modified) (3 diffs)
• src/includes/topics/functions.php (modified) (6 diffs)
• tests/phpunit/testcases/forums/functions/counts.php (modified) (6 diffs)
• tests/phpunit/testcases/topics/functions/counts.php (modified) (5 diffs)
• tests/phpunit/testcases/topics/functions/topic.php (modified) (1 diff)

trunk/src/includes/core/actions.php

@@ -256 +256 @@
 add_action( 'bbp_unapproved_reply', 'bbp_update_reply_walker' );
 
-// Users topic & reply counts
+// Update forum topic/reply counts.
+add_action( 'bbp_new_reply',        'bbp_increase_forum_reply_count'        );
+add_action( 'bbp_new_topic',        'bbp_increase_forum_topic_count'        );
+add_action( 'bbp_trashed_reply',    'bbp_decrease_forum_reply_count'        );
+add_action( 'bbp_trashed_topic',    'bbp_decrease_forum_topic_count'        );
+add_action( 'bbp_trashed_topic',    'bbp_increase_forum_topic_count_hidden' );
+add_action( 'bbp_untrashed_reply',  'bbp_increase_forum_reply_count'        );
+add_action( 'bbp_untrashed_topic',  'bbp_increase_forum_topic_count'        );
+add_action( 'bbp_untrashed_topic',  'bbp_decrease_forum_topic_count_hidden' );
+add_action( 'bbp_spammed_reply',    'bbp_decrease_forum_reply_count'        );
+add_action( 'bbp_spammed_topic',    'bbp_decrease_forum_topic_count'        );
+add_action( 'bbp_spammed_topic',    'bbp_increase_forum_topic_count_hidden' );
+add_action( 'bbp_unspammed_reply',  'bbp_increase_forum_reply_count'        );
+add_action( 'bbp_unspammed_topic',  'bbp_increase_forum_topic_count'        );
+add_action( 'bbp_unspammed_topic',  'bbp_decrease_forum_topic_count_hidden' );
+add_action( 'bbp_approved_reply',   'bbp_increase_forum_reply_count'        );
+add_action( 'bbp_approved_topic',   'bbp_increase_forum_topic_count'        );
+add_action( 'bbp_approved_topic',   'bbp_decrease_forum_topic_count_hidden' );
+add_action( 'bbp_unapproved_reply', 'bbp_decrease_forum_reply_count'        );
+add_action( 'bbp_unapproved_topic', 'bbp_decrease_forum_topic_count'        );
+add_action( 'bbp_unapproved_topic', 'bbp_increase_forum_topic_count_hidden' );
+
+// Update forum reply counts for approved/unapproved topics.
+add_action( 'bbp_approved_topic',   'bbp_approved_unapproved_topic_update_forum_reply_count' );
+add_action( 'bbp_unapproved_topic', 'bbp_approved_unapproved_topic_update_forum_reply_count' );
+
+// Update topic reply counts.
+add_action( 'bbp_new_reply',        'bbp_increase_topic_reply_count'        );
+add_action( 'bbp_trashed_reply',    'bbp_decrease_topic_reply_count'        );
+add_action( 'bbp_trashed_reply',    'bbp_increase_topic_reply_count_hidden' );
+add_action( 'bbp_untrashed_reply',  'bbp_increase_topic_reply_count'        );
+add_action( 'bbp_untrashed_reply',  'bbp_decrease_topic_reply_count_hidden' );
+add_action( 'bbp_spammed_reply',    'bbp_decrease_topic_reply_count'        );
+add_action( 'bbp_spammed_reply',    'bbp_increase_topic_reply_count_hidden' );
+add_action( 'bbp_unspammed_reply',  'bbp_increase_topic_reply_count'        );
+add_action( 'bbp_unspammed_reply',  'bbp_decrease_topic_reply_count_hidden' );
+add_action( 'bbp_approved_reply',   'bbp_increase_topic_reply_count'        );
+add_action( 'bbp_approved_reply',   'bbp_decrease_topic_reply_count_hidden' );
+add_action( 'bbp_unapproved_reply', 'bbp_decrease_topic_reply_count'        );
+add_action( 'bbp_unapproved_reply', 'bbp_increase_topic_reply_count_hidden' );
+
+// Users topic & reply counts.
 add_action( 'bbp_new_topic',     'bbp_increase_user_topic_count' );
 add_action( 'bbp_new_reply',     'bbp_increase_user_reply_count' );
@@ -267 +308 @@
 add_action( 'bbp_spam_topic',    'bbp_decrease_user_topic_count' );
 add_action( 'bbp_spam_reply',    'bbp_decrease_user_reply_count' );
+
+// Insert topic/reply counts.
+add_action( 'bbp_insert_topic', 'bbp_insert_topic_update_counts', 10, 2 );
+add_action( 'bbp_insert_reply', 'bbp_insert_reply_update_counts', 10, 3 );
 
 // Topic status transition helpers for replies

trunk/src/includes/forums/functions.php

@@ -73 +73 @@
         'forum_id' => $forum_id,
     ) );
+
+    /**
+     * Fires after forum has been inserted via `bbp_insert_forum`.
+     *
+     * @since 2.6.0 bbPress (r6036)
+     *
+     * @param int $forum_id The forum id.
+     */
+    do_action( 'bbp_insert_forum', (int) $forum_id );
 
     // Return new forum ID
@@ -1142 +1151 @@
             foreach ( (array) $ancestors as $parent_forum_id ) {
 
-                // Get forum counts
-                $parent_topic_count       = bbp_get_forum_topic_count( $parent_forum_id, false, true );
+                // Only update topic count when an ancestor is not a category.
+                if ( ! bbp_is_forum_category( $parent_forum_id ) ) {
+
+                    $parent_topic_count = bbp_get_forum_topic_count( $parent_forum_id, false, true );
+                    update_post_meta( $parent_forum_id, '_bbp_topic_count', (int) ( $parent_topic_count + $difference ) );
+                }
+
+                // Update the total topic count.
                 $parent_total_topic_count = bbp_get_forum_topic_count( $parent_forum_id, true,  true );
-
-                // Update counts
-                update_post_meta( $parent_forum_id, '_bbp_topic_count',       (int) ( $parent_topic_count       + $difference ) );
                 update_post_meta( $parent_forum_id, '_bbp_total_topic_count', (int) ( $parent_total_topic_count + $difference ) );
             }
@@ -1156 +1168 @@
 
     return (int) apply_filters( 'bbp_bump_forum_topic_count', $forum_topic_count, $forum_id, $difference, $update_ancestors );
+}
+
+/**
+ * Increase the total topic count of a forum by one.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $forum_id The forum id.
+ *
+ * @uses bbp_is_topic() To get the topic id
+ * @uses bbp_get_topic_forum_id() To get the topics forum id
+ * @uses bbp_is_topic_published() To get the topics published status
+ * @uses bbp_is_topic_closed() To get the topics closed status
+ * @uses bbp_increase_forum_topic_count_hidden() To increase the forums hidden
+ *                                                topic count by 1
+ * @uses bbp_bump_forum_topic_count() To bump the forum topic count
+ *
+ * @return void
+ */
+function bbp_increase_forum_topic_count( $forum_id = 0 ) {
+
+    // Bail early if no id is passed.
+    if ( empty( $forum_id ) ) {
+        return;
+    }
+
+    // If it's a topic, get the forum id.
+    if ( bbp_is_topic( $forum_id ) ) {
+        $topic_id = $forum_id;
+        $forum_id = bbp_get_topic_forum_id( $topic_id );
+
+        // If this is a new, unpublished, topic, increase hidden count and bail.
+        if ( 'bbp_new_topic' === current_filter() && ( ! bbp_is_topic_published( $topic_id ) && ! bbp_is_topic_closed( $topic_id ) ) ) {
+            bbp_increase_forum_topic_count_hidden( $forum_id );
+            return;
+        }
+    }
+
+    bbp_bump_forum_topic_count( $forum_id );
+}
+
+/**
+ * Decrease the total topic count of a forum by one.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $forum_id The forum id.
+ *
+ * @uses bbp_is_topic() To get the topic id
+ * @uses bbp_get_topic_forum_id() To get the topics forum id
+ * @uses bbp_bump_forum_topic_count() To bump the forum topic count
+ *
+ * @return void
+ */
+function bbp_decrease_forum_topic_count( $forum_id = 0 ) {
+
+    // Bail early if no id is passed.
+    if ( empty( $forum_id ) ) {
+        return;
+    }
+
+    // If it's a topic, get the forum id.
+    if ( bbp_is_topic( $forum_id ) ) {
+        $forum_id = bbp_get_topic_forum_id( $forum_id );
+    }
+
+    bbp_bump_forum_topic_count( $forum_id, -1 );
 }
 
@@ -1192 +1271 @@
 
 /**
+ * Increase the total hidden topic count of a forum by one.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $forum_id The forum id.
+ *
+ * @uses bbp_is_topic() To get the topic id
+ * @uses bbp_get_topic_forum_id() To get the topics forum id
+ * @uses bbp_bump_forum_topic_count_hidden() To bump the forum hidden topic count
+ *
+ * @return void
+ */
+function bbp_increase_forum_topic_count_hidden( $forum_id = 0 ) {
+
+    // Bail early if no id is passed.
+    if ( empty( $forum_id ) ) {
+        return;
+    }
+
+    // If it's a topic, get the forum id.
+    if ( bbp_is_topic( $forum_id ) ) {
+        $forum_id = bbp_get_topic_forum_id( $forum_id );
+    }
+
+    bbp_bump_forum_topic_count_hidden( $forum_id );
+}
+
+/**
+ * Decrease the total hidden topic count of a forum by one.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $forum_id The forum id.
+ *
+ * @uses bbp_is_topic() To get the topic id
+ * @uses bbp_get_topic_forum_id() To get the topics forum id
+ * @uses bbp_bump_forum_topic_count_hidden() To bump the forums hidden topic
+ *                                            count by -1
+ *
+ * @return void
+ */
+function bbp_decrease_forum_topic_count_hidden( $forum_id = 0 ) {
+
+    // Bail early if no id is passed.
+    if ( empty( $forum_id ) ) {
+        return;
+    }
+
+    // If it's a topic, get the forum id.
+    if ( bbp_is_topic( $forum_id ) ) {
+        $forum_id = bbp_get_topic_forum_id( $forum_id );
+    }
+
+    bbp_bump_forum_topic_count_hidden( $forum_id, -1 );
+}
+
+/**
  * Bump the total topic count of a forum
  *
@@ -1233 +1369 @@
             foreach ( (array) $ancestors as $parent_forum_id ) {
 
-                // Get forum counts
-                $parent_topic_count       = bbp_get_forum_reply_count( $parent_forum_id, false, true );
+                // Only update reply count when an ancestor is not a category.
+                if ( ! bbp_is_forum_category( $parent_forum_id ) ) {
+
+                    $parent_reply_count = bbp_get_forum_reply_count( $parent_forum_id, false, true );
+                    update_post_meta( $parent_forum_id, '_bbp_reply_count', (int) ( $parent_reply_count + $difference ) );
+                }
+
+                // Update the total reply count.
                 $parent_total_reply_count = bbp_get_forum_reply_count( $parent_forum_id, true,  true );
-
-                // Update counts
-                update_post_meta( $parent_forum_id, '_bbp_reply_count',       (int) ( $parent_topic_count       + $difference ) );
                 update_post_meta( $parent_forum_id, '_bbp_total_reply_count', (int) ( $parent_total_reply_count + $difference ) );
             }
@@ -1247 +1386 @@
 
     return (int) apply_filters( 'bbp_bump_forum_reply_count', $forum_reply_count, $forum_id, $difference, $update_ancestors );
+}
+
+/**
+ * Increase the total reply count of a forum by one.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $forum_id The forum id.
+ *
+ * @uses bbp_is_reply() To get the reply id
+ * @uses bbp_get_reply_forum_id() To get the replies forum id
+ * @uses bbp_is_reply_published() To get the replies published status
+ * @uses bbp_bump_forum_reply_count() To bump the forum reply count
+ *
+ * @return void
+ */
+function bbp_increase_forum_reply_count( $forum_id = 0 ) {
+
+    // Bail early if no id is passed.
+    if ( empty( $forum_id ) ) {
+        return;
+    }
+
+    // If it's a reply, get the forum id.
+    if ( bbp_is_reply( $forum_id ) ) {
+        $reply_id = $forum_id;
+        $forum_id = bbp_get_reply_forum_id( $reply_id );
+
+        // Don't update if this is a new, unpublished, reply.
+        if ( 'bbp_new_reply' === current_filter() && ! bbp_is_reply_published( $reply_id ) ) {
+            return;
+        }
+    }
+
+    bbp_bump_forum_reply_count( $forum_id );
+}
+
+/**
+ * Decrease the total reply count of a forum by one.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $forum_id The forum id.
+ *
+ * @uses bbp_is_reply() To get the reply id
+ * @uses bbp_get_reply_forum_id() To get the replies forum id
+ * @uses bbp_bump_forum_reply_count() To bump the forum reply count
+ *
+ * @return void
+ */
+function bbp_decrease_forum_reply_count( $forum_id = 0 ) {
+
+    // Bail early if no id is passed.
+    if ( empty( $forum_id ) ) {
+        return;
+    }
+
+    // If it's a reply, get the forum id.
+    if ( bbp_is_reply( $forum_id ) ) {
+        $forum_id = bbp_get_reply_forum_id( $forum_id );
+    }
+
+    bbp_bump_forum_reply_count( $forum_id, -1 );
+}
+
+/**
+ * Update forum reply counts when a topic is approved or unapproved.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $topic_id The topic id.
+ *
+ * @uses bbp_get_public_child_ids() To get the topic's public child ids
+ * @uses bbp_get_reply_post_type() To get the reply post type
+ * @uses bbp_bump_forum_reply_count() To bump the forum reply count
+ * @uses bbp_get_topic_forum_id() To get the topics forum id
+ *
+ * @return void
+ */
+function bbp_approved_unapproved_topic_update_forum_reply_count( $topic_id = 0 ) {
+
+    // Bail early if we don't have a topic id.
+    if ( empty( $topic_id ) ) {
+        return;
+    }
+
+    // Get the topic's replies.
+    $replies = bbp_get_public_child_ids( $topic_id, bbp_get_reply_post_type() );
+    $count   = count( $replies );
+
+    // If we're unapproving, set count to negative.
+    if ( 'bbp_unapproved_topic' === current_filter() ) {
+        $count = -$count;
+    }
+
+    // Update counts.
+    bbp_bump_forum_reply_count( bbp_get_topic_forum_id( $topic_id ), $count );
 }
 
@@ -1733 +1969 @@
 
     // Counts
-    bbp_update_forum_subforum_count    ( $r['forum_id'] );
-    bbp_update_forum_reply_count       ( $r['forum_id'] );
-    bbp_update_forum_topic_count       ( $r['forum_id'] );
-    bbp_update_forum_topic_count_hidden( $r['forum_id'] );
+    bbp_update_forum_subforum_count( $r['forum_id'] );
+
+    // Only update topic count if we're deleting a topic, or in the dashboard.
+    if ( in_array( current_filter(), array( 'bbp_deleted_topic', 'save_post' ), true ) ) {
+        bbp_update_forum_reply_count(        $r['forum_id'] );
+        bbp_update_forum_topic_count(        $r['forum_id'] );
+        bbp_update_forum_topic_count_hidden( $r['forum_id'] );
+    }
 
     // Update the parent forum if one was passed
@@ -1849 +2089 @@
  */
 function bbp_get_hidden_forum_ids() {
-    $forum_ids = get_option( '_bbp_hidden_forums', array() );
+    $forum_ids = get_option( '_bbp_hidden_forums', array() );
 
     return apply_filters( 'bbp_get_hidden_forum_ids', (array) $forum_ids );
@@ -1866 +2106 @@
  */
 function bbp_get_private_forum_ids() {
-    $forum_ids = get_option( '_bbp_private_forums', array() );
+    $forum_ids = get_option( '_bbp_private_forums', array() );
 
     return apply_filters( 'bbp_get_private_forum_ids', (array) $forum_ids );
@@ -2075 +2315 @@
  */
 function bbp_forum_query_topic_ids( $forum_id ) {
-    $topic_ids = bbp_get_public_child_ids( $forum_id, bbp_get_topic_post_type() );
+    $topic_ids = bbp_get_public_child_ids( $forum_id, bbp_get_topic_post_type() );
 
     return (array) apply_filters( 'bbp_forum_query_topic_ids', $topic_ids, $forum_id );

trunk/src/includes/replies/functions.php

@@ -66 +66 @@
     bbp_update_reply( $reply_id, $reply_meta['topic_id'], $reply_meta['forum_id'], array(), $reply_data['post_author'], false, $reply_meta['reply_to'] );
 
+    /**
+     * Fires after reply has been inserted via `bbp_insert_reply`.
+     *
+     * @since 2.6.0 bbPress (r6036)
+     *
+     * @param int $reply_id               The reply id.
+     * @param int $reply_meta['topic_id'] The reply topic meta.
+     * @param int $reply_meta['forum_id'] The reply forum meta.
+     */
+    do_action( 'bbp_insert_reply', (int) $reply_id, (int) $reply_meta['topic_id'], (int) $reply_meta['forum_id'] );
+
     // Return new reply ID
     return $reply_id;
+}
+
+/**
+ * Update counts after a reply is inserted via `bbp_insert_reply`.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $reply_id The reply id.
+ * @param int $topic_id The topic id.
+ * @param int $forum_id The forum id.
+ *
+ * @uses bbp_get_reply_status() To get the reply status
+ * @uses bbp_get_public_status_id() To get the public status id
+ * @uses bbp_increase_topic_reply_count() To bump the topics reply count by 1
+ * @uses bbp_increase_forum_reply_count() To bump the forums reply count by 1
+ * @uses bbp_increase_topic_reply_count_hidden() To bump the topics hidden reply
+ *                                               count by 1
+ *
+ * @return void
+ */
+function bbp_insert_reply_update_counts( $reply_id = 0, $topic_id = 0, $forum_id = 0 ) {
+
+    // If the reply is public, update the forum/topic reply counts.
+    if ( bbp_get_reply_status( $reply_id ) === bbp_get_public_status_id() ) {
+        bbp_increase_topic_reply_count( $topic_id );
+        bbp_increase_forum_reply_count( $forum_id );
+
+    // If the reply isn't public only update the topic reply hidden count.
+    } else {
+        bbp_increase_topic_reply_count_hidden( $topic_id );
+    }
 }
 
@@ -978 +1020 @@
 
                 // Counts
-                bbp_update_topic_voice_count       ( $ancestor );
-                bbp_update_topic_reply_count       ( $ancestor );
-                bbp_update_topic_reply_count_hidden( $ancestor );
+                bbp_update_topic_voice_count( $ancestor );
+
+                // Only update reply count if we're deleting a reply, or in the dashboard.
+                if ( in_array( current_filter(), array( 'bbp_deleted_reply', 'save_post' ), true ) ) {
+                    bbp_update_topic_reply_count(        $ancestor );
+                    bbp_update_topic_reply_count_hidden( $ancestor );
+                }
 
             // Forum meta relating to most recent topic
@@ -1004 +1050 @@
 
                 // Counts
-                bbp_update_forum_reply_count( $ancestor );
+                // Only update reply count if we're deleting a reply, or in the dashboard.
+                if ( in_array( current_filter(), array( 'bbp_deleted_reply', 'save_post' ), true ) ) {
+                    bbp_update_forum_reply_count( $ancestor );
+                }
             }
         }

trunk/src/includes/topics/functions.php

@@ -70 +70 @@
     // Update the topic and hierarchy
     bbp_update_topic( $topic_id, $topic_meta['forum_id'], array(), $topic_data['post_author'], false );
+
+    /**
+     * Fires after topic has been inserted via `bbp_insert_topic`.
+     *
+     * @since 2.6.0 bbPress (r6036)
+     *
+     * @param int $topic_id               The topic id.
+     * @param int $topic_meta['forum_id'] The topic forum meta.
+     */
+    do_action( 'bbp_insert_topic', (int) $topic_id, (int) $topic_meta['forum_id'] );
 
     // Return new topic ID
@@ -1022 +1032 @@
  * up the old and new branches and updating the counts.
  *
- * @param int $topic_id Topic id
- * @param int $old_forum_id Old forum id
- * @param int $new_forum_id New forum id
+ * @since 2.0.0 bbPress (r2907)
+ *
+ * @param int $topic_id     The topic id.
+ * @param int $old_forum_id Old forum id.
+ * @param int $new_forum_id New forum id.
  * @uses bbp_get_topic_id() To get the topic id
  * @uses bbp_get_forum_id() To get the forum id
+ * @uses bbp_clean_post_cache() To clean the old and new forum post caches
+ * @uses bbp_update_topic_forum_id() To update the topic forum id
  * @uses wp_update_post() To update the topic post parent`
  * @uses bbp_get_stickies() To get the old forums sticky topics
@@ -1033 +1047 @@
  * @uses bbp_stick_topic() To stick the topic in the new forum
  * @uses bbp_get_reply_post_type() To get the reply post type
- * @uses bbp_get_all_child_ids() To get the public child ids
+ * @uses bbp_get_all_child_ids() To get all the child ids
  * @uses bbp_update_reply_forum_id() To update the reply forum id
- * @uses bbp_update_topic_forum_id() To update the topic forum id
  * @uses get_post_ancestors() To get the topic's ancestors
+ * @uses bbp_get_public_child_ids() To get all the public child ids
+ * @uses get_post_field() To get the topic's post status
+ * @uses bbp_get_public_status_id() To get the public status id
+ * @uses bbp_decrease_forum_topic_count() To bump the forum topic count by -1
+ * @uses bbp_bump_forum_reply_count() To bump the forum reply count
+ * @uses bbp_increase_forum_topic_count() To bump the forum topic count by 1
+ * @uses bbp_decrease_forum_topic_count_hidden() To bump the forum topic hidden count by -1
+ * @uses bbp_increase_forum_topic_count_hidden() To bump the forum topic hidden count by 1
  * @uses bbp_is_forum() To check if the ancestor is a forum
  * @uses bbp_update_forum() To update the forum
@@ -1110 +1131 @@
     // Get topic ancestors
     $old_forum_ancestors = array_values( array_unique( array_merge( array( $old_forum_id ), (array) get_post_ancestors( $old_forum_id ) ) ) );
+
+    // Get reply count.
+    $public_reply_count = count( bbp_get_public_child_ids( $topic_id, bbp_get_reply_post_type() ) );
+
+    // Topic status.
+    $topic_status = get_post_field( 'post_status', $topic_id );
+
+    // Update old/new forum counts.
+    if ( $topic_status === bbp_get_public_status_id() ) {
+
+        // Update old forum counts.
+        bbp_decrease_forum_topic_count( $old_forum_id );
+        bbp_bump_forum_reply_count( $old_forum_id, -$public_reply_count );
+
+        // Update new forum counts.
+        bbp_increase_forum_topic_count( $new_forum_id );
+        bbp_bump_forum_reply_count( $new_forum_id, $public_reply_count );
+    } else {
+
+        // Update old forum counts.
+        bbp_decrease_forum_topic_count_hidden( $old_forum_id );
+
+        // Update new forum counts.
+        bbp_increase_forum_topic_count_hidden( $new_forum_id );
+    }
 
     // Loop through ancestors and update them
@@ -2379 +2425 @@
 
 /**
+ * Increase the total reply count of a topic by one.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $topic_id The topic id.
+ *
+ * @uses bbp_is_reply() To check if the passed topic id is a reply
+ * @uses bbp_get_reply_topic_id() To get the replies topic id
+ * @uses bbp_is_reply_published() To check if the reply is published
+ * @uses bbp_increase_topic_reply_count_hidden() To increase the topics reply
+ *                                                hidden count by 1
+ * @uses bbp_bump_topic_reply_count() To bump the topic reply count
+ *
+ * @return void
+ */
+function bbp_increase_topic_reply_count( $topic_id = 0 ) {
+
+    // Bail early if no id is passed.
+    if ( empty( $topic_id ) ) {
+        return;
+    }
+
+    // If it's a reply, get the topic id.
+    if ( bbp_is_reply( $topic_id ) ) {
+        $reply_id = $topic_id;
+        $topic_id = bbp_get_reply_topic_id( $reply_id );
+
+        // If this is a new, unpublished, reply, update hidden count and bail.
+        if ( 'bbp_new_reply' === current_filter() && ! bbp_is_reply_published( $reply_id ) ) {
+            bbp_increase_topic_reply_count_hidden( $topic_id );
+            return;
+        }
+    }
+
+    bbp_bump_topic_reply_count( $topic_id );
+}
+
+/**
+ * Decrease the total reply count of a topic by one.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $topic_id The topic id.
+ *
+ * @uses bbp_is_reply() To check if the passed topic id is a reply
+ * @uses bbp_get_reply_topic_id() To get the replies topic id
+ * @uses bbp_bump_topic_reply_count() To bump the topic reply count
+ *
+ * @return void
+ */
+function bbp_decrease_topic_reply_count( $topic_id = 0 ) {
+
+    // Bail early if no id is passed.
+    if ( empty( $topic_id ) ) {
+        return;
+    }
+
+    // If it's a reply, get the topic id.
+    if ( bbp_is_reply( $topic_id ) ) {
+        $topic_id = bbp_get_reply_topic_id( $topic_id );
+    }
+
+    bbp_bump_topic_reply_count( $topic_id, -1 );
+}
+
+/**
  * Bump the total hidden reply count of a topic
  *
@@ -2409 +2521 @@
 
     return (int) apply_filters( 'bbp_bump_topic_reply_count_hidden', $new_count, $topic_id, $difference );
+}
+
+/**
+ * Increase the total hidden reply count of a topic by one.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $topic_id The topic id.
+ *
+ * @uses bbp_is_reply() To check if the passed topic id is a reply
+ * @uses bbp_get_reply_topic_id() To get the topic id
+ * @uses bbp_bump_topic_reply_count_hidden() To bump topic hidden reply count
+ *
+ * @return void
+ */
+function bbp_increase_topic_reply_count_hidden( $topic_id = 0 ) {
+
+    // Bail early if no id is passed.
+    if ( empty( $topic_id ) ) {
+        return;
+    }
+
+    // If it's a reply, get the topic id.
+    if ( bbp_is_reply( $topic_id ) ) {
+        $topic_id = bbp_get_reply_topic_id( $topic_id );
+    }
+
+    bbp_bump_topic_reply_count_hidden( $topic_id );
+}
+
+/**
+ * Decrease the total hidden reply count of a topic by one.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $topic_id The topic id.
+ *
+ * @uses bbp_is_reply() To check if the passed topic id is a reply
+ * @uses bbp_get_reply_topic_id() To get the topic id
+ * @uses bbp_bump_topic_reply_count_hidden() To bump topic hidden reply count
+ *
+ * @return void
+ */
+function bbp_decrease_topic_reply_count_hidden( $topic_id = 0 ) {
+
+    // Bail early if no id is passed.
+    if ( empty( $topic_id ) ) {
+        return;
+    }
+
+    // If it's a reply, get the topic id.
+    if ( bbp_is_reply( $topic_id ) ) {
+        $topic_id = bbp_get_reply_topic_id( $topic_id );
+    }
+
+    bbp_bump_topic_reply_count_hidden( $topic_id, -1 );
+}
+
+/**
+ * Update counts after a topic is inserted via `bbp_insert_topic`.
+ *
+ * @since 2.6.0 bbPress (r6036)
+ *
+ * @param int $reply_id The reply id.
+ * @param int $topic_id The topic id.
+ *
+ * @uses bbp_get_topic_status() To get the post status
+ * @uses bbp_get_public_status_id() To get the public status id
+ * @uses bbp_increase_forum_topic_count() To bump the topic's forum topic count by 1
+ * @uses bbp_increase_forum_topic_count_hidden() To bump the topic's forum topic
+ *                                               hidden count by 1
+ *
+ * @return void
+ */
+function bbp_insert_topic_update_counts( $topic_id = 0, $forum_id = 0 ) {
+
+    // If the topic is public, update the forum topic counts.
+    if ( bbp_get_topic_status( $topic_id ) === bbp_get_public_status_id() ) {
+        bbp_increase_forum_topic_count( $forum_id );
+
+    // If the topic isn't public only update the forum topic hidden count.
+    } else {
+        bbp_increase_forum_topic_count_hidden( $forum_id );
+    }
 }
 

trunk/tests/phpunit/testcases/forums/functions/counts.php

@@ -14 +14 @@
      */
     public function test_bbp_forum_new_topic_counts() {
+        remove_action( 'bbp_insert_topic', 'bbp_insert_topic_update_counts', 10 );
+
         $f = $this->factory->forum->create();
         $t1 = $this->factory->topic->create( array(
@@ -24 +26 @@
         $u = $this->factory->user->create();
 
-        // Cheating here, but we need $_SERVER['SERVER_NAME'] to be set.
-        $this->setUp_wp_mail( false );
+        // Don't attempt to send an email. This is for speed and PHP errors.
+        remove_action( 'bbp_new_topic', 'bbp_notify_forum_subscribers', 11, 4 );
 
         // Simulate the 'bbp_new_topic' action.
         do_action( 'bbp_new_topic', $t1, $f, false, bbp_get_current_user_id(), $t1 );
 
-        // Reverse our changes.
-        $this->tearDown_wp_mail( false );
-
         $count = bbp_get_forum_topic_count( $f, true, true );
         $this->assertSame( 1, $count );
@@ -46 +45 @@
             ),
         ) );
-
-        // Cheating here, but we need $_SERVER['SERVER_NAME'] to be set.
-        $this->setUp_wp_mail( false );
 
         // Simulate the 'bbp_new_topic' action.
         do_action( 'bbp_new_topic', $t2, $f, false, $u , $t2 );
 
-        // Reverse our changes.
-        $this->tearDown_wp_mail( false );
-
-        $count = bbp_get_forum_topic_count( $f, true, true );
-        $this->assertSame( 2, $count );
-
-        $count = bbp_get_forum_topic_count_hidden( $f, true, true );
-        $this->assertSame( 0, $count );
+        $count = bbp_get_forum_topic_count( $f, true, true );
+        $this->assertSame( 2, $count );
+
+        $count = bbp_get_forum_topic_count_hidden( $f, true, true );
+        $this->assertSame( 0, $count );
+
+        // Re-add removed actions.
+        add_action( 'bbp_insert_topic', 'bbp_insert_topic_update_counts', 10, 2 );
+        add_action( 'bbp_new_topic',    'bbp_notify_forum_subscribers',   11, 4 );
     }
 
@@ -255 +252 @@
 
     /**
+     * @covers ::bbp_increase_forum_topic_count
+     */
+    public function test_bbp_increase_forum_topic_count() {
+        $f = $this->factory->forum->create();
+
+        $count = bbp_get_forum_topic_count( $f );
+        $this->assertSame( '0', $count );
+
+        bbp_increase_forum_topic_count( $f );
+
+        $count = bbp_get_forum_topic_count( $f );
+        $this->assertSame( '1', $count );
+    }
+
+    /**
+     * @covers ::bbp_decrease_forum_topic_count
+     */
+    public function test_bbp_decrease_forum_topic_count() {
+        $f = $this->factory->forum->create();
+
+        $count = bbp_get_forum_topic_count( $f );
+        $this->assertSame( '0', $count );
+
+        $t = $this->factory->topic->create_many( 2, array(
+            'post_parent' => $f,
+        ) );
+
+        bbp_update_forum_topic_count( $f );
+
+        $count = bbp_get_forum_topic_count( $f );
+        $this->assertSame( '2', $count );
+
+        bbp_update_forum_topic_count( $f );
+
+        bbp_decrease_forum_topic_count( $f );
+
+        $count = bbp_get_forum_topic_count( $f );
+        $this->assertSame( '1', $count );
+    }
+
+    /**
      * @covers ::bbp_bump_forum_topic_count_hidden
      */
@@ -270 +308 @@
 
     /**
+     * @covers ::bbp_increase_forum_topic_count_hidden
+     */
+    public function test_bbp_increase_forum_topic_count_hidden() {
+        $f = $this->factory->forum->create();
+
+        $count = bbp_get_forum_topic_count_hidden( $f );
+        $this->assertSame( '0', $count );
+
+        bbp_increase_forum_topic_count_hidden( $f );
+
+        $count = bbp_get_forum_topic_count_hidden( $f );
+        $this->assertSame( '1', $count );
+    }
+
+    /**
+     * @covers ::bbp_decrease_forum_topic_count_hidden
+     */
+    public function test_bbp_decrease_forum_topic_count_hidden() {
+        $f = $this->factory->forum->create();
+
+        $count = bbp_get_forum_topic_count_hidden( $f );
+        $this->assertSame( '0', $count );
+
+        $t = $this->factory->topic->create_many( 2, array(
+            'post_parent' => $f,
+            'post_status' => bbp_get_spam_status_id(),
+            'topic_meta' => array(
+                'forum_id' => $f,
+                'spam_meta_status' => 'publish',
+            )
+        ) );
+
+        bbp_update_forum_topic_count_hidden( $f );
+
+        $count = bbp_get_forum_topic_count_hidden( $f );
+        $this->assertSame( '2', $count );
+
+        bbp_decrease_forum_topic_count_hidden( $f );
+
+        $count = bbp_get_forum_topic_count_hidden( $f );
+        $this->assertSame( '1', $count );
+    }
+
+    /**
      * @covers ::bbp_bump_forum_reply_count
      */
@@ -279 +361 @@
 
         bbp_bump_forum_reply_count( $f );
+
+        $count = bbp_get_forum_reply_count( $f );
+        $this->assertSame( '1', $count );
+    }
+
+    /**
+     * @covers ::bbp_increase_forum_reply_count
+     */
+    public function test_bbp_increase_forum_reply_count() {
+        $f = $this->factory->forum->create();
+
+        $count = bbp_get_forum_reply_count( $f );
+        $this->assertSame( '0', $count );
+
+        bbp_increase_forum_reply_count( $f );
+
+        $count = bbp_get_forum_reply_count( $f );
+        $this->assertSame( '1', $count );
+    }
+
+    /**
+     * @covers ::bbp_decrease_forum_reply_count
+     */
+    public function test_bbp_decrease_forum_reply_count() {
+        $f = $this->factory->forum->create();
+
+        $count = bbp_get_forum_reply_count( $f );
+        $this->assertSame( '0', $count );
+
+        $t = $this->factory->topic->create( array(
+            'post_parent' => $f,
+        ) );
+
+        $r = $this->factory->reply->create_many( 2, array(
+            'post_parent' => $t,
+        ) );
+
+        bbp_update_forum_reply_count( $f );
+
+        $count = bbp_get_forum_reply_count( $f );
+        $this->assertSame( '2', $count );
+
+        bbp_decrease_forum_reply_count( $f );
 
         $count = bbp_get_forum_reply_count( $f );

trunk/tests/phpunit/testcases/topics/functions/counts.php

@@ -14 +14 @@
      */
     public function test_bbp_topic_new_reply_counts() {
+        remove_action( 'bbp_insert_reply', 'bbp_insert_reply_update_counts', 10 );
+
         $f = $this->factory->forum->create();
         $t = $this->factory->topic->create( array(
@@ -32 +34 @@
         $u = $this->factory->user->create();
 
-        // Cheating here, but we need $_SERVER['SERVER_NAME'] to be set.
-        $this->setUp_wp_mail( false );
+        // Don't attempt to send an email. This is for speed and PHP errors.
+        remove_action( 'bbp_new_reply', 'bbp_notify_topic_subscribers', 11, 5 );
 
         // Simulate the 'bbp_new_reply' action.
         do_action( 'bbp_new_reply', $r1, $t, $f, false, bbp_get_current_user_id() );
 
-        // Reverse our changes.
-        $this->tearDown_wp_mail( false );
-
         $count = bbp_get_topic_reply_count( $t, true );
         $this->assertSame( 1, $count );
@@ -58 +57 @@
             ),
         ) );
-
-        // Cheating here, but we need $_SERVER['SERVER_NAME'] to be set.
-        $this->setUp_wp_mail( false );
 
         // Simulate the 'bbp_new_topic' action.
         do_action( 'bbp_new_reply', $r2, $t, $f, false, $u );
 
-        // Reverse our changes.
-        $this->tearDown_wp_mail( false );
-
-        $count = bbp_get_topic_reply_count( $t, true );
-        $this->assertSame( 2, $count );
-
-        $count = bbp_get_topic_reply_count_hidden( $t, true );
-        $this->assertSame( 0, $count );
-
-        $count = bbp_get_topic_voice_count( $t, true );
-        $this->assertSame( 2, $count );
+        $count = bbp_get_topic_reply_count( $t, true );
+        $this->assertSame( 2, $count );
+
+        $count = bbp_get_topic_reply_count_hidden( $t, true );
+        $this->assertSame( 0, $count );
+
+        $count = bbp_get_topic_voice_count( $t, true );
+        $this->assertSame( 2, $count );
+
+        // Re-add removed actions.
+        add_action( 'bbp_insert_reply', 'bbp_insert_reply_update_counts', 10, 2 );
+        add_action( 'bbp_new_reply',    'bbp_notify_topic_subscribers',   11, 5 );
+
     }
 
@@ -342 +340 @@
 
     /**
+     * @covers ::bbp_increase_topic_reply_count
+     */
+    public function test_bbp_increase_topic_reply_count() {
+        $t = $this->factory->topic->create();
+
+        $count = bbp_get_topic_reply_count( $t );
+        $this->assertSame( '0', $count );
+
+        bbp_increase_topic_reply_count( $t );
+
+        $count = bbp_get_topic_reply_count( $t );
+        $this->assertSame( '1', $count );
+    }
+
+    /**
+     * @covers ::bbp_decrease_topic_reply_count
+     */
+    public function test_bbp_decrease_topic_reply_count() {
+        $t = $this->factory->topic->create();
+
+        $count = bbp_get_topic_reply_count( $t );
+        $this->assertSame( '0', $count );
+
+        // Set the count manually to 2
+        bbp_update_topic_reply_count( $t, 2 );
+
+        $count = bbp_get_topic_reply_count( $t );
+        $this->assertSame( '2', $count );
+
+        bbp_decrease_topic_reply_count( $t );
+
+        $count = bbp_get_topic_reply_count( $t );
+        $this->assertSame( '1', $count );
+    }
+
+    /**
      * @covers ::bbp_bump_topic_reply_count_hidden
      */
@@ -357 +391 @@
         $count = bbp_get_topic_reply_count_hidden( $t );
         $this->assertSame( '4', $count );
+    }
+
+    /**
+     * @covers ::bbp_increase_topic_reply_count_hidden
+     */
+    public function test_bbp_increase_topic_reply_count_hidden() {
+        $t = $this->factory->topic->create();
+
+        $count = bbp_get_topic_reply_count_hidden( $t );
+        $this->assertSame( '0', $count );
+
+        bbp_increase_topic_reply_count_hidden( $t );
+
+        $count = bbp_get_topic_reply_count_hidden( $t );
+        $this->assertSame( '1', $count );
+    }
+
+    /**
+     * @covers ::bbp_decrease_topic_reply_count_hidden
+     */
+    public function test_bbp_decrease_topic_reply_count_hidden() {
+        $t = $this->factory->topic->create();
+
+        $count = bbp_get_topic_reply_count_hidden( $t );
+        $this->assertSame( '0', $count );
+
+        // Set the count manually to 2
+        bbp_update_topic_reply_count_hidden( $t, 2 );
+
+        $count = bbp_get_topic_reply_count_hidden( $t );
+        $this->assertSame( '2', $count );
+
+        bbp_decrease_topic_reply_count_hidden( $t );
+
+        $count = bbp_get_topic_reply_count_hidden( $t );
+        $this->assertSame( '1', $count );
     }
 

trunk/tests/phpunit/testcases/topics/functions/topic.php

@@ -182 +182 @@
         $this->assertSame( $topic_id, bbp_get_reply_topic_id( $reply_id ) );
 
+        // Old Topic/Reply Counts
+        $this->assertSame( 0, bbp_get_forum_topic_count( $old_forum_id, true, true ) );
+        $this->assertSame( 0, bbp_get_forum_reply_count( $old_forum_id, true, true ) );
+
+
         // Retore the user
         $this->set_current_user( $this->old_current_user );