<!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>[11832] sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php: Profiles: Remove redundancy that simple handlers don't need.</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/11832">11832</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/11832","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-05-10 23:25:49 +0000 (Tue, 10 May 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: Remove redundancy that simple handlers don't need.

See https://github.com/WordPress/five-for-the-future/issues/191</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-05-10 23:25:43 UTC (rev 11831)
+++ sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php       2022-05-10 23:25:49 UTC (rev 11832)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,6 +178,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                $source = sanitize_text_field( $_POST['source'] ?? $_POST['component'] );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                // The original `action` was the `admin-ajax.php` action, which is no longer needed.
+                               // Renaming this allows simple handlers to pass the sanitized $_POST directly to `bp_activity_add()`.
+                               $_POST['action'] = $_POST['message'];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                // The `slack` source requires multiples users, so the parameters are named differently.
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( empty( $_POST['user'] ) && empty( $_POST['user_id'] ) && 'slack' !== $source ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                $activity_id = $this->handle_forum_activity();
</span><span class="cx" style="display: block; padding: 0 10px">                                                break;
</span><span class="cx" style="display: block; padding: 0 10px">                                        case 'learn':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $activity_id = $this->add_activity( $activity );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $activity_id = bp_activity_add( $this->sanitize_activity( $_POST ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 break;
</span><span class="cx" style="display: block; padding: 0 10px">                                        case 'plugin':
</span><span class="cx" style="display: block; padding: 0 10px">                                                $activity_id = $this->handle_plugin_activity();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +246,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Sanitize a `$_POST` request to add activity.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Sanitize `$_POST` args intended for `bp_activity_add()`.
</ins><span class="cx" style="display: block; padding: 0 10px">                  *
</span><span class="cx" style="display: block; padding: 0 10px">                 * @throws Exception
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,14 +264,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                'user_id'           => false,
</span><span class="cx" style="display: block; padding: 0 10px">                                'item_id'           => false,
</span><span class="cx" style="display: block; padding: 0 10px">                                'secondary_item_id' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'error_type'        => 'wp_error',
</del><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">-                        // Map a few differences between what the client sends and what `bp_activity_add()` expects.
-                       $activity['component'] = $activity['source'];
-                       $activity['action']    = $activity['message']; // The original `action` is the `admin-ajax.php` action.
-                       $activity['type']      = $activity['component'] . '_' . $activity['type'];
-
</del><span class="cx" style="display: block; padding: 0 10px">                         $activity = array_intersect_key( $activity, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">                        $activity = array_merge( $defaults, $activity );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,37 +288,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                throw new Exception( '-1 Activity reported for unrecognized user ID: ' . $activity['user_id'] );
</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">-                        $activity['user_id'] = $user->ID;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Standardize on a WP_Error so that the rest of the file can assume it, rather than handling both.
+                       $activity['error_type'] = 'wp_error';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        return $activity;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Add an activity payload to a profile
-                *
-                * @param array $activity The arguments that should be passed to `bp_activity_add()`
-                *
-                * @return int|string Activity ID on success; error on failure.
-                */
-               protected function add_activity( array $activity ) {
-                       $activity_id = bp_activity_add( $activity );
-
-
-                       if ( is_int( $activity_id ) ) {
-                               $result = $activity_id;
-
-                       } else {
-                               $result = sprintf(
-                                       '-1 Unable to save activity: %s. Request was: %s',
-                                       $activity_id->get_error_message(),
-                                       wp_json_encode( $activity )
-                               );
-                       }
-
-                       return $result;
-               }
-
-               /**
</del><span class="cx" style="display: block; padding: 0 10px">                  * Handles incoming activities for a forum.
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><span class="cx" style="display: block; padding: 0 10px">                 * Recognized activities:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,6 +668,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        $ret .= "\t$k => $v\n";
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px">                         return $ret;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>