<!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>[4814] sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events: Official WordPress Events: Use the v2 REST endpoint to fetch WordCamps</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/4814">4814</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/4814","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>2017-01-27 23:17:15 +0000 (Fri, 27 Jan 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: Use the v2 REST endpoint to fetch WordCamps
This maintains the v1 routines for now, and adds separate routines for v2.
When the v1 endpoint is officially deprecated we can remove them. To
switch the endpoint used, change the value of WORDCAMP_API_VERSION.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsofficialwordpresseventphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-event.php</a></li>
<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_htmlwpcontentpluginsofficialwordpresseventsofficialwordpresseventphp"></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-event.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-event.php 2017-01-27 19:22:03 UTC (rev 4813)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-event.php 2017-01-27 23:17:15 UTC (rev 4814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * for events across various event types.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Official_WordPress_Event {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $type, $title, $url, $start_timestamp, $end_timestamp, $location;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $type, $title, $url, $start_timestamp, $end_timestamp, $location, $coordinates;
</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"> * Constructor
</span></span></pre></div>
<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-01-27 19:22:03 UTC (rev 4813)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php 2017-01-27 23:17:15 UTC (rev 4814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> Plugin Name: Official WordPress Events
</span><span class="cx" style="display: block; padding: 0 10px"> Description: Retrieves data on official WordPress events
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +7,8 @@
</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"> class Official_WordPress_Events {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const WORDCAMP_API_BASE_URL = 'http://central.wordcamp.org/wp-json/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const WORDCAMP_API_BASE_URL = 'https://central.wordcamp.org/wp-json/';
+ const WORDCAMP_API_VERSION = 2;
</ins><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"> const POSTS_PER_PAGE = 50;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Ability to feature a camp in a hero area
</span><span class="cx" style="display: block; padding: 0 10px"> * Add a "load more" button that retrieves more events via AJAX and updates the DOM. Have each click load the next month of events?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Update WORDCAMP_API_BASE_URL to use HTTPS when central.wordcamp.org supports it
</del><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +62,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"> * Get all official events
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><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_all_events() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,18 +70,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> usort( $events, array( $this, 'sort_events' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // todo Cache results here too, to avoid processing the raw data on each request? If so, then no longer need to cache API call results?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><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">- * Sort events based on start timestamp
- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Sort events based on start timestamp
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * This is a callback for usort()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param $a
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $b
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function sort_events( $a, $b ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,21 +111,71 @@
</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">+ * 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',
+ 'filter' => array(
+ 'posts_per_page' => self::POSTS_PER_PAGE * .5, // WordCamps happen much less frequently than meetups
+ // todo request camps that are in the next few months, ordered by start date ASC. requires https://github.com/WP-API/WP-API/issues/479 or customization on the wordcamp.org side
+ ),
+ );
+ $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;
+ }
+
+ /**
</ins><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">- $events = array();
- $request_params = array(
- 'type' => 'wordcamp',
- 'filter' => array(
- 'posts_per_page' => self::POSTS_PER_PAGE * .5, // WordCamps happen much less frequently than meetups
- // todo request camps that are in the next few months, ordered by start date ASC. requires https://github.com/WP-API/WP-API/issues/479 or customization on the wordcamp.org side
- ),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $endpoint = $this->get_wordcamp_events_endpoint( self::WORDCAMP_API_VERSION );
+ $response = $this->remote_get( esc_url_raw( $endpoint ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = $this->remote_get( esc_url_raw( add_query_arg( $request_params, self::WORDCAMP_API_BASE_URL . 'posts' ) ) );
</del><ins style="background-color: #dfd; 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;
+ }
+
+ return $events;
+ }
+
+ /**
+ * Parse a response from the v1 API.
+ *
+ * @param $response
+ *
+ * @return array
+ */
+ protected function parse_wordcamp_events_api_v1( $response ) {
+ $events = array();
</ins><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,6 +222,77 @@
</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">+ * 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(
+ 'type' => 'wordcamp',
+ 'title' => $wordcamp->title->rendered,
+ );
+
+ foreach ( $wordcamp as $field => $value ) {
+ switch ( $field ) {
+ case 'Start Date (YYYY-mm-dd)':
+ $value = absint( $value );
+ if ( empty( $value ) || $value < strtotime( '-1 day' ) ) {
+ continue 3;
+ } else {
+ $event['start_timestamp'] = $value;
+ }
+ break;
+
+ case 'End Date (YYYY-mm-dd)':
+ $value = absint( $value );
+ $event['end_timestamp'] = $value;
+ break;
+
+ case 'URL':
+ if ( empty( $value ) ) {
+ continue 3;
+ } else {
+ $event['url'] = $value;
+ }
+ break;
+
+ case 'Location':
+ $event['location'] = $value;
+ break;
+
+ case '_venue_coordinates' :
+ if ( isset( $value->latitude, $value->longitude ) ) {
+ $event['coordinates'] = array(
+ 'latitude' => $value->latitude,
+ 'longitude' => $value->longitude,
+ );
+ }
+ break;
+ }
+ }
+
+ $events[] = new Official_WordPress_Event( $event );
+ }
+
+ uasort( $events, array( $this, 'sort_events' ) );
+
+ // Return fewer WordCamps since they happen less frequently than meetups
+ $events = array_slice( $events, 0, self::POSTS_PER_PAGE * 0.5 );
+ }
+
+ return $events;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get WordPress meetups from the Meetup.com 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="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +303,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'MEETUP_API_KEY' ) || ! MEETUP_API_KEY || ! $groups = $this->get_meetup_group_ids() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $events;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = $this->remote_get( sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '%s2/events?group_id=%s&time=0,1m&page=%d&key=%s',
</span><span class="cx" style="display: block; padding: 0 10px"> self::MEETUP_API_BASE_URL,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,13 +326,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $location = $this->reverse_geocode( $meetup->group->group_lat, $meetup->group->group_lon );
</span><span class="cx" style="display: block; padding: 0 10px"> $location = $this->format_reverse_geocode_address( $location->address_components );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $events[] = new Official_WordPress_Event( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'meetup',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $meetup->name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $meetup->event_url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'start_timestamp' => $start_timestamp,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'end_timestamp' => ( empty ( $meetup->duration ) ? $start_timestamp : $start_timestamp + ( $meetup->duration / 1000 ) ), // convert to seconds
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'end_timestamp' => ( empty ( $meetup->duration ) ? $start_timestamp : $start_timestamp + ( $meetup->duration / 1000 ) ), // convert to seconds
</ins><span class="cx" style="display: block; padding: 0 10px"> 'location' => $location,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +340,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Gets the IDs of all of the meetup groups associated
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'MEETUP_API_KEY' ) || ! MEETUP_API_KEY ) {
</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">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = $this->remote_get( sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '%s2/profiles?&member_id=%d&key=%s',
</span><span class="cx" style="display: block; padding: 0 10px"> self::MEETUP_API_BASE_URL,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,16 +359,16 @@
</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"> $group_ids = json_decode( wp_remote_retrieve_body( $response ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty ( $group_ids->results ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $group_ids = wp_list_pluck( $group_ids->results, 'group' );
</span><span class="cx" style="display: block; padding: 0 10px"> $group_ids = wp_list_pluck( $group_ids, 'id' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $group_ids ) || ! is_array( $group_ids ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $group_ids = 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">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $group_ids;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +476,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 200 != $response['response']['code'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // trigger_error() has a message limit of 1024 bytes, so we truncate $response['body'] to make sure that $body doesn't get truncated.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $error = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Received HTTP code: %s and body: %s. Request was to: %s; Arguments were: %s',
</span><span class="cx" style="display: block; padding: 0 10px"> $response['response']['code'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,14 +484,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url,
</span><span class="cx" style="display: block; padding: 0 10px"> print_r( $args, true )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $response = new WP_Error( 'woe_invalid_http_response', 'Invalid HTTP response code', $response );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $response = new WP_Error( 'woe_invalid_http_response', 'Invalid HTTP response code', $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">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = preg_replace( '/&key=[a-z0-9]+/i', '&key=[redacted]', $error );
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error( sprintf( '%s error for %s: %s', __METHOD__, parse_url( site_url(), PHP_URL_HOST ), sanitize_text_field( $error ) ), E_USER_WARNING );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $to = apply_filters( 'owe_error_email_addresses', array() ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $to, sprintf( '%s error for %s', __METHOD__, parse_url( site_url(), PHP_URL_HOST ) ), sanitize_text_field( $error ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>