<!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>[BuddyPress][13367] trunk/src: Improve Activity & Group Activity `post_update` functions</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://buddypress.trac.wordpress.org/changeset/13367">13367</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13367","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-11-13 12:50:54 +0000 (Sun, 13 Nov 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'>Improve Activity & Group Activity `post_update` functions
1. Improve the `bp_activity_post_update()` function's extensibility including a filter name (`'activity_post_update'`) into the `bp_parse_args()` function used to merge given arguments with default ones. This allows Plugins or BuddyPress add-ons such as BP Attachments to create a content from a different input than the Activity Post Form's textarea using one of these two filters:
- `'bp_before_activity_post_update_parse_args'` or
- `'bp_after_activity_post_update_parse_args'`
2. `groups_post_update()` now completely respects the `$error_type` argument making sure to return a WP_Error object when it is defined to `wp_error`. If not, it returns `false`.
3. To avoid code/i18n string duplication adapt `bp_nouveau_ajax_post_update()` so that it enjoys the 2 above improvements.
Closes https://github.com/buddypress/buddypress/pull/37
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8764">#8764</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsactivityphp">trunk/src/bp-groups/bp-groups-activity.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesactivityajaxphp">trunk/src/bp-templates/bp-nouveau/includes/activity/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-functions.php 2022-11-12 08:53:05 UTC (rev 13366)
+++ trunk/src/bp-activity/bp-activity-functions.php 2022-11-13 12:50:54 UTC (rev 13367)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2113,7 +2113,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => bp_loggedin_user_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'error_type' => 'bool',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'activity_post_update'
</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"> if ( empty( $r['content'] ) || ! strlen( trim( $r['content'] ) ) ) {
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-activity.php 2022-11-12 08:53:05 UTC (rev 13366)
+++ trunk/src/bp-groups/bp-groups-activity.php 2022-11-13 12:50:54 UTC (rev 13367)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,16 +578,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $group_id = (int) $bp->groups->current_group->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">- $content = $r['content'];
- $user_id = (int) $r['user_id'];
- if ( ! $content || ! strlen( trim( $content ) ) || ! $user_id || ! $group_id ) {
- return false;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = $r['content'];
+ $user_id = (int) $r['user_id'];
+ $is_user_active = bp_is_user_active( $user_id );
+ $is_group_allowed = $group_id && ( bp_current_user_can( 'bp_moderate' ) || groups_is_user_member( $user_id, $group_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp->groups->current_group = groups_get_group( $group_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $content || ! strlen( trim( $content ) ) || ! $is_user_active || ! $is_group_allowed ) {
+ if ( 'wp_error' === $r['error_type'] ) {
+ $error_code = 'bp_activity_missing_content';
+ $error_code_message = __( 'Please enter some content to post.', 'buddypress' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Be sure the user is a member of the group before posting.
- if ( ! bp_current_user_can( 'bp_moderate' ) && ! groups_is_user_member( $user_id, $group_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $is_user_active ) {
+ $error_code = 'bp_activity_inactive_user';
+ $error_code_message = __( 'User account has not yet been activated.', 'buddypress' );
+ } elseif ( ! $is_group_allowed ) {
+ $error_code = 'bp_activity_unallowed_group';
+ $error_code_message = __( 'You need to be a member of this group to share updates with their members.', 'buddypress' );
+ }
+
+ return new WP_Error( $error_code, $error_code_message );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesactivityajaxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/activity/ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/activity/ajax.php 2022-11-12 08:53:05 UTC (rev 13366)
+++ trunk/src/bp-templates/bp-nouveau/includes/activity/ajax.php 2022-11-13 12:50:54 UTC (rev 13367)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,14 +506,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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">- if ( empty( $_POST['content'] ) ) {
- wp_send_json_error(
- array(
- 'message' => __( 'Please enter some content to post.', 'buddypress' ),
- )
- );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $activity_id = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $item_id = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $object = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,7 +528,12 @@
</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"> if ( 'user' === $object && bp_is_active( 'activity' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $activity_id = bp_activity_post_update( array( 'content' => $_POST['content'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activity_id = bp_activity_post_update(
+ array(
+ 'content' => $_POST['content'],
+ 'error_type' => 'wp_error',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'group' === $object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $item_id && bp_is_active( 'groups' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,8 +540,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // This function is setting the current group!
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_id = groups_post_update(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => $_POST['content'],
- 'group_id' => $item_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => $_POST['content'],
+ 'group_id' => $item_id,
+ 'error_type' => 'wp_error',
</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">@@ -565,9 +563,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_id = apply_filters( 'bp_activity_custom_update', false, $object, $item_id, $_POST['content'] );
</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">- if ( empty( $activity_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $activity_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'message' => $activity_id->get_error_message(),
+ )
+ );
+ } elseif ( empty( $activity_id ) ) {
+ wp_send_json_error(
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => __( 'There was a problem posting your update. Please try again.', 'buddypress' ),
</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>