Changeset 6534 for trunk/src/includes/core/actions.php

Timestamp:

06/12/2017 09:23:32 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Engagements: Revert part of r6525, and adjust some actions.

• Engagements will need to be "public only" for 2.6, and we can reconsider what private/hidden engagements look like later
• Make sure that engagements are saved before voice counts are done
• Use new is_public style wrapper function for topics & replies where appropriate
• Remove a few current_filter() checks that should no longer be necessary with current action hook implementation
• There may be more clean-up necessary here, but this is required to bring all unit-tests back to passing as they've been written, specifically things hooked to the bbp_insert_topic and bbp_insert_reply hooks

See #3068. Hat-tip netweb.

File:

• trunk/src/includes/core/actions.php (modified) (4 diffs)

trunk/src/includes/core/actions.php

@@ -258 +258 @@
 add_action( 'bbp_trashed_reply',    'bbp_decrease_forum_reply_count'        );
 add_action( 'bbp_trashed_topic',    'bbp_decrease_forum_topic_count'        );
-add_action( 'bbp_trashed_topic',    'bbp_increase_forum_topic_count_hidden' );
 add_action( 'bbp_untrashed_reply',  'bbp_increase_forum_reply_count'        );
 add_action( 'bbp_untrashed_topic',  'bbp_increase_forum_topic_count'        );
-add_action( 'bbp_untrashed_topic',  'bbp_decrease_forum_topic_count_hidden' );
 add_action( 'bbp_spammed_reply',    'bbp_decrease_forum_reply_count'        );
 add_action( 'bbp_spammed_topic',    'bbp_decrease_forum_topic_count'        );
-add_action( 'bbp_spammed_topic',    'bbp_increase_forum_topic_count_hidden' );
 add_action( 'bbp_unspammed_reply',  'bbp_increase_forum_reply_count'        );
 add_action( 'bbp_unspammed_topic',  'bbp_increase_forum_topic_count'        );
-add_action( 'bbp_unspammed_topic',  'bbp_decrease_forum_topic_count_hidden' );
 add_action( 'bbp_approved_reply',   'bbp_increase_forum_reply_count'        );
 add_action( 'bbp_approved_topic',   'bbp_increase_forum_topic_count'        );
-add_action( 'bbp_approved_topic',   'bbp_decrease_forum_topic_count_hidden' );
 add_action( 'bbp_unapproved_reply', 'bbp_decrease_forum_reply_count'        );
 add_action( 'bbp_unapproved_topic', 'bbp_decrease_forum_topic_count'        );
+add_action( 'bbp_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' );
 
@@ -282 +282 @@
 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_increase_topic_reply_count'        );
 add_action( 'bbp_untrashed_reply',  'bbp_decrease_topic_reply_count_hidden' );
-add_action( 'bbp_spammed_reply',    'bbp_decrease_topic_reply_count'        );
 add_action( 'bbp_spammed_reply',    'bbp_increase_topic_reply_count_hidden' );
-add_action( 'bbp_unspammed_reply',  'bbp_increase_topic_reply_count'        );
 add_action( 'bbp_unspammed_reply',  'bbp_decrease_topic_reply_count_hidden' );
-add_action( 'bbp_approved_reply',   'bbp_increase_topic_reply_count'        );
 add_action( 'bbp_approved_reply',   'bbp_decrease_topic_reply_count_hidden' );
-add_action( 'bbp_unapproved_reply', 'bbp_decrease_topic_reply_count'        );
 add_action( 'bbp_unapproved_reply', 'bbp_increase_topic_reply_count_hidden' );
 add_action( 'bbp_deleted_reply',    'bbp_decrease_topic_reply_count_hidden' );
@@ -307 +307 @@
 add_action( 'bbp_spam_reply',    'bbp_decrease_user_reply_count' );
 
