<!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>[11398] sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/meetup/class-meetup-client.php: Official WordPress Events: Meetup Class: Fix some bugs, make some tweaks, add some compatibility.</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/11398">11398</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/11398","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-12-22 09:04:01 +0000 (Wed, 22 Dec 2021)</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: Meetup Class: Fix some bugs, make some tweaks, add some compatibility.
See <a href="http://meta.trac.wordpress.org/changeset/11393">[11393]</a>.
See https://github.com/WordPress/wordcamp.org/issues/697</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsmeetupclassmeetupclientphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/meetup/class-meetup-client.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsmeetupclassmeetupclientphp"></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/meetup/class-meetup-client.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/meetup/class-meetup-client.php 2021-12-22 07:47:51 UTC (rev 11397)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/meetup/class-meetup-client.php 2021-12-22 09:04:01 UTC (rev 11398)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Utilities;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use DateTime, DateTimeZone;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use DateTimeInterface, DateTimeImmutable, DateTimeZone, DateInterval;
</ins><span class="cx" style="display: block; padding: 0 10px"> use WP_Error;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) || die();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,17 +323,19 @@
</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">- * Convert a ISO8601-ish DateTime returned from the API to a timestamp.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Convert any timestamp such as a ISO8601-ish DateTime returned from the API to a epoch timestamp.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Handles timestamps in two main formats:
</span><span class="cx" style="display: block; padding: 0 10px"> * - 2021-11-20T17:00+05:30
</span><span class="cx" style="display: block; padding: 0 10px"> * - 2021-11-20T06:30-05:00[US/Eastern]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Neither contains seconds.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - Seconds since epoch
+ * - Milliseconds since epoch
+ * - DateTime objects
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Some extra compat formats are included, just incase Meetup.com decides to return in other similar formats,
</span><span class="cx" style="display: block; padding: 0 10px"> * or with different timezone formats, etc.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $datetime A DateTime string returned by the API
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $datetime A DateTime string returned by the API, a DateTime instance, or a numeric epoch with or without milliseconds.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int The UTC epoch timestamp.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function datetime_to_time( $datetime ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,6 +346,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return (int) $datetime;
</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">+ // Handle DateTime objects.
+ if ( $datetime instanceof DateTimeInterface ) {
+ return $datetime->getTimestamp();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $datetime_formats = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'Y-m-d\TH:iP', // 2021-11-20T17:00+05:30
</span><span class="cx" style="display: block; padding: 0 10px"> 'Y-m-d\TH:i:sP', // 2021-11-20T17:00:00+05:30
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,7 +375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Try each of the timezone formats.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $datetime_formats as $format ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $time = DateTime::createFromFormat( $format, $datetime );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $time = DateTimeImmutable::createFromFormat( $format, $datetime );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $time ) {
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,15 +522,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'node'
</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">- foreach ( $results as &$result ) {
- $result['member_count'] = $result['groupAnalytics']['totalMembers'];
- $result['pro_join_date'] = $this->datetime_to_time( $result['proJoinDate'] ) * 1000;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results = $this->apply_backcompat_fields( 'groups', $results );
</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( $result['groupAnalytics']['lastEventDate'] ) ) {
- $result['last_event'] = $this->datetime_to_time( $result['groupAnalytics']['lastEventDate'] ) * 1000;
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $results;
</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">@@ -1058,6 +1058,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'dateTime',
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone',
</span><span class="cx" style="display: block; padding: 0 10px"> 'endTime',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'duration',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'createdAt',
</span><span class="cx" style="display: block; padding: 0 10px"> 'isOnline',
</span><span class="cx" style="display: block; padding: 0 10px"> 'going',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1122,17 +1123,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result['time'] = $this->datetime_to_time( $result['dateTime'] ) * 1000;
</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">- // Easier to parse the difference between start and end, than parse the ISO 'duration' the API provides for now.
- $result['duration'] = 0;
- if ( ! empty( $result['endTime'] ) ) {
- $result['duration'] = ( $this->datetime_to_time( $result['endTime'] ) - $this->datetime_to_time( $result['dateTime'] ) );
- $result['duration'] *= 1000;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Parse an ISO DateInterval into seconds.
+ $now = time();
+ $result['duration'] = ( DateTimeImmutable::createFromFormat( 'U', $now ) )->add( new DateInterval( $result['duration'] ) )->getTimestamp() - $now;
+ $result['duration'] *= 1000;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result['utc_offset'] = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $result['timezone'] ) && isset( $result['time'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result['utc_offset'] = (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- new DateTime(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ new DateTimeImmutable(
</ins><span class="cx" style="display: block; padding: 0 10px"> // $result['time'] is back-compat above.
</span><span class="cx" style="display: block; padding: 0 10px"> gmdate( 'Y-m-d H:i:s', $result['time']/1000 ),
</span><span class="cx" style="display: block; padding: 0 10px"> new DateTimeZone( $result['timezone'] )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1182,7 +1181,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'group' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Stub in the fields that are different.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result['created'] = $this->datetime_to_time( $result['foundedDate'] ) * 1000;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result['founded_date'] = $this->datetime_to_time( $result['foundedDate'] ) * 1000;
+ $result['created'] = $result['founded_date'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['localized_location'] = $this->localise_location( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $result['localized_country_name'] = $this->localised_country_name( $result['country'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $result['members'] = $result['groupAnalytics']['totalMembers'] ?? 0;
</span></span></pre>
</div>
</div>
</body>
</html>