Changeset 11945

Timestamp:

07/07/2022 12:59:26 AM (2 years ago)

Author:

dd32

Message:

Support: Don't show deactivated Slack account details on forum user profiles.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php

@@ -355 +355 @@
 
     $user_id = bbp_get_user_id( $user_id );
-    $slack_username = '';
-
-    $data = $wpdb->get_var( $wpdb->prepare( "SELECT profiledata FROM slack_users WHERE user_id = %d", $user_id ) );
+
+    $data = wp_cache_get( "user_id:$user_id", 'slack_data' );
+    if ( false === $data ) {
+        $data = $wpdb->get_var( $wpdb->prepare( "SELECT profiledata FROM slack_users WHERE user_id = %d", $user_id ) );
+
+        // Cache nonexistence as an empty string.
+        wp_cache_add( "user_id:$user_id", (string) $data, 'slack_data', 1800 );
+    }
+
     if ( $data && ( $data = json_decode( $data, true ) ) ) {
-        if ( isset( $data['profile']['display_name'] ) ) {
-            $slack_username = $data['profile']['display_name'];
+        if ( ! empty( $data['deleted'] ) ) {
+            return false;
         }
-    }
-
-    return $slack_username;
+
+        // Optional Display Name field
+        if ( ! empty( $data['profile']['display_name'] ) ) {
+            return $data['profile']['display_name'];
+        }
+
+        // Fall back to "Full Name" field.
+        if ( ! empty( $data['profile']['real_name'] ) ) {
+            return $data['profile']['real_name'];
+        }
+    }
+
+    return false;
 }