<!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>[8922] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php: Make/Meetings: add a shortcode for displaying the next meeting time for a team.</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/8922">8922</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/8922","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>tellyworth</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-06-05 06:59:37 +0000 (Wed, 05 Jun 2019)</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'>Make/Meetings: add a shortcode for displaying the next meeting time for a team.
This uses the meetings from the CPT on the Meetings tab, and will enable us to deprecate the redundant Weekly Meeting meta in the Sites CPT.
Props ck3lee.
See <a href="http://meta.trac.wordpress.org/ticket/3078">#3078</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgmeetingposttypewporgmeetingposttypephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgmeetingposttypewporgmeetingposttypephp"></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/wporg-meeting-posttype/wporg-meeting-posttype.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/wporg-meeting-posttype/wporg-meeting-posttype.php 2019-06-05 05:24:31 UTC (rev 8921)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php 2019-06-05 06:59:37 UTC (rev 8922)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,6 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_head', array( $mpt, 'meeting_column_width' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_bar_menu', array( $mpt, 'add_edit_meetings_item_to_admin_bar' ), 80 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', array( $mpt, 'add_edit_meetings_icon_to_admin_bar' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_shortcode( 'meeting_time', array( $mpt, 'meeting_time_shortcode' ) );
</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"> public function meeting_column_width() { ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,48 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'nopaging', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // meta query to eliminate expired meetings from query
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query->set( 'meta_query', array(
- 'relation'=>'OR',
- // not recurring AND start_date >= CURDATE() = one-time meeting today or still in future
- array(
- 'relation'=>'AND',
- array(
- 'key'=>'recurring',
- 'value'=>array( 'weekly', 'biweekly', 'occurrence', 'monthly', '1' ),
- 'compare'=>'NOT IN',
- ),
- array(
- 'key'=>'start_date',
- 'type'=>'DATE',
- 'compare'=>'>=',
- 'value'=>'CURDATE()',
- )
- ),
- // recurring = 1 AND ( end_date = '' OR end_date > CURDATE() ) = recurring meeting that has no end or has not ended yet
- array(
- 'relation'=>'AND',
- array(
- 'key'=>'recurring',
- 'value'=>array( 'weekly', 'biweekly', 'occurrence', 'monthly', '1' ),
- 'compare'=>'IN',
- ),
- array(
- 'relation'=>'OR',
- array(
- 'key'=>'end_date',
- 'value'=>'',
- 'compare'=>'=',
- ),
- array(
- 'key'=>'end_date',
- 'type'=>'DATE',
- 'compare'=>'>',
- 'value'=>'CURDATE()',
- )
- )
- ),
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query->set( 'meta_query', $this->meeting_meta_query );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // WP doesn't understand CURDATE() and prepares it as a quoted string. Repair this:
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_meta_sql', function ($sql) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,6 +422,104 @@
</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">+ /**
+ * Renders meeting information with the next meeting time based on user's local timezone. Used in Make homepage.
+ */
+ public function meeting_time_shortcode( $attr, $content = '' ) {
+
+ if ( empty( $attr['team'] ) ) {
+ return '';
+ }
+
+ if ( $attr['team'] === 'Documentation' ) {
+ $attr['team'] = 'Docs';
+ }
+
+ // meta query to eliminate expired meetings from query
+ add_filter( 'get_meta_sql', function ($sql) {
+ return str_replace( "'CURDATE()'", 'CURDATE()', $sql );
+ } );
+
+ $query = new WP_Query(
+ array(
+ 'post_type' => 'meeting',
+ 'nopaging' => true,
+ 'meta_query' => array(
+ 'relation' => 'AND',
+ array(
+ 'key' => 'team',
+ 'value' => $attr['team'],
+ 'compare' => 'EQUALS',
+ ),
+ $this->meeting_meta_query
+ )
+ )
+ );
+
+ if ( count( $query->posts ) > 0 ) {
+
+ $post = $query->posts[0];
+ $next_meeting_datestring = $post->next_date;
+ $utc_time = strftime( '%H:%M:%S', strtotime( $post->time ) );
+ $next_meeting_iso = $next_meeting_datestring . 'T' . $utc_time . '+00:00';
+ $next_meeeting_timestamp = strtotime( $next_meeting_datestring . $utc_time );
+
+ $out = '<p>';
+ $out .= 'Next meeting: ' . __( $post->post_title );
+ $display_count = count( $query->posts ) - 1;
+ $out .= $display_count === 0 ? '' : ' <a title="Click to view all meetings for this team" href="/meetings#' . esc_attr( $attr['team'] ) . '">' . sprintf( __( '(+%s more)'), $display_count ) . '</a>';
+ $out .= '</br>';
+ $out .= '<time class="date" date-time="' . esc_attr( $next_meeting_iso ) . '" title="' . esc_attr( $next_meeting_iso ) . '">' . $next_meeting_iso . '</time> ';
+ $out .= sprintf( __( '(%s from now)' ), human_time_diff( $next_meeeting_timestamp, current_time('timestamp') ) );
+ $out .= empty( $post->location ) ? '' : ' ' . sprintf( __('at %s on Slack'), $post->location );
+ $out .= '</p>';
+ }
+
+
+ return $out;
+ }
+
+ private $meeting_meta_query = array(
+ 'relation'=>'OR',
+ // not recurring AND start_date >= CURDATE() = one-time meeting today or still in future
+ array(
+ 'relation'=>'AND',
+ array(
+ 'key'=>'recurring',
+ 'value'=>array( 'weekly', 'biweekly', 'occurrence', 'monthly', '1' ),
+ 'compare'=>'NOT IN',
+ ),
+ array(
+ 'key'=>'start_date',
+ 'type'=>'DATE',
+ 'compare'=>'>=',
+ 'value'=>'CURDATE()',
+ )
+ ),
+ // recurring = 1 AND ( end_date = '' OR end_date > CURDATE() ) = recurring meeting that has no end or has not ended yet
+ array(
+ 'relation'=>'AND',
+ array(
+ 'key'=>'recurring',
+ 'value'=>array( 'weekly', 'biweekly', 'occurrence', 'monthly', '1' ),
+ 'compare'=>'IN',
+ ),
+ array(
+ 'relation'=>'OR',
+ array(
+ 'key'=>'end_date',
+ 'value'=>'',
+ 'compare'=>'=',
+ ),
+ array(
+ 'key'=>'end_date',
+ 'type'=>'DATE',
+ 'compare'=>'>',
+ 'value'=>'CURDATE()',
+ )
+ )
+ ),
+ );
</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"> // fire it up
</span></span></pre>
</div>
</div>
</body>
</html>