<!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>[11399] sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events: Official WordPress Events: Sync Meetup_Client with upstream WordCamp client, remove milliseconds from API.</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/11399">11399</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/11399","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:44:34 +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: Sync Meetup_Client with upstream WordCamp client, remove milliseconds from API.
See https://github.com/WordPress/wordcamp.org/pull/712
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>
<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_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 09:04:01 UTC (rev 11398)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/meetup/class-meetup-client.php 2021-12-22 09:44:34 UTC (rev 11399)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @var bool If true, the client will fetch fewer results, for faster debugging.
</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 $debug;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $debug = false;
</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"> * Meetup_Client constructor.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,8 +423,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Attempt to extract codes and messages from a suspected error response.
</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 array $data The data in the response body, parsed as an array. May be null for HTTP errors such as 404's.
- * @param int $response_code Optional. The HTTP status code from the response.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param null|array $data The data in the response body, parsed as an array. May be null for HTTP errors such as 404's.
+ * @param int $response_code Optional. The HTTP status code from the response.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,7 +609,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"> * Retrieve the event Status for a range of given IDs.
</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 array $event_ids An array of [ id => MeetupID, id2 => MeetupID2 ] to query for.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Array of Event Statuses if events is found, null values if MeetupID doesn't exist.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1041,7 +1041,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 the default fields for each object type.
</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 string $type The Object type.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Fields to query.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1106,9 +1106,9 @@
</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"> * Apply back-compat fields/filters for previous uses of the client.
</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"> * Can be removed once all uses of the library have migrated over.
</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 string $type The type of result object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $result The result to back-compat.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return The $result with back-compat.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1120,13 +1120,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $result['dateTime'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Required for utc_offset below.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result['time'] = $this->datetime_to_time( $result['dateTime'] ) * 1000;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result['time'] = $this->datetime_to_time( $result['dateTime'] );
</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"> // Parse an ISO DateInterval into seconds.
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $result['duration'] = ( DateTimeImmutable::createFromFormat( 'U', $now ) )->add( new DateInterval( $result['duration'] ) )->getTimestamp() - $now;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result['duration'] *= 1000;
</del><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1133,11 +1132,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result['utc_offset'] = (
</span><span class="cx" style="display: block; padding: 0 10px"> new DateTimeImmutable(
</span><span class="cx" style="display: block; padding: 0 10px"> // $result['time'] is back-compat above.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- gmdate( 'Y-m-d H:i:s', $result['time']/1000 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ gmdate( 'Y-m-d H:i:s', $result['time'] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> new DateTimeZone( $result['timezone'] )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> )->getOffset();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result['utc_offset'] *= 1000;
</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"> if ( ! empty( $result['venue'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1181,7 +1179,7 @@
</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['founded_date'] = $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'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['created'] = $result['founded_date'];
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1189,16 +1187,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result['member_count'] = $result['members'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $result['proJoinDate'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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">+ $result['pro_join_date'] = $this->datetime_to_time( $result['proJoinDate'] );
</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"> if ( ! empty( $result['pastEvents']['edges'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result['last_event'] = [
- 'time' => $this->datetime_to_time( end( $result['pastEvents']['edges'] )['node']['dateTime'] ) * 1000,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result['last_event'] = [
+ 'time' => $this->datetime_to_time( end( $result['pastEvents']['edges'] )['node']['dateTime'] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'yes_rsvp_count' => end( $result['pastEvents']['edges'] )['node']['going'],
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result['past_event_count'] = count( $result['pastEvents']['edges'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $result['groupAnalytics']['lastEventDate'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result['last_event'] = $this->datetime_to_time( $result['groupAnalytics']['lastEventDate'] ) * 1000;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // NOTE: last_event here vs above differs intentionally.
+ $result['last_event'] = $this->datetime_to_time( $result['groupAnalytics']['lastEventDate'] );
+ $result['past_event_count'] = $result['groupAnalytics']['totalPastEvents'];
</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"> $result['lat'] = $result['latitude'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1246,7 +1247,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"> * Localise a country code to a country name using WP-CLDR if present.
</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 string $country Country Code.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return Country Name, or country code upon failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</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 2021-12-22 09:04:01 UTC (rev 11398)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php 2021-12-22 09:44:34 UTC (rev 11399)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,7 +605,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Convert to local time, because the `date_utc` column in `wporg_events` is misnomed and actually
</span><span class="cx" style="display: block; padding: 0 10px"> * expects the _local_ time.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $start_timestamp = ( $meetup['time'] / 1000 ) + ( $meetup['utc_offset'] / 1000 ); // convert to seconds
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $start_timestamp = $meetup['time'] + $meetup['utc_offset'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $latitude = ! empty( $meetup['venue']['lat'] ) ? $meetup['venue']['lat'] : $meetup['group']['lat'];
</span><span class="cx" style="display: block; padding: 0 10px"> $longitude = ! empty( $meetup['venue']['lon'] ) ? $meetup['venue']['lon'] : $meetup['group']['lon'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,8 +646,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $meetup['description'] ?? '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'num_attendees' => $meetup['yes_rsvp_count'],
</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.
- 'utc_offset' => $meetup['utc_offset'] / 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'] ) ),
+ 'utc_offset' => $meetup['utc_offset'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'location' => $location,
</span><span class="cx" style="display: block; padding: 0 10px"> 'country_code' => $country_code,
</span><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => $latitude,
</span></span></pre>
</div>
</div>
</body>
</html>