<!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>[7188] sites/trunk/api.wordpress.org/public_html/events/1.0: Events: Add WP15 promo when no local WP15 events</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/7188">7188</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/7188","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-05-09 18:06:54 +0000 (Wed, 09 May 2018)</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'>Events: Add WP15 promo when no local WP15 events
* Add function to detect WP15 events in a list
* Add function to check conditions and add promo item if
conditions are met
* Add unit tests</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10indexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10indexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2018-05-09 16:55:21 UTC (rev 7187)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2018-05-09 18:06:54 UTC (rev 7188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,6 +164,7 @@
</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"> $events = get_events( $event_args );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $events = maybe_add_wp15_promo( $events, $_SERVER['HTTP_USER_AGENT'], time() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $events = add_regional_wordcamps( $events, $_SERVER['HTTP_USER_AGENT'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Internal location data cannot be exposed in the response, see get_location().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -981,6 +982,79 @@
</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">+ * Add a special WP15 meetup event to the Events Widget in Core if the user location doesn't already have a
+ * WP15 event in the list.
+ *
+ * @param array $local_events The list of events for a particular location.
+ * @param string $user_agent The User Agent string of the client requesting the events.
+ * @param int $time Unix timestamp.
+ *
+ * @return array
+ */
+function maybe_add_wp15_promo( $local_events, $user_agent, $time ) {
+ if ( ! is_client_core( $user_agent ) ) {
+ return $local_events;
+ }
+
+ if ( $time < strtotime( 'April 27th, 2018' ) || $time > strtotime( 'May 28th, 2018' ) ) {
+ return $local_events;
+ }
+
+ $wp15_events = array_filter( $local_events, function( $event ) {
+ return is_wp15_event( $event['title'] );
+ } );
+
+ if ( empty( $wp15_events ) ) {
+ $promo = array(
+ 'type' => 'meetup',
+ 'title' => 'WP15',
+ 'url' => 'https://wordpress.org/news/2018/04/celebrate-the-wordpress-15th-anniversary-on-may-27/',
+ 'meetup' => null,
+ 'meetup_url' => null,
+ 'date' => '2018-05-27 12:00:00',
+ 'location' => array(
+ 'location' => 'Everywhere',
+ ),
+ );
+
+ array_unshift( $local_events, $promo );
+ }
+
+ return $local_events;
+}
+
+/**
+ * Determine if a meetup event is a WP15 celebration, based on the event title.
+ *
+ * Note that unlike the version of this function in the `wp15-meetup-events` plugin, the event data we're parsing here
+ * doesn't include a meetup event ID or a description, so we must rely on the title. In testing, this resulted in about
+ * 10% fewer events identified.
+ *
+ * @see https://meta.trac.wordpress.org/browser/sites/trunk/wp15.wordpress.net/public_html/content/plugins/wp15-meetup-events/wp15-meetup-events.php#L141
+ *
+ * @param string $title
+ *
+ * @return bool
+ */
+function is_wp15_event( $title ) {
+ $match = false;
+ $keywords = array(
+ 'wp15', '15 year', '15 ano', '15 año', '15 candeline', 'wordt 15',
+ 'anniversary', 'aniversário', 'aniversario', 'birthday', 'cumpleaños',
+ 'Tanti auguri'
+ );
+
+ foreach ( $keywords as $keyword ) {
+ if ( false !== stripos( $title, $keyword ) ) {
+ $match = true;
+ break;
+ }
+ }
+
+ return $match;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Create a bounded latitude/longitude box of x KM around specific coordinates.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param float $lat The latitude of the location.
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2018-05-09 16:55:21 UTC (rev 7187)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2018-05-09 18:06:54 UTC (rev 7188)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,6 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_get_events();
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_get_events_country_restriction();
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_add_regional_wordcamps();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tests_failed += test_maybe_add_wp15_promo();
</ins><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_build_response();
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_is_client_core();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1206,6 +1207,160 @@
</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">+ * Test `maybe_add_wp15_promo()`
+ *
+ * @return int
+ */
+function test_maybe_add_wp15_promo() {
+ $failed = 0;
+
+ $local_events_yes_wp15 = array(
+ array(
+ 'type' => 'meetup',
+ 'title' => 'WordPress 15th Anniversary Celebration',
+ 'url' => 'https://www.meetup.com/pdx-wp/events/250109566/',
+ 'meetup' => 'Portland WordPress Meetup',
+ 'meetup_url' => 'https://www.meetup.com/pdx-wp/',
+ 'date' => '2018-05-27 12:00:00',
+ 'location' => array(
+ 'location' => 'Portland, OR, USA',
+ 'country' => 'us',
+ 'latitude' => 45.540115,
+ 'longitude' => - 122.630699,
+ ),
+ ),
+ array(
+ 'type' => 'wordcamp',
+ 'title' => 'WordCamp Portland, Oregon, USA',
+ 'url' => 'https://2018.portland.wordcamp.org',
+ 'meetup' => null,
+ 'meetup_url' => null,
+ 'date' => '2018-11-03 00:00:00',
+ 'location' => array(
+ 'location' => 'Portland, OR, USA',
+ 'country' => 'us',
+ 'latitude' => 45.540115,
+ 'longitude' => - 122.630699,
+ ),
+ ),
+ );
+
+ $local_events_no_wp15 = array(
+ array(
+ 'type' => 'meetup',
+ 'title' => 'Kickoff: Meet and greet, roundtable discussion',
+ 'url' => 'https://www.meetup.com/Corvallis-WordPress-Meetup/events/250327006/',
+ 'meetup' => 'Corvallis WordPress Meetup',
+ 'meetup_url' => 'https://www.meetup.com/Corvallis-WordPress-Meetup/',
+ 'date' => '2018-05-22 18:30:00',
+ 'location' => array(
+ 'location' => 'Corvallis, OR, USA',
+ 'country' => 'us',
+ 'latitude' => 44.563564,
+ 'longitude' => - 123.26095,
+ ),
+ ),
+ array(
+ 'type' => 'wordcamp',
+ 'title' => 'WordCamp Portland, Oregon, USA',
+ 'url' => 'https://2018.portland.wordcamp.org',
+ 'meetup' => null,
+ 'meetup_url' => null,
+ 'date' => '2018-11-03 00:00:00',
+ 'location' => array(
+ 'location' => 'Portland, OR, USA',
+ 'country' => 'us',
+ 'latitude' => 45.540115,
+ 'longitude' => - 122.630699,
+ ),
+ ),
+ );
+
+ $local_events_added_wp15 = array(
+ array(
+ 'type' => 'meetup',
+ 'title' => 'WP15',
+ 'url' => 'https://wordpress.org/news/2018/04/celebrate-the-wordpress-15th-anniversary-on-may-27/',
+ 'meetup' => null,
+ 'meetup_url' => null,
+ 'date' => '2018-05-27 12:00:00',
+ 'location' => array(
+ 'location' => 'Everywhere',
+ ),
+ ),
+ array(
+ 'type' => 'meetup',
+ 'title' => 'Kickoff: Meet and greet, roundtable discussion',
+ 'url' => 'https://www.meetup.com/Corvallis-WordPress-Meetup/events/250327006/',
+ 'meetup' => 'Corvallis WordPress Meetup',
+ 'meetup_url' => 'https://www.meetup.com/Corvallis-WordPress-Meetup/',
+ 'date' => '2018-05-22 18:30:00',
+ 'location' => array(
+ 'location' => 'Corvallis, OR, USA',
+ 'country' => 'us',
+ 'latitude' => 44.563564,
+ 'longitude' => - 123.26095,
+ ),
+ ),
+ array(
+ 'type' => 'wordcamp',
+ 'title' => 'WordCamp Portland, Oregon, USA',
+ 'url' => 'https://2018.portland.wordcamp.org',
+ 'meetup' => null,
+ 'meetup_url' => null,
+ 'date' => '2018-11-03 00:00:00',
+ 'location' => array(
+ 'location' => 'Portland, OR, USA',
+ 'country' => 'us',
+ 'latitude' => 45.540115,
+ 'longitude' => - 122.630699,
+ ),
+ ),
+ );
+
+ $user_agent = 'WordPress/4.9; https://example.org';
+
+ $time_before_date_range = 1523295832;
+ $time_during_date_range = 1525887832;
+
+ printf( "\n\nRunning %d maybe_add_wp15_promo() tests\n", 4 );
+
+ // Test that the promo is added if there is not already a WP15 event.
+ $events_promo_added = maybe_add_wp15_promo( $local_events_no_wp15, $user_agent, $time_during_date_range );
+
+ if ( $events_promo_added !== $local_events_added_wp15 ) {
+ $failed++;
+ output_results( 'needs-promo', false, $local_events_added_wp15, $events_promo_added );
+ }
+
+ // Test that no promo is added if there is already a WP15 event.
+ $events_already_has_one = maybe_add_wp15_promo( $local_events_yes_wp15, $user_agent, $time_during_date_range );
+
+ if ( $events_already_has_one !== $local_events_yes_wp15 ) {
+ $failed++;
+ output_results( 'already-has-event', false, $local_events_yes_wp15, $events_already_has_one );
+ }
+
+ // Test that no changes are made if the user agent isn't Core.
+ $events_no_user_agent = maybe_add_wp15_promo( $local_events_no_wp15, '', $time_during_date_range );
+
+ if ( $events_no_user_agent !== $local_events_no_wp15 ) {
+ $failed++;
+ output_results( 'no-user-agent', false, $local_events_no_wp15, $events_no_user_agent );
+ }
+
+ // Test that no promo is added if the time is outside the date range.
+ $events_outside_date_range = maybe_add_wp15_promo( $local_events_no_wp15, $user_agent, $time_before_date_range );
+
+ if ( $events_outside_date_range !== $local_events_no_wp15 ) {
+ $failed++;
+ output_results( 'outside-date-range', false, $local_events_no_wp15, $events_outside_date_range );
+ }
+
+ return $failed;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Stub to simulate cache misses, so that the tests always get fresh results
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false
</span></span></pre>
</div>
</div>
</body>
</html>