Changeset 12574

Timestamp:

05/08/2023 02:46:30 AM (3 years ago)

Author:

dd32

Message:

Support Forums: Also Viewing: Change it to be privacy-by-default. This allows for only mods to see other mods, and for plugin support reps to see other support reps for the same plugins/themes.

See #6431.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins

Files:

• support-forums/inc/class-directory-compat.php (modified) (1 diff)
• wporg-bbp-also-viewing/wporg-bbp-also-viewing.js (modified) (1 diff)
• wporg-bbp-also-viewing/wporg-bbp-also-viewing.php (modified) (4 diffs)

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

@@ -1056 +1056 @@
                 return $support_reps;
         }
+
+        /**
+         * Get the plugin or theme object slugs for a given user.
+         *
+         * @param int $user_id The user id.
+         * @return array
+         */
+        public function get_user_object_slugs( $user_id ) {
+                global $wpdb;
+
+                // Check the cache.
+                $cache_key   = $user_id;
+                $cache_group = $this->compat() . '-user-object-slugs';
+                $slugs       = wp_cache_get( $cache_key, $cache_group );
+                if ( $slugs !== false ) {
+                        return $slugs;
+                }
+                $slugs = [];
+
+                // Themes.
+                if ( 'theme' == $this->compat() ) {
+                        $slugs = $wpdb->get_col( $wpdb->prepare(
+                                "SELECT post_name
+                                        FROM %i
+                                        WHERE post_type = 'repopackage' AND post_author = %d",
+                                $wpdb->base_prefix . WPORG_THEME_DIRECTORY_BLOGID . '_posts',
+                                $user_id
+                        ) );
+                }
+
+                // Plugins
+                if ( 'plugin' == $this->compat() ) {
+                        $slugs = $wpdb->get_col( $wpdb->prepare(
+                                "SELECT DISTINCT p.post_name
+                                        FROM %i AS t
+                                                LEFT JOIN %i AS tt ON tt.term_id = t.term_id
+                                                LEFT JOIN %i AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id
+                                                LEFT JOIN %i AS p ON tr.object_id = p.ID
+                                        WHERE tt.taxonomy IN( 'plugin_contributors', 'plugin_support_reps', 'plugin_committers' ) AND t.name = %s",
+                                        $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_terms',
+                                        $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_term_taxonomy',
+                                        $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_term_relationships',
+                                        $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_posts',
+                                        get_user_by( 'id', $user_id )->user_nicename
+                        ) );
+                }
+
+                wp_cache_set( $cache_key, $slugs, $cache_group, HOUR_IN_SECONDS );
+
+                return $slugs;
+        }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.js

