Changeset 7467

Timestamp:

09/10/2026 12:35:43 AM (12 days ago)

Author:

johnjamesjacoby

Message:

Counts: synchronize metadata across concurrent writes.

Introduce bbp_bump_count_meta() to update existing numeric metadata with bounded compare-and-swap retries while preserving WordPress metadata filters, actions, sanitization, and cache invalidation. Apply atomic differences to forum, topic, reply, ancestor, and user contribution counts.

Reconcile counts, engagements, and voices across status transitions, permanent deletion, author changes and reassignment, moderator move/merge/split operations, and repair recounts. Correct recursive forum totals and reply visibility, and preserve term-backed favorites and subscriptions during engagement rebuilds.

Document the count-hook compatibility changes and new helper arguments, and add regression coverage for single-site and multisite workflows.

In trunk, for 2.7.

Props alex-ye.
Fixes #2233.
Fixes #3678.

Location:

trunk

Files:

• CHANGELOG.md (modified) (1 diff)
• src/bbpress.php (modified) (1 diff)
• src/includes/admin/tools/repair.php (modified) (1 diff)
• src/includes/common/engagements.php (modified) (2 diffs)
• src/includes/common/functions.php (modified) (5 diffs)
• src/includes/core/abstraction.php (modified) (1 diff)
• src/includes/core/actions.php (modified) (1 diff)
• src/includes/forums/functions.php (modified) (23 diffs)
• src/includes/replies/functions.php (modified) (3 diffs)
• src/includes/topics/functions.php (modified) (10 diffs)
• src/includes/users/engagements.php (modified) (2 diffs)
• src/includes/users/functions.php (modified) (2 diffs)
• src/includes/users/options.php (modified) (6 diffs)
• src/readme.txt (modified) (1 diff)
• tests/phpunit/testcases/admin/tools.php (modified) (5 diffs)
• tests/phpunit/testcases/common/engagements.php (added)
• tests/phpunit/testcases/core/abstraction.php (modified) (1 diff)
• tests/phpunit/testcases/forums/functions/counts.php (modified) (6 diffs)
• tests/phpunit/testcases/forums/functions/query.php (modified) (1 diff)
• tests/phpunit/testcases/replies/functions/reply.php (modified) (1 diff)
• tests/phpunit/testcases/topics/functions/counts.php (modified) (3 diffs)
• tests/phpunit/testcases/topics/functions/topic.php (modified) (2 diffs)
• tests/phpunit/testcases/users/functions/counts.php (modified) (2 diffs)

trunk/CHANGELOG.md

@@ -64 +64 @@
 - Kept public, hidden, and author contribution counts accurate when topics and
   replies change moderation status or are permanently deleted.
-- Kept subforum counts accurate across public, private, hidden, trashed, moved,
-  restored, and permanently deleted forums.
+- Prevented simultaneous topic and reply submissions from overwriting each
+  other's existing stored count changes.
+- Kept forum, ancestor, contribution, engagement, and voice counts synchronized
+  when moderators move replies or merge and split topics.
+- Reconciled replacement-user contribution, engagement, and voice counts when
+  a deleted user's posts are reassigned.
+- Excluded replies beneath non-public topics from forum reply counts during
+  moderation and repair recounts.
+- Kept subforum counts and recursive forum aggregates accurate across public,
+  private, hidden, trashed, moved, restored, and permanently deleted forums.
 - Corrected count repair tools to clear stale metadata caches, exclude anonymous
   authors from voice counts, honor reply-status filters, rebuild private and
   hidden forums, and preserve similarly named metadata on other post types.
+- Made topic engagement and voice recounts honor filtered public reply statuses.
+- Preserved term-backed favorites and subscriptions during engagement recounts.
 
 - Cache a distinct count of current-site forum-role holders for forum statistics,

trunk/src/bbpress.php

@@ -863 +863 @@
                 // Forum
                 $count['object_subtype'] = bbp_get_forum_post_type();
-                register_meta( 'post', '_bbp_topic_count',           $count );
-                register_meta( 'post', '_bbp_reply_count',           $count );
-                register_meta( 'post', '_bbp_total_topic_count',     $count );
-                register_meta( 'post', '_bbp_total_reply_count',     $count );
-                register_meta( 'post', '_bbp_topic_count_hidden',    $count );
-                register_meta( 'post', '_bbp_reply_count_hidden',    $count );
-                register_meta( 'post', '_bbp_forum_subforum_count',  $count );
+                register_meta( 'post', '_bbp_topic_count',              $count );
+                register_meta( 'post', '_bbp_reply_count',              $count );
+                register_meta( 'post', '_bbp_total_topic_count',        $count );
+                register_meta( 'post', '_bbp_total_reply_count',        $count );
+                register_meta( 'post', '_bbp_topic_count_hidden',       $count );
+                register_meta( 'post', '_bbp_reply_count_hidden',       $count );
+                register_meta( 'post', '_bbp_total_topic_count_hidden', $count );
+                register_meta( 'post', '_bbp_total_reply_count_hidden', $count );
+                register_meta( 'post', '_bbp_forum_subforum_count',     $count );
 
                 // Topic

trunk/src/includes/admin/tools/repair.php

@@ -444 +444 @@
                                                 LEFT JOIN `{$bbp_db->posts}` AS `posts` ON `posts`.`ID` = `postmeta`.`post_id`
                                                 WHERE `posts`.`post_type` = '{$fpt}'
-                                                AND `postmeta`.`meta_key` IN ( '_bbp_topic_count', '_bbp_total_topic_count', '_bbp_topic_count_hidden' )";
+                                                AND `postmeta`.`meta_key` IN ( '_bbp_topic_count', '_bbp_total_topic_count', '_bbp_topic_count_hidden', '_bbp_total_topic_count_hidden' )";
         if ( false === $bbp_db->query( $sql_delete ) ) {
                 return array( 1, sprintf( $statement, $result ) );

trunk/src/includes/common/engagements.php

@@ -430 +430 @@
          *
          * @since 2.6.0 bbPress (r6737)
+         * @since 2.6.16 Limit removal to the requested relationship taxonomy.
          *
          * @param int    $object_id The object id.
@@ -439 +440 @@
          */
         public function remove_object_from_all_users( $object_id = 0, $meta_key = '', $meta_type = 'post' ) {
-                return wp_delete_object_term_relationships( $object_id, get_object_taxonomies( 'bbp_user' ) );
+                $tax_key = "{$meta_key}_{$meta_type}";
+                $this->jit_taxonomy( $tax_key );
+
+                return wp_delete_object_term_relationships( $object_id, $tax_key );
         }
 

trunk/src/includes/common/functions.php

@@ -276 +276 @@
                 $was_public        = in_array( $old_status, bbp_get_public_topic_statuses(), true );
                 $is_public         = in_array( $new_status, bbp_get_public_topic_statuses(), true );
+                $was_hidden        = in_array( $old_status, bbp_get_non_public_topic_statuses(), true );
+                $is_hidden         = in_array( $new_status, bbp_get_non_public_topic_statuses(), true );
                 $public_difference = (int) $is_public - (int) $was_public;
-                $hidden_difference = $is_new
-                        ? (int) ! $is_public
-                        : - $public_difference;
-
-                // A new topic or public boundary crossing changes at least one count
+                $hidden_difference = (int) $is_hidden - (int) $was_hidden;
+
+                // A new topic or count boundary crossing changes at least one count
                 if ( ! empty( $public_difference ) || ! empty( $hidden_difference ) ) {
                         $forum_id = $is_new
@@ -302 +302 @@
                         }
 
-                        // Topic approval does not change its replies' statuses
-                        if ( ! $is_new && in_array( bbp_get_pending_status_id(), array( $old_status, $new_status ), true ) ) {
-                                $reply_count = bbp_get_public_child_count( $post->ID, bbp_get_reply_post_type() );
-                                bbp_bump_forum_reply_count( $forum_id, $reply_count * $public_difference );
+                        // Recount replies after their parent topic crosses the public boundary
+                        if ( ! $is_new && ! empty( $forum_id ) && ! empty( $public_difference ) ) {
+                                bbp_update_forum_reply_count( $forum_id, true );
                         }
                 }
@@ -313 +312 @@
                 $was_public        = in_array( $old_status, bbp_get_public_reply_statuses(), true );
                 $is_public         = in_array( $new_status, bbp_get_public_reply_statuses(), true );
+                $was_hidden        = in_array( $old_status, bbp_get_non_public_reply_statuses(), true );
+                $is_hidden         = in_array( $new_status, bbp_get_non_public_reply_statuses(), true );
                 $public_difference = (int) $is_public - (int) $was_public;
-                $hidden_difference = $is_new
-                        ? (int) ! $is_public
-                        : - $public_difference;
-
-                // A new reply or public boundary crossing changes at least one count
+                $hidden_difference = (int) $is_hidden - (int) $was_hidden;
+
+                // A new reply or count boundary crossing changes at least one count
                 if ( ! empty( $public_difference ) || ! empty( $hidden_difference ) ) {
                         $topic_id = $is_new
@@ -326 +325 @@
                                 ? bbp_get_topic_forum_id( $topic_id )
                                 : bbp_get_reply_forum_id( $post->ID );
+                        $forum_public_difference = bbp_is_topic_public( $topic_id )
+                                ? $public_difference
+                                : 0;
 
                         // Update the topic's public reply count
@@ -338 +340 @@
 
                         // Update the forum's public reply count
-                        if ( ! empty( $forum_id ) && ! empty( $public_difference ) ) {
-                                bbp_bump_forum_reply_count( $forum_id, $public_difference );
+                        if ( ! empty( $forum_id ) && ! empty( $forum_public_difference ) ) {
+                                bbp_bump_forum_reply_count( $forum_id, $forum_public_difference );
                         }
 

trunk/src/includes/core/abstraction.php

@@ -147 +147 @@
 function bbp_db() {
         return bbp_get_global_object( 'wpdb', 'WPDB' );
+}
+
+/**
+ * Atomically bump a numeric metadata value using compare-and-swap retries.
+ *
+ * Count updates normally require reading a value, changing it in PHP, and
+ * writing it back. Two requests can read the same value and overwrite one
+ * another's changes. This function avoids that lost update by making the write
+ * conditional on the value that was read. If another request changes the value
+ * first, the condition matches no rows, so the current value is read directly
+ * from the database and the calculation is retried.
+ *
+ * The first read uses the WordPress metadata API and its cache. Missing
+ * metadata is added through add_metadata() so its standard lifecycle continues
+ * to run. Existing metadata uses a conditional database update while preserving
+ * the standard update metadata short-circuit filter and before/after actions.
+ * Before actions run for every conditional attempt, while after actions run
+ * only after a successful write. Metadata caches are cleared between attempts
+ * and after successful writes. Values are sanitized through sanitize_meta(),
+ * cast to integers, and prevented from falling below zero.
+ *
+ * Retries are bounded and filterable. This function does not lock rows or hold
+ * a database transaction open, and returns false when there is no change, a
+ * database operation fails, or all attempts lose to concurrent writes. It is
+ * intended for uniquely keyed numeric count metadata; WordPress metadata tables
+ * do not enforce uniqueness during simultaneous first-time inserts.
+ *
+ * @since 2.6.16
+ *
+ * @see https://bbpress.trac.wordpress.org/ticket/3678
+ *
+ * @param string $meta_type  Type of object metadata is for.
+ * @param int    $object_id  ID of the object metadata is for.
+ * @param string $meta_key   Metadata key.
+ * @param int    $difference Amount to add to the stored value.
+ * @param int    $default    Existing value to use when metadata is missing.
+ * @return bool True on success, false on failure or no change.
+ */
+function bbp_bump_count_meta( $meta_type = '', $object_id = 0, $meta_key = '', $difference = 1, $default = 0 ) {
+
+        $object_id  = (int) $object_id;
+        $difference = (int) $difference;
+        $default    = (int) $default;
+
+        // Bail if required values are missing
+        if ( empty( $object_id ) || empty( $meta_key ) || empty( $difference ) ) {
+                return false;
+        }
+
+        /**
+         * Short-circuits bumping numeric metadata.
+         *
+         * Returning a non-null value prevents the normal metadata update.
+         *
+         * @since 2.6.16
+         *
+         * @param null|bool $check      Whether to short-circuit the metadata update.
+         * @param string    $meta_type  Type of object metadata is for.
+         * @param int       $object_id  ID of the object metadata is for.
+         * @param string    $meta_key   Metadata key.
+         * @param int       $difference Amount to add to the stored value.
+         * @param int       $default    Existing value to use when metadata is missing.
+         */
+        $check = apply_filters( 'bbp_pre_bump_count_meta', null, $meta_type, $object_id, $meta_key, $difference, $default );
+        if ( null !== $check ) {
+                return (bool) $check;
+        }
+
+        /**
+         * Filters the metadata types that support atomic count updates.
+         *
+         * @since 2.6.16
+         *
+         * @param array  $meta_types Supported metadata types.
+         * @param string $meta_type  Requested metadata type.
+         * @param int    $object_id  ID of the object metadata is for.
+         * @param string $meta_key   Metadata key.
+         */
+        $meta_types = (array) apply_filters( 'bbp_bump_count_meta_types', array( 'post', 'user', 'term', 'comment' ), $meta_type, $object_id, $meta_key );
+
+        // Bail if the metadata type is unsupported
+        if ( ! in_array( $meta_type, $meta_types, true ) ) {
+                return false;
+        }
+
+        $bbp_db     = bbp_db();
+        $table_name = sanitize_key( $meta_type . 'meta' );
+        $table      = isset( $bbp_db->{$table_name} ) ? $bbp_db->{$table_name} : '';
+        $column     = sanitize_key( $meta_type . '_id' );
+        $id_column  = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_id';
+
+        // Bail if the metadata table does not exist
+        if ( empty( $table ) ) {
+                return false;
+        }
+
+        /**
+         * Filters the maximum number of conditional metadata write attempts.
+         *
+         * @since 2.6.16
+         *
+         * @param int    $max_attempts Maximum number of attempts.
+         * @param string $meta_type    Type of object metadata is for.
+         * @param int    $object_id    ID of the object metadata is for.
+         * @param string $meta_key     Metadata key.
+         * @param int    $difference   Amount to add to the stored value.
+         * @param int    $default      Existing value to use when metadata is missing.
+         */
+        $max_attempts = (int) apply_filters( 'bbp_bump_count_meta_max_attempts', 5, $meta_type, $object_id, $meta_key, $difference, $default );
+        $max_attempts = max( 1, $max_attempts );
+        $checked      = false;
+        $subtype      = get_object_subtype( $meta_type, $object_id );
+        $count_query  = $bbp_db->prepare( "SELECT meta_value FROM {$table} WHERE meta_key = %s AND {$column} = %d LIMIT 1", $meta_key, $object_id );
+
+        // Retry when another request updates the same value first
+        for ( $attempt = 0; $attempt < $max_attempts; $attempt++ ) {
+                if ( empty( $attempt ) ) {
+                        $exists = metadata_exists( $meta_type, $object_id, $meta_key );
+                        $count  = $exists
+                                ? (int) get_metadata( $meta_type, $object_id, $meta_key, true )
+                                : $default;
+                } else {
+                        $stored = $bbp_db->get_var( $count_query );
+
+                        // Bail on a database error
+                        if ( ! empty( $bbp_db->last_error ) ) {
+                                return false;
+                        }
+
+                        $exists = null !== $stored;
+                        $count  = $exists ? (int) $stored : $default;
+                }
+
+                $new_count = sanitize_meta( $meta_key, bbp_number_not_negative( $count + $difference ), $meta_type, $subtype );
+                $new_count = (int) $new_count;
+
+                // Allow metadata updates to be short-circuited as usual
+                if ( ! $checked ) {
+                        $checked = true;
+                        $check   = apply_filters( "update_{$meta_type}_metadata", null, $object_id, $meta_key, $new_count, '' );
+
+                        if ( null !== $check ) {
+                                return (bool) $check;
+                        }
+                }
+
+                // Bail if the count is already at its lower bound
+                if ( $new_count === $count ) {
+                        if ( ! empty( $attempt ) ) {
+                                return false;
+                        }
+
+                        $stored = $bbp_db->get_var( $count_query );
+
+                        // Bail on a database error
+                        if ( ! empty( $bbp_db->last_error ) ) {
+                                return false;
+                        }
+
+                        $current_exists = null !== $stored;
+                        $current_count  = $current_exists ? (int) $stored : $default;
+
+                        if ( ( $current_exists === $exists ) && ( $current_count === $count ) ) {
+                                return false;
+                        }
+
+                        wp_cache_delete( $object_id, $meta_type . '_meta' );
+                        continue;
+                }
+
+                // Add missing metadata using the standard WordPress lifecycle
+                if ( ! $exists ) {
+                        if ( ! empty( add_metadata( $meta_type, $object_id, $meta_key, $new_count, true ) ) ) {
+                                return true;
+                        }
+
+                        $stored = $bbp_db->get_var( $count_query );
+
+                        // Bail if the add failed without a concurrent insert or on a database error
+                        if ( ! empty( $bbp_db->last_error ) || ( null === $stored ) ) {
+                                return false;
+                        }
+
+                        wp_cache_delete( $object_id, $meta_type . '_meta' );
+                        continue;
+                }
+
+                $meta_ids = $bbp_db->get_col( $bbp_db->prepare( "SELECT {$id_column} FROM {$table} WHERE meta_key = %s AND {$column} = %d", $meta_key, $object_id ) );
+
+                // Bail on a database error
+                if ( ! empty( $bbp_db->last_error ) ) {
+                        return false;
+                }
+
+                // Retry if metadata was removed after the cached existence check
+                if ( empty( $meta_ids ) ) {
+                        wp_cache_delete( $object_id, $meta_type . '_meta' );
+                        continue;
+                }
+
+                // Run the standard actions immediately before the conditional update
+                foreach ( $meta_ids as $meta_id ) {
+                        do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $new_count );
+
+                        if ( 'post' === $meta_type ) {
+                                do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $new_count );
+                        }
+                }
+
+                // Compare count metadata numerically to normalize stored numeric strings
+                $updated = $bbp_db->update(
+                        $table,
+                        array( 'meta_value' => $new_count ),
+                        array(
+                                $column      => $object_id,
+                                'meta_key'   => $meta_key,
+                                'meta_value' => $count
+                        ),
+                        array( '%d' ),
+                        array( '%d', '%s', '%d' )
+                );
+
+                // Bail on a database error
+                if ( false === $updated ) {
+                        return false;
+                }
+
+                wp_cache_delete( $object_id, $meta_type . '_meta' );
+
+                // Retry when another request updated the count first
+                if ( empty( $updated ) ) {
+                        continue;
+                }
+
+                // Run the standard actions immediately after the conditional update
+                foreach ( $meta_ids as $meta_id ) {
+                        do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $new_count );
+
+                        if ( 'post' === $meta_type ) {
+                                do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $new_count );
+                        }
+                }
+
+                return true;
+        }
+
+        return false;
 }
 

