Changeset 11761

Timestamp:

04/11/2022 09:01:21 PM (4 years ago)

Author:

iandunn

Message:

Slack: Return results instead of echoing for testability.

Location:

sites/trunk

Files:

• api.wordpress.org/public_html/dotorg/slack/props.php (modified) (2 diffs)
• common/includes/slack/props/lib.php (modified) (4 diffs)
• common/includes/slack/props/test.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/dotorg/slack/props.php

@@ -1 +1 @@
 <?php
+
+/*
+ * This endpoint receives payloads from the `/props` slash command in `#props`.
+ *
+ * To manage, browse to https://wordpress.slack.com/apps/manage/custom-integrations > Slash Commands > `/props`.
+ */
 
 namespace {
@@ -28 +34 @@
 
 if ( constant( __NAMESPACE__ . '\\WEBHOOK_TOKEN' ) === $_POST['token'] ) {
-        run( $_POST );
+        echo run( $_POST );
 }
-
 }

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

@@ -5 +5 @@
 
 function show_error( $user ) {
-        echo "Please use `/props SLACK_USERNAME MESSAGE` to give props.\n";
+        return "Please use `/props SLACK_USERNAME MESSAGE` to give props.\n";
 }
 
+/**
+ * Receive `/props` request and send to `#props`.
+ *
+ * @param array $data
+ * @param bool  $force_test Send to test channel instead of #props
+ *
+ * @return string
+ */
 function run( $data, $force_test = false ) {
         $sender = $data['user_name'];
 
         if ( $data['command'] !== '/props' ) {
-                echo "???\n";
-                return;
+                return "???\n";
         }
 
         if ( empty( $data['text'] ) ) {
-                show_error( $sender );
-                return;
+                return show_error( $sender );
         }
 
@@ -26 +32 @@
 
         if ( ! strlen( $receiver ) || ! strlen( $message ) ) {
-                show_error( $sender );
-                return;
+                return show_error( $sender );
         }
 
@@ -43 +48 @@
                 $send->set_icon( call_user_func( $get_avatar, $sender, $data['user_id'], $data['team_id'] ) );
         }
-        
+
         if ( $force_test ) {
                 $send->testing( true );
@@ -50 +55 @@
         $send->send( '#props' );
 
-        printf( "Your props to @%s have been sent.\n", $receiver );
+        return sprintf( "Your props to @%s have been sent.\n", $receiver );
 }

sites/trunk/common/includes/slack/props/test.php

@@ -23 +23 @@
 );
 
-run( $data, true );
+echo run( $data, true );