Changeset 4367

Timestamp:

05/15/2011 10:40:03 PM (15 years ago)

Author:

boonebgorges

Message:

Reconfigures the way that new activity mentions are stored and incremented, so that counts more accurately reflect new and deleted activity items. Fixes #2082

Location:

trunk

Files:

• bp-activity/bp-activity-filters.php (modified) (2 diffs)
• bp-activity/bp-activity-functions.php (modified) (4 diffs)
• bp-activity/bp-activity-screens.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)

trunk/bp-activity/bp-activity-filters.php

@@ -113 +113 @@
  * @param string $content The activity content
  */
-function bp_activity_at_name_filter( $content ) {
+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;
+
         $usernames = bp_activity_find_mentions( $content );
 
@@ -126 +131 @@
 
                 // Increase 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 );
+                bp_activity_adjust_mention_count( $activity->id, 'add' );
 
                 $content = preg_replace( '/(@' . $username . '\b)/', "<a href='" . bp_core_get_user_domain( $user_id ) . "' rel='nofollow'>@$username</a>", $content );
         }
 
-        return $content;
+        // Resave the activity item with the linked usernames
+        $activity->content = $content;
+        $activity->save();
 }
-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' );
+add_filter( 'bp_activity_after_save', 'bp_activity_at_name_filter' );
 
 function bp_activity_make_nofollow_filter( $text ) {

trunk/bp-activity/bp-activity-functions.php

@@ -16 +16 @@
  * @since 1.3
  *
- * @param $content The content of the activity, usually found in $activity->content
+ * @param str $content The content of the activity, usually found in $activity->content
  * @return array $usernames Array of the found usernames that match existing users
  */
@@ -31 +31 @@
 
 /**
- * Reduces new mention count for mentioned users when activity items are deleted
+ * Resets a user's unread mentions list and count
  *
  * @package BuddyPress Activity
  * @since 1.3
  *
- * @param $activity_id The unique id for the activity item
- */
-function bp_activity_reduce_mention_count( $activity_id ) {
+ * @param int $user_id The id of the user whose unread mentions are being reset
+ */
+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' ) {
         $activity = new BP_Activity_Activity( $activity_id );
 
@@ -51 +64 @@
                                 continue;
 
-                        // Decrease the number of new @ mentions for the user
+                        // Adjust the mention list and count for the member
                         $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 );
+                        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 );
                 }
         }
 }
-add_action( 'bp_activity_action_delete_activity', 'bp_activity_reduce_mention_count' );
 
 /**
@@ -758 +796 @@
         $args = wp_parse_args( $args, $defaults );
 
+        // Adjust the new mention count of any mentioned member
+        bp_activity_adjust_mention_count( $args['id'], 'delete' );
+
         if ( !$activity_ids_deleted = BP_Activity_Activity::delete( $args ) )
                 return false;

trunk/bp-activity/bp-activity-screens.php

@@ -68 +68 @@
 add_action( 'bp_activity_screen_single_activity_permalink', 'bp_activity_remove_screen_notifications' );
 add_action( 'bp_activity_screen_mentions',                  'bp_activity_remove_screen_notifications' );
+
+/**
+ * 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' );
 
 function bp_activity_screen_single_activity_permalink() {

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -113 +113 @@
                 case 'mentions':
                         $feed_url = $bp->loggedin_user->domain . bp_get_activity_slug() . '/mentions/feed/';
-                        delete_user_meta( $bp->loggedin_user->id, 'bp_new_mention_count' );
+                        bp_activity_clear_new_mentions( $bp->loggedin_user->id );
                         break;
                 default: