<!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>[5146] sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php: Official WordPress Events: Remove unused WordCamp v1 endpoing handling</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 { 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/5146">5146</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/5146","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>2017-03-10 20:00:51 +0000 (Fri, 10 Mar 2017)</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'>Official WordPress Events: Remove unused WordCamp v1 endpoing handling
Now that the v2 endpoint has been working reliably for awhile, there's no reason to keep this around.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsofficialwordpresseventsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsofficialwordpresseventsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php 2017-03-10 20:00:47 UTC (rev 5145)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php 2017-03-10 20:00:51 UTC (rev 5146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Official_WordPress_Events {
</span><span class="cx" style="display: block; padding: 0 10px"> const EVENTS_TABLE = 'wporg_events';
</span><span class="cx" style="display: block; padding: 0 10px"> const WORDCAMP_API_BASE_URL = 'https://central.wordcamp.org/wp-json/';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const WORDCAMP_API_VERSION = 2;
</del><span class="cx" style="display: block; padding: 0 10px"> const MEETUP_API_BASE_URL = 'https://api.meetup.com/';
</span><span class="cx" style="display: block; padding: 0 10px"> const MEETUP_MEMBER_ID = 72560962;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,130 +206,40 @@
</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">- * Generate the WordCamps endpoint URL for a particular version of the REST API.
- *
- * @param int $api_version
- *
- * @return string
- */
- protected function get_wordcamp_events_endpoint( $api_version = 1 ) {
- switch ( $api_version ) {
- case 1 :
- default :
- $request_params = array(
- 'type' => 'wordcamp',
- );
- $endpoint = add_query_arg( $request_params, self::WORDCAMP_API_BASE_URL . 'posts' );
- break;
-
- case 2 :
- $request_params = array(
- 'status' => 'wcpt-scheduled',
- 'per_page' => 100,
- // todo 100 is the built-in limit for per_page. As the number of WordCamps per year grows, we may need to increase this. See https://github.com/WP-API/WP-API/issues/2914#issuecomment-266222585
- );
- $endpoint = add_query_arg( $request_params, self::WORDCAMP_API_BASE_URL . 'wp/v2/wordcamps' );
- break;
- }
-
- return $endpoint;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Retrieve events fromm the WordCamp.org API
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_wordcamp_events() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $endpoint = $this->get_wordcamp_events_endpoint( self::WORDCAMP_API_VERSION );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request_params = array(
+ 'status' => 'wcpt-scheduled',
+ 'per_page' => 100,
+ // Note: With the number of WordCamps per year growing fast, we may need to batch requests in the near future, like we do for meetups
+ );
+
+ $endpoint = add_query_arg( $request_params, self::WORDCAMP_API_BASE_URL . 'wp/v2/wordcamps' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = $this->remote_get( esc_url_raw( $endpoint ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $events = $this->parse_wordcamp_events( $response );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch ( self::WORDCAMP_API_VERSION ) {
- case 1 :
- default :
- $events = $this->parse_wordcamp_events_api_v1( $response );
- break;
-
- case 2 :
- $events = $this->parse_wordcamp_events_api_v2( $response );
- break;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->log( sprintf( 'returning %d events', count( $events ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $events;
</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">- * Parse a response from the v1 API.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Parse an event response from the WordCamp.org API.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param $response
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $response
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function parse_wordcamp_events_api_v1( $response ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function parse_wordcamp_events( $response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $events = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamps = json_decode( wp_remote_retrieve_body( $response ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wordcamps ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wordcamps as $wordcamp ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $wordcamp->post_meta ) ) {
- continue;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $event = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => 'wordcamp',
- 'title' => $wordcamp->title,
- );
-
- foreach ( $wordcamp->post_meta as $meta_item ) {
- switch ( $meta_item->key ) {
- case 'Start Date (YYYY-mm-dd)':
- if ( empty( $meta_item->value ) || $meta_item->value < time() ) {
- // todo this can be removed when we're able to filter the request by post meta (see above)
-
- continue 3;
- } else {
- $event['start_timestamp'] = $meta_item->value;
- }
- break;
-
- case 'End Date (YYYY-mm-dd)':
- $event['end_timestamp'] = $meta_item->value;
- break;
-
- case 'URL':
- case 'Location':
- $event[ strtolower( $meta_item->key ) ] = $meta_item->value;
- break;
- }
- }
-
- if ( ! empty( $event['url'] ) ) {
- $events[] = new Official_WordPress_Event( $event );
- }
- }
- }
-
- return $events;
- }
-
- /**
- * Parse a response from the v2 API.
- *
- * This does additional sorting of the returned events that the v1 parser doesn't do.
- *
- * @param $response
- *
- * @return array
- */
- protected function parse_wordcamp_events_api_v2( $response ) {
- $events = array();
- $wordcamps = json_decode( wp_remote_retrieve_body( $response ) );
-
- if ( $wordcamps ) {
- foreach ( $wordcamps as $wordcamp ) {
- $event = array(
</del><span class="cx" style="display: block; padding: 0 10px"> 'source_id' => $wordcamp->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'wordcamp',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $wordcamp->title->rendered,
</span></span></pre>
</div>
</div>
</body>
</html>