<!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>[10270] sites/trunk/api.wordpress.org/public_html/events/1.0/index.php: Events: Add `start_unix_timestamp` and `end_unix_timestamp` fields.</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/10270">10270</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/10270","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>2020-09-16 18:16:57 +0000 (Wed, 16 Sep 2020)</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'>Events: Add `start_unix_timestamp` and `end_unix_timestamp` fields.
The `date` and `end_date` fields are WP timestamps which reflect the event's local timezone. True Unix timestamps are needed for the Events Widget to display events in the user's local timezone.
Fixes <a href="http://meta.trac.wordpress.org/ticket/4480">#4480</a>
See #core51130
Props Rarst, dd32, iandunn</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10indexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10indexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2020-09-16 09:34:15 UTC (rev 10269)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2020-09-16 18:16:57 UTC (rev 10270)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'THROTTLE_GEONAMES', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'THROTTLE_IP2LOCATION', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- defined( 'DAY_IN_SECONDS' ) or define( 'DAY_IN_SECONDS', 60 * 60 * 24 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ defined( 'HOUR_IN_SECONDS' ) or define( 'HOUR_IN_SECONDS', 60 * 60 );
+ defined( 'DAY_IN_SECONDS' ) or define( 'DAY_IN_SECONDS', HOUR_IN_SECONDS * 24 );
</ins><span class="cx" style="display: block; padding: 0 10px"> defined( 'WEEK_IN_SECONDS' ) or define( 'WEEK_IN_SECONDS', 7 * DAY_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The test suite just needs the functions defined and doesn't want any headers or output
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -868,9 +869,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $event->url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup' => $event->meetup,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => $event->meetup_url,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'date' => $event->date_utc, // TODO: DB stores a local date, not UTC.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /*
+ * The `date_utc` column in the database is misnomed, and contains times in the event's local
+ * timezone. So the `date` field in the response is the local time, and the `date_utc` field in
+ * the response here is _actually_ UTC.
+ */
+ 'date' => $event->date_utc,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => $event->end_date,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'start_unix_timestamp' => strtotime( $event->date_utc ) - $event->date_utc_offset,
+ 'end_unix_timestamp' => strtotime( $event->end_date ) - $event->date_utc_offset,
</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"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Capitalize it for use in presentation contexts, like the Events Widget.
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'online' === $event->location ? 'Online' : $event->location,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1031,6 +1041,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => '2020-02-21 00:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => '2020-02-23 00:00:00',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'start_unix_timestamp' => strtotime( '2020-02-21 00:00:00' ) - 7 * HOUR_IN_SECONDS,
+ 'end_unix_timestamp' => strtotime( '2020-02-23 00:00:00' ) - 7 * HOUR_IN_SECONDS,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'Bangkok, Thailand',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1056,6 +1068,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => '2020-06-04 00:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => '2020-06-06 00:00:00',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'start_unix_timestamp' => strtotime( '2020-06-04 00:00:00' ) - 1 * HOUR_IN_SECONDS,
+ 'end_unix_timestamp' => strtotime( '2020-06-06 00:00:00' ) - 1 * HOUR_IN_SECONDS,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'Online',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1082,6 +1096,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => '2020-10-27 00:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => '2020-10-29 00:00:00',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'start_unix_timestamp' => strtotime( '2020-10-27 00:00:00' ) - 5 * HOUR_IN_SECONDS,
+ 'end_unix_timestamp' => strtotime( '2020-10-29 00:00:00' ) - 5 * HOUR_IN_SECONDS,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'Online',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1270,6 +1286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => '2018-05-27 12:00:00',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'Everywhere',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1340,7 +1357,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $next_online_camp ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $raw_camp = $wpdb->get_row( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- `title`, `url`, `meetup`, `meetup_url`, `date_utc`, `end_date`, `country`, `latitude`, `longitude`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ `title`, `url`, `meetup`, `meetup_url`, `date_utc`, `date_utc_offset`, `end_date`, `country`, `latitude`, `longitude`
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM `wporg_events`
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> type = 'wordcamp' AND
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1358,8 +1375,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $raw_camp->url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup' => $raw_camp->meetup,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => $raw_camp->meetup_url,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // See notes about UTC in `get_events()`.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'date' => $raw_camp->date_utc,
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => $raw_camp->end_date,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'start_unix_timestamp' => strtotime( $raw_camp->date_utc ) - $raw_camp->date_utc_offset,
+ 'end_unix_timestamp' => strtotime( $raw_camp->end_date ) - $raw_camp->date_utc_offset,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'Online',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1415,7 +1436,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $found ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $raw_discussion_group = $wpdb->get_row( "
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- SELECT `title`, `url`, `meetup`, `meetup_url`, `date_utc`, `end_date`, `country`, `latitude`, `longitude`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ SELECT `title`, `url`, `meetup`, `meetup_url`, `date_utc`, `date_utc_offset`, `end_date`, `country`, `latitude`, `longitude`
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM `wporg_events`
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> type = 'meetup' AND
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1434,8 +1455,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $raw_discussion_group->url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup' => $raw_discussion_group->meetup,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => $raw_discussion_group->meetup_url,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // See notes about UTC in `get_events()`.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'date' => $raw_discussion_group->date_utc,
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => $raw_discussion_group->end_date,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'start_unix_timestamp' => strtotime( $raw_discussion_group->date_utc ) - $raw_discussion_group->date_utc_offset,
+ 'end_unix_timestamp' => strtotime( $raw_discussion_group->end_date ) - $raw_discussion_group->date_utc_offset,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'Online',
</span></span></pre>
</div>
</div>
</body>
</html>