<!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>[11787] sites/trunk/common/includes/slack/props: Props: Remove old `/props` handler and tests.</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/11787">11787</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/11787","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-04-25 22:24:42 +0000 (Mon, 25 Apr 2022)</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'>Props: Remove old `/props` handler and tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkcommonincludesslackpropslibphp">sites/trunk/common/includes/slack/props/lib.php</a></li>
<li><a href="#sitestrunkcommonincludesslackpropsteststestlibphp">sites/trunk/common/includes/slack/props/tests/test-lib.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkcommonincludesslackpropstestslivetestphp">sites/trunk/common/includes/slack/props/tests/live-test.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkcommonincludesslackpropslibphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/common/includes/slack/props/lib.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/slack/props/lib.php 2022-04-25 22:24:36 UTC (rev 11786)
+++ sites/trunk/common/includes/slack/props/lib.php 2022-04-25 22:24:42 UTC (rev 11787)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,66 +1,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace Dotorg\Slack\Props;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use Dotorg\Slack\Send;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use Exception;
</ins><span class="cx" style="display: block; padding: 0 10px"> use function Dotorg\Profiles\{ post as profiles_post };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function show_error( $user ) {
- return "Please use `/props SLACK_USERNAME MESSAGE` to give props.\n";
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Receive `/props` request and send to `#props`.
- *
- * This is being deprecated in favor of `handle_props_message()`.
- *
- * @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' ) {
- return "???\n";
- }
-
- if ( empty( $data['text'] ) ) {
- return show_error( $sender );
- }
-
- list( $receiver, $message ) = @preg_split( '/\s+/', trim( $data['text'] ), 2 );
-
- $receiver = ltrim( $receiver, '@' );
-
- if ( ! strlen( $receiver ) || ! strlen( $message ) ) {
- return show_error( $sender );
- }
-
- // TODO: Add WordPress.org username to $text if different than Slack username.
- $text = sprintf( "Props to @%s: %s", $receiver, $message );
-
- $send = new Send( \Dotorg\Slack\Send\WEBHOOK );
- $send->set_username( $sender );
- $send->set_text( $text );
- $send->set_link_names( true ); // We want to the person getting props!
-
- $get_avatar = __NAMESPACE__ . '\\' . 'get_avatar';
-
- if ( function_exists( $get_avatar ) ) {
- $send->set_icon( call_user_func( $get_avatar, $sender, $data['user_id'], $data['team_id'] ) );
- }
-
- if ( $force_test ) {
- $send->testing( true );
- }
-
- $send->send( '#props' );
-
- return sprintf( "Your props to @%s have been sent.\n", $receiver );
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Adds props in Slack to w.org profiles.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Receives webhook notifications for all new messages in `#props`,
</span></span></pre></div>
<a id="sitestrunkcommonincludesslackpropstestslivetestphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/common/includes/slack/props/tests/live-test.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/slack/props/tests/live-test.php 2022-04-25 22:24:36 UTC (rev 11786)
+++ sites/trunk/common/includes/slack/props/tests/live-test.php 2022-04-25 22:24:42 UTC (rev 11787)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,25 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-namespace Dotorg\Slack\Props;
-
-$config = dirname( __DIR__, 4 ) . '/dotorg/slack/props.php';
-
-if ( file_exists( $config ) ) {
- // If the endpoint exists, use it to load everything
- require_once $config;
-} else {
- // Otherwise, load stuff manually
- require_once dirname( __DIR__, 3 ) . '/slack-config.php';
- require_once __DIR__ . '/lib.php';
-}
-
-$data = array(
- 'token' => WEBHOOK_TOKEN,
- 'user_name' => 'nb',
- 'text' => 'mdawaffe very props',
- 'command' => '/props',
- 'user_id' => 'U02S3PS2B',
- 'team_id' => '1',
-);
-
-echo run( $data, true );
</del></span></pre></div>
<a id="sitestrunkcommonincludesslackpropsteststestlibphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/common/includes/slack/props/tests/test-lib.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/slack/props/tests/test-lib.php 2022-04-25 22:24:36 UTC (rev 11786)
+++ sites/trunk/common/includes/slack/props/tests/test-lib.php 2022-04-25 22:24:42 UTC (rev 11787)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace Dotorg\Slack\Props\Tests;
</span><span class="cx" style="display: block; padding: 0 10px"> use wpdbStub;
</span><span class="cx" style="display: block; padding: 0 10px"> use PHPUnit\Framework\TestCase;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use function Dotorg\Slack\Props\{ run, is_valid_props, get_recipient_slack_ids, map_slack_users_to_wporg, prepare_message };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use function Dotorg\Slack\Props\{ is_valid_props, get_recipient_slack_ids, map_slack_users_to_wporg, prepare_message };
</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"> * @group slack
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,83 +21,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @covers ::run
- * @dataProvider data_run
- * @group unit
- */
- public function test_run( array $request, $expected ) : void {
- $actual = run( $request, true );
-
- $this->assertSame( $expected, $actual );
- }
-
- public function data_run() : array {
- $valid_request = array(
- 'user_name' => 'iandunn',
- 'text' => 'kimparsell Thanks for being so welcoming at WordCamp Columbus',
- 'command' => '/props',
- 'user_id' => 'U02QCF502',
- 'team_id' => '1',
- );
-
- // Can't call show_error() here since data providers run before `setUp()`.
- $usage = "Please use `/props SLACK_USERNAME MESSAGE` to give props.\n";
- $success = "Your props to @kimparsell have been sent.\n";
-
- $cases = array(
- 'wrong command' => array(
- 'request' => array_merge(
- $valid_request,
- array(
- 'command' => '/here',
- )
- ),
-
- 'expected' => "???\n",
- ),
-
- 'empty text' => array(
- 'request' => array_merge(
- $valid_request,
- array(
- 'text' => '',
- )
- ),
-
- 'expected' => $usage,
- ),
-
- 'username but no message, or vice versa' => array(
- 'request' => array_merge(
- $valid_request,
- array(
- 'text' => 'kimparsell',
- )
- ),
-
- 'expected' => $usage,
- ),
-
- 'username with @' => array(
- 'request' => array_merge(
- $valid_request,
- array(
- 'text' => '@' . $valid_request['text'],
- )
- ),
- 'expected' => $success,
- ),
-
- 'username without @' => array(
- 'request' => $valid_request,
- 'expected' => $success,
- ),
- );
-
- return $cases;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @covers ::is_valid_props
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_is_valid_props
</span><span class="cx" style="display: block; padding: 0 10px"> * @group unit
</span></span></pre>
</div>
</div>
</body>
</html>