trunk/src/includes/core/actions.php

@@ -288 +288 @@
 add_action( 'bbp_deleted_topic', 'bbp_decrease_user_topic_count' );
 add_action( 'bbp_deleted_reply', 'bbp_decrease_user_reply_count' );
+add_action( 'bbp_post_updated',  'bbp_update_counts_on_post_author_change', 10, 3 );
+add_action( 'bbp_post_updated',  'bbp_recalculate_engagements_on_post_author_change', 20, 3 );
+
+// Update counts and engagements after WordPress reassigns a deleted user's posts
+add_action( 'delete_user',  'bbp_update_counts_on_user_reassignment', 10, 2 );
+add_action( 'deleted_user', 'bbp_update_counts_on_user_reassignment', 10, 2 );
 
 // Topic status transition helpers for replies

trunk/src/includes/forums/functions.php

@@ -1111 +1111 @@
  *
  * @since 2.1.0 bbPress (r3825)
+ * @since 2.6.16 Use atomic metadata writes and non-negative counts.
  *
  * @param int $forum_id Optional. Forum id.
@@ -1132 +1133 @@
 
         // Update this forum id
-        update_post_meta( $forum_id, '_bbp_topic_count',       (int) ( $topic_count + $difference ) );
-        update_post_meta( $forum_id, '_bbp_total_topic_count', (int) ( $total_topic_count + $difference ) );
+        bbp_bump_count_meta( 'post', $forum_id, '_bbp_topic_count',       $difference, $topic_count       );
+        bbp_bump_count_meta( 'post', $forum_id, '_bbp_total_topic_count', $difference, $total_topic_count );
 
         // Check for ancestors
@@ -1150 +1151 @@
 
                                         $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 ) );
+                                        bbp_bump_count_meta( 'post', $parent_forum_id, '_bbp_topic_count', $difference, $parent_topic_count );
                                 }
 
                                 // Update the total topic count.
                                 $parent_total_topic_count = bbp_get_forum_topic_count( $parent_forum_id, true,  true );
-                                update_post_meta( $parent_forum_id, '_bbp_total_topic_count', (int) ( $parent_total_topic_count + $difference ) );
+                                bbp_bump_count_meta( 'post', $parent_forum_id, '_bbp_total_topic_count', $difference, $parent_total_topic_count );
                         }
                 }
         }
 
-        $forum_topic_count = (int) ( $total_topic_count + $difference );
+        $forum_topic_count = bbp_number_not_negative( $total_topic_count + $difference );
 
         // Filter & return
@@ -1230 +1231 @@
  *
  * @since 2.1.0 bbPress (r3825)
+ * @since 2.6.16 Use atomic metadata writes and non-negative counts.
  *
  * @param int $forum_id Optional. Forum id.
@@ -1251 +1253 @@
 
         // Update this forum id
-        update_post_meta( $forum_id, '_bbp_topic_count_hidden',       (int) ( $reply_count + $difference ) );
-        update_post_meta( $forum_id, '_bbp_total_topic_count_hidden', (int) ( $total_topic_count + $difference ) );
+        bbp_bump_count_meta( 'post', $forum_id, '_bbp_topic_count_hidden',       $difference, $reply_count       );
+        bbp_bump_count_meta( 'post', $forum_id, '_bbp_total_topic_count_hidden', $difference, $total_topic_count );
 
         // Check for ancestors
@@ -1269 +1271 @@
 
                                         $parent_topic_count = bbp_get_forum_topic_count_hidden( $parent_forum_id, false, true );
-                                        update_post_meta( $parent_forum_id, '_bbp_topic_count_hidden', (int) ( $parent_topic_count + $difference ) );
+                                        bbp_bump_count_meta( 'post', $parent_forum_id, '_bbp_topic_count_hidden', $difference, $parent_topic_count );
                                 }
 
                                 // Update the total topic count.
                                 $parent_total_topic_count = bbp_get_forum_topic_count_hidden( $parent_forum_id, true, true );
-                                update_post_meta( $parent_forum_id, '_bbp_total_topic_count_hidden', (int) ( $parent_total_topic_count + $difference ) );
+                                bbp_bump_count_meta( 'post', $parent_forum_id, '_bbp_total_topic_count_hidden', $difference, $parent_total_topic_count );
                         }
                 }
         }
 
-        $forum_topic_count = (int) ( $total_topic_count + $difference );
+        $forum_topic_count = bbp_number_not_negative( $total_topic_count + $difference );
 
         // Filter & return
@@ -1349 +1351 @@
  *
  * @since 2.1.0 bbPress (r3825)
+ * @since 2.6.16 Use atomic metadata writes and non-negative counts.
  *
  * @param int $forum_id Optional. Forum id.
@@ -1370 +1373 @@
 
         // Update this forum id
-        update_post_meta( $forum_id, '_bbp_reply_count',       (int) ( $reply_count + $difference ) );
-        update_post_meta( $forum_id, '_bbp_total_reply_count', (int) ( $total_reply_count + $difference ) );
+        bbp_bump_count_meta( 'post', $forum_id, '_bbp_reply_count',       $difference, $reply_count       );
+        bbp_bump_count_meta( 'post', $forum_id, '_bbp_total_reply_count', $difference, $total_reply_count );
 
         // Check for ancestors
@@ -1388 +1391 @@
 
                                         $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 ) );
+                                        bbp_bump_count_meta( 'post', $parent_forum_id, '_bbp_reply_count', $difference, $parent_reply_count );
                                 }
 
                                 // Update the total reply count.
                                 $parent_total_reply_count = bbp_get_forum_reply_count( $parent_forum_id, true,  true );
-                                update_post_meta( $parent_forum_id, '_bbp_total_reply_count', (int) ( $parent_total_reply_count + $difference ) );
+                                bbp_bump_count_meta( 'post', $parent_forum_id, '_bbp_total_reply_count', $difference, $parent_total_reply_count );
                         }
                 }
         }
 
-        $forum_reply_count = (int) ( $total_reply_count + $difference );
+        $forum_reply_count = bbp_number_not_negative( $total_reply_count + $difference );
 
         // Filter & return
@@ -1408 +1411 @@
  *
  * @since 2.6.0 bbPress (r6922)
+ * @since 2.6.16 Use atomic metadata writes and non-negative counts.
  *
  * @param int $forum_id Optional. Forum id.
@@ -1429 +1433 @@
 
         // Update this forum id
-        update_post_meta( $forum_id, '_bbp_reply_count_hidden',       (int) ( $reply_count + $difference ) );
-        update_post_meta( $forum_id, '_bbp_total_reply_count_hidden', (int) ( $total_reply_count + $difference ) );
+        bbp_bump_count_meta( 'post', $forum_id, '_bbp_reply_count_hidden',       $difference, $reply_count       );
+        bbp_bump_count_meta( 'post', $forum_id, '_bbp_total_reply_count_hidden', $difference, $total_reply_count );
 
         // Check for ancestors
@@ -1447 +1451 @@
 
                                         $parent_reply_count = bbp_get_forum_reply_count_hidden( $parent_forum_id, false, true );
-                                        update_post_meta( $parent_forum_id, '_bbp_reply_count_hidden', (int) ( $parent_reply_count + $difference ) );
+                                        bbp_bump_count_meta( 'post', $parent_forum_id, '_bbp_reply_count_hidden', $difference, $parent_reply_count );
                                 }
 
                                 // Update the total reply count.
                                 $parent_total_reply_count = bbp_get_forum_reply_count_hidden( $parent_forum_id, true,  true );
-                                update_post_meta( $parent_forum_id, '_bbp_total_reply_count_hidden', (int) ( $parent_total_reply_count + $difference ) );
+                                bbp_bump_count_meta( 'post', $parent_forum_id, '_bbp_total_reply_count_hidden', $difference, $parent_total_reply_count );
                         }
                 }
         }
 
-        $forum_reply_count = (int) ( $total_reply_count + $difference );
+        $forum_reply_count = bbp_number_not_negative( $total_reply_count + $difference );
 
         // Filter & return
         return (int) apply_filters( 'bbp_bump_forum_reply_count_hidden', $forum_reply_count, $forum_id, $difference, $update_ancestors );
+}
+
+/**
+ * Bump one total count through a forum's ancestors.
+ *
+ * This is used after recounting a forum that may be nested as a subforum. The
+ * starting forum's total has already been updated, so only its parent forums
+ * receive the difference between the old and new totals. The supplied metadata
+ * key identifies which total topic or reply count is propagated.
+ *
+ * Forum hierarchy is stored in `post_parent`, making get_post_ancestors() the
+ * canonical, cache-aware way to walk from a subforum toward its root forum.
+ * Only parent forums are traversed: topics and replies are never ancestors in
+ * a valid forum hierarchy, even when the metadata key stores their totals. The
+ * walk stops if a malformed parent relationship leaves the forum post type.
+ *
+ * @since 2.6.16
+ *
+ * @param int    $forum_id   Starting forum ID. Its own count is not changed.
+ * @param string $meta_key   Topic or reply total count metadata key.
+ * @param int    $difference Amount to add to the stored value.
+ * @return bool True when all ancestor counts were updated, false otherwise.
+ */
+function bbp_bump_forum_ancestor_count( $forum_id = 0, $meta_key = '', $difference = 0 ) {
+        $forum_id   = bbp_get_forum_id( $forum_id );
+        $difference = (int) $difference;
+
+        // Bail if nothing can change
+        if ( empty( $forum_id ) || empty( $meta_key ) || empty( $difference ) ) {
+                return false;
+        }
+
+        $updated      = true;
+        $ancestor_ids = get_post_ancestors( $forum_id );
+
+        // Return if this forum has no ancestors
+        if ( empty( $ancestor_ids ) ) {
+                return $updated;
+        }
+
+        // Update only total counts on ancestor forums
+        foreach ( $ancestor_ids as $ancestor_id ) {
+
+                // Stop if malformed data leaves the subforum hierarchy
+                if ( ! bbp_is_forum( $ancestor_id ) ) {
+                        break;
+                }
+
+                $count = (int) get_post_meta( $ancestor_id, $meta_key, true );
+
+                if ( ! bbp_bump_count_meta( 'post', $ancestor_id, $meta_key, $difference, $count ) ) {
+                        $updated = false;
+                }
+        }
+
+        return $updated;
 }
 
@@ -1978 +2038 @@
  *
  * @since 2.0.0 bbPress (r2464)
+ * @since 2.6.16 Optionally update ancestor forum totals.
  *
  * @param int $forum_id Optional. Forum id or topic id. It is checked whether it
  *                       is a topic or a forum. If it's a topic, its parent,
  *                       i.e. the forum is automatically retrieved.
- * @param bool $total_count Optional. To return the total count or normal count.
+ * @param bool $update_ancestors Optional. Whether to update ancestor totals.
  * @return int Forum topic count.
  */