@@ -57 +57 @@
                         banner.hide();
                 } else {
-                        userList = currentlyViewing.map( function( item ) {
+                        anonymousUsers      = currentlyViewing.filter( function( item ) { return ! item.user_id; } );
+                        anonymousUserCount  = anonymousUsers.length;
+                        anonymousUserTyping = anonymousUsers.filter( function( item ) { return !! item.isTyping; } ).length;
+                        userList            = currentlyViewing.filter( function( item ) { return !! item.user_id; } );
+
+                        // Markup those who are typing, and flatten it to just the name.
+                        userList = userList.map( function( item ) {
                                 return item.who + ( item.isTyping ? ' ' + __( '(is typing)', 'wporg-forums' ) : '' );
                         } );
 
-                        if ( userCount > 1 ) {
+                        // Add the anonymous users to the list.
+                        if ( anonymousUserCount ) {
+                                var anonymousText = _n( '%s other person', '%s other people', anonymousUserCount, 'wporg-forums' );
+
+                                anonymousText = anonymousText.replace( '%s', anonymousUserCount );
+                                if ( anonymousUserTyping ) {
+                                        anonymousText += ' ' + _n( '(%s is typing)', '(%s are typing)', anonymousUserTyping, 'wporg-forums' );
+                                }
+
+                                userList.push( anonymousText );
+                        }
+
+                        displayCount = userList.length;
+
+                        if ( displayCount > 1 ) {
                                 userlistPretty = __( '%1$s and %2$s', 'wporg-forums' )
-                                .replace( '%1$s', userList.slice( 0, -1 ).join( ', ' ) + ( userCount > 2 ? ',' : '' ) )
-                                .replace( '%2$s', userList.slice( -1 ) );
+                                        .replace( '%1$s', userList.slice( 0, -1 ).join( ', ' ) + ( displayCount > 2 ? ',' : '' ) )
+                                        .replace( '%2$s', userList.slice( -1 ) );
                         } else {
                                 userlistPretty = userList.join( ', ' ); // only one element.

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.php

@@ -2 +2 @@
 namespace WordPressdotorg\BBP_Also_Viewing;
 use function WordPressdotorg\SEO\Canonical\get_canonical_url;
+use const MINUTE_IN_SECONDS;
 
 /**
@@ -28 +29 @@
 
 const USER_OPTION  = 'also-viewing';
-const TIMEOUT      = 5 * \MINUTE_IN_SECONDS;
+const TIMEOUT      = 5 * MINUTE_IN_SECONDS;
 const REFRESH_INT  = 45; // How often the client should check for new viewers in seconds.
 const CACHE_GROUP  = 'also-viewing';
-const CACHE_TIME   = 5 * \MINUTE_IN_SECONDS;
+const CACHE_TIME   = 5 * MINUTE_IN_SECONDS;
 const REPLY_THRESH = 20; // The number of replies a user must have before the feature can be opt'd into.
 
@@ -275 +276 @@
  * Get the list of OTHER users who are currently viewing a page.
  *
+ * This anonymizes users so that only mods can see other mods, and plugin support reps can see other reps and committers.
+ *
  * @param string $page The page to get the userse for.
  *
@@ -287 +290 @@
         }
 
+        // Anonymize the list of users if appropriate.
+        // Mods + Admins can see all.
+        if ( current_user_can( 'moderate' ) || current_user_can( 'list_users' ) ) {
+                return array_values( $users );
+        }
+
+        // Anonymize mods for other users.
+        foreach ( $users as &$u ) {
+                if ( user_can( $u['user_id'], 'moderate' ) ) {
+                        $u['who']     = '';
+                        $u['user_id'] = 0;
+                }
+        }
+
+        // Anonymize users unless they've got similar caps.
+        // Plugin support reps can see other reps and committers -for their own plugins-.
+        $current_user_objects = get_user_object_slugs( get_current_user_id() );
+        foreach ( $users as &$u ) {
+                $user_objects = get_user_object_slugs( $u['user_id'] );
+                if ( ! array_intersect( $user_objects, $current_user_objects ) ) {
+                        $u['who']     = '';
+                        $u['user_id'] = 0;
+                }
+        }
+
         return array_values( $users );
+}
+
+/**
+ * Fetch the list of plugins/themes a user has access to.
+ *
+ * @param int $user_id The user ID to check for.
+ * @return array Array of plugin slugs.
+ */
+function get_user_object_slugs( $user_id ) {
+        if ( ! class_exists( '\WordPressdotorg\Forums\Plugin' ) ) {
+                return [];
+        }
+
+        $plugin_slugs = \WordPressdotorg\Forums\Plugin::get_instance()->plugins->get_user_object_slugs( $user_id );
+        $theme_slugs  = \WordPressdotorg\Forums\Plugin::get_instance()->themes->get_user_object_slugs( $user_id );
+
+        $matrix = [];
+        foreach ( $plugin_slugs as $slug ) {
+                $matrix[] = "plugin:{$slug}";
+        }
+        foreach ( $theme_slugs as $slug ) {
+                $matrix[] = "theme:{$slug}";
+        }
+
+        return $matrix;
 }