Changeset 6923 for trunk/src/includes/topics/template.php

Timestamp:

11/09/2019 05:35:42 AM (5 years ago)

Author:

johnjamesjacoby

Message:

Counts (meta-data): full audit of forum/topic/reply, public/non-public counts.

This commit is the result of a full count audit, exposing multiple inconsistencies and voids in relation to how public and non-public counts are (re)calculated.

For instance, hidden forum replies are not counted at all, until now. By introducing a new Repair tool, hidden forum reply counts are now counted.

In addition, there were multiple bugs with topic & reply moderation, where the act of approving or unapproving topics or replies would cause the numbers to be inaccurate, or where topics & replies being caught in moderation were still increasing public counts.

It was also possible to, as a Key Master, publicly reply to unapproved topics, which was a completely unanticipated side-effect of allowing Key Masters to do pretty much anything. Going forward, the default reply status is the topic status, but is still beholden to all existing moderation settings and user role capabilities. This results in a more sane user experience, and prevents the unusual circumstance of there being "0 topics and 30 replies" in public-facing forums.

Certain count increase/decrease actions have been reprioritized to avoid collisions and race conditions, proving once again that ya gotta get up to get down.

See #2838. Fixes #1799.

File:

• trunk/src/includes/topics/template.php (modified) (10 diffs)

trunk/src/includes/topics/template.php

@@ -805 +805 @@
         ), 'get_topic_pagination' );
 
+        // Slug must be checked for topics that have never been approved/published
+        $has_slug = bbp_get_topic( $r['topic_id'] )->post_name;
+
         // If pretty permalinks are enabled, make our pagination pretty
-        $base = bbp_use_pretty_urls()
+        $base = ! empty( $has_slug ) && bbp_use_pretty_urls() && ! bbp_is_topic_pending( $r['topic_id'] )
             ? trailingslashit( get_permalink( $r['topic_id'] ) ) . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' )
             : add_query_arg( 'paged', '%#%', get_permalink( $r['topic_id'] ) );
@@ -947 +950 @@
 
             $revision_log = get_post_meta( $topic_id, '_bbp_revision_log', true );
-            $revision_log = empty( $revision_log ) ? array() : $revision_log;
+            $revision_log = ! empty( $revision_log )
+                ? $revision_log
+                : array();
 
             // Filter & return
@@ -1658 +1663 @@
     function bbp_get_topic_forum_id( $topic_id = 0 ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $forum_id = get_post_field( 'post_parent', $topic_id );
+        $forum_id = (int) get_post_field( 'post_parent', $topic_id );
 
         // Meta-data fallback
         if ( empty( $forum_id ) ) {
-            $forum_id = get_post_meta( $topic_id, '_bbp_forum_id', true );
+            $forum_id = (int) get_post_meta( $topic_id, '_bbp_forum_id', true );
         }
 
         // Filter
         if ( ! empty( $forum_id ) ) {
-            $forum_id = bbp_get_forum_id( $forum_id );
-        }
-
-        // Filter & return
-        return (int) apply_filters( 'bbp_get_topic_forum_id', (int) $forum_id, $topic_id );
+            $forum_id = (int) bbp_get_forum_id( $forum_id );
+        }
+
+        // Filter & return
+        return (int) apply_filters( 'bbp_get_topic_forum_id', $forum_id, $topic_id );
     }
 
@@ -1694 +1699 @@
     function bbp_get_topic_last_active_id( $topic_id = 0 ) {
         $topic_id  = bbp_get_topic_id( $topic_id );
-        $active_id = get_post_meta( $topic_id, '_bbp_last_active_id', true );
-
-        // Filter & return
-        return (int) apply_filters( 'bbp_get_topic_last_active_id', (int) $active_id, $topic_id );
+        $active_id = (int) get_post_meta( $topic_id, '_bbp_last_active_id', true );
+
+        // Filter & return
+        return (int) apply_filters( 'bbp_get_topic_last_active_id', $active_id, $topic_id );
     }
 
@@ -1856 +1861 @@
     function bbp_get_topic_last_reply_id( $topic_id = 0 ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $reply_id = get_post_meta( $topic_id, '_bbp_last_reply_id', true );
-
-        // Filter & return
-        return (int) apply_filters( 'bbp_get_topic_last_reply_id', (int) $reply_id, $topic_id );
+        $reply_id = (int) get_post_meta( $topic_id, '_bbp_last_reply_id', true );
+
+        // Filter & return
+        return (int) apply_filters( 'bbp_get_topic_last_reply_id', $reply_id, $topic_id );
     }
 
@@ -2058 +2063 @@
     function bbp_get_topic_reply_count( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $replies  = get_post_meta( $topic_id, '_bbp_reply_count', true );
+        $replies  = (int) get_post_meta( $topic_id, '_bbp_reply_count', true );
         $filter   = ( true === $integer )
             ? 'bbp_get_topic_reply_count_int'
@@ -2088 +2093 @@
     function bbp_get_topic_post_count( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $replies  = get_post_meta( $topic_id, '_bbp_reply_count', true ) + 1;
+        $replies  = ( (int) get_post_meta( $topic_id, '_bbp_reply_count', true ) ) + 1;
         $filter   = ( true === $integer )
             ? 'bbp_get_topic_post_count_int'
@@ -2120 +2125 @@
     function bbp_get_topic_reply_count_hidden( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $replies  = get_post_meta( $topic_id, '_bbp_reply_count_hidden', true );
+        $replies  = (int) get_post_meta( $topic_id, '_bbp_reply_count_hidden', true );
         $filter   = ( true === $integer )
             ? 'bbp_get_topic_reply_count_hidden_int'
@@ -2148 +2153 @@
     function bbp_get_topic_voice_count( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $voices   = get_post_meta( $topic_id, '_bbp_voice_count', true );
+        $voices   = (int) get_post_meta( $topic_id, '_bbp_voice_count', true );
         $filter   = ( true === $integer )
             ? 'bbp_get_topic_voice_count_int'
@@ -2343 +2348 @@
         // See if links need to be unset
         $topic_status = bbp_get_topic_status( $r['id'] );
-        if ( in_array( $topic_status, array( bbp_get_spam_status_id(), bbp_get_trash_status_id(), bbp_get_pending_status_id() ) ) ) {
+        if ( in_array( $topic_status, bbp_get_non_public_topic_statuses(), true ) ) {
 
             // Close link shouldn't be visible on trashed/spammed/pending topics