<!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][4367] trunk: Reconfigures the way that new activity mentions are stored and incremented, so that counts more accurately reflect new and deleted activity items.</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>4367</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-05-15 22:40:03 +0000 (Sun, 15 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reconfigures the way that new activity mentions are stored and incremented, so that counts more accurately reflect new and deleted activity items. Fixes #2082</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpactivitybpactivityscreensphp">trunk/bp-activity/bp-activity-screens.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="trunkbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-filters.php (4366 => 4367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2011-05-15 21:26:06 UTC (rev 4366)
+++ trunk/bp-activity/bp-activity-filters.php 2011-05-15 22:40:03 UTC (rev 4367)
</span><span class="lines">@@ -112,7 +112,12 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $content The activity content
</span><span class="cx"> */
</span><del>-function bp_activity_at_name_filter( $content ) {
</del><ins>+function bp_activity_at_name_filter( $activity ) {
+ // Only run this function once for a given activity item
+ remove_filter( 'bp_activity_after_save', 'bp_activity_at_name_filter' );
+
+ $content = $activity->content;
+
</ins><span class="cx"> $usernames = bp_activity_find_mentions( $content );
</span><span class="cx">
</span><span class="cx"> foreach( (array)$usernames as $username ) {
</span><span class="lines">@@ -125,20 +130,16 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // Increase the number of new @ mentions for the user
</span><del>- $new_mention_count = (int)get_user_meta( $user_id, 'bp_new_mention_count', true );
- update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count + 1 );
</del><ins>+ bp_activity_adjust_mention_count( $activity->id, 'add' );
</ins><span class="cx">
</span><span class="cx"> $content = preg_replace( '/(@' . $username . '\b)/', "<a href='" . bp_core_get_user_domain( $user_id ) . "' rel='nofollow'>@$username</a>", $content );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return $content;
</del><ins>+ // Resave the activity item with the linked usernames
+ $activity->content = $content;
+ $activity->save();
</ins><span class="cx"> }
</span><del>-add_filter( 'bp_activity_new_update_content', 'bp_activity_at_name_filter' );
-add_filter( 'groups_activity_new_update_content', 'bp_activity_at_name_filter' );
-add_filter( 'pre_comment_content', 'bp_activity_at_name_filter' );
-add_filter( 'group_forum_topic_text_before_save', 'bp_activity_at_name_filter' );
-add_filter( 'group_forum_post_text_before_save', 'bp_activity_at_name_filter' );
-add_filter( 'bp_activity_comment_content', 'bp_activity_at_name_filter' );
</del><ins>+add_filter( 'bp_activity_after_save', 'bp_activity_at_name_filter' );
</ins><span class="cx">
</span><span class="cx"> function bp_activity_make_nofollow_filter( $text ) {
</span><span class="cx"> return preg_replace_callback( '|<a (.+?)>|i', 'bp_activity_make_nofollow_filter_callback', $text );
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (4366 => 4367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2011-05-15 21:26:06 UTC (rev 4366)
+++ trunk/bp-activity/bp-activity-functions.php 2011-05-15 22:40:03 UTC (rev 4367)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> * @package BuddyPress Activity
</span><span class="cx"> * @since 1.3
</span><span class="cx"> *
</span><del>- * @param $content The content of the activity, usually found in $activity->content
</del><ins>+ * @param str $content The content of the activity, usually found in $activity->content
</ins><span class="cx"> * @return array $usernames Array of the found usernames that match existing users
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_find_mentions( $content ) {
</span><span class="lines">@@ -30,14 +30,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Reduces new mention count for mentioned users when activity items are deleted
</del><ins>+ * Resets a user's unread mentions list and count
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Activity
</span><span class="cx"> * @since 1.3
</span><span class="cx"> *
</span><del>- * @param $activity_id The unique id for the activity item
</del><ins>+ * @param int $user_id The id of the user whose unread mentions are being reset
</ins><span class="cx"> */
</span><del>-function bp_activity_reduce_mention_count( $activity_id ) {
</del><ins>+function bp_activity_clear_new_mentions( $user_id ) {
+ delete_user_meta( $user_id, 'bp_new_mention_count' );
+ delete_user_meta( $user_id, 'bp_new_mentions' );
+}
+
+/**
+ * Adjusts new mention count for mentioned users when activity items are deleted or created
+ *
+ * @package BuddyPress Activity
+ * @since 1.3
+ *
+ * @param int $activity_id The unique id for the activity item
+ */
+function bp_activity_adjust_mention_count( $activity_id, $action = 'add' ) {
</ins><span class="cx"> $activity = new BP_Activity_Activity( $activity_id );
</span><span class="cx">
</span><span class="cx"> if ( $usernames = bp_activity_find_mentions( strip_tags( $activity->content ) ) ) {
</span><span class="lines">@@ -50,13 +63,38 @@
</span><span class="cx"> if ( empty( $user_id ) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- // Decrease the number of new @ mentions for the user
</del><ins>+ // Adjust the mention list and count for the member
</ins><span class="cx"> $new_mention_count = (int)get_user_meta( $user_id, 'bp_new_mention_count', true );
</span><del>- update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count - 1 );
</del><ins>+ if ( !$new_mentions = get_user_meta( $user_id, 'bp_new_mentions', true ) )
+ $new_mentions = array();
+
+ switch ( $action ) {
+ case 'delete' :
+ $key = array_search( $activity_id, $new_mentions );
+ if ( $key !== false ) {
+ var_dump( $new_mentions );
+ var_dump( $activity_id );
+ unset( $new_mentions[$key] );
+ }
+ break;
+
+ case 'add' :
+ default :
+ if ( !in_array( $activity_id, $new_mentions ) ) {
+ $new_mentions[] = (int)$activity_id;
+ }
+ break;
+ }
+
+ // Get an updated mention count
+ $new_mention_count = count( $new_mentions );
+
+ // Resave the user_meta
+ update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count );
+ update_user_meta( $user_id, 'bp_new_mentions', $new_mentions );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'bp_activity_action_delete_activity', 'bp_activity_reduce_mention_count' );
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Formats notifications related to activity
</span><span class="lines">@@ -757,6 +795,9 @@
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><ins>+ // Adjust the new mention count of any mentioned member
+ bp_activity_adjust_mention_count( $args['id'], 'delete' );
+
</ins><span class="cx"> if ( !$activity_ids_deleted = BP_Activity_Activity::delete( $args ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivitybpactivityscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-screens.php (4366 => 4367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-screens.php 2011-05-15 21:26:06 UTC (rev 4366)
+++ trunk/bp-activity/bp-activity-screens.php 2011-05-15 22:40:03 UTC (rev 4367)
</span><span class="lines">@@ -68,6 +68,20 @@
</span><span class="cx"> add_action( 'bp_activity_screen_single_activity_permalink', 'bp_activity_remove_screen_notifications' );
</span><span class="cx"> add_action( 'bp_activity_screen_mentions', 'bp_activity_remove_screen_notifications' );
</span><span class="cx">
</span><ins>+/**
+ * Reset the logged-in user's new mentions data when he visits his mentions screen
+ *
+ * @package BuddyPress Activity
+ * @since 1.3
+ * @uses bp_activity_clear_new_mentions()
+ * @uses bp_is_my_profile()
+ */
+function bp_activity_reset_my_new_mentions() {
+ if ( bp_is_my_profile() )
+ bp_activity_clear_new_mentions( bp_loggedin_user_id() );
+}
+add_action( 'bp_activity_screen_mentions', 'bp_activity_reset_my_new_mentions' );
+
</ins><span class="cx"> function bp_activity_screen_single_activity_permalink() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (4366 => 4367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2011-05-15 21:26:06 UTC (rev 4366)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2011-05-15 22:40:03 UTC (rev 4367)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'mentions':
</span><span class="cx"> $feed_url = $bp->loggedin_user->domain . bp_get_activity_slug() . '/mentions/feed/';
</span><del>- delete_user_meta( $bp->loggedin_user->id, 'bp_new_mention_count' );
</del><ins>+ bp_activity_clear_new_mentions( $bp->loggedin_user->id );
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> $feed_url = home_url( bp_get_activity_root_slug() . '/feed/' );
</span></span></pre>
</div>
</div>
</body>
</html>