<!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>[12015] sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php: Profiles: Move digest actions to the source handler.</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/12015">12015</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/12015","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:08 +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: Move digest actions to the source handler.
It's easier for the handler to generated the message, because it has all of the information about the activity, whereas the digest mechanism only has the final activity entry. Moving it to the handler also keeps all of the related things together.</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 10:32:07 UTC (rev 12014)
+++ 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)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -892,8 +892,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $activities as $activity ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $bump = intval( $activity['bump'] ?? 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $activity_id = $this->digest_bump( $this->sanitize_activity( $activity ), $bump );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activity = $this->sanitize_activity( $activity );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch ( $activity['type'] ) {
+ case 'glotpress_translation_suggested':
+ $action = 'Suggested';
+ break;
+
+ case 'glotpress_translation_approved':
+ $action = 'Translated';
+ break;
+
+ case 'glotpress_translation_reviewed':
+ $action = 'Reviewed';
+ break;
+ }
+
+ $singular = $action . ' %d string on <a href="https://translate.wordpress.org">translate.wordpress.org</a>.';
+ $plural = $action . ' %d strings on <a href="https://translate.wordpress.org">translate.wordpress.org</a>.';
+ $activity_id = $this->digest_bump( $activity, $bump, $singular, $plural );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $activity_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '-1 Unable to save activity for %d: %s. ',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -916,7 +934,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><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 = 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function digest_bump( array $new_activity, int $bump, string $singular, string $plural ) {
</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">@@ -952,8 +970,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_action = $this->get_digest_actions( $new_activity['component'], $new_activity['type'], $current_count + $bump );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_total = $current_count + $bump;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_action = sprintf(
+ _n( $action_singular, $action_plural, $new_total ),
+ $new_total
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $stored_activity_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_object = new BP_Activity_Activity( $stored_activity_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_object->action = $new_action;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -961,7 +984,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_id = is_wp_error( $saved ) ? $saved : $stored_activity_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Increase this even if couldn't update action, to preserve accurate count.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_activity_update_meta( $stored_activity_id, 'digest_count', $current_count + $bump );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_activity_update_meta( $stored_activity_id, 'digest_count', $new_total );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_activity['action'] = $new_action;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -972,43 +995,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $activity_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * Get the action string for a digest activity.
- *
- * This doesn't use BuddyPress' `format_callback` because we don't register the `type`s.
- */
- protected function get_digest_actions( string $component, string $type, int $count ) : string {
- $action = '';
- $singular = false;
- $plural = false;
-
- switch ( $component . ':' . $type ) {
- case 'glotpress:glotpress_translation_suggested':
- $singular = 'Suggested %d string on <a href="https://translate.wordpress.org">translate.wordpress.org</a>.';
- $plural = 'Suggested %d strings on <a href="https://translate.wordpress.org">translate.wordpress.org</a>.';
- break;
-
- case 'glotpress:glotpress_translation_approved':
- $singular = 'Translated %d string on <a href="https://translate.wordpress.org">translate.wordpress.org</a>.';
- $plural = 'Translated %d strings on <a href="https://translate.wordpress.org">translate.wordpress.org</a>.';
- break;
-
- case 'glotpress:glotpress_translation_reviewed':
- $singular = 'Reviewed %d string on <a href="https://translate.wordpress.org">translate.wordpress.org</a>.';
- $plural = 'Reviewed %d strings on <a href="https://translate.wordpress.org">translate.wordpress.org</a>.';
- break;
- }
-
- if ( $singular && $plural ) {
- $action = sprintf(
- _n( $singular, $plural, $count ),
- $count
- );
- }
-
- return $action;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> } /* /class WPOrg_Profiles_Activity_Handler */
</span><span class="cx" style="display: block; padding: 0 10px"> } /* if class_exists */
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>