<!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>[12016] sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php: Profiles: Handle notifications of handbook updates.</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/12016">12016</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/12016","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>2022-08-12 21:13:14 +0000 (Fri, 12 Aug 2022)</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'>Profiles: Handle notifications of handbook updates.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkprofileswordpressorgpublic_htmlwpcontentpluginswporgprofilesactivityhandlerwporgprofilesactivityhandlerphp">sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkprofileswordpressorgpublic_htmlwpcontentpluginswporgprofilesactivityhandlerwporgprofilesactivityhandlerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php 2022-08-12 21:13:08 UTC (rev 12015)
+++ sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php 2022-08-12 21:13:14 UTC (rev 12016)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -723,6 +723,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function handle_wordpress_activity() {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::get_user( $_POST['user'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = $_POST['content'];
+ $primary_link = sanitize_url( $_POST['url'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '-1 Activity reported for unrecognized user : ' . sanitize_text_field( $_POST['user'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,7 +739,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['title'],
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['blog']
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $_POST['type'] ) && 'new' === $_POST['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = 'blog_post_create';
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = $_POST['post_id'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -770,13 +772,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['title'],
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['blog']
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $_POST['type'] ) && 'update' === $_POST['type'] ) {
+ // Handbooks are currently the only post type that send notifications of updates.
+ $type = 'blog_handbook_update';
+ $item_id = $_POST['post_id'];
+ $action = ''; // Will be set by `digest_bump()`
+ $content = false;
+ $primary_link = sanitize_url( $_POST['blog_url'] ); // To group digest entries by site.
+
+ $singular = sprintf(
+ 'Updated a handbook page on <a href="%s">%s</a>.',
+ sanitize_url( $_POST['blog_url'] ),
+ sanitize_text_field( $_POST['blog'] )
+ );
+
+ $plural = sprintf(
+ 'Made %s updates to handbook pages on <a href="%s">%s</a>.',
+ '%d',
+ sanitize_url( $_POST['blog_url'] ),
+ sanitize_text_field( $_POST['blog'] )
+ );
</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"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => $action,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => $_POST['content'],
- 'primary_link' => $_POST['url'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => $content,
+ 'primary_link' => $primary_link,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'component' => 'blogs',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => $type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'item_id' => intval( $item_id ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,7 +806,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_sitewide' => false,
</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">- return bp_activity_add( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'blog_handbook_update' === $type ) {
+ $activity_id = $this->digest_bump( $args, 1, $singular, $plural, true );
+ } else {
+ $activity_id = bp_activity_add( $args );
+ }
+
+ return $activity_id;
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -932,9 +960,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * entry per day is created. That single entry gets updated each time a new action occurs, so the latest
</span><span class="cx" style="display: block; padding: 0 10px"> * count is always displayed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $group_by_site If `true`, a separate digest entry is created for each site; otherwise a
+ * single entry is shared across all sites. If `true`,
+ * `$new_activity['primary_link']` must be the _site_ URL, rather than the
+ * _post_ URL.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Error|int
</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 function digest_bump( array $new_activity, int $bump, string $singular, string $plural ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function digest_bump(
+ array $new_activity, int $bump, string $action_singular, string $action_plural,
+ bool $group_by_site = false
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Standardize on this to reduce the number of paths in error handling code.
</span><span class="cx" style="display: block; padding: 0 10px"> // Also done in `sanitize_activity()`, but callers aren't guaranteed to use that.
</span><span class="cx" style="display: block; padding: 0 10px"> $new_activity['error_type'] = 'wp_error';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,6 +1004,16 @@
</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">+ if ( $group_by_site ) {
+ $args['filter_query'][] = array(
+ array(
+ 'column' => 'primary_link',
+ 'value' => $new_activity['primary_link'],
+ 'relation' => 'AND',
+ ),
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $stored_activity_id = bp_activity_get( $args )['activities'][0] ?? false;
</span><span class="cx" style="display: block; padding: 0 10px"> $current_count = (int) bp_activity_get_meta( $stored_activity_id, 'digest_count', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $new_total = $current_count + $bump;
</span></span></pre>
</div>
</div>
</body>
</html>