Changeset 6923 for trunk/src/includes/core/actions.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/core/actions.php (modified) (5 diffs)

trunk/src/includes/core/actions.php

@@ -231 +231 @@
 
 // Subscriptions
-add_action( 'bbp_spam_topic',   'bbp_remove_topic_from_all_subscriptions'       );
-add_action( 'bbp_trash_topic',  'bbp_remove_topic_from_all_subscriptions'       );
-add_action( 'bbp_delete_topic', 'bbp_remove_topic_from_all_subscriptions'       );
-add_action( 'bbp_trash_forum',  'bbp_remove_forum_from_all_subscriptions'       );
-add_action( 'bbp_delete_forum', 'bbp_remove_forum_from_all_subscriptions'       );
-add_action( 'bbp_new_reply',    'bbp_notify_topic_subscribers',           11, 5 );
-add_action( 'bbp_new_topic',    'bbp_notify_forum_subscribers',           11, 4 );
+add_action( 'bbp_spam_topic',   'bbp_remove_topic_from_all_subscriptions' );
+add_action( 'bbp_trash_topic',  'bbp_remove_topic_from_all_subscriptions' );
+add_action( 'bbp_delete_topic', 'bbp_remove_topic_from_all_subscriptions' );
+add_action( 'bbp_trash_forum',  'bbp_remove_forum_from_all_subscriptions' );
+add_action( 'bbp_delete_forum', 'bbp_remove_forum_from_all_subscriptions' );
+
+// Subscription notifications
+add_action( 'bbp_new_reply',    'bbp_notify_topic_subscribers', 11, 5 );
+add_action( 'bbp_new_topic',    'bbp_notify_forum_subscribers', 11, 4 );
 
 // Sticky
@@ -264 +266 @@
 add_action( 'bbp_unapproved_reply', 'bbp_update_reply_walker' );
 
-// Update forum topic/reply counts.
-add_action( 'bbp_new_reply',        'bbp_increase_forum_reply_count'        );
-add_action( 'bbp_new_topic',        'bbp_increase_forum_topic_count'        );
-add_action( 'bbp_trashed_reply',    'bbp_decrease_forum_reply_count'        );
-add_action( 'bbp_trashed_topic',    'bbp_decrease_forum_topic_count'        );
-add_action( 'bbp_untrashed_reply',  'bbp_increase_forum_reply_count'        );
-add_action( 'bbp_untrashed_topic',  'bbp_increase_forum_topic_count'        );
-add_action( 'bbp_spammed_reply',    'bbp_decrease_forum_reply_count'        );
-add_action( 'bbp_spammed_topic',    'bbp_decrease_forum_topic_count'        );
-add_action( 'bbp_unspammed_reply',  'bbp_increase_forum_reply_count'        );
-add_action( 'bbp_unspammed_topic',  'bbp_increase_forum_topic_count'        );
-add_action( 'bbp_approved_reply',   'bbp_increase_forum_reply_count'        );
-add_action( 'bbp_approved_topic',   'bbp_increase_forum_topic_count'        );
-add_action( 'bbp_unapproved_reply', 'bbp_decrease_forum_reply_count'        );
-add_action( 'bbp_unapproved_topic', 'bbp_decrease_forum_topic_count'        );
+// Update forum reply counts
+add_action( 'bbp_new_reply',        'bbp_increase_forum_reply_count' );
+add_action( 'bbp_untrashed_reply',  'bbp_increase_forum_reply_count' );
+add_action( 'bbp_unspammed_reply',  'bbp_increase_forum_reply_count' );
+add_action( 'bbp_approved_reply',   'bbp_increase_forum_reply_count' );
+add_action( 'bbp_trash_reply',      'bbp_decrease_forum_reply_count' );
+add_action( 'bbp_spam_reply',       'bbp_decrease_forum_reply_count' );
+add_action( 'bbp_unapprove_reply',  'bbp_decrease_forum_reply_count' );
+
+// Update forum hidden reply counts
+add_action( 'bbp_trashed_reply',    'bbp_increase_forum_reply_count_hidden' );
+add_action( 'bbp_spammed_reply',    'bbp_increase_forum_reply_count_hidden' );
+add_action( 'bbp_unapproved_reply', 'bbp_increase_forum_reply_count_hidden' );
+add_action( 'bbp_untrash_reply',    'bbp_decrease_forum_reply_count_hidden' );
+add_action( 'bbp_unspam_reply',     'bbp_decrease_forum_reply_count_hidden' );
+add_action( 'bbp_approve_reply',    'bbp_decrease_forum_reply_count_hidden' );
+add_action( 'bbp_delete_reply',     'bbp_decrease_forum_reply_count_hidden' );
+
+// Update forum topic counts
+add_action( 'bbp_new_topic',        'bbp_increase_forum_topic_count' );
+add_action( 'bbp_untrashed_topic',  'bbp_increase_forum_topic_count' );
+add_action( 'bbp_unspammed_topic',  'bbp_increase_forum_topic_count' );
+add_action( 'bbp_approved_topic',   'bbp_increase_forum_topic_count' );
+add_action( 'bbp_trash_topic',      'bbp_decrease_forum_topic_count' );
+add_action( 'bbp_spam_topic',       'bbp_decrease_forum_topic_count' );
+add_action( 'bbp_unapprove_topic',  'bbp_decrease_forum_topic_count' );
+
+// Update forum hidden topic counts
 add_action( 'bbp_trashed_topic',    'bbp_increase_forum_topic_count_hidden' );
