Changeset 4738 for trunk/bp-activity/bp-activity-filters.php

Timestamp:

07/20/2011 11:29:25 PM (13 years ago)

Author:

boonebgorges

Message:

Fixes at-mentions so that they are turned into links in contexts other than activity updates. Fixes #3363. Deprecates groups_at_mention_notification() in favor of bp_activity_at_message_notification(). Reconfigures at-mention notification so that BP notifications and email notifications are receieved for a wider variety of activity item types.

File:

• trunk/bp-activity/bp-activity-filters.php (modified) (3 diffs)

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

@@ -72 +72 @@
 add_filter( 'bp_get_activity_feed_item_description', 'bp_activity_make_nofollow_filter' );
 
-add_filter( 'bp_get_activity_parent_content', 'bp_create_excerpt' );
+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_get_activity_parent_content',        'bp_create_excerpt' );
 
 function bp_activity_filter_kses( $content ) {
@@ -102 +106 @@
 
 /**
- * bp_activity_at_name_filter()
- *
- * Finds and links @-mentioned users in activity updates
+ * Finds and links @-mentioned users in the contents of activity items
  *
  * @package BuddyPress Activity
  *
  * @param string $content The activity content
+ * @param int $activity_id When $adjust_mention_count is true, you must provide an $activity_id, 
+ *   which will be added to the list of the user's unread mentions
  */
-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;
-
+function bp_activity_at_name_filter( $content, $activity_id = 0 ) {
     $usernames = bp_activity_find_mentions( $content );
 
@@ -127 +126 @@
             continue;
 
-        // Increase the number of new @ mentions for the user
-        bp_activity_adjust_mention_count( $activity->id, 'add' );
+        // If an activity_id is provided, we can send email and BP notifications
+        if ( $activity_id ) {
+            bp_activity_at_message_notification( $activity_id, $user_id );
+        }
 
         $content = preg_replace( '/(@' . $username . '\b)/', "<a href='" . bp_core_get_user_domain( $user_id ) . "' rel='nofollow'>@$username</a>", $content );
     }
 
-    // Resave the activity item with the linked usernames
-    $activity->content = $content;
+    // Adjust the activity count for this item  
+    if ( $activity_id )
+        bp_activity_adjust_mention_count( $activity_id, 'add' );
+
+    return $content;
+} 
+
+/**
+ * Catch mentions in saved activity items
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @param obj $activity
+ */
+function bp_activity_at_name_filter_updates( $activity ) {
+    // Only run this function once for a given activity item
+    remove_filter( 'bp_activity_after_save', 'bp_activity_at_name_filter_updates' );
+    
+    // Run the content through the linking filter, making sure to increment mention count
+    $activity->content = bp_activity_at_name_filter( $activity->content, $activity->id );
+    
+    // Resave the activity with the new content
     $activity->save();
 }
-add_filter( 'bp_activity_after_save', 'bp_activity_at_name_filter' );
+add_filter( 'bp_activity_after_save', 'bp_activity_at_name_filter_updates' );
 
 function bp_activity_make_nofollow_filter( $text ) {