Changeset 13442 for trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php

Timestamp:

03/27/2023 06:19:06 PM (23 months ago)

Author:

imath

Message:

Improve Components Member's single item navigation generation

• Edit the BP_Component Class so that it globalize navigation items before registering it.
• Introduce bp_get_component_navigations(), a new function that will be used to get Member's single navigation customizable slugs within the BuddyPress settings area.
• Perform all remaining bp_loggedin_user_domain() replacements (55) in favor of the bp_loggedin_user_url() function which uses BP Rewrites to build URLs.
• Improve bp_loggedin_user_link() by adding a new $chunks array of arguments to output escaped URL in templates.
• Adapt some PHPUnit testcases.

Props r-a-y, johnjamesjacoby, boonebgorges

Closes ​https://github.com/buddypress/buddypress/pull/78
See #4954

File:

• trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php (modified) (7 diffs)

trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 8.0.0
+ * @version 12.0.0
  */
 
@@ -88 +88 @@
             'avatar_width'  => $width,
             'avatar_height' => $height,
-            'user_domain'   => bp_loggedin_user_domain(),
+            'user_domain'   => bp_loggedin_user_url(),
             'avatar_alt'    => sprintf(
                 /* translators: %s: member name */
@@ -220 +220 @@
             )
         );
+        $activity_slug = bp_nouveau_get_component_slug( 'activity' );
+        $path_chunks   = array(
+            'single_item_component' => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug, $activity_slug ),
+        );
 
         // If the user has favorite create a nav item
         if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) {
+            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_favorites', 'favorites' );
+
             $nav_items['favorites'] = array(
                 'component' => 'activity',
                 'slug'      => 'favorites', // slug is used because BP_Core_Nav requires it, but it's the scope
                 'li_class'  => array(),
-                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/favorites/',
+                'link'      => bp_loggedin_user_url( $path_chunks ),
                 'text'      => __( 'My Favorites', 'buddypress' ),
                 'count'     => false,
@@ -236 +242 @@
         // The friends component is active and user has friends
         if ( bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) {
+            $friends_slug                      = bp_nouveau_get_component_slug( 'friends' );
+            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_' . $friends_slug, $friends_slug );
+
             $nav_items['friends'] = array(
                 'component' => 'activity',
                 'slug'      => 'friends', // slug is used because BP_Core_Nav requires it, but it's the scope
                 'li_class'  => array( 'dynamic' ),
-                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/' . bp_nouveau_get_component_slug( 'friends' ) . '/',
+                'link'      =>  bp_loggedin_user_url( $path_chunks ),
                 'text'      => __( 'My Friends', 'buddypress' ),
                 'count'     => '',
@@ -249 +258 @@
         // The groups component is active and user has groups
         if ( bp_is_active( 'groups' ) && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) {
+            $groups_slug                       = bp_nouveau_get_component_slug( 'groups' );
+            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_' . $groups_slug, $groups_slug );
+
             $nav_items['groups'] = array(
                 'component' => 'activity',
                 'slug'      => 'groups', // slug is used because BP_Core_Nav requires it, but it's the scope
                 'li_class'  => array( 'dynamic' ),
-                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/' . bp_nouveau_get_component_slug( 'groups' ) . '/',
+                'link'      => bp_loggedin_user_url( $path_chunks ),
                 'text'      => __( 'My Groups', 'buddypress' ),
                 'count'     => '',
@@ -262 +274 @@
         // Mentions are allowed
         if ( bp_activity_do_mentions() ) {
-            $deprecated_hooks[] = array( 'bp_before_activity_type_tab_mentions', 'activity', 36 );
+            $deprecated_hooks[]                = array( 'bp_before_activity_type_tab_mentions', 'activity', 36 );
+            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_mentions', 'mentions' );
 
             $count = '';
@@ -273 +286 @@
                 'slug'      => 'mentions', // slug is used because BP_Core_Nav requires it, but it's the scope
                 'li_class'  => array( 'dynamic' ),
-                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/mentions/',
+                'link'      => bp_loggedin_user_url( $path_chunks ),
                 'text'      => __( 'Mentions', 'buddypress' ),
                 'count'     => $count,