-add_action( 'bbp_untrashed_topic',  'bbp_decrease_forum_topic_count_hidden' );
 add_action( 'bbp_spammed_topic',    'bbp_increase_forum_topic_count_hidden' );
-add_action( 'bbp_unspammed_topic',  'bbp_decrease_forum_topic_count_hidden' );
-add_action( 'bbp_approved_topic',   'bbp_decrease_forum_topic_count_hidden' );
 add_action( 'bbp_unapproved_topic', 'bbp_increase_forum_topic_count_hidden' );
-
-// Update forum reply counts for approved/unapproved topics.
+add_action( 'bbp_untrash_topic',    'bbp_decrease_forum_topic_count_hidden' );
+add_action( 'bbp_unspam_topic',     'bbp_decrease_forum_topic_count_hidden' );
+add_action( 'bbp_approve_topic',    'bbp_decrease_forum_topic_count_hidden' );
+add_action( 'bbp_delete_topic',     'bbp_decrease_forum_topic_count_hidden' );
+
+// Update topic reply counts
+add_action( 'bbp_new_reply',        'bbp_increase_topic_reply_count' );
+add_action( 'bbp_untrashed_reply',  'bbp_increase_topic_reply_count' );
+add_action( 'bbp_unspammed_reply',  'bbp_increase_topic_reply_count' );
+add_action( 'bbp_approved_reply',   'bbp_increase_topic_reply_count' );
+add_action( 'bbp_trash_reply',      'bbp_decrease_topic_reply_count' );
+add_action( 'bbp_spam_reply',       'bbp_decrease_topic_reply_count' );
+add_action( 'bbp_unapprove_reply',  'bbp_decrease_topic_reply_count' );
+
+// Update topic hidden reply counts
+add_action( 'bbp_trashed_reply',    'bbp_increase_topic_reply_count_hidden' );
+add_action( 'bbp_unapproved_reply', 'bbp_increase_topic_reply_count_hidden' );
+add_action( 'bbp_spammed_reply',    'bbp_increase_topic_reply_count_hidden' );
+add_action( 'bbp_untrash_reply',    'bbp_decrease_topic_reply_count_hidden' );
+add_action( 'bbp_unspam_reply',     'bbp_decrease_topic_reply_count_hidden' );
+add_action( 'bbp_approve_reply',    'bbp_decrease_topic_reply_count_hidden' );
+add_action( 'bbp_delete_reply',     'bbp_decrease_topic_reply_count_hidden' );
+
+// Update forum reply counts for approved/unapproved topics
 add_action( 'bbp_approved_topic',   'bbp_approved_unapproved_topic_update_forum_reply_count' );
 add_action( 'bbp_unapproved_topic', 'bbp_approved_unapproved_topic_update_forum_reply_count' );
 
-// Update topic reply counts.
-add_action( 'bbp_new_reply',        'bbp_increase_topic_reply_count'        );
-add_action( 'bbp_trashed_reply',    'bbp_decrease_topic_reply_count'        );
-add_action( 'bbp_untrashed_reply',  'bbp_increase_topic_reply_count'        );
-add_action( 'bbp_spammed_reply',    'bbp_decrease_topic_reply_count'        );
-add_action( 'bbp_unspammed_reply',  'bbp_increase_topic_reply_count'        );
-add_action( 'bbp_approved_reply',   'bbp_increase_topic_reply_count'        );
-add_action( 'bbp_unapproved_reply', 'bbp_decrease_topic_reply_count'        );
-add_action( 'bbp_trashed_reply',    'bbp_increase_topic_reply_count_hidden' );
-add_action( 'bbp_untrashed_reply',  'bbp_decrease_topic_reply_count_hidden' );
-add_action( 'bbp_spammed_reply',    'bbp_increase_topic_reply_count_hidden' );
-add_action( 'bbp_unspammed_reply',  'bbp_decrease_topic_reply_count_hidden' );
-add_action( 'bbp_approved_reply',   'bbp_decrease_topic_reply_count_hidden' );
-add_action( 'bbp_unapproved_reply', 'bbp_increase_topic_reply_count_hidden' );
-add_action( 'bbp_deleted_reply',    'bbp_decrease_topic_reply_count_hidden' );
-
-// Users topic & reply counts.
+// Users topic & reply counts
 add_action( 'bbp_new_topic',     'bbp_increase_user_topic_count' );
 add_action( 'bbp_new_reply',     'bbp_increase_user_reply_count' );
@@ -325 +343 @@
 add_action( 'bbp_unspam_topic',  'bbp_unspam_topic_replies'  );
 
-// Topic engagements on user creation.
+// Topic engagements on user creation
 add_action( 'bbp_new_topic', 'bbp_update_topic_engagements', 20 );
 add_action( 'bbp_new_reply', 'bbp_update_topic_engagements', 20 );
@@ -344 +362 @@
 add_action( 'bbp_insert_reply', 'bbp_update_topic_voice_count', 30 );
 
-// Recalculate engagements.
+// Recalculate engagements
 add_action( 'bbp_trashed_reply',    'bbp_recalculate_topic_engagements' );
 add_action( 'bbp_untrashed_reply',  'bbp_recalculate_topic_engagements' );
@@ -360 +378 @@
 add_action( 'bbp_deleted_topic',    'bbp_recalculate_topic_engagements' );
 
-// Update engagement counts.
+// Update engagement counts
 add_action( 'bbp_trashed_reply',    'bbp_update_topic_voice_count', 30 );
 add_action( 'bbp_untrashed_reply',  'bbp_update_topic_voice_count', 30 );