<!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>[4866] sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php: Official WordPress Events: Paginate meetup requests</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/4866">4866</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/4866","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-02-03 17:03:14 +0000 (Fri, 03 Feb 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: Paginate meetup requests</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-02-03 16:45:36 UTC (rev 4865)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php 2017-02-03 17:03:14 UTC (rev 4866)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,27 +12,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> const WORDCAMP_API_VERSION = 2;
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const POSTS_PER_PAGE = 50;
</del><span class="cx" style="display: block; padding: 0 10px">
</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"> * @todo
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Database
</span><span class="cx" style="display: block; padding: 0 10px"> * ==============
</span><span class="cx" style="display: block; padding: 0 10px"> * Can/should probably remove calls to geocode API in favor of using meetup v2/group or some other endpoint that returns detailed location breakdown
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Meetups only pulling 1 week instead of full month
- * Look at meetup-stats.php and see if any differences are relevant, or if there's anything else that'd be helpful in general
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Look at meetup-stats.php and see if any differences are relevant, or if there's anything else that'd be helpful in general
</ins><span class="cx" style="display: block; padding: 0 10px"> * Check non-latin characters, accents etc to make sure stored properly in db
</span><span class="cx" style="display: block; padding: 0 10px"> * Add admin_notice to wordcamp post type to warn when coordinates missing. Also back-fill current ones that are missing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * PHP timeout @ 100 seconds - should be fixed by switch to pulling from db
</del><span class="cx" style="display: block; padding: 0 10px"> * Store wordcamp dates in UTC, and also store timezone? Would need to start collecting timezone for wordcamps and then back-fill old records
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Maybe pull more than 1 month of meetups
</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"> * Shortcode
</span><span class="cx" style="display: block; padding: 0 10px"> * ==============
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Make meetups and wordcamps cut off on the same date, so it doesn't look like there aren't any meetups later in the year
</del><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><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,10 +208,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> default :
</span><span class="cx" style="display: block; padding: 0 10px"> $request_params = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'wordcamp',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '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><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $endpoint = add_query_arg( $request_params, self::WORDCAMP_API_BASE_URL . 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,18 +394,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $groups = array_chunk( $groups, 200, true );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $groups as $group_batch ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = $this->remote_get( sprintf(
- '%s2/events?group_id=%s&time=0,1m&page=%d&key=%s',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request_url = sprintf(
+ '%s2/events?group_id=%s&time=0,3m&page=%d&key=%s',
</ins><span class="cx" style="display: block; padding: 0 10px"> self::MEETUP_API_BASE_URL,
</span><span class="cx" style="display: block; padding: 0 10px"> implode( ',', $group_batch),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::POSTS_PER_PAGE,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 200,
</ins><span class="cx" style="display: block; padding: 0 10px"> MEETUP_API_KEY
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meetups = json_decode( wp_remote_retrieve_body( $response ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while( '' !== $request_url ) {
+ $response = $this->remote_get( $request_url );
+ $body = json_decode( wp_remote_retrieve_body( $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">- if ( ! empty ( $meetups->results ) ) {
- $meetups = $meetups->results;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty ( $body->results ) ) {
+ $meetups = $body->results;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $meetups as $meetup ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $start_timestamp = ( $meetup->time / 1000 ) + ( $meetup->utc_offset / 1000 ); // convert to seconds
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +443,10 @@
</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">+
+ $request_url = $body->meta->next;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><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"> return $events;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,6 +518,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function parse_reverse_geocode_address( $address_components ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $address = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $address_components ) ) {
+ return $address;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $address_components as $component ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'locality' == $component->types[0] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $address['city'] = $component->short_name;
</span></span></pre>
</div>
</div>
</body>
</html>