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

Timestamp:

07/20/2011 11:29:25 PM (15 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-notifications.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-notifications.php

@@ -9 +9 @@
  * @param int $activity_id The id of the activity update
  */
-function bp_activity_at_message_notification( $content, $poster_user_id, $activity_id ) {
+function bp_activity_at_message_notification( $activity_id, $receiver_user_id ) {
         global $bp;
 
-        /* Scan for @username strings in an activity update. Notify each user. */
-        $pattern = '/[@]+([A-Za-z0-9-_\.@]+)/';
-        preg_match_all( $pattern, $content, $usernames );
+        $activity = new BP_Activity_Activity( $activity_id );
 
-        /* Make sure there's only one instance of each username */
-        if ( !$usernames = array_unique( $usernames[1] ) )
-                return false;
+        $subject = '';
+        $message = '';
+        
+        // Add the BP notification
+        bp_core_add_notification( $activity_id, $receiver_user_id, 'activity', 'new_at_mention', $activity->user_id );
+                        
+        // Now email the user with the contents of the message (if they have enabled email notifications)
+        if ( 'no' != bp_get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
+                $poster_name = bp_core_get_user_displayname( $activity->user_id );
 
-        foreach( (array)$usernames as $username ) {
-                if ( bp_is_username_compatibility_mode() )
-                        $receiver_user_id = bp_core_get_userid( $username );
-                else
-                        $receiver_user_id = bp_core_get_userid_from_nicename( $username );
+                $message_link = bp_activity_get_permalink( $activity_id );
+                $settings_link = bp_core_get_user_domain( $receiver_user_id ) . bp_get_settings_slug() . '/notifications/';
 
-                if ( empty( $receiver_user_id ) )
-                        continue;
+                $poster_name = stripslashes( $poster_name );
+                $content = bp_activity_filter_kses( strip_tags( stripslashes( $activity->content ) ) );
 
-                bp_core_add_notification( $activity_id, $receiver_user_id, 'activity', 'new_at_mention', $poster_user_id );
+                // Set up and send the message
+                $ud       = bp_core_get_core_userdata( $receiver_user_id );
+                $to       = $ud->user_email;
+                $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+                $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
 
-                $subject = '';
-                $message = '';
+                if ( bp_is_active( 'groups' ) && bp_is_group() ) {
+                        $message = sprintf( __(
+'%1$s mentioned you in the group "%2$s":
 
-                // Now email the user with the contents of the message (if they have enabled email notifications)
-                if ( 'no' != bp_get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
-                        $poster_name = bp_core_get_user_displayname( $poster_user_id );
+"%3$s"
 
-                        $message_link = bp_activity_get_permalink( $activity_id );
-                        $settings_link = bp_core_get_user_domain( $receiver_user_id ) . bp_get_settings_slug() . '/notifications/';
+To view and respond to the message, log in and visit: %4$s
 
-                        $poster_name = stripslashes( $poster_name );
-                        $content = bp_activity_filter_kses( stripslashes($content) );
-
-                        // Set up and send the message
-                        $ud       = bp_core_get_core_userdata( $receiver_user_id );
-                        $to       = $ud->user_email;
-                        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
-                        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
-
-$message = sprintf( __(
+---------------------
+', 'buddypress' ), $poster_name, bp_get_current_group_name(), $content, $message_link );
+                } else {
+                        $message = sprintf( __(
 '%1$s mentioned you in an update:
 
@@ -59 +56 @@
 ---------------------
 ', 'buddypress' ), $poster_name, $content, $message_link );
+                }
 
-                        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
 
-                        /* Send the message */
-                        $to = apply_filters( 'bp_activity_at_message_notification_to', $to );
-                        $subject = apply_filters( 'bp_activity_at_message_notification_subject', $subject, $poster_name );
-                        $message = apply_filters( 'bp_activity_at_message_notification_message', $message, $poster_name, $content, $message_link, $settings_link );
+                /* Send the message */
+                $to      = apply_filters( 'bp_activity_at_message_notification_to', $to );
+                $subject = apply_filters( 'bp_activity_at_message_notification_subject', $subject, $poster_name );
+                $message = apply_filters( 'bp_activity_at_message_notification_message', $message, $poster_name, $content, $message_link, $settings_link );
 
-                        wp_mail( $to, $subject, $message );
-                }
-                
-                do_action( 'bp_activity_sent_mention_email', $usernames, $subject, $message, $content, $poster_user_id, $activity_id );
+                wp_mail( $to, $subject, $message );
         }
+        
+        do_action( 'bp_activity_sent_mention_email', $activity, $subject, $message, $content );
 }
-add_action( 'bp_activity_posted_update', 'bp_activity_at_message_notification', 10, 3 );
 
 function bp_activity_new_comment_notification( $comment_id, $commenter_id, $params ) {