<!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][5328] trunk: When a blog comment status transition occurs, update the relevant activity's status.</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 { 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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5328">5328</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-11-13 21:06:39 +0000 (Sun, 13 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>When a blog comment status transition occurs, update the relevant activity's status. See <a href="http://buddypress.trac.wordpress.org/ticket/3660">#3660</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsfunctionsphp">trunk/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunkbpcoredeprecated16php">trunk/bp-core/deprecated/1.6.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-functions.php (5327 => 5328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-functions.php 2011-11-13 21:04:14 UTC (rev 5327)
+++ trunk/bp-blogs/bp-blogs-functions.php 2011-11-13 21:06:39 UTC (rev 5328)
</span><span class="lines">@@ -288,14 +288,6 @@
</span><span class="cx"> add_action( 'comment_post', 'bp_blogs_record_comment', 10, 2 );
</span><span class="cx"> add_action( 'edit_comment', 'bp_blogs_record_comment', 10 );
</span><span class="cx">
</span><del>-function bp_blogs_manage_comment( $comment_id, $comment_status ) {
- if ( 'spam' == $comment_status || 'hold' == $comment_status || 'delete' == $comment_status || 'trash' == $comment_status )
- return bp_blogs_remove_comment( $comment_id );
-
- return bp_blogs_record_comment( $comment_id, true );
-}
-add_action( 'wp_set_comment_status', 'bp_blogs_manage_comment', 10, 2 );
-
</del><span class="cx"> function bp_blogs_add_user_to_blog( $user_id, $role = false, $blog_id = 0 ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="lines">@@ -397,6 +389,79 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'delete_comment', 'bp_blogs_remove_comment' );
</span><span class="cx">
</span><ins>+
+/**
+ * When a blog comment status transition occurs, update the relevant activity's status.
+ *
+ * @global object $bp BuddyPress global settings
+ * @param string $new_status New comment status.
+ * @param string $old_status Previous comment status.
+ * @param object $comment Comment data.
+ * @since 1.6
+ */
+function bp_blogs_transition_activity_status( $new_status, $old_status, $comment ) {
+ global $bp;
+
+ // Check the Activity component is active
+ if ( ! bp_is_active( 'activity' ) )
+ return;
+
+ /**
+ * Activity currently doesn't have any concept of a trash, or an unapproved/approved state.
+ *
+ * If a blog comment transitions to a "delete" or "hold" status, delete the activity item.
+ * If a blog comment transitions to trashed, or spammed, mark the activity as spam.
+ * If a blog comment transitions to approved (and the activity exists), mark the activity as ham.
+ * Otherwise, record the comment into the activity stream.
+ */
+
+ // This clause was moved in from bp_blogs_remove_comment() in BuddyPress 1.6. It handles delete/hold.
+ if ( in_array( $new_status, array( 'delete', 'hold' ) ) )
+ return bp_blogs_remove_comment( $comment->comment_ID );
+
+ // These clauses handle trash, spam, and un-spams.
+ elseif ( in_array( $new_status, array( 'trash', 'spam' ) ) )
+ $action = 'spam_activity';
+ elseif ( 'approved' == $new_status )
+ $action = 'ham_activity';
+
+ // Get the activity
+ $activity_id = bp_activity_get_activity_id( array( 'component' => $bp->blogs->id, 'item_id' => get_current_blog_id(), 'secondary_item_id' => $comment->comment_ID, 'type' => 'new_blog_comment', ) );
+
+ // Check activity item exists
+ if ( ! $activity_id ) {
+
+ // If no activity exists, but the comment has been approved, record it into the activity table.
+ if ( 'approved' == $new_status )
+ return bp_blogs_record_comment( $comment->comment_ID, true );
+
+ return;
+ }
+
+ // Create an activity object
+ $activity = new BP_Activity_Activity( $activity_id );
+ if ( empty( $activity->component ) )
+ return;
+
+ // Spam/ham the activity if it's not already in that state
+ if ( 'spam_activity' == $action && ! $activity->is_spam ) {
+ bp_activity_mark_as_spam( $activity );
+ } elseif ( 'ham_activity' == $action) {
+ bp_activity_mark_as_ham( $activity );
+ }
+
+ // Add "new_blog_comment" to the whitelisted activity types, so that the activity's Akismet history is generated
+ $comment_akismet_history = create_function( '$t', '$t[] = "new_blog_comment"; return $t;' );
+ add_filter( 'bp_akismet_get_activity_types', $comment_akismet_history );
+
+ // Save the updated activity
+ $activity->save();
+
+ // Remove the "new_blog_comment" activity type whitelist so we don't break anything
+ remove_filter( 'bp_akismet_get_activity_types', $comment_akismet_history );
+}
+add_action( 'transition_comment_status', 'bp_blogs_transition_activity_status', 10, 3 );
+
</ins><span class="cx"> function bp_blogs_total_blogs() {
</span><span class="cx"> if ( !$count = wp_cache_get( 'bp_total_blogs', 'bp' ) ) {
</span><span class="cx"> $blogs = BP_Blogs_Blog::get_all();
</span></span></pre></div>
<a id="trunkbpcoredeprecated16php"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/deprecated/1.6.php (5327 => 5328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/deprecated/1.6.php 2011-11-13 21:04:14 UTC (rev 5327)
+++ trunk/bp-core/deprecated/1.6.php 2011-11-13 21:06:39 UTC (rev 5328)
</span><span class="lines">@@ -47,4 +47,17 @@
</span><span class="cx"> _deprecated_function( __FUNCTION__, '1.6' );
</span><span class="cx"> bp_is_user_spammer( $user_id );
</span><span class="cx"> }
</span><ins>+
+
+/**
+ * Blogs functions
+ */
+
+/*
+ * @deprecated 1.6
+ * @deprecated No longer used; see bp_blogs_transition_activity_status()
+ */
+function bp_blogs_manage_comment( $comment_id, $comment_status ) {
+ _deprecated_function( __FUNCTION__, '1.6', 'No longer used' );
+}
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (5327 => 5328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2011-11-13 21:04:14 UTC (rev 5327)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2011-11-13 21:06:39 UTC (rev 5328)
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx">
</span><span class="cx"> // Load up the activity item
</span><span class="cx"> $activity = new BP_Activity_Activity( (int) $_POST['id'] );
</span><del>- if ( empty( $activity->id ) ) {
</del><ins>+ if ( empty( $activity->component ) ) {
</ins><span class="cx"> echo '-1';
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>