-// Insert topic/reply engagements.
-add_action( 'bbp_insert_topic', 'bbp_update_topic_engagements' );
-add_action( 'bbp_insert_reply', 'bbp_update_topic_engagements' );
-
-// Insert topic/reply counts.
-add_action( 'bbp_insert_topic', 'bbp_insert_topic_update_counts', 10, 2 );
-add_action( 'bbp_insert_reply', 'bbp_insert_reply_update_counts', 10, 3 );
-
-// Update engagements.
-add_action( 'bbp_new_topic', 'bbp_update_topic_engagements' );
-add_action( 'bbp_new_reply', 'bbp_update_topic_engagements' );
-
-// Recalculate engagements.
-add_action( 'bbp_deleted_topic', 'bbp_recalculate_topic_engagements' );
-add_action( 'bbp_deleted_reply', 'bbp_recalculate_topic_engagements' );
-
-// Update engagement counts.
-add_action( 'bbp_new_reply',        'bbp_update_topic_voice_count' );
-add_action( 'bbp_trashed_reply',    'bbp_update_topic_voice_count' );
-add_action( 'bbp_untrashed_reply',  'bbp_update_topic_voice_count' );
-add_action( 'bbp_spammed_reply',    'bbp_update_topic_voice_count' );
-add_action( 'bbp_unspammed_reply',  'bbp_update_topic_voice_count' );
-add_action( 'bbp_approved_reply',   'bbp_update_topic_voice_count' );
-add_action( 'bbp_unapproved_reply', 'bbp_update_topic_voice_count' );
-add_action( 'bbp_deleted_reply',    'bbp_update_topic_voice_count' );
-
-// Insert reply voice counts.
-add_action( 'bbp_insert_reply', 'bbp_update_topic_voice_count' );
-
 // Topic status transition helpers for replies
 add_action( 'bbp_trash_topic',   'bbp_trash_topic_replies'   );
@@ -342 +313 @@
 add_action( 'bbp_spam_topic',    'bbp_spam_topic_replies'    );
 add_action( 'bbp_unspam_topic',  'bbp_unspam_topic_replies'  );
+
+// 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 );
+
+add_action( 'bbp_new_reply', 'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_new_topic', 'bbp_update_topic_voice_count', 30 );
+
+// Topic/reply counts on code insert (unit tests)
+add_action( 'bbp_insert_topic', 'bbp_insert_topic_update_counts', 10, 2 );
+add_action( 'bbp_insert_reply', 'bbp_insert_reply_update_counts', 10, 3 );
+
+// Topic engagements on code insert (unit tests)
+add_action( 'bbp_insert_topic', 'bbp_update_topic_engagements', 20 );
+add_action( 'bbp_insert_reply', 'bbp_update_topic_engagements', 20 );
+
+// Topic engagement counts on code insert (unit tests)
+add_action( 'bbp_insert_topic', 'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_insert_reply', 'bbp_update_topic_voice_count', 30 );
+
+// Recalculate engagements.
+add_action( 'bbp_trashed_reply',    'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_untrashed_reply',  'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_spammed_reply',    'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_unspammed_reply',  'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_approved_reply',   'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_unapproved_reply', 'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_deleted_reply',    'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_trashed_topic',    'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_untrashed_topic',  'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_spammed_topic',    'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_unspammed_topic',  'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_approved_topic',   'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_unapproved_topic', 'bbp_recalculate_topic_engagements' );
+add_action( 'bbp_deleted_topic',    'bbp_recalculate_topic_engagements' );
+
+// 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 );
+add_action( 'bbp_spammed_reply',    'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_unspammed_reply',  'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_approved_reply',   'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_unapproved_reply', 'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_deleted_reply',    'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_trashed_topic',    'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_untrashed_topic',  'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_spammed_topic',    'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_unspammed_topic',  'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_approved_topic',   'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_unapproved_topic', 'bbp_update_topic_voice_count', 30 );
+add_action( 'bbp_deleted_topic',    'bbp_update_topic_voice_count', 30 );
 
 // User status