<!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>[8508] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/rest-api.php: Blocks: Add Avatar URLs for Organizer blocks.</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/8508">8508</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/8508","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>vedjain</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-03-25 09:45:00 +0000 (Mon, 25 Mar 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'>Blocks: Add Avatar URLs for Organizer blocks.
Also refactor code to make it more modular while adding support for avatar URL for organizers.
props iandunn</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesincrestapiphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/rest-api.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesincrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/rest-api.php 2019-03-25 09:44:53 UTC (rev 8507)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/rest-api.php 2019-03-25 09:45:00 UTC (rev 8508)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,60 +64,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_additional_rest_fields() {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Speaker avatars.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Speaker/organizer avatars.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * We can't expose a Speaker's e-mail address in the API response, but can we go ahead
</span><span class="cx" style="display: block; padding: 0 10px"> * and derive their Gravatar URL and expose that instead.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_option( 'show_avatars' ) ) {
- $avatar_properties = array();
- $avatar_sizes = rest_get_avatar_sizes();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $avatar_properties = array();
+ $avatar_sizes = rest_get_avatar_sizes();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $avatar_sizes as $size ) {
- $avatar_properties[ $size ] = array(
- /* translators: %d: avatar image size in pixels */
- 'description' => sprintf( __( 'Avatar URL with image size of %d pixels.' ), $size ),
- 'type' => 'string',
- 'format' => 'uri',
- 'context' => array( 'embed', 'view', 'edit' ),
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $avatar_sizes as $size ) {
+ $avatar_properties[ $size ] = array(
+ /* translators: %d: avatar image size in pixels */
+ 'description' => sprintf( __( 'Avatar URL with image size of %d pixels.' ), $size ),
+ 'type' => 'string',
+ 'format' => 'uri',
+ 'context' => array( 'embed', 'view', 'edit' ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_rest_field(
- 'wcb_speaker',
- 'avatar_urls',
- array(
- 'get_callback' => function ( $speaker_post ) {
- $speaker_post = (object) $speaker_post;
- $avatar_urls = [];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $avatar_schema = array(
+ 'description' => __( 'Avatar URLs for the speaker.', 'wordcamporg' ),
+ 'type' => 'object',
+ 'context' => array( 'embed', 'view', 'edit' ),
+ 'readonly' => true,
+ 'properties' => $avatar_properties,
+ );
</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 ( $speaker_email = get_post_meta( $speaker_post->id, '_wcb_speaker_email', true ) ) {
- $avatar_urls = rest_get_avatar_urls( $speaker_email );
- } elseif ( $speaker_user_id = get_post_meta( $speaker_post->id, '_wcpt_user_id', true ) ) {
- $speaker = get_user_by( 'id', $speaker_user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_rest_field(
+ 'wcb_speaker',
+ 'avatar_urls',
+ array(
+ 'get_callback' => __NAMESPACE__ . '\get_avatar_urls_from_username_email',
+ 'schema' => $avatar_schema,
+ )
+ );
</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 ( $speaker ) {
- $avatar_urls = rest_get_avatar_urls( $speaker->user_email );
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_rest_field(
+ 'wcb_organizer',
+ 'avatar_urls',
+ array(
+ 'get_callback' => __NAMESPACE__ . '\get_avatar_urls_from_username_email',
+ 'schema' => $avatar_schema,
+ )
+ );
</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( $avatar_urls ) ) {
- $avatar_urls = rest_get_avatar_urls( '' );
- }
-
- return $avatar_urls;
- },
- 'schema' => array(
- 'description' => __( 'Avatar URLs for the speaker.', 'wordcamporg' ),
- 'type' => 'object',
- 'context' => array( 'embed', 'view', 'edit' ),
- 'readonly' => true,
- 'properties' => $avatar_properties,
- ),
- )
- );
- } // End if().
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Session date and time
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,16 +133,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'schema' => [
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Date and time of the session', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'object',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'context' => array( 'embed', 'view' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'context' => array( 'embed', 'view', 'edit' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'readonly' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'properties' => [
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => [
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'context' => array( 'embed', 'view' ),
</del><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> 'time' => [
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'context' => array( 'embed', 'view' ),
</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"> ],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,11 +147,37 @@
</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">+add_action( 'rest_api_init', __NAMESPACE__ . '\register_additional_rest_fields' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Get the URLs for an avatar based on an email address or username.
+ *
+ * @param array $post
+ *
+ * @return array
+ */
+function get_avatar_urls_from_username_email( $post ) {
+ $post = (object) $post;
+ $avatar_urls = [];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'rest_api_init', __NAMESPACE__ . '\register_additional_rest_fields' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $email = get_post_meta( $post->id, '_wcb_speaker_email', true ) ) {
+ $avatar_urls = rest_get_avatar_urls( $email );
+ } elseif ( $user_id = get_post_meta( $post->id, '_wcpt_user_id', true ) ) {
+ $user = get_user_by( 'id', $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $user ) {
+ $avatar_urls = rest_get_avatar_urls( $user->user_email );
+ }
+ }
</ins><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( $avatar_urls ) ) {
+ $avatar_urls = rest_get_avatar_urls( '' );
+ }
+
+ return $avatar_urls;
+}
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Register route for sending schedule of favourite sessions via e-mail.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>