Changeset 13503 for trunk/src/bp-messages/bp-messages-star.php

Timestamp:

06/18/2023 04:11:04 AM (22 months ago)

Author:

imath

Message:

BP Rewrites: optimize the code used to build URLs

The bp_members_get_path_chunks() & bp_groups_get_path_chunks() functions are making sure URL chunks are customized according to the slugs settings. Instead of redoing at many places all or some of the operations performed by these functions, update the code to build URLs so that it uses these functions.

See #4954
Fixes #8923
Closes ​https://github.com/buddypress/buddypress/pull/117

File:

• trunk/src/bp-messages/bp-messages-star.php (modified) (3 diffs)

trunk/src/bp-messages/bp-messages-star.php

@@ -114 +114 @@
         );
 
-        // Check user ID and determine base user slug.
-        $user_slug = bp_members_get_user_slug( $r['user_id'] );
-
-        // Bail if no user domain was calculated.
-        if ( empty( $user_slug ) ) {
+        // Check user ID.
+        $user_id = (int) $r['user_id'];
+        if ( empty( $user_id ) ) {
             return '';
         }
 
-        $message_slug        = bp_get_messages_slug();
-        $custom_message_slug = bp_rewrites_get_slug( 'members', 'member_' . $message_slug, $message_slug );
-        $path_chunks         = array(
-            'component_id'          => 'members',
-            'single_item'           => $user_slug,
-            'single_item_component' => $custom_message_slug,
-        );
+        // Init path chunks.
+        $path_chunks = array( bp_get_messages_slug() );
 
         // Define local variables.
@@ -175 +168 @@
 
             if ( true === $is_starred ) {
-                $action                                      = 'unstar';
-                $bulk_attr                                   = ' data-star-bulk="1"';
-                $path_chunks['single_item_action']           = bp_rewrites_get_slug( 'members', 'member_' . $message_slug . '_unstar', 'unstar' );
-                $path_chunks['single_item_action_variables'] = array( $message_id, $nonce, bp_rewrites_get_slug( 'members', 'member_' . $message_slug . '_all', 'all' ) );
+                $action        = 'unstar';
+                $bulk_attr     = ' data-star-bulk="1"';
+                $path_chunks[] = $action;
+                $path_chunks[] = array( $message_id, $nonce, 'all' );
             } else {
-                $action                                      = 'star';
-                $path_chunks['single_item_action']           = bp_rewrites_get_slug( 'members', 'member_' . $message_slug . '_star', 'star' );
-                $path_chunks['single_item_action_variables'] = array( $message_id, $nonce );
+                $action        = 'star';
+                $path_chunks[] = $action;
+                $path_chunks[] = array( $message_id, $nonce );
             }
 
@@ -194 +187 @@
 
             if ( true === $is_starred ) {
-                $action                                      = 'unstar';
-                $path_chunks['single_item_action']           = bp_rewrites_get_slug( 'members', 'member_' . $message_slug . '_unstar', 'unstar' );
-                $path_chunks['single_item_action_variables'] = array( $message_id, $nonce );
+                $action = 'unstar';
             } else {
-                $action                                      = 'star';
-                $path_chunks['single_item_action']           = bp_rewrites_get_slug( 'members', 'member_' . $message_slug . '_star', 'star' );
-                $path_chunks['single_item_action_variables'] = array( $message_id, $nonce );
-            }
-
-            $title = $r["title_{$action}"];
-        }
-
-        $url = bp_rewrites_get_url( $path_chunks );
+                $action = 'star';
+            }
+
+            $path_chunks[] = $action;
+            $path_chunks[] = array( $message_id, $nonce );
+            $title         = $r["title_{$action}"];
+        }
+
+        $url = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( $path_chunks ) );
 
         /**