Changeset 7661 for sites/trunk/common/includes/slack/announce/lib.php

Timestamp:

09/12/2018 03:04:38 AM (7 years ago)

Author:

dd32

Message:

Slack: When comparing a slack user to the user whitelist, determine the user by comparing the Slack ID to our slack database prior to using the deprecated user_name slack field.

This should allow users who sign up after a certain date to be whitelisted for /announce and /here commands.

See #3799.

File:

• sites/trunk/common/includes/slack/announce/lib.php (modified) (2 diffs)

sites/trunk/common/includes/slack/announce/lib.php

@@ -59 +59 @@
 
 function run( $data ) {
-    $user = $data['user_name'];
+    global $wpdb;
+
     $channel = $data['channel_name'];
+    $user = false;
+
+    // Find the user_login for the Slack user_id
+    if ( isset( $data['user_id'] ) ) {
+        $wp_user_id = $wpdb->get_var( $wpdb->prepare(
+            "SELECT user_id FROM slack_users WHERE slack_id = %s",
+            $data['user_id']
+        ) );
+        if ( $user = get_user_by( 'id', $wp_user_id ) ) {
+            $user = $user->user_login;
+        }
+    }
+    // Default back to the historical 'user_name' Slack field.
+    if ( ! $user ) {
+        $user = $data['user_name'];
+    }
 
     if ( empty( $data['text'] ) ) {
@@ -114 +131 @@
         $send->set_icon( call_user_func( $get_avatar, $data['user_name'], $data['user_id'], $data['team_id'] ) );
     }
-    
+
     // By sending the channel ID, we can post to private groups.
     $send->send( $data['channel_id'] );