-function bbp_update_forum_topic_count( $forum_id = 0 ) {
-        $forum_id = bbp_get_forum_id( $forum_id );
+function bbp_update_forum_topic_count( $forum_id = 0, $update_ancestors = false ) {
+        $forum_id             = bbp_get_forum_id( $forum_id );
+        $old_total_topics     = ( true === $update_ancestors )
+                ? (int) get_post_meta( $forum_id, '_bbp_total_topic_count', true )
+                : 0;
         $children_topic_count = 0;
+        $total_topics         = 0;
 
         // Loop through subforums and add together forum topic counts
@@ -2007 +2072 @@
         update_post_meta( $forum_id, '_bbp_total_topic_count', $total_topics );
 
+        // Update ancestor total counts by the persisted difference
+        if ( true === $update_ancestors ) {
+                bbp_bump_forum_ancestor_count( $forum_id, '_bbp_total_topic_count', $total_topics - $old_total_topics );
+        }
+
         // Filter & return
         return (int) apply_filters( 'bbp_update_forum_topic_count', $total_topics, $forum_id );
@@ -2017 +2087 @@
  * @since 2.0.0 bbPress (r2888)
  * @since 2.6.0 bbPress (r5954) Replace direct queries with WP_Query() objects
+ * @since 2.6.16 Optionally update ancestor forum totals.
  *
  * @param int $forum_id Optional. Topic id to update.
  * @param int $topic_count Optional. Set the topic count manually.
+ * @param bool $update_ancestors Optional. Whether to update ancestor totals.
  *
  * @return int Topic hidden topic count.
  */
-function bbp_update_forum_topic_count_hidden( $forum_id = 0, $topic_count = false ) {
+function bbp_update_forum_topic_count_hidden( $forum_id = 0, $topic_count = false, $update_ancestors = false ) {
 
         // If topic_id was passed as $forum_id, then get its forum
@@ -2035 +2107 @@
         }
 
+        $children_topic_count = 0;
+        $total_topics         = 0;
+        $old_total_topics     = ( true === $update_ancestors )
+                ? (int) get_post_meta( $forum_id, '_bbp_total_topic_count_hidden', true )
+                : 0;
+
         // Can't update what isn't there
         if ( ! empty( $forum_id ) ) {
+
+                // Loop through children and add together hidden topic counts
+                $children = bbp_forum_query_subforum_ids( $forum_id );
+                if ( ! empty( $children ) ) {
+                        foreach ( (array) $children as $child ) {
+                                bbp_update_forum_topic_count_hidden( $child );
+                                $children_topic_count += bbp_get_forum_topic_count_hidden( $child, true, true );
+                        }
+                }
 
                 // Get topics of forum
@@ -2063 +2150 @@
                 }
 
-                $topic_count = (int) $topic_count;
-
-                // Update the count
-                update_post_meta( $forum_id, '_bbp_topic_count_hidden', $topic_count );
+                $topic_count  = (int) $topic_count;
+                $total_topics = (int) ( $topic_count + $children_topic_count );
+
+                // Update the counts
+                update_post_meta( $forum_id, '_bbp_topic_count_hidden',       $topic_count  );
+                update_post_meta( $forum_id, '_bbp_total_topic_count_hidden', $total_topics );
+
+                // Update ancestor total counts by the persisted difference
+                if ( true === $update_ancestors ) {
+                        bbp_bump_forum_ancestor_count( $forum_id, '_bbp_total_topic_count_hidden', $total_topics - $old_total_topics );
+                }
         }
 
@@ -2078 +2172 @@
  * @since 2.0.0 bbPress (r2464)
  * @since 2.6.0 bbPress (r5954) Replace direct queries with WP_Query() objects.
+ * @since 2.6.16 Count replies only when their parent topics are public.
+ * @since 2.6.16 Optionally update ancestor forum totals.
  *
  * @param int  $forum_id Optional. Forum id or topic id. It is checked whether it
  *                       is a topic or a forum. If it's a topic, its parent,
  *                       i.e. the forum is automatically retrieved.
+ * @param bool $update_ancestors Optional. Whether to update ancestor totals.
  *
  * @return int Forum reply count.
  */
-function bbp_update_forum_reply_count( $forum_id = 0 ) {
-
-        $forum_id = bbp_get_forum_id( $forum_id );
+function bbp_update_forum_reply_count( $forum_id = 0, $update_ancestors = false ) {
+
+        $forum_id             = bbp_get_forum_id( $forum_id );
+        $old_total_replies    = ( true === $update_ancestors )
+                ? (int) get_post_meta( $forum_id, '_bbp_total_reply_count', true )
+                : 0;
         $children_reply_count = 0;
 
@@ -2099 +2199 @@
 
         // Don't count replies if the forum is a category
-        $reply_count = ! bbp_is_forum_category( $forum_id )
-                ? bbp_get_public_child_count( $forum_id, bbp_get_reply_post_type() )
-                : 0;
+        if ( bbp_is_forum_category( $forum_id ) ) {
+                $reply_count = 0;
+
+        // Count public replies whose parent topics are also public
+        } else {
+                $bbp_db         = bbp_db();
+                $reply_statuses = bbp_get_public_reply_statuses();
+                $topic_statuses = bbp_get_public_topic_statuses();
+
+                if ( empty( $reply_statuses ) || empty( $topic_statuses ) ) {
+                        $reply_count = 0;
+                } else {
+                        $reply_placeholders = implode( ', ', array_fill( 0, count( $reply_statuses ), '%s' ) );
+                        $topic_placeholders = implode( ', ', array_fill( 0, count( $topic_statuses ), '%s' ) );
+                        $sql                = "SELECT COUNT(*) FROM {$bbp_db->posts} AS replies
+                                INNER JOIN {$bbp_db->posts} AS topics ON replies.post_parent = topics.ID
+                                WHERE topics.post_parent = %d
+                                        AND topics.post_type = %s
+                                        AND topics.post_status IN ({$topic_placeholders})
+                                        AND replies.post_type = %s
+                                        AND replies.post_status IN ({$reply_placeholders})";
+                        $query              = $bbp_db->prepare(
+                                $sql,
+                                array_merge(
+                                        array( $forum_id, bbp_get_topic_post_type() ),
+                                        $topic_statuses,
+                                        array( bbp_get_reply_post_type() ),
+                                        $reply_statuses
+                                )
+                        );
+                        $reply_count = bbp_number_not_negative( $bbp_db->get_var( $query ) );
+                }
+        }
 
         // Calculate total replies in this forum
@@ -2110 +2240 @@
         update_post_meta( $forum_id, '_bbp_total_reply_count', $total_replies );
 
+        // Update ancestor total counts by the persisted difference
+        if ( true === $update_ancestors ) {
+                bbp_bump_forum_ancestor_count( $forum_id, '_bbp_total_reply_count', $total_replies - $old_total_replies );
+        }
+
         // Filter & return
         return (int) apply_filters( 'bbp_update_forum_reply_count', $total_replies, $forum_id );
@@ -2118 +2253 @@
  *
  * @since 2.6.0 bbPress (r6922)
+ * @since 2.6.16 Optionally update ancestor forum totals.
  *
  * @param int  $forum_id Optional. Forum id or topic id. It is checked whether it
  *                       is a topic or a forum. If it's a topic, its parent,
  *                       i.e. the forum is automatically retrieved.
+ * @param bool $update_ancestors Optional. Whether to update ancestor totals.
  *
  * @return int Forum reply count.
  */
-function bbp_update_forum_reply_count_hidden( $forum_id = 0 ) {
-
-        $forum_id = bbp_get_forum_id( $forum_id );
+function bbp_update_forum_reply_count_hidden( $forum_id = 0, $update_ancestors = false ) {
+
+        $forum_id             = bbp_get_forum_id( $forum_id );
+        $old_total_replies    = ( true === $update_ancestors )
+                ? (int) get_post_meta( $forum_id, '_bbp_total_reply_count_hidden', true )
+                : 0;
         $children_reply_count = 0;
 
@@ -2149 +2289 @@
         update_post_meta( $forum_id, '_bbp_reply_count_hidden',       $reply_count   );
         update_post_meta( $forum_id, '_bbp_total_reply_count_hidden', $total_replies );
+
+        // Update ancestor total counts by the persisted difference
+        if ( true === $update_ancestors ) {
+                bbp_bump_forum_ancestor_count( $forum_id, '_bbp_total_reply_count_hidden', $total_replies - $old_total_replies );
+        }
 
         // Filter & return
@@ -2739 +2884 @@
  * Returns the forum's subforum ids.
  *
- * Only forums with published status are returned.
+ * Only forums with countable statuses are returned.
  *
  * @since 2.0.0 bbPress (r2908)
+ * @since 2.6.16 Exclude forums with uncountable statuses.
  *
  * @param int $forum_id Forum id.
  */
 function bbp_forum_query_subforum_ids( $forum_id ) {
-        $subforum_ids = bbp_get_all_child_ids( $forum_id, bbp_get_forum_post_type() );
+        $forum_id     = bbp_get_forum_id( $forum_id );
+        $statuses     = bbp_get_countable_forum_statuses();
+        $subforum_ids = array();
+
+        // Query and cache countable subforums. The public child-ID helper excludes
+        // private and hidden forums, while the all-child helper includes trash, so
+        // neither existing helper represents the statuses counted here.
+        if ( ! empty( $forum_id ) && ! empty( $statuses ) ) {
+                $key = md5(
+                        serialize(
+                                array(
+                                        'parent_id'   => $forum_id,
+                                        'post_type'   => bbp_get_forum_post_type(),
+                                        'post_status' => $statuses
+                                )
+                        )
+                );
+                $cache_key    = "bbp_child_ids:{$key}:" . wp_cache_get_last_changed( 'bbpress_posts' );
+                $subforum_ids = wp_cache_get( $cache_key, 'bbpress_posts' );
+
+                if ( false === $subforum_ids ) {
+                        $bbp_db       = bbp_db();
+                        $placeholders = implode( ', ', array_fill( 0, count( $statuses ), '%s' ) );
+                        $query        = $bbp_db->prepare(
+                                "SELECT ID FROM {$bbp_db->posts} WHERE post_parent = %d AND post_type = %s AND post_status IN ({$placeholders}) ORDER BY ID DESC",
+                                array_merge( array( $forum_id, bbp_get_forum_post_type() ), $statuses )
+                        );
+                        $subforum_ids = (array) $bbp_db->get_col( $query );
+
+                        wp_cache_set( $cache_key, $subforum_ids, 'bbpress_posts' );
+                }
+        }
 
         // Filter & return

trunk/src/includes/replies/functions.php

@@ -1526 +1526 @@
  *
  * @since 2.3.0 bbPress (r4521)
+ * @since 2.6.16 Recount both forums and topic engagements.
  *
  * @param int $move_reply_id Move reply id.
@@ -1532 +1533 @@
  */
 function bbp_move_reply_count( $move_reply_id, $source_topic_id, $destination_topic_id ) {
-
-        // Forum topic counts
-        bbp_update_forum_topic_count( bbp_get_topic_forum_id( $destination_topic_id ) );
-
-        // Forum reply counts
-        bbp_update_forum_reply_count( bbp_get_topic_forum_id( $destination_topic_id ) );
+        $source_forum_id      = bbp_get_topic_forum_id( $source_topic_id );
+        $destination_forum_id = bbp_get_topic_forum_id( $destination_topic_id );
+
+        // A reply converted into a topic changes its forum's topic counts
+        if ( bbp_is_topic( $move_reply_id ) ) {
+                bbp_update_forum_topic_count( $destination_forum_id, true );
+                bbp_update_forum_topic_count_hidden( $destination_forum_id, false, true );
+
+                // Transfer the public contribution between count types
+                if ( bbp_is_topic_published( $move_reply_id ) ) {
+                        $user_id = bbp_get_topic_author_id( $move_reply_id );
+                        bbp_bump_user_reply_count( $user_id, -1 );
+                        bbp_bump_user_topic_count( $user_id, 1 );
+                }
+        }
+
+        // Recount replies in both forums
+        foreach ( bbp_get_unique_array_values( array( $source_forum_id, $destination_forum_id ) ) as $forum_id ) {
+                bbp_update_forum_reply_count( $forum_id, true );
+                bbp_update_forum_reply_count_hidden( $forum_id, true );
+        }
 
         // Topic reply counts
@@ -1547 +1563 @@
         bbp_update_topic_reply_count_hidden( $destination_topic_id );
 
-        // Topic voice counts
+        // Topic engagement and voice counts
+        bbp_recalculate_topic_engagements( $source_topic_id      );
+        bbp_recalculate_topic_engagements( $destination_topic_id );
         bbp_update_topic_voice_count( $source_topic_id      );
         bbp_update_topic_voice_count( $destination_topic_id );

trunk/src/includes/topics/functions.php

@@ -1368 +1368 @@
  *
  * @since 2.0.0 bbPress (r2756)
+ * @since 2.6.16 Recount both forums and topic engagements.
  *
  * @param int $destination_topic_id Destination topic id.
@@ -1374 +1375 @@
  */
 function bbp_merge_topic_count( $destination_topic_id, $source_topic_id, $source_topic_forum_id ) {
+        $destination_forum_id = bbp_get_topic_forum_id( $destination_topic_id );
 
         /** Source Topic **********************************************************/
 
         // Forum Topic Counts
-        bbp_update_forum_topic_count( $source_topic_forum_id );
+        bbp_update_forum_topic_count( $source_topic_forum_id, true );
+        bbp_update_forum_topic_count_hidden( $source_topic_forum_id, false, true );
 
         // Forum Reply Counts
-        bbp_update_forum_reply_count( $source_topic_forum_id );
+        foreach ( bbp_get_unique_array_values( array( $source_topic_forum_id, $destination_forum_id ) ) as $forum_id ) {
+                bbp_update_forum_reply_count( $forum_id, true );
+                bbp_update_forum_reply_count_hidden( $forum_id, true );
+        }
 
         /** Destination Topic *****************************************************/
@@ -1391 +1397 @@
         bbp_update_topic_reply_count_hidden( $destination_topic_id );
 
-        // Topic Voice Counts
+        // Topic Engagement and Voice Counts
+        bbp_recalculate_topic_engagements( $destination_topic_id );
         bbp_update_topic_voice_count( $destination_topic_id );
+
+        // Transfer the converted source topic author's contribution to replies
+        if ( bbp_is_reply_published( $source_topic_id ) ) {
+                $user_id = bbp_get_reply_author_id( $source_topic_id );
+                bbp_bump_user_topic_count( $user_id, -1 );
+                bbp_bump_user_reply_count( $user_id, 1 );
+        }
 
         do_action( 'bbp_merge_topic_count', $destination_topic_id, $source_topic_id, $source_topic_forum_id );
@@ -1718 +1732 @@
  *
  * @since 2.0.0 bbPress (r2756)
+ * @since 2.6.16 Recount both forums and topic engagements.
  *
  * @param int $from_reply_id From reply id.
@@ -1724 +1739 @@
  */
 function bbp_split_topic_count( $from_reply_id, $source_topic_id, $destination_topic_id ) {
-
-        // Forum Topic Counts
-        bbp_update_forum_topic_count( bbp_get_topic_forum_id( $destination_topic_id ) );
-
-        // Forum Reply Counts
-        bbp_update_forum_reply_count( bbp_get_topic_forum_id( $destination_topic_id ) );
+        $source_forum_id      = bbp_get_topic_forum_id( $source_topic_id );
+        $destination_forum_id = bbp_get_topic_forum_id( $destination_topic_id );
+
+        // A reply converted into a topic changes its forum's topic counts
+        if ( bbp_is_topic( $from_reply_id ) ) {
+                bbp_update_forum_topic_count( $destination_forum_id, true );
+                bbp_update_forum_topic_count_hidden( $destination_forum_id, false, true );
+
+                // Transfer the public contribution between count types
+                if ( bbp_is_topic_published( $from_reply_id ) ) {
+                        $user_id = bbp_get_topic_author_id( $from_reply_id );
+                        bbp_bump_user_reply_count( $user_id, -1 );
+                        bbp_bump_user_topic_count( $user_id, 1 );
+                }
+        }
+
+        // Recount replies in both forums
+        foreach ( bbp_get_unique_array_values( array( $source_forum_id, $destination_forum_id ) ) as $forum_id ) {
+                bbp_update_forum_reply_count( $forum_id, true );
+                bbp_update_forum_reply_count_hidden( $forum_id, true );
+        }
 
         // Topic Reply Counts
@@ -1739 +1769 @@
         bbp_update_topic_reply_count_hidden( $destination_topic_id );
 
-        // Topic Voice Counts
+        // Topic Engagement and Voice Counts
+        bbp_recalculate_topic_engagements( $source_topic_id      );
+        bbp_recalculate_topic_engagements( $destination_topic_id );
         bbp_update_topic_voice_count( $source_topic_id      );
         bbp_update_topic_voice_count( $destination_topic_id );
@@ -2405 +2437 @@
  *
  * @since 2.1.0 bbPress (r3825)
+ * @since 2.6.16 Use atomic metadata writes and non-negative counts.
  *
  * @param int $topic_id   Optional. Topic id.
@@ -2422 +2455 @@
         $reply_count = bbp_get_topic_reply_count( $topic_id, true );
         $difference  = (int) $difference;
-        $new_count   = (int) ( $reply_count + $difference );
+        $new_count   = bbp_number_not_negative( $reply_count + $difference );
 
         // Update this topic id's reply count
-        update_post_meta( $topic_id, '_bbp_reply_count', $new_count );
+        bbp_bump_count_meta( 'post', $topic_id, '_bbp_reply_count', $difference, $reply_count );
 
         // Filter & return
@@ -2495 +2528 @@
  *
  * @since 2.1.0 bbPress (r3825)
+ * @since 2.6.16 Use atomic metadata writes and non-negative counts.
  *
  * @param int $topic_id   Optional. Topic id.
@@ -2512 +2546 @@
         $reply_count = bbp_get_topic_reply_count_hidden( $topic_id, true );
         $difference  = (int) $difference;
-        $new_count   = (int) ( $reply_count + $difference );
+        $new_count   = bbp_number_not_negative( $reply_count + $difference );
 
         // Update this topic id's hidden reply count
-        update_post_meta( $topic_id, '_bbp_reply_count_hidden', $new_count );
+        bbp_bump_count_meta( 'post', $topic_id, '_bbp_reply_count_hidden', $difference, $reply_count );
 
         // Filter & return

trunk/src/includes/users/engagements.php

@@ -195 +195 @@
  *
  * @since 2.6.0 bbPress (r6522)
+ * @since 2.6.16 Honor filtered public reply statuses.
  *
  * @param int $topic_id Optional. Topic id.
@@ -203 +204 @@
 
         // Default variables
-        $topic_id = bbp_get_topic_id( $topic_id );
-        $bbp_db   = bbp_db();
-        $statii   = "'" . implode( "', '", bbp_get_public_topic_statuses() ) . "'";
-
-        // A cool UNION query!
-        $sql = "
-SELECT DISTINCT( post_author ) FROM (
-        SELECT post_author FROM {$bbp_db->posts}
-                WHERE ( ID = %d AND post_status IN ({$statii}) AND post_type = %s )
-UNION
-        SELECT post_author FROM {$bbp_db->posts}
-                WHERE ( post_parent = %d AND post_status = %s AND post_type = %s )
-) as u1";
-
-        // Prepare & get results
-        $query   = $bbp_db->prepare( $sql, $topic_id, bbp_get_topic_post_type(), $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type() );
-        $results = $bbp_db->get_col( $query );
+        $topic_id       = bbp_get_topic_id( $topic_id );
+        $bbp_db         = bbp_db();
+        $topic_type     = bbp_get_topic_post_type();
+        $reply_type     = bbp_get_reply_post_type();
+        $topic_statuses = array_unique( array_filter( bbp_get_public_topic_statuses() ) );
+        $reply_statuses = array_unique( array_filter( bbp_get_public_reply_statuses() ) );
+        $sql            = array();
+        $values         = array();
+
+        // Add the topic author for countable topic statuses
+        if ( ! empty( $topic_statuses ) ) {
+                $placeholders = implode( ', ', array_fill( 0, count( $topic_statuses ), '%s' ) );
+                $sql[]        = "SELECT post_author FROM {$bbp_db->posts} WHERE ID = %d AND post_status IN ( {$placeholders} ) AND post_type = %s";
+                $values       = array_merge( $values, array( $topic_id ), $topic_statuses, array( $topic_type ) );
+        }
+
+        // Add reply authors for countable reply statuses
+        if ( ! empty( $reply_statuses ) ) {
+                $placeholders = implode( ', ', array_fill( 0, count( $reply_statuses ), '%s' ) );
+                $sql[]        = "SELECT post_author FROM {$bbp_db->posts} WHERE post_parent = %d AND post_status IN ( {$placeholders} ) AND post_type = %s";
+                $values       = array_merge( $values, array( $topic_id ), $reply_statuses, array( $reply_type ) );
+        }
+
+        // Query unique topic and reply authors
+        $results = ! empty( $sql )
+                ? $bbp_db->get_col( $bbp_db->prepare( implode( ' UNION ', $sql ), $values ) )
+                : array();
 
         // Parse results into voices
-        $engagements = ! is_wp_error( $results )
-                ? wp_parse_id_list( array_filter( $results ) )
-                : array();
+        $engagements = wp_parse_id_list( array_filter( $results ) );
 
         // Filter & return

trunk/src/includes/users/functions.php

@@ -720 +720 @@
                 : bbp_get_user_topic_count( $user_id, true );
 
-        $user_topic_count = bbp_number_not_negative( $count + $difference );
+        $user_topic_count = (int) bbp_number_not_negative( $count + $difference );
 
         // Add them up and filter them
         $new_count = (int) apply_filters( 'bbp_bump_user_topic_count', $user_topic_count, $user_id, $difference, $count );
 
-        return bbp_update_user_topic_count( $user_id, $new_count );
+        // Preserve absolute count filters before using the atomic difference
+        $difference = ( $new_count === $user_topic_count )
+                ? $new_count - $count
+                : false;
+
+        return bbp_update_user_topic_count( $user_id, $new_count, $difference );
 }
 
@@ -756 +761 @@
                 : bbp_get_user_reply_count( $user_id, true );
 
-        $user_reply_count = bbp_number_not_negative( $count + $difference );
+        $user_reply_count = (int) bbp_number_not_negative( $count + $difference );
 
         // Add them up and filter them
         $new_count = (int) apply_filters( 'bbp_bump_user_reply_count', $user_reply_count, $user_id, $difference, $count );
 
-        return bbp_update_user_reply_count( $user_id, $new_count );
+        // Preserve absolute count filters before using the atomic difference
+        $difference = ( $new_count === $user_reply_count )
+                ? $new_count - $count
+                : false;
+
+        return bbp_update_user_reply_count( $user_id, $new_count, $difference );
+}
+
+/**
+ * Update user counts when a topic or reply changes authors.
+ *
+ * @since 2.6.16
+ *
+ * @param int     $post_id     Post ID.
+ * @param WP_Post $post_after  Post object following the update.
+ * @param WP_Post $post_before Post object before the update.
+ */
+function bbp_update_counts_on_post_author_change( $post_id = 0, $post_after = false, $post_before = false ) {
+
+        // Bail if the author or post type did not change as expected
+        if ( ( $post_after->post_author === $post_before->post_author ) || ( $post_after->post_type !== $post_before->post_type ) ) {
+                return;
+        }
+
+        // Set topic public membership
+        if ( bbp_get_topic_post_type() === $post_after->post_type ) {
+                $public_statuses = bbp_get_public_topic_statuses();
+                $was_public      = in_array( $post_before->post_status, $public_statuses, true );
+                $is_public       = in_array( $post_after->post_status,  $public_statuses, true );
+                $is_topic        = true;
+
+        // Set reply public membership
+        } elseif ( bbp_get_reply_post_type() === $post_after->post_type ) {
+                $public_statuses = bbp_get_public_reply_statuses();
+                $was_public      = in_array( $post_before->post_status, $public_statuses, true );
+                $is_public       = in_array( $post_after->post_status,  $public_statuses, true );
+                $is_topic        = false;
+
+        // Bail if this is not a topic or reply
+        } else {
+                return;
+        }
+
+        // The transition callback already handles posts that were not public
+        if ( ! $was_public ) {
+                return;
+        }
+
+        // Transfer a public contribution between authors
+        if ( $is_public ) {
+                if ( $is_topic ) {
+                        bbp_bump_user_topic_count( $post_before->post_author, -1 );
+                        bbp_bump_user_topic_count( $post_after->post_author,   1 );
+                } else {
+                        bbp_bump_user_reply_count( $post_before->post_author, -1 );
+                        bbp_bump_user_reply_count( $post_after->post_author,   1 );
+                }
+
+        // Repair both authors after the transition callback targeted the new author
+        } else {
+                foreach ( bbp_get_unique_array_values( array( $post_before->post_author, $post_after->post_author ) ) as $user_id ) {
+                        if ( $is_topic ) {
+                                bbp_update_user_topic_count( $user_id, bbp_get_user_topic_count_raw( $user_id ) );
+                        } else {
+                                bbp_update_user_reply_count( $user_id, bbp_get_user_reply_count_raw( $user_id ) );
+                        }
+                }
+        }
+}
+
+/**
+ * Update topic engagements when a topic or reply changes authors.
+ *
+ * @since 2.6.16
+ *
+ * @param int     $post_id     Post ID.
+ * @param WP_Post $post_after  Post object following the update.
+ * @param WP_Post $post_before Post object before the update.
+ */
+function bbp_recalculate_engagements_on_post_author_change( $post_id = 0, $post_after = false, $post_before = false ) {
+
+        // Bail if the author did not change
+        if ( $post_after->post_author === $post_before->post_author ) {
+                return;
+        }
+
+        // Get the topic ID from a topic or reply
+        if ( bbp_get_topic_post_type() === $post_after->post_type ) {
+                $topic_id = $post_id;
+        } elseif ( bbp_get_reply_post_type() === $post_after->post_type ) {
+                $topic_id = bbp_get_reply_topic_id( $post_id );
+        } else {
+                return;
+        }
+
+        // Recalculate engagements and their count
+        bbp_recalculate_topic_engagements( $topic_id );
+        bbp_update_topic_voice_count( $topic_id );
+}
+
+/**
+ * Update counts and engagements when a deleted user's posts are reassigned.
+ *
+ * WordPress reassigns post authors directly in the database, bypassing the
+ * normal post update actions. Record affected topics before that write, then
+ * repair the replacement user's counts and those topics after it completes.
+ *
+ * @since 2.6.16
+ *
+ * @param int      $user_id  ID of the user being deleted.
+ * @param int|null $reassign ID of the user receiving the posts.
+ */
+function bbp_update_counts_on_user_reassignment( $user_id = 0, $reassign = null ) {
+        static $topic_ids = array();
+
+        $user_id = (int) $user_id;
+        $reassign = (int) $reassign;
+
+        // Bail if posts are not being reassigned to another user
+        if ( empty( $user_id ) || empty( $reassign ) || ( $user_id === $reassign ) ) {
+                return;
+        }
+
+        $key = get_current_blog_id() . ':' . $user_id . ':' . $reassign;
+
+        // Record affected topics before WordPress changes their authors directly
+        if ( 'delete_user' === current_filter() ) {
+                $bbp_db     = bbp_db();
+                $topic_type = bbp_get_topic_post_type();
+                $reply_type = bbp_get_reply_post_type();
+                $query      = $bbp_db->prepare(
+                        "SELECT DISTINCT CASE WHEN post_type = %s THEN ID ELSE post_parent END FROM {$bbp_db->posts} WHERE post_author = %d AND post_type IN ( %s, %s )",
+                        $topic_type,
+                        $user_id,
+                        $topic_type,
+                        $reply_type
+                );
+
+                $topic_ids[ $key ] = wp_parse_id_list( array_filter( $bbp_db->get_col( $query ) ) );
+                return;
+        }
+
+        // Bail unless WordPress completed the reassignment recorded above
+        if ( ( 'deleted_user' !== current_filter() ) || ! isset( $topic_ids[ $key ] ) ) {
+                return;
+        }
+
+        $affected_topic_ids = $topic_ids[ $key ];
+        unset( $topic_ids[ $key ] );
+
+        // Bail if the deleted user did not author any topics or replies
+        if ( empty( $affected_topic_ids ) ) {
+                return;
+        }
+
+        // Recount contributions for the replacement user
+        bbp_update_user_topic_count( $reassign, bbp_get_user_topic_count_raw( $reassign ) );
+        bbp_update_user_reply_count( $reassign, bbp_get_user_reply_count_raw( $reassign ) );
+
+        // Rebuild engagements and voices for each affected topic
+        foreach ( $affected_topic_ids as $topic_id ) {
+                bbp_recalculate_topic_engagements( $topic_id, true );
+                bbp_update_topic_voice_count( $topic_id );
+        }
 }
 

trunk/src/includes/users/options.php

@@ -124 +124 @@
  *
  * @since 2.6.0 bbPress (r5309)
- *
- * @param int $user_id
- * @param mixed $count
+ * @since 2.6.16 Support atomic count differences.
+ *
+ * @param int       $user_id    User ID.
+ * @param mixed     $count      New topic count.
+ * @param int|false $difference Optional. Difference from the previous count.
  * @return boolean
  */
-function bbp_update_user_topic_count( $user_id = 0, $count = false ) {
+function bbp_update_user_topic_count( $user_id = 0, $count = false, $difference = false ) {
 
         // Validate user id
@@ -138 +140 @@
 
         // Just in time filtering of the user's topic count
+        $unfiltered_count = $count;
         $count = apply_filters( 'bbp_update_user_topic_count', $count, $user_id );
 
@@ -145 +148 @@
         }
 
+        // Atomically bump an unfiltered user option
+        if ( ( false !== $difference ) && ( $count === $unfiltered_count ) ) {
+                $default  = (int) $unfiltered_count - (int) $difference;
+                $meta_key = bbp_db()->get_blog_prefix() . '_bbp_topic_count';
+                $result   = bbp_bump_count_meta( 'user', $user_id, $meta_key, $difference, $default );
+
+                return $result;
+        }
+
         // Return the updated user option
         return update_user_option( $user_id, '_bbp_topic_count', $count );
@@ -153 +165 @@
  *
  * @since 2.6.0 bbPress (r5309)
- *
- * @param int $user_id User id.
- * @param mixed $count
+ * @since 2.6.16 Support atomic count differences.
+ *
+ * @param int       $user_id    User ID.
+ * @param mixed     $count      New reply count.
+ * @param int|false $difference Optional. Difference from the previous count.
  * @return boolean
  */
-function bbp_update_user_reply_count( $user_id = 0, $count = false ) {
+function bbp_update_user_reply_count( $user_id = 0, $count = false, $difference = false ) {
 
         // Validate user id
@@ -167 +181 @@
 
         // Just in time filtering of the user's reply count
+        $unfiltered_count = $count;
         $count = apply_filters( 'bbp_update_user_reply_count', $count, $user_id );
 
@@ -172 +187 @@
         if ( false === $count ) {
                 return false;
+        }
+
+        // Atomically bump an unfiltered user option
+        if ( ( false !== $difference ) && ( $count === $unfiltered_count ) ) {
+                $default  = (int) $unfiltered_count - (int) $difference;
+                $meta_key = bbp_db()->get_blog_prefix() . '_bbp_reply_count';
+                $result   = bbp_bump_count_meta( 'user', $user_id, $meta_key, $difference, $default );
+
+                return $result;
         }
 

trunk/src/readme.txt

@@ -56 +56 @@
 Permanent deletion does not produce a post-status transition. Its count maintenance continues through the existing `bbp_deleted_topic` and `bbp_deleted_reply` actions.
 
+Count bump functions now use conditional metadata writes and bounded retries so simultaneous requests do not overwrite each other's existing count changes. Existing bbPress count filters and the standard WordPress metadata filters and actions continue to run. WordPress metadata tables do not enforce unique object-and-key pairs, so simultaneous first-time inserts retain the same limitation as the core metadata API. The `bbp_pre_bump_count_meta` filter can short-circuit an update, the `bbp_bump_count_meta_max_attempts` filter controls the default limit of five write attempts, and the `bbp_bump_count_meta_types` filter controls the post, user, term, and comment metadata types supported by default. `bbp_update_user_topic_count()` and `bbp_update_user_reply_count()` accept an optional third `$difference` argument for this internal bump lifecycle; existing calls remain compatible.
+
+Post-author changes and user deletion with post reassignment now reconcile affected user contribution, topic engagement, and voice counts. Moderator move, merge, and split operations also reconcile source, destination, and ancestor forum counts. Forum count updater functions accept an optional final argument for propagating a recount's difference through ancestor totals; existing calls remain compatible. Forum reply recounts include public replies only when their parent topics are also public. A public reply beneath a non-public topic is excluded from the public forum total without being included in the pending, spammed, and trashed reply count. Topic engagement recounts honor filtered public topic and reply statuses, and preserve other term-backed relationships.
+
 = Subforum counts in 2.6.16 =
 
-bbPress now maintains subforum counts when forums are trashed, restored, permanently deleted, or moved between parents. The new `bbp_post_updated` action receives the post ID, the updated `WP_Post` object, and the previous `WP_Post` object after any bbPress post type is updated.
+bbPress now maintains subforum counts when forums are trashed, restored, permanently deleted, or moved between parents. Recursive forum counts include public, private, and hidden subforums while excluding subforums with uncountable statuses. The new `bbp_post_updated` action receives the post ID, the updated `WP_Post` object, and the previous `WP_Post` object after any bbPress post type is updated.
 
 == Screenshots ==

trunk/tests/phpunit/testcases/admin/tools.php

@@ -371 +371 @@
                 $this->assertSame( 0, $count );
 
+                // Category total topic count hidden.
+                $count = bbp_get_forum_topic_count_hidden( $c, true, true );
+                $this->assertSame( 2, $count );
+
                 // Forum topic count.
                 $count = bbp_get_forum_topic_count( $f, false, true );
@@ -383 +387 @@
                 $this->assertSame( 2, $count );
 
-                // Delete the _bbp_total_topic_count meta key.
+                // Delete the _bbp_topic_count_hidden meta key.
                 $this->assertTrue( delete_post_meta_by_key( '_bbp_topic_count_hidden' ) );
+
+                // Delete the _bbp_total_topic_count_hidden meta key.
+                $this->assertTrue( delete_post_meta_by_key( '_bbp_total_topic_count_hidden' ) );
 
                 // Delete the _bbp_total_topic_count meta key.
@@ -404 +411 @@
                 $this->assertSame( 0, $count );
 
+                // Category total topic count hidden.
+                $count = bbp_get_forum_topic_count_hidden( $c, true, true );
+                $this->assertSame( 0, $count );
+
                 // Forum topic count.
                 $count = bbp_get_forum_topic_count( $f, false, true );
@@ -431 +442 @@
                 $this->assertSame( 0, $count );
 
+                // Category total topic count hidden.
+                $count = bbp_get_forum_topic_count_hidden( $c, true, true );
+                $this->assertSame( 2, $count );
+
                 // Forum topic count.
                 $count = bbp_get_forum_topic_count( $f, false, true );
@@ -442 +457 @@
                 $count = bbp_get_forum_topic_count_hidden( $f, true, true );
                 $this->assertSame( 2, $count );
+        }
+
+        /**
+         * @covers ::bbp_admin_repair_forum_hidden_reply_count
+         */
+        public function test_bbp_admin_repair_forum_hidden_reply_count() {
+                $c = $this->factory->forum->create( array(
+                        'forum_meta' => array( 'forum_type' => 'category' ),
+                ) );
+                $f = $this->factory->forum->create( array(
+                        'post_parent' => $c,
+                        'forum_meta'  => array( 'forum_id' => $c ),
+                ) );
+                $t = $this->factory->topic->create( array(
+                        'post_parent' => $f,
+                        'topic_meta'  => array( 'forum_id' => $f ),
+                ) );
+
+                $this->factory->reply->create( array(
+                        'post_parent' => $t,
+                        'post_status' => bbp_get_pending_status_id(),
+                        'reply_meta'  => array(
+                                'forum_id' => $f,
+                                'topic_id' => $t,
+                        ),
+                ) );
+
+                $this->assertSame( 0, bbp_get_forum_reply_count_hidden( $c, false, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count_hidden( $c, true, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count_hidden( $f, false, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count_hidden( $f, true, true ) );
+
+                $this->assertTrue( delete_post_meta_by_key( '_bbp_reply_count_hidden' ) );
+                $this->assertTrue( delete_post_meta_by_key( '_bbp_total_reply_count_hidden' ) );
+
+                bbp_admin_repair_forum_hidden_reply_count();
+
+                $this->assertSame( 0, bbp_get_forum_reply_count_hidden( $c, false, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count_hidden( $c, true, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count_hidden( $f, false, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count_hidden( $f, true, true ) );
         }
 

trunk/tests/phpunit/testcases/core/abstraction.php

@@ -32 +32 @@
 
         /**
+         * @covers ::bbp_bump_count_meta
+         */
+        public function test_bbp_bump_count_meta_handles_missing_and_non_negative_values() {
+                $post_id = self::factory()->post->create();
+
+                $this->assertTrue( bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count', 2, 3 ) );
+                $this->assertSame( 5, (int) get_post_meta( $post_id, '_bbp_test_count', true ) );
+                $this->assertTrue( bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count', -10 ) );
+                $this->assertSame( 0, (int) get_post_meta( $post_id, '_bbp_test_count', true ) );
+                $this->assertFalse( bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count', -1 ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         */
+        public function test_bbp_bump_count_meta_validates_required_values_before_filters() {
+                $filtered = 0;
+                $callback = function( $check ) use ( &$filtered ) {
+                        $filtered++;
+                        return $check;
+                };
+
+                add_filter( 'bbp_pre_bump_count_meta', $callback );
+                $this->assertFalse( bbp_bump_count_meta( 'post', 0, '_bbp_test_count' ) );
+                $this->assertFalse( bbp_bump_count_meta( 'post', 1, '' ) );
+                $this->assertFalse( bbp_bump_count_meta( 'post', 1, '_bbp_test_count', 0 ) );
+                remove_filter( 'bbp_pre_bump_count_meta', $callback, 10 );
+
+                $this->assertSame( 0, $filtered );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         */
+        public function test_bbp_bump_count_meta_can_be_short_circuited_before_type_validation() {
+                $meta_types_filtered = 0;
+                $received            = array();
+                $pre_callback        = function( $check, $meta_type, $object_id, $meta_key, $difference, $default ) use ( &$received ) {
+                        $received = func_get_args();
+                        return false;
+                };
+                $types_callback = function( $meta_types ) use ( &$meta_types_filtered ) {
+                        $meta_types_filtered++;
+                        return $meta_types;
+                };
+
+                add_filter( 'bbp_pre_bump_count_meta', $pre_callback, 10, 6 );
+                add_filter( 'bbp_bump_count_meta_types', $types_callback );
+                $result = bbp_bump_count_meta( 'invalid', 1, '_bbp_test_count' );
+                remove_filter( 'bbp_bump_count_meta_types', $types_callback, 10 );
+                remove_filter( 'bbp_pre_bump_count_meta', $pre_callback, 10 );
+
+                $this->assertFalse( $result );
+                $this->assertSame( array( null, 'invalid', 1, '_bbp_test_count', 1, 0 ), $received );
+                $this->assertSame( 0, $meta_types_filtered );
+
+                $pre_callback = function() {
+                        return true;
+                };
+
+                add_filter( 'bbp_pre_bump_count_meta', $pre_callback );
+                $result = bbp_bump_count_meta( 'invalid', 1, '_bbp_test_count' );
+                remove_filter( 'bbp_pre_bump_count_meta', $pre_callback, 10 );
+
+                $this->assertTrue( $result );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         */
+        public function test_bbp_bump_count_meta_supports_user_term_and_comment_metadata() {
+                $post_id    = self::factory()->post->create();
+                $user_id    = self::factory()->user->create();
+                $term_id    = self::factory()->term->create();
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $post_id ) );
+
+                $this->assertTrue( bbp_bump_count_meta( 'user', $user_id, '_bbp_test_count', 1 ) );
+                $this->assertSame( 1, (int) get_user_meta( $user_id, '_bbp_test_count', true ) );
+                $this->assertTrue( bbp_bump_count_meta( 'term', $term_id, '_bbp_test_count', 2 ) );
+                $this->assertSame( 2, (int) get_term_meta( $term_id, '_bbp_test_count', true ) );
+                $this->assertTrue( bbp_bump_count_meta( 'comment', $comment_id, '_bbp_test_count', 3 ) );
+                $this->assertSame( 3, (int) get_comment_meta( $comment_id, '_bbp_test_count', true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         */
+        public function test_bbp_bump_count_meta_types_are_filterable() {
+                $term_id  = self::factory()->term->create();
+                $callback = function() {
+                        return array( 'post' );
+                };
+
+                add_filter( 'bbp_bump_count_meta_types', $callback );
+                $result = bbp_bump_count_meta( 'term', $term_id, '_bbp_test_count' );
+                remove_filter( 'bbp_bump_count_meta_types', $callback, 10 );
+
+                $this->assertFalse( $result );
+                $this->assertSame( '', get_term_meta( $term_id, '_bbp_test_count', true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         */
+        public function test_bbp_bump_count_meta_does_not_retry_a_filtered_update() {
+                $post_id = self::factory()->post->create();
+                $updates = 0;
+                $callback = function() use ( &$updates ) {
+                        $updates++;
+                        return false;
+                };
+
+                update_post_meta( $post_id, '_bbp_test_count', 5 );
+                add_filter( 'update_post_metadata', $callback );
+                $result = bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count' );
+                remove_filter( 'update_post_metadata', $callback, 10 );
+
+                $this->assertFalse( $result );
+                $this->assertSame( 1, $updates );
+                $this->assertSame( 5, (int) get_post_meta( $post_id, '_bbp_test_count', true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         */
+        public function test_bbp_bump_count_meta_filters_an_update_before_adding_metadata() {
+                $post_id  = self::factory()->post->create();
+                $previous = null;
+                $callback = function( $check, $filtered_post_id, $meta_key, $meta_value, $prev_value ) use ( &$previous ) {
+                        $previous = $prev_value;
+                        return false;
+                };
+
+                add_filter( 'update_post_metadata', $callback, 10, 5 );
+                $result = bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count' );
+                remove_filter( 'update_post_metadata', $callback, 10 );
+
+                $this->assertFalse( $result );
+                $this->assertSame( '', $previous );
+                $this->assertSame( '', get_post_meta( $post_id, '_bbp_test_count', true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_count_meta_uses_the_database_after_a_filtered_read() {
+                $post_id = self::factory()->post->create();
+                $callback = function( $value, $filtered_post_id, $meta_key ) use ( $post_id ) {
+                        return ( ( $post_id === $filtered_post_id ) && ( '_bbp_test_count' === $meta_key ) )
+                                ? 100
+                                : $value;
+                };
+
+                update_post_meta( $post_id, '_bbp_test_count', 5 );
+                add_filter( 'get_post_metadata', $callback, 10, 3 );
+                $result = bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count' );
+                remove_filter( 'get_post_metadata', $callback, 10 );
+
+                $this->assertTrue( $result );
+                $this->assertSame( 6, (int) get_post_meta( $post_id, '_bbp_test_count', true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         */
+        public function test_bbp_bump_count_meta_returns_false_when_adding_metadata_fails() {
+                $post_id = self::factory()->post->create();
+                $callback = function() {
+                        return false;
+                };
+
+                add_filter( 'add_post_metadata', $callback );
+                $result = bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count' );
+                remove_filter( 'add_post_metadata', $callback, 10 );
+
+                $this->assertFalse( $result );
+                $this->assertSame( '', get_post_meta( $post_id, '_bbp_test_count', true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_count_meta_preserves_an_interleaved_update_from_zero() {
+                $post_id     = self::factory()->post->create();
+                $interleaved = false;
+                $callback    = function( $check, $filtered_post_id, $meta_key ) use ( $post_id, &$interleaved ) {
+                        if ( ( $post_id === $filtered_post_id ) && ( '_bbp_test_count' === $meta_key ) && ! $interleaved ) {
+                                $interleaved = true;
+                                bbp_bump_count_meta( 'post', $post_id, $meta_key );
+                        }
+
+                        return $check;
+                };
+
+                update_post_meta( $post_id, '_bbp_test_count', 0 );
+                add_filter( 'update_post_metadata', $callback, 10, 3 );
+                bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count' );
+                remove_filter( 'update_post_metadata', $callback, 10 );
+
+                $this->assertSame( 2, (int) get_post_meta( $post_id, '_bbp_test_count', true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_count_meta_preserves_interleaved_decrements() {
+                $post_id      = self::factory()->post->create();
+                $interleaved  = false;
+                $filter_calls = 0;
+                $callback     = function( $check, $filtered_post_id, $meta_key ) use ( $post_id, &$interleaved, &$filter_calls ) {
+                        $filter_calls++;
+
+                        if ( ( $post_id === $filtered_post_id ) && ( '_bbp_test_count' === $meta_key ) && ! $interleaved ) {
+                                $interleaved = true;
+                                bbp_bump_count_meta( 'post', $post_id, $meta_key, -1 );
+                        }
+
+                        return $check;
+                };
+
+                update_post_meta( $post_id, '_bbp_test_count', 3 );
+                add_filter( 'update_post_metadata', $callback, 10, 3 );
+                bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count', -1 );
+                remove_filter( 'update_post_metadata', $callback, 10 );
+
+                $this->assertSame( 1, (int) get_post_meta( $post_id, '_bbp_test_count', true ) );
+                $this->assertSame( 2, $filter_calls );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_count_meta_refreshes_a_stale_zero_before_decrementing() {
+                global $wpdb;
+
+                $post_id = self::factory()->post->create();
+
+                update_post_meta( $post_id, '_bbp_test_count', 0 );
+                get_post_meta( $post_id, '_bbp_test_count', true );
+
+                $wpdb->update(
+                        $wpdb->postmeta,
+                        array( 'meta_value' => 1 ),
+                        array(
+                                'post_id'  => $post_id,
+                                'meta_key' => '_bbp_test_count'
+                        ),
+                        array( '%d' ),
+                        array( '%d', '%s' )
+                );
+
+                $this->assertTrue( bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count', -1 ) );
+                $this->assertSame( 0, (int) get_post_meta( $post_id, '_bbp_test_count', true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_count_meta_max_attempts_is_filterable() {
+                $post_id     = self::factory()->post->create();
+                $interleaved = false;
+                $callback    = function( $check, $filtered_post_id, $meta_key ) use ( $post_id, &$interleaved ) {
+                        if ( ( $post_id === $filtered_post_id ) && ( '_bbp_test_count' === $meta_key ) && ! $interleaved ) {
+                                $interleaved = true;
+                                bbp_bump_count_meta( 'post', $post_id, $meta_key, -1 );
+                        }
+
+                        return $check;
+                };
+                $max_attempts = function() {
+                        return 1;
+                };
+
+                update_post_meta( $post_id, '_bbp_test_count', 3 );
+                add_filter( 'update_post_metadata', $callback, 10, 3 );
+                add_filter( 'bbp_bump_count_meta_max_attempts', $max_attempts );
+                $result = bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count', -1 );
+                remove_filter( 'bbp_bump_count_meta_max_attempts', $max_attempts, 10 );
+                remove_filter( 'update_post_metadata', $callback, 10 );
+
+                $this->assertFalse( $result );
+                $this->assertSame( 2, (int) get_post_meta( $post_id, '_bbp_test_count', true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_count_meta_preserves_an_interleaved_add() {
+                $post_id     = self::factory()->post->create();
+                $interleaved = false;
+                $callback    = function( $check, $filtered_post_id, $meta_key ) use ( $post_id, &$interleaved ) {
+                        if ( ( $post_id === $filtered_post_id ) && ( '_bbp_test_count' === $meta_key ) && ! $interleaved ) {
+                                $interleaved = true;
+                                bbp_bump_count_meta( 'post', $post_id, $meta_key );
+                        }
+
+                        return $check;
+                };
+
+                add_filter( 'add_post_metadata', $callback, 10, 3 );
+                bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count' );
+                remove_filter( 'add_post_metadata', $callback, 10 );
+
+                $this->assertSame( 2, (int) get_post_meta( $post_id, '_bbp_test_count', true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_count_meta
+         */
+        public function test_bbp_bump_count_meta_runs_standard_metadata_actions() {
+                $post_id        = self::factory()->post->create();
+                $updated        = 0;
+                $legacy_updated = 0;
+                $callback = function( $meta_id, $updated_post_id, $meta_key, $meta_value ) use ( $post_id, &$updated ) {
+                        if ( ( $post_id === $updated_post_id ) && ( '_bbp_test_count' === $meta_key ) && ( 2 === $meta_value ) ) {
+                                $updated++;
+                        }
+                };
+                $legacy_callback = function( $meta_id, $updated_post_id, $meta_key, $meta_value ) use ( $post_id, &$legacy_updated ) {
+                        if ( ( $post_id === $updated_post_id ) && ( '_bbp_test_count' === $meta_key ) && ( 2 === $meta_value ) ) {
+                                $legacy_updated++;
+                        }
+                };
+
+                update_post_meta( $post_id, '_bbp_test_count', 1 );
+                add_action( 'updated_post_meta', $callback, 10, 4 );
+                add_action( 'updated_postmeta', $legacy_callback, 10, 4 );
+                bbp_bump_count_meta( 'post', $post_id, '_bbp_test_count' );
+                remove_action( 'updated_post_meta', $callback, 10 );
+                remove_action( 'updated_postmeta', $legacy_callback, 10 );
+
+                $this->assertSame( 1, $updated );
+                $this->assertSame( 1, $legacy_updated );
+        }
+
+        /**
          * @covers ::bbp_rewrite
          * @todo   Implement test_bbp_rewrite().

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

@@ -11 +11 @@
 
         /**
+         * @covers BBPress::register_meta
+         */
+        public function test_hidden_total_count_meta_is_registered() {
+                bbpress()->register_meta();
+
+                $registered = get_registered_meta_keys( 'post', bbp_get_forum_post_type() );
+
+                $this->assertArrayHasKey( '_bbp_total_topic_count_hidden', $registered );
+                $this->assertArrayHasKey( '_bbp_total_reply_count_hidden', $registered );
+        }
+
+        /**
          * @covers ::bbp_get_countable_forum_statuses
          */
@@ -34 +46 @@
 
         /**
+         * @covers ::bbp_update_forum_topic_count_hidden
+         * @covers ::bbp_forum_query_subforum_ids
+         * @ticket BBP3678
+         */
+        public function test_hidden_topic_counts_exclude_trashed_subforums() {
+                $parent_id = $this->factory->forum->create( array(
+                        'forum_meta' => array( 'forum_type' => 'category' ),
+                ) );
+                $forum_id = $this->factory->forum->create( array(
+                        'post_parent' => $parent_id,
+                        'forum_meta'  => array( 'forum_id' => $parent_id ),
+                ) );
+                $this->factory->topic->create( array(
+                        'post_parent' => $forum_id,
+                        'post_status' => bbp_get_spam_status_id(),
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+
+                $this->assertSame( 0, bbp_update_forum_topic_count_hidden( $parent_id ) );
+                $this->assertSame( 1, bbp_get_forum_topic_count_hidden( $parent_id, true, true ) );
+
+                wp_trash_post( $forum_id );
+
+                $this->assertSame( 0, bbp_update_forum_topic_count_hidden( $parent_id ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_forum_ancestor_count
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_forum_ancestor_count_stops_outside_forum_hierarchy() {
+                $forum_id = $this->factory->forum->create();
+                $topic_id = $this->factory->topic->create( array(
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $subforum_id = $this->factory->forum->create( array(
+                        'post_parent' => $topic_id,
+                        'forum_meta'  => array( 'forum_id' => $topic_id ),
+                ) );
+
+                update_post_meta( $forum_id, '_bbp_total_topic_count', 2 );
+                update_post_meta( $topic_id, '_bbp_total_topic_count', 3 );
+
+                bbp_bump_forum_ancestor_count( $subforum_id, '_bbp_total_topic_count', 1 );
+
+                $this->assertSame( 2, (int) get_post_meta( $forum_id, '_bbp_total_topic_count', true ) );
+                $this->assertSame( 3, (int) get_post_meta( $topic_id, '_bbp_total_topic_count', true ) );
+        }
+
+        /**
          * Generic function to test the forum counts with a new topic
          *
@@ -90 +153 @@
 
         /**
+         * @covers ::bbp_update_counts_on_transition_post_status
+         */
+        public function test_bbp_forum_draft_topic_is_not_counted_as_hidden() {
+                $user_id  = $this->factory->user->create();
+                $forum_id = $this->factory->forum->create();
+                $topic_id = $this->factory->topic->create( array(
+                        'post_author' => $user_id,
+                        'post_parent' => $forum_id,
+                        'post_status' => 'draft',
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+
+                $this->assertSame( 0, bbp_get_forum_topic_count( $forum_id, false, true ) );
+                $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $forum_id, false, true ) );
+
+                wp_update_post( array(
+                        'ID'          => $topic_id,
+                        'post_status' => bbp_get_pending_status_id(),
+                ) );
+                $this->assertSame( 1, bbp_get_forum_topic_count_hidden( $forum_id, false, true ) );
+
+                wp_update_post( array(
+                        'ID'          => $topic_id,
+                        'post_status' => 'draft',
+                ) );
+                $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $forum_id, false, true ) );
+        }
+
+        /**
          * Generic function to test the forum counts on a trashed/untrashed topic
          */
@@ -266 +358 @@
 
         /**
+         * @covers ::bbp_update_counts_on_transition_post_status
+         */
+        public function test_bbp_forum_reply_count_stays_excluded_when_pending_topic_is_trashed_and_restored() {
+                $forum_id = $this->factory->forum->create();
+                $topic_id = $this->factory->topic->create( array(
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+
+                $this->factory->reply->create( array(
+                        'post_parent' => $topic_id,
+                        'post_status' => bbp_get_public_status_id(),
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $topic_id,
+                        ),
+                ) );
+
+                bbp_unapprove_topic( $topic_id );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $forum_id, true, true ) );
+
+                wp_trash_post( $topic_id );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $forum_id, true, true ) );
+
+                wp_untrash_post( $topic_id );
+                $this->assertSame( bbp_get_pending_status_id(), bbp_get_topic_status( $topic_id ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $forum_id, true, true ) );
+        }
+
+        /**
+         * @covers ::bbp_update_counts_on_transition_post_status
+         * @ticket BBP3678
+         */
+        public function test_topic_status_transition_updates_ancestor_forum_reply_counts() {
+                $parent_id = $this->factory->forum->create( array(
+                        'forum_meta' => array( 'forum_type' => 'category' ),
+                ) );
+                $forum_id = $this->factory->forum->create( array(
+                        'post_parent' => $parent_id,
+                        'forum_meta'  => array( 'forum_id' => $parent_id ),
+                ) );
+                $topic_id = $this->factory->topic->create( array(
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $this->factory->reply->create( array(
+                        'post_parent' => $topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $topic_id,
+                        ),
+                ) );
+
+                $this->assertSame( 1, bbp_get_forum_reply_count( $parent_id, true, true ) );
+
+                bbp_unapprove_topic( $topic_id );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $forum_id, true, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $parent_id, true, true ) );
+
+                bbp_approve_topic( $topic_id );
+                $this->assertSame( 1, bbp_get_forum_reply_count( $forum_id, true, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count( $parent_id, true, true ) );
+        }
+
+        /**
+         * @covers ::bbp_update_counts_on_transition_post_status
+         */
+        public function test_bbp_forum_reply_count_excludes_new_public_reply_in_pending_topic() {
+                $forum_id = $this->factory->forum->create();
+                $topic_id = $this->factory->topic->create( array(
+                        'post_parent' => $forum_id,
+                        'post_status' => bbp_get_pending_status_id(),
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+
+                $this->factory->reply->create( array(
+                        'post_parent' => $topic_id,
+                        'post_status' => bbp_get_public_status_id(),
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $topic_id,
+                        ),
+                ) );
+
+                $this->assertSame( 0, bbp_get_forum_reply_count( $forum_id, true, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count_hidden( $forum_id, true, true ) );
+                $this->assertSame( 1, bbp_get_topic_reply_count( $topic_id, true ) );
+                $this->assertSame( 0, bbp_update_forum_reply_count( $forum_id ) );
+        }
+
+        /**
          * @covers ::bbp_bump_forum_topic_count
          */
@@ -278 +461 @@
                 $count = bbp_get_forum_topic_count( $f );
                 $this->assertSame( '1', $count );
+        }
+
+        /**
+         * @covers ::bbp_bump_forum_topic_count
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_forum_topic_count_preserves_an_interleaved_update() {
+                $forum_id   = $this->factory->forum->create();
+                $interleaved = false;
+                $callback    = function( $count, $filtered_forum_id ) use ( &$interleaved ) {
+                        if ( ! $interleaved ) {
+                                $interleaved = true;
+                                bbp_bump_forum_topic_count( $filtered_forum_id );
+                        }
+
+                        return $count;
+                };
+
+                add_filter( 'bbp_get_forum_topic_count_int', $callback, 10, 2 );
+                bbp_bump_forum_topic_count( $forum_id );
+                remove_filter( 'bbp_get_forum_topic_count_int', $callback, 10 );
+
+                $this->assertSame( 2, bbp_get_forum_topic_count( $forum_id, false, true ) );
+                $this->assertSame( 2, bbp_get_forum_topic_count( $forum_id, true, true ) );
         }
 
@@ -702 +909 @@
 
         /**
+         * @covers ::bbp_update_forum_topic_count_hidden
+         */
+        public function test_bbp_update_forum_topic_count_hidden_rebuilds_total_counts() {
+                $parent_id = $this->factory->forum->create();
+                $child_id  = $this->factory->forum->create( array( 'post_parent' => $parent_id ) );
+
+                $this->factory->topic->create( array(
+                        'post_parent' => $child_id,
+                        'post_status' => bbp_get_pending_status_id(),
+                        'topic_meta'  => array( 'forum_id' => $child_id ),
+                ) );
+
+                update_post_meta( $parent_id, '_bbp_total_topic_count_hidden', 99 );
+                update_post_meta( $child_id, '_bbp_total_topic_count_hidden', 99 );
+
+                $this->assertSame( 0, bbp_update_forum_topic_count_hidden( $parent_id ) );
+                $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $parent_id, false, true ) );
+                $this->assertSame( 1, bbp_get_forum_topic_count_hidden( $parent_id, true, true ) );
+                $this->assertSame( 1, bbp_get_forum_topic_count_hidden( $child_id, true, true ) );
+        }
+
+        /**
          * @covers ::bbp_update_forum_reply_count
          */

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

@@ -69 +69 @@
 
         /**
+         * @covers ::bbp_forum_query_subforum_ids
+         * @ticket BBP3678
+         */
+        public function test_bbp_forum_query_subforum_ids_excludes_uncountable_statuses() {
+                $this->assertSame( array(), bbp_forum_query_subforum_ids( 0 ) );
+
+                $parent_id = $this->factory->forum->create();
+                $public_id = $this->factory->forum->create( array(
+                        'post_parent' => $parent_id,
+                ) );
+                $hidden_id = $this->factory->forum->create( array(
+                        'post_parent' => $parent_id,
+                        'post_status' => bbp_get_hidden_status_id(),
+                ) );
+                $private_id = $this->factory->forum->create( array(
+                        'post_parent' => $parent_id,
+                        'post_status' => bbp_get_private_status_id(),
+                ) );
+                $trash_id = $this->factory->forum->create( array(
+                        'post_parent' => $parent_id,
+                ) );
+                wp_update_post( array(
+                        'ID'          => $trash_id,
+                        'post_status' => bbp_get_trash_status_id(),
+                ) );
+
+                $this->assertEqualSets( array( $public_id, $private_id, $hidden_id ), bbp_forum_query_subforum_ids( $parent_id ) );
+        }
+
+        /**
          * @covers ::bbp_forum_query_last_reply_id
          */

trunk/tests/phpunit/testcases/replies/functions/reply.php

@@ -250 +250 @@
         /**
          * @covers ::bbp_move_reply_count
-         * @todo   Implement test_bbp_move_reply_count().
          */
         public function test_bbp_move_reply_count() {
-                // Remove the following lines when you implement this test.
-                $this->markTestIncomplete(
-                        'This test has not been implemented yet.'
-                );
+                $topic_author_id       = $this->factory->user->create();
+                $reply_author_id       = $this->factory->user->create();
+                $destination_author_id = $this->factory->user->create();
+                $source_parent_id      = $this->factory->forum->create( array( 'forum_meta' => array( 'forum_type' => 'category' ) ) );
+                $destination_parent_id = $this->factory->forum->create( array( 'forum_meta' => array( 'forum_type' => 'category' ) ) );
+                $source_forum_id       = $this->factory->forum->create( array( 'post_parent' => $source_parent_id ) );
+                $destination_forum_id  = $this->factory->forum->create( array( 'post_parent' => $destination_parent_id ) );
+                $source_topic_id      = $this->factory->topic->create( array(
+                        'post_author' => $topic_author_id,
+                        'post_parent' => $source_forum_id,
+                        'topic_meta'  => array( 'forum_id' => $source_forum_id ),
+                ) );
+                $destination_topic_id = $this->factory->topic->create( array(
+                        'post_author' => $destination_author_id,
+                        'post_parent' => $destination_forum_id,
+                        'topic_meta'  => array( 'forum_id' => $destination_forum_id ),
+                ) );
+                $reply_id = $this->factory->reply->create( array(
+                        'post_author' => $reply_author_id,
+                        'post_parent' => $source_topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $source_forum_id,
+                                'topic_id' => $source_topic_id,
+                        ),
+                ) );
+
+                wp_update_post( array(
+                        'ID'          => $reply_id,
+                        'post_parent' => $destination_topic_id,
+                ) );
+                bbp_update_reply_topic_id( $reply_id, $destination_topic_id );
+                bbp_update_reply_forum_id( $reply_id, $destination_forum_id );
+                bbp_move_reply_count( $reply_id, $source_topic_id, $destination_topic_id );
+
+                $this->assertSame( 0, bbp_get_forum_reply_count( $source_forum_id, true, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count( $destination_forum_id, true, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $source_parent_id, true, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count( $destination_parent_id, true, true ) );
+                $this->assertSame( 0, bbp_get_topic_reply_count( $source_topic_id, true ) );
+                $this->assertSame( 1, bbp_get_topic_reply_count( $destination_topic_id, true ) );
+                $this->assertEqualSets( array( $topic_author_id ), bbp_get_topic_engagements( $source_topic_id ) );
+                $this->assertEqualSets( array( $reply_author_id, $destination_author_id ), bbp_get_topic_engagements( $destination_topic_id ) );
+                $this->assertSame( 1, bbp_get_topic_voice_count( $source_topic_id, true ) );
+                $this->assertSame( 2, bbp_get_topic_voice_count( $destination_topic_id, true ) );
+        }
+
+        /**
+         * @covers ::bbp_move_reply_count
+         */
+        public function test_bbp_move_reply_count_updates_hidden_counts() {
+                $source_parent_id      = $this->factory->forum->create( array( 'forum_meta' => array( 'forum_type' => 'category' ) ) );
+                $destination_parent_id = $this->factory->forum->create( array( 'forum_meta' => array( 'forum_type' => 'category' ) ) );
+                $source_forum_id       = $this->factory->forum->create( array( 'post_parent' => $source_parent_id ) );
+                $destination_forum_id  = $this->factory->forum->create( array( 'post_parent' => $destination_parent_id ) );
+                $source_topic_id      = $this->factory->topic->create( array(
+                        'post_parent' => $source_forum_id,
+                        'topic_meta'  => array( 'forum_id' => $source_forum_id ),
+                ) );
+                $destination_topic_id = $this->factory->topic->create( array(
+                        'post_parent' => $destination_forum_id,
+                        'topic_meta'  => array( 'forum_id' => $destination_forum_id ),
+                ) );
+                $reply_id = $this->factory->reply->create( array(
+                        'post_parent' => $source_topic_id,
+                        'post_status' => bbp_get_pending_status_id(),
+                        'reply_meta'  => array(
+                                'forum_id' => $source_forum_id,
+                                'topic_id' => $source_topic_id,
+                        ),
+                ) );
+
+                wp_update_post( array(
+                        'ID'          => $reply_id,
+                        'post_parent' => $destination_topic_id,
+                ) );
+                bbp_update_reply_topic_id( $reply_id, $destination_topic_id );
+                bbp_update_reply_forum_id( $reply_id, $destination_forum_id );
+                bbp_move_reply_count( $reply_id, $source_topic_id, $destination_topic_id );
+
+                $this->assertSame( 0, bbp_get_forum_reply_count_hidden( $source_forum_id, true, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count_hidden( $destination_forum_id, true, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count_hidden( $source_parent_id, true, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count_hidden( $destination_parent_id, true, true ) );
+                $this->assertSame( 0, bbp_get_topic_reply_count_hidden( $source_topic_id, true ) );
+                $this->assertSame( 1, bbp_get_topic_reply_count_hidden( $destination_topic_id, true ) );
+        }
+
+        /**
+         * @covers ::bbp_move_reply_count
+         */
+        public function test_bbp_move_reply_count_transfers_contribution_when_converted_to_topic() {
+                $user_id  = $this->factory->user->create();
+                $forum_id = $this->factory->forum->create();
+                $topic_id = $this->factory->topic->create( array(
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $reply_id = $this->factory->reply->create( array(
+                        'post_author' => $user_id,
+                        'post_parent' => $topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $topic_id,
+                        ),
+                ) );
+
+                wp_update_post( array(
+                        'ID'          => $reply_id,
+                        'post_parent' => $forum_id,
+                        'post_type'   => bbp_get_topic_post_type(),
+                ) );
+                bbp_update_topic_forum_id( $reply_id, $forum_id );
+                bbp_update_topic_topic_id( $reply_id );
+                bbp_move_reply_count( $reply_id, $topic_id, $reply_id );
+
+                $this->assertSame( 0, bbp_get_user_reply_count( $user_id, true ) );
+                $this->assertSame( 1, bbp_get_user_topic_count( $user_id, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $forum_id, true, true ) );
+                $this->assertSame( 2, bbp_get_forum_topic_count( $forum_id, true, true ) );
         }
 

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

@@ -92 +92 @@
 
         /**
+         * @covers ::bbp_update_counts_on_transition_post_status
+         */
+        public function test_bbp_topic_draft_reply_is_not_counted_as_hidden() {
+                $forum_id = $this->factory->forum->create();
+                $topic_id = $this->factory->topic->create( array(
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $reply_id = $this->factory->reply->create( array(
+                        'post_parent' => $topic_id,
+                        'post_status' => 'draft',
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $topic_id,
+                        ),
+                ) );
+
+                $this->assertSame( 0, bbp_get_topic_reply_count_hidden( $topic_id, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count_hidden( $forum_id, false, true ) );
+
+                wp_update_post( array(
+                        'ID'          => $reply_id,
+                        'post_status' => bbp_get_pending_status_id(),
+                ) );
+                $this->assertSame( 1, bbp_get_topic_reply_count_hidden( $topic_id, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count_hidden( $forum_id, false, true ) );
+
+                wp_update_post( array(
+                        'ID'          => $reply_id,
+                        'post_status' => 'draft',
+                ) );
+                $this->assertSame( 0, bbp_get_topic_reply_count_hidden( $topic_id, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count_hidden( $forum_id, false, true ) );
+        }
+
+        /**
          * Generic function to test the topic counts on a deleted reply
          */
@@ -380 +416 @@
 
         /**
+         * @covers ::bbp_bump_topic_reply_count
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_topic_reply_count_preserves_an_interleaved_update() {
+                $topic_id   = $this->factory->topic->create();
+                $interleaved = false;
+                $callback    = function( $count, $filtered_topic_id ) use ( &$interleaved ) {
+                        if ( ! $interleaved ) {
+                                $interleaved = true;
+                                bbp_bump_topic_reply_count( $filtered_topic_id );
+                        }
+
+                        return $count;
+                };
+
+                add_filter( 'bbp_get_topic_reply_count_int', $callback, 10, 2 );
+                bbp_bump_topic_reply_count( $topic_id );
+                remove_filter( 'bbp_get_topic_reply_count_int', $callback, 10 );
+
+                $this->assertSame( 2, bbp_get_topic_reply_count( $topic_id, true ) );
+        }
+
+        /**
          * @covers ::bbp_decrease_topic_reply_count
          */
@@ -589 +648 @@
                 $count = bbp_get_topic_voice_count( $t );
                 $this->assertSame( '2', $count );
+        }
+
+        /**
+         * @covers ::bbp_get_topic_engagements_raw
+         * @covers ::bbp_recalculate_topic_engagements
+         * @covers ::bbp_update_topic_voice_count
+         * @ticket BBP3678
+         */
+        public function test_topic_voice_count_honors_filtered_public_reply_statuses() {
+                $topic_author_id = $this->factory->user->create();
+                $reply_author_id = $this->factory->user->create();
+                $forum_id        = $this->factory->forum->create();
+                $topic_id        = $this->factory->topic->create( array(
+                        'post_author' => $topic_author_id,
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $public_statuses = function( $statuses ) {
+                        $statuses[] = 'private';
+                        return $statuses;
+                };
+
+                add_filter( 'bbp_get_public_reply_statuses', $public_statuses );
+
+                try {
+                        $this->factory->reply->create( array(
+                                'post_author' => $reply_author_id,
+                                'post_parent' => $topic_id,
+                                'post_status' => 'private',
+                                'reply_meta'  => array(
+                                        'forum_id' => $forum_id,
+                                        'topic_id' => $topic_id,
+                                ),
+                        ) );
+
+                        bbp_recalculate_topic_engagements( $topic_id, true );
+                        bbp_update_topic_voice_count( $topic_id );
+                } finally {
+                        remove_filter( 'bbp_get_public_reply_statuses', $public_statuses, 10 );
+                }
+
+                $this->assertSame( array( $topic_author_id, $reply_author_id ), bbp_get_topic_engagements( $topic_id ) );
+                $this->assertSame( 2, bbp_get_topic_voice_count( $topic_id, true ) );
         }
 

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

@@ -274 +274 @@
         /**
          * @covers ::bbp_merge_topic_count
-         * @todo   Implement test_bbp_merge_topic_count().
          */
         public function test_bbp_merge_topic_count() {
-                // Remove the following lines when you implement this test.
-                $this->markTestIncomplete(
-                        'This test has not been implemented yet.'
-                );
+                $source_author_id      = $this->factory->user->create();
+                $reply_author_id       = $this->factory->user->create();
+                $destination_author_id = $this->factory->user->create();
+                $source_parent_id      = $this->factory->forum->create( array( 'forum_meta' => array( 'forum_type' => 'category' ) ) );
+                $destination_parent_id = $this->factory->forum->create( array( 'forum_meta' => array( 'forum_type' => 'category' ) ) );
+                $source_forum_id       = $this->factory->forum->create( array( 'post_parent' => $source_parent_id ) );
+                $destination_forum_id  = $this->factory->forum->create( array( 'post_parent' => $destination_parent_id ) );
+                $source_topic_id      = $this->factory->topic->create( array(
+                        'post_author' => $source_author_id,
+                        'post_parent' => $source_forum_id,
+                        'topic_meta'  => array( 'forum_id' => $source_forum_id ),
+                ) );
+                $destination_topic_id = $this->factory->topic->create( array(
+                        'post_author' => $destination_author_id,
+                        'post_parent' => $destination_forum_id,
+                        'topic_meta'  => array( 'forum_id' => $destination_forum_id ),
+                ) );
+                $reply_id = $this->factory->reply->create( array(
+                        'post_author' => $reply_author_id,
+                        'post_parent' => $source_topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $source_forum_id,
+                                'topic_id' => $source_topic_id,
+                        ),
+                ) );
+
+                wp_update_post( array(
+                        'ID'          => $reply_id,
+                        'post_parent' => $destination_topic_id,
+                ) );
+                bbp_update_reply_topic_id( $reply_id, $destination_topic_id );
+                bbp_update_reply_forum_id( $reply_id, $destination_forum_id );
+                wp_update_post( array(
+                        'ID'          => $source_topic_id,
+                        'post_parent' => $destination_topic_id,
+                        'post_type'   => bbp_get_reply_post_type(),
+                ) );
+                bbp_update_reply_topic_id( $source_topic_id, $destination_topic_id );
+                bbp_update_reply_forum_id( $source_topic_id, $destination_forum_id );
+                bbp_merge_topic_count( $destination_topic_id, $source_topic_id, $source_forum_id );
+
+                $this->assertSame( 0, bbp_get_forum_topic_count( $source_forum_id, true, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $source_forum_id, true, true ) );
+                $this->assertSame( 2, bbp_get_forum_reply_count( $destination_forum_id, true, true ) );
+                $this->assertSame( 0, bbp_get_forum_topic_count( $source_parent_id, true, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $source_parent_id, true, true ) );
+                $this->assertSame( 2, bbp_get_forum_reply_count( $destination_parent_id, true, true ) );
+                $this->assertSame( 2, bbp_get_topic_reply_count( $destination_topic_id, true ) );
+                $this->assertSame( 0, bbp_get_user_topic_count( $source_author_id, true ) );
+                $this->assertSame( 1, bbp_get_user_reply_count( $source_author_id, true ) );
+                $this->assertEqualSets( array( $source_author_id, $reply_author_id, $destination_author_id ), bbp_get_topic_engagements( $destination_topic_id ) );
+                $this->assertSame( 3, bbp_get_topic_voice_count( $destination_topic_id, true ) );
         }
 
@@ -296 +343 @@
         /**
          * @covers ::bbp_split_topic_count
-         * @todo   Implement test_bbp_split_topic_count().
          */
         public function test_bbp_split_topic_count() {
-                // Remove the following lines when you implement this test.
-                $this->markTestIncomplete(
-                        'This test has not been implemented yet.'
-                );
+                $source_parent_id      = $this->factory->forum->create( array( 'forum_meta' => array( 'forum_type' => 'category' ) ) );
+                $destination_parent_id = $this->factory->forum->create( array( 'forum_meta' => array( 'forum_type' => 'category' ) ) );
+                $source_forum_id       = $this->factory->forum->create( array( 'post_parent' => $source_parent_id ) );
+                $destination_forum_id  = $this->factory->forum->create( array( 'post_parent' => $destination_parent_id ) );
+                $source_topic_id      = $this->factory->topic->create( array(
+                        'post_parent' => $source_forum_id,
+                        'topic_meta'  => array( 'forum_id' => $source_forum_id ),
+                ) );
+                $destination_topic_id = $this->factory->topic->create( array(
+                        'post_parent' => $destination_forum_id,
+                        'topic_meta'  => array( 'forum_id' => $destination_forum_id ),
+                ) );
+                $reply_id = $this->factory->reply->create( array(
+                        'post_parent' => $source_topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $source_forum_id,
+                                'topic_id' => $source_topic_id,
+                        ),
+                ) );
+
+                wp_update_post( array(
+                        'ID'          => $reply_id,
+                        'post_parent' => $destination_topic_id,
+                ) );
+                bbp_update_reply_topic_id( $reply_id, $destination_topic_id );
+                bbp_update_reply_forum_id( $reply_id, $destination_forum_id );
+                bbp_split_topic_count( $reply_id, $source_topic_id, $destination_topic_id );
+
+                $this->assertSame( 0, bbp_get_forum_reply_count( $source_forum_id, true, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count( $destination_forum_id, true, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $source_parent_id, true, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count( $destination_parent_id, true, true ) );
+                $this->assertSame( 0, bbp_get_topic_reply_count( $source_topic_id, true ) );
+                $this->assertSame( 1, bbp_get_topic_reply_count( $destination_topic_id, true ) );
+        }
+
+        /**
+         * @covers ::bbp_split_topic_count
+         * @ticket BBP3678
+         */
+        public function test_bbp_split_topic_count_updates_converted_reply_counts_and_engagements() {
+                $source_author_id = $this->factory->user->create();
+                $reply_author_id  = $this->factory->user->create();
+                $forum_id         = $this->factory->forum->create();
+                $source_topic_id  = $this->factory->topic->create( array(
+                        'post_author' => $source_author_id,
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $from_reply_id = $this->factory->reply->create( array(
+                        'post_author' => $reply_author_id,
+                        'post_parent' => $source_topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $source_topic_id,
+                        ),
+                ) );
+
+                wp_update_post( array(
+                        'ID'          => $from_reply_id,
+                        'post_parent' => $forum_id,
+                        'post_type'   => bbp_get_topic_post_type(),
+                ) );
+                bbp_update_topic_topic_id( $from_reply_id );
+                bbp_update_topic_forum_id( $from_reply_id, $forum_id );
+
+                bbp_split_topic_count( $from_reply_id, $source_topic_id, $from_reply_id );
+
+                $this->assertSame( 2, bbp_get_forum_topic_count( $forum_id, true, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $forum_id, true, true ) );
+                $this->assertSame( 1, bbp_get_user_topic_count( $source_author_id, true ) );
+                $this->assertSame( 1, bbp_get_user_topic_count( $reply_author_id, true ) );
+                $this->assertSame( 0, bbp_get_user_reply_count( $reply_author_id, true ) );
+                $this->assertSame( array( $source_author_id ), bbp_get_topic_engagements( $source_topic_id ) );
+                $this->assertSame( array( $reply_author_id ), bbp_get_topic_engagements( $from_reply_id ) );
+                $this->assertSame( 1, bbp_get_topic_voice_count( $source_topic_id, true ) );
+                $this->assertSame( 1, bbp_get_topic_voice_count( $from_reply_id, true ) );
         }
 

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

@@ -247 +247 @@
                 $count = bbp_get_user_topic_count( $u, $integer );
                 $this->assertSame( $int_value + 1, $count );
+        }
+
+        /**
+         * @covers ::bbp_bump_user_topic_count
+         * @covers ::bbp_update_user_topic_count
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_user_topic_count_preserves_an_interleaved_update() {
+                $user_id     = $this->factory->user->create();
+                $interleaved = false;
+                $callback    = function( $count, $filtered_user_id ) use ( &$interleaved ) {
+                        if ( ! $interleaved ) {
+                                $interleaved = true;
+                                bbp_bump_user_topic_count( $filtered_user_id );
+                        }
+
+                        return $count;
+                };
+
+                bbp_update_user_topic_count( $user_id, 0 );
+                add_filter( 'bbp_get_user_topic_count_int', $callback, 10, 2 );
+                bbp_bump_user_topic_count( $user_id );
+                remove_filter( 'bbp_get_user_topic_count_int', $callback, 10 );
+
+                $this->assertSame( 2, bbp_get_user_topic_count( $user_id, true ) );
+        }
+
+        /**
+         * @covers ::bbp_bump_user_topic_count
+         * @covers ::bbp_update_user_topic_count
+         */
+        public function test_bbp_bump_user_topic_count_preserves_count_filters() {
+                $user_id      = $this->factory->user->create();
+                $atomic_calls = 0;
+                $bump         = function( $count ) {
+                        return $count + 4;
+                };
+                $update   = function( $count ) {
+                        return $count + 3;
+                };
+                $atomic = function( $check ) use ( &$atomic_calls ) {
+                        $atomic_calls++;
+                        return $check;
+                };
+
+                bbp_update_user_topic_count( $user_id, 5 );
+                add_filter( 'bbp_bump_user_topic_count', $bump );
+                add_filter( 'bbp_update_user_topic_count', $update );
+                add_filter( 'bbp_pre_bump_count_meta', $atomic );
+                bbp_bump_user_topic_count( $user_id );
+                remove_filter( 'bbp_bump_user_topic_count', $bump, 10 );
+                remove_filter( 'bbp_update_user_topic_count', $update, 10 );
+                remove_filter( 'bbp_pre_bump_count_meta', $atomic, 10 );
+
+                $this->assertSame( 13, bbp_get_user_topic_count( $user_id, true ) );
+                $this->assertSame( 0, $atomic_calls );
+        }
+
+        /**
+         * @covers ::bbp_bump_user_reply_count
+         * @covers ::bbp_update_user_reply_count
+         */
+        public function test_bbp_bump_user_reply_count_preserves_an_absolute_update_filter() {
+                $user_id      = $this->factory->user->create();
+                $atomic_calls = 0;
+                $update       = function() {
+                        return 100;
+                };
+                $atomic = function( $check ) use ( &$atomic_calls ) {
+                        $atomic_calls++;
+                        return $check;
+                };
+
+                bbp_update_user_reply_count( $user_id, 5 );
+                add_filter( 'bbp_update_user_reply_count', $update );
+                add_filter( 'bbp_pre_bump_count_meta', $atomic );
+                bbp_bump_user_reply_count( $user_id );
+                remove_filter( 'bbp_update_user_reply_count', $update, 10 );
+                remove_filter( 'bbp_pre_bump_count_meta', $atomic, 10 );
+
+                $this->assertSame( 100, bbp_get_user_reply_count( $user_id, true ) );
+                $this->assertSame( 0, $atomic_calls );
+        }
+
+        /**
+         * @covers ::bbp_bump_user_topic_count
+         * @covers ::bbp_update_user_topic_count
+         * @ticket BBP3678
+         */
+        public function test_bbp_bump_user_topic_count_uses_the_current_site_option() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( 'Requires multisite.' );
+                }
+
+                $user_id = $this->factory->user->create();
+                $site_id = $this->factory->blog->create();
+
+                bbp_update_user_topic_count( $user_id, 5 );
+                switch_to_blog( $site_id );
+
+                try {
+                        bbp_update_user_topic_count( $user_id, 7 );
+                        bbp_bump_user_topic_count( $user_id );
+                        $this->assertSame( 8, bbp_get_user_topic_count( $user_id, true ) );
+                        $this->assertSame( 8, (int) get_user_meta( $user_id, bbp_db()->get_blog_prefix() . '_bbp_topic_count', true ) );
+                } finally {
+                        restore_current_blog();
+                }
+
+                $this->assertSame( 5, bbp_get_user_topic_count( $user_id, true ) );
         }
 
@@ -402 +512 @@
 
         /**
+         * @covers ::bbp_update_counts_on_user_reassignment
+         * @ticket BBP3678
+         */
+        public function test_deleting_user_with_reassignment_updates_counts_and_engagements() {
+                $deleted_user_id  = $this->factory->user->create();
+                $reassign_user_id = $this->factory->user->create();
+                $forum_id         = $this->factory->forum->create();
+                $topic_id         = $this->factory->topic->create( array(
+                        'post_author' => $deleted_user_id,
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $deleted_user_reply_id = $this->factory->reply->create( array(
+                        'post_author' => $deleted_user_id,
+                        'post_parent' => $topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $topic_id,
+                        ),
+                ) );
+                $this->factory->reply->create( array(
+                        'post_author' => $reassign_user_id,
+                        'post_parent' => $topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $topic_id,
+                        ),
+                ) );
+                $reply_only_topic_id = $this->factory->topic->create( array(
+                        'post_author' => $reassign_user_id,
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $this->factory->reply->create( array(
+                        'post_author' => $deleted_user_id,
+                        'post_parent' => $reply_only_topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $reply_only_topic_id,
+                        ),
+                ) );
+
+                $this->assertSame( 1, bbp_get_user_topic_count( $deleted_user_id, true ) );
+                $this->assertSame( 2, bbp_get_user_reply_count( $deleted_user_id, true ) );
+                $this->assertSame( 1, bbp_get_user_topic_count( $reassign_user_id, true ) );
+                $this->assertSame( 1, bbp_get_user_reply_count( $reassign_user_id, true ) );
+                $this->assertSame( 2, bbp_get_topic_voice_count( $topic_id, true ) );
+                $this->assertSame( 2, bbp_get_topic_voice_count( $reply_only_topic_id, true ) );
+
+                wp_delete_user( $deleted_user_id, $reassign_user_id );
+
+                $this->assertSame( $reassign_user_id, (int) get_post_field( 'post_author', $topic_id ) );
+                $this->assertSame( $reassign_user_id, (int) get_post_field( 'post_author', $deleted_user_reply_id ) );
+                $this->assertSame( 2, bbp_get_user_topic_count( $reassign_user_id, true ) );
+                $this->assertSame( 3, bbp_get_user_reply_count( $reassign_user_id, true ) );
+                $this->assertSame( array( $reassign_user_id ), bbp_get_topic_engagements( $topic_id ) );
+                $this->assertSame( array( $reassign_user_id ), bbp_get_topic_engagements( $reply_only_topic_id ) );
+                $this->assertSame( 1, bbp_get_topic_voice_count( $topic_id, true ) );
+                $this->assertSame( 1, bbp_get_topic_voice_count( $reply_only_topic_id, true ) );
+        }
+
+        /**
+         * @covers ::bbp_update_counts_on_user_reassignment
+         * @ticket BBP3678
+         */
+        public function test_deleting_user_with_reassignment_updates_current_multisite_counts() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( 'Requires multisite.' );
+                }
+
+                $deleted_user_id  = $this->factory->user->create();
+                $reassign_user_id = $this->factory->user->create();
+                $site_id          = $this->factory->blog->create();
+
+                add_user_to_blog( $site_id, $deleted_user_id, 'subscriber' );
+                add_user_to_blog( $site_id, $reassign_user_id, 'subscriber' );
+                switch_to_blog( $site_id );
+
+                try {
+                        $forum_id = $this->factory->forum->create();
+                        $this->factory->topic->create( array(
+                                'post_author' => $deleted_user_id,
+                                'post_parent' => $forum_id,
+                                'topic_meta'  => array( 'forum_id' => $forum_id ),
+                        ) );
+
+                        wp_delete_user( $deleted_user_id, $reassign_user_id );
+
+                        $meta_key = bbp_db()->get_blog_prefix() . '_bbp_topic_count';
+                        $this->assertSame( 1, bbp_get_user_topic_count( $reassign_user_id, true ) );
+                        $this->assertSame( 1, (int) get_user_meta( $reassign_user_id, $meta_key, true ) );
+                } finally {
+                        restore_current_blog();
+                }
+        }
+
+        /**
+         * @covers ::bbp_make_spam_user
+         * @covers ::bbp_make_ham_user
+         * @covers ::bbp_update_counts_on_transition_post_status
+         * @ticket BBP3678
+         */
+        public function test_bbp_make_spam_and_ham_user_updates_counts() {
+                $user_id  = $this->factory->user->create();
+                $forum_id = $this->factory->forum->create();
+                $topic_id = $this->factory->topic->create( array(
+                        'post_author' => $user_id,
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $this->factory->reply->create( array(
+                        'post_author' => $user_id,
+                        'post_parent' => $topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $topic_id,
+                        ),
+                ) );
+
+                $this->assertTrue( bbp_make_spam_user( $user_id ) );
+                $this->assertSame( 0, bbp_get_user_topic_count( $user_id, true ) );
+                $this->assertSame( 0, bbp_get_user_reply_count( $user_id, true ) );
+                $this->assertSame( 0, bbp_get_forum_topic_count( $forum_id, false, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count( $forum_id, false, true ) );
+                $this->assertSame( 1, bbp_get_forum_topic_count_hidden( $forum_id, false, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count_hidden( $forum_id, false, true ) );
+
+                $this->assertTrue( bbp_make_ham_user( $user_id ) );
+                $this->assertSame( 1, bbp_get_user_topic_count( $user_id, true ) );
+                $this->assertSame( 1, bbp_get_user_reply_count( $user_id, true ) );
+                $this->assertSame( 1, bbp_get_forum_topic_count( $forum_id, false, true ) );
+                $this->assertSame( 1, bbp_get_forum_reply_count( $forum_id, false, true ) );
+                $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $forum_id, false, true ) );
+                $this->assertSame( 0, bbp_get_forum_reply_count_hidden( $forum_id, false, true ) );
+        }
+
+        /**
+         * @covers ::bbp_update_counts_on_post_author_change
+         */
+        public function test_changing_post_authors_updates_user_counts() {
+                $old_user_id = $this->factory->user->create();
+                $new_user_id = $this->factory->user->create();
+                $forum_id    = $this->factory->forum->create();
+                $topic_id    = $this->factory->topic->create( array(
+                        'post_author' => $old_user_id,
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $reply_id = $this->factory->reply->create( array(
+                        'post_author' => $old_user_id,
+                        'post_parent' => $topic_id,
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $topic_id,
+                        ),
+                ) );
+
+                wp_update_post( array( 'ID' => $topic_id, 'post_author' => $new_user_id ) );
+                $this->assertSame( 2, bbp_get_topic_voice_count( $topic_id, true ) );
+
+                wp_update_post( array( 'ID' => $reply_id, 'post_author' => $new_user_id ) );
+                $this->assertSame( 1, bbp_get_topic_voice_count( $topic_id, true ) );
+
+                $this->assertSame( 0, bbp_get_user_topic_count( $old_user_id, true ) );
+                $this->assertSame( 0, bbp_get_user_reply_count( $old_user_id, true ) );
+                $this->assertSame( 1, bbp_get_user_topic_count( $new_user_id, true ) );
+                $this->assertSame( 1, bbp_get_user_reply_count( $new_user_id, true ) );
+        }
+
+        /**
+         * @covers ::bbp_update_counts_on_post_author_change
+         */
+        public function test_changing_post_author_and_status_rebuilds_user_counts() {
+                $old_user_id = $this->factory->user->create();
+                $new_user_id = $this->factory->user->create();
+                $forum_id    = $this->factory->forum->create();
+                $topic_id    = $this->factory->topic->create( array(
+                        'post_author' => $old_user_id,
+                        'post_parent' => $forum_id,
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+
+                wp_update_post( array(
+                        'ID'          => $topic_id,
+                        'post_author' => $new_user_id,
+                        'post_status' => bbp_get_pending_status_id(),
+                ) );
+
+                $this->assertSame( 0, bbp_get_user_topic_count( $old_user_id, true ) );
+                $this->assertSame( 0, bbp_get_user_topic_count( $new_user_id, true ) );
+        }
+
+        /**
          * @covers ::bbp_increase_user_topic_count
          */