<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12574] sites/trunk/wordpress.org/public_html/wp-content/plugins: Support Forums: Also Viewing: Change it to be privacy-by-default.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/12574">12574</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12574","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-05-08 02:46:30 +0000 (Mon, 08 May 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://meta.trac.wordpress.org/ticket/6431">#6431</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassdirectorycompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpalsoviewingwporgbbpalsoviewingjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpalsoviewingwporgbbpalsoviewingphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassdirectorycompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php 2023-05-05 13:35:17 UTC (rev 12573)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php 2023-05-08 02:46:30 UTC (rev 12574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1055,4 +1055,55 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $support_reps;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * 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;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpalsoviewingwporgbbpalsoviewingjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.js 2023-05-05 13:35:17 UTC (rev 12573)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.js 2023-05-08 02:46:30 UTC (rev 12574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,14 +56,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! userCount ) {
</span><span class="cx" style="display: block; padding: 0 10px"> banner.hide();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- userList = currentlyViewing.map( function( item ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return item.who + ( item.isTyping ? ' ' + __( '(is typing)', 'wporg-forums' ) : '' );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( userCount > 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> userlistPretty = __( '%1$s and %2$s', 'wporg-forums' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .replace( '%1$s', userList.slice( 0, -1 ).join( ', ' ) + ( userCount > 2 ? ',' : '' ) )
- .replace( '%2$s', userList.slice( -1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .replace( '%1$s', userList.slice( 0, -1 ).join( ', ' ) + ( displayCount > 2 ? ',' : '' ) )
+ .replace( '%2$s', userList.slice( -1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> userlistPretty = userList.join( ', ' ); // only one element.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpalsoviewingwporgbbpalsoviewingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.php 2023-05-05 13:35:17 UTC (rev 12573)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.php 2023-05-08 02:46:30 UTC (rev 12574)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\BBP_Also_Viewing;
</span><span class="cx" style="display: block; padding: 0 10px"> use function WordPressdotorg\SEO\Canonical\get_canonical_url;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use const MINUTE_IN_SECONDS;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Plugin Name: bbPress: Also Viewing
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,10 +28,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const USER_OPTION = 'also-viewing';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const TIMEOUT = 5 * \MINUTE_IN_SECONDS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const TIMEOUT = 5 * MINUTE_IN_SECONDS;
</ins><span class="cx" style="display: block; padding: 0 10px"> const REFRESH_INT = 45; // How often the client should check for new viewers in seconds.
</span><span class="cx" style="display: block; padding: 0 10px"> const CACHE_GROUP = 'also-viewing';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const CACHE_TIME = 5 * \MINUTE_IN_SECONDS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const CACHE_TIME = 5 * MINUTE_IN_SECONDS;
</ins><span class="cx" style="display: block; padding: 0 10px"> const REPLY_THRESH = 20; // The number of replies a user must have before the feature can be opt'd into.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function init() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,6 +275,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the list of OTHER users who are currently viewing a page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This anonymizes users so that only mods can see other mods, and plugin support reps can see other reps and committers.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $page The page to get the userse for.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Array of user names + if they're typing.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,10 +289,60 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array_values( $users );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Mark a user as currently viewing/typing on the current page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $page The page being viewed. Default current page.
</span></span></pre>
</div>
</div>
</body>
</html>