Changeset 10595

Timestamp:

01/19/2021 04:40:47 AM (4 years ago)

Author:

dd32

Message:

Support Forums: When automatically adding a "Forum role changed to.." user note, append it to the last note added if it's from the current user in the last 5 minutes.

This allows for a note added while blocking/unblocking a user to contain both the moderator note and the action performed.

See #4192.
Fixes #4691.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php

@@ -1301 +1301 @@
         $blocked_role    = bbp_get_blocked_role();
         $password_broken = ( 0 === strpos( $user->user_pass, $blocked_prefix ) );
+        $note_text       = false;
 
         if ( $blocked_role === $new_role && ! $password_broken ) {
@@ -1322 +1323 @@
 
             // Add a user note about this action.
-            Plugin::get_instance()->user_notes->add_user_note(
-                $user->ID,
-                sprintf(
-                    'Forum role changed to %s.',
-                    get_role( $new_role )->name
-                )
+            $note_text = sprintf(
+                'Forum role changed to %s.',
+                get_role( $new_role )->name
             );
         } else if (
@@ -1348 +1346 @@
 
             // Add a user note about this action.
+            $note_text = sprintf(
+                'Forum role changed to %s.',
+                get_role( $new_role )->name
+            );
+        }
+
+        if ( $note_text ) {
+            // Add a user note about this action.
+            $notes   = Plugin::get_instance()->user_notes->get_user_notes( $user->ID );
+            $note_id = 0;
+
+            // Check to see if the last note added was from the current user in the last few minutes, and if so, append to it.
+            if ( $notes->count ) {
+                $last_note_id = array_key_last( $notes->raw );
+                $last_note    = $notes->raw[ $last_note_id ];
+                if (
+                    // Note from the current user
+                    $last_note->moderator === wp_get_current_user()->user_nicename &&
+                    // ..and created within 5 minutes.
+                    absint( time() - strtotime( $last_note->date ) ) <= 5 * MINUTE_IN_SECONDS
+                ) {
+                    $note_id = $last_note_id;
+
+                    // Prefix the existing message.
+                    $note_text = trim( $last_note->text . "\n\n" . $note_text );
+                }
+            }
+
+            // Add a user note about this action.
             Plugin::get_instance()->user_notes->add_user_note(
                 $user->ID,
-                sprintf(
-                    'Forum role changed to %s.',
-                    get_role( $new_role )->name
-                )
+                $note_text,
+                null,
+                $note_id
             );
         }