<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [3468] trunk:
Decreases new mention count when activity items are deleted.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3468</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-11-21 22:41:37 +0000 (Sun, 21 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Decreases new mention count when activity items are deleted. Fixes #2082</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.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 (3467 => 3468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2010-11-21 22:03:50 UTC (rev 3467)
+++ trunk/bp-activity/bp-activity-filters.php 2010-11-21 22:41:37 UTC (rev 3468)
</span><span class="lines">@@ -102,16 +102,20 @@
</span><span class="cx"> return wp_kses( $content, $activity_allowedtags );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * bp_activity_at_name_filter()
+ *
+ * Finds and links @-mentioned users in activity updates
+ *
+ * @package BuddyPress Activity
+ *
+ * @param string $content The activity content
+ */
</ins><span class="cx"> function bp_activity_at_name_filter( $content ) {
</span><span class="cx"> include_once( ABSPATH . WPINC . '/registration.php' );
</span><span class="cx">
</span><del>- $pattern = '/[@]+([A-Za-z0-9-_\.]+)/';
- preg_match_all( $pattern, $content, $usernames );
</del><ins>+ $usernames = bp_activity_find_mentions( $content );
</ins><span class="cx">
</span><del>- // Make sure there's only one instance of each username
- if ( !$usernames = array_unique( $usernames[1] ) )
- return $content;
-
</del><span class="cx"> foreach( (array)$usernames as $username ) {
</span><span class="cx"> if ( !$user_id = username_exists( $username ) )
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (3467 => 3468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-11-21 22:03:50 UTC (rev 3467)
+++ trunk/bp-activity.php 2010-11-21 22:41:37 UTC (rev 3468)
</span><span class="lines">@@ -502,6 +502,56 @@
</span><span class="cx"> add_action( 'wp', 'bp_activity_action_favorites_feed', 3 );
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * bp_activity_find_mentions()
+ *
+ * Searches through the content of an activity item to locate usernames, designated by an @ sign
+ *
+ * @package BuddyPress Activity
+ * @since 1.3
+ *
+ * @param $content The content of the activity, usually found in $activity->content
+ * @return array $usernames Array of the found usernames that match existing users
+ */
+function bp_activity_find_mentions( $content ) {
+ $pattern = '/[@]+([A-Za-z0-9-_\.]+)/';
+ preg_match_all( $pattern, $content, $usernames );
+
+ // Make sure there's only one instance of each username
+ if ( !$usernames = array_unique( $usernames[1] ) )
+ return false;
+
+ return $usernames;
+}
+
+/**
+ * bp_activity_reduce_mention_count()
+ *
+ * Reduces new mention count for mentioned users when activity items are deleted
+ *
+ * @package BuddyPress Activity
+ * @since 1.3
+ *
+ * @param $activity_id The unique id for the activity item
+ */
+function bp_activity_reduce_mention_count( $activity_id ) {
+ $activity = new BP_Activity_Activity( $activity_id );
+
+ if ( $usernames = bp_activity_find_mentions( strip_tags( $activity->content ) ) ) {
+ include_once( ABSPATH . WPINC . '/registration.php' );
+
+ foreach( (array)$usernames as $username ) {
+ if ( !$user_id = username_exists( $username ) )
+ continue;
+
+ // Decrease the number of new @ mentions for the user
+ $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 );
+ }
+ }
+}
+add_action( 'bp_activity_action_delete_activity', 'bp_activity_reduce_mention_count' );
+
+/**
</ins><span class="cx"> * bp_activity_format_notifications()
</span><span class="cx"> *
</span><span class="cx"> * Formats notifications related to activity
</span></span></pre>
</div>
</div>
</body>
</html>