Changeset 10895 for trunk/src/bp-activity/bp-activity-notifications.php
- Timestamp:
- 06/22/2016 09:17:23 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-activity/bp-activity-notifications.php
r10825 r10895 209 209 * @param int $total_items The total number of notifications to format. 210 210 * @param string $format 'string' to get a BuddyBar-compatible notification, 'array' otherwise. 211 * @param int $id Optional. The notification ID. 211 212 * @return string $return Formatted @mention notification. 212 213 */ 213 function bp_activity_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {214 function bp_activity_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string', $id = 0 ) { 214 215 $action_filter = $action; 215 216 $return = false; … … 226 227 227 228 if ( (int) $total_items > 1 ) { 228 $text = sprintf( __( 'You have %1$d new mentions', 'buddypress' ), (int) $total_items );229 $text = sprintf( __( 'You have %1$d new mentions', 'buddypress' ), (int) $total_items ); 229 230 $amount = 'multiple'; 230 231 } else { 231 $text = 232 $text = sprintf( __( '%1$s mentioned you', 'buddypress' ), $user_fullname ); 232 233 } 233 234 break; … … 243 244 $amount = 'multiple'; 244 245 } else { 245 $link = bp_activity_get_permalink( $activity_id);246 $text =sprintf( __( '%1$s commented on one of your updates', 'buddypress' ), $user_fullname );246 $link = add_query_arg( 'nid', (int) $id, bp_activity_get_permalink( $activity_id ) ); 247 $text = sprintf( __( '%1$s commented on one of your updates', 'buddypress' ), $user_fullname ); 247 248 } 248 249 break; … … 258 259 $amount = 'multiple'; 259 260 } else { 260 $link = bp_activity_get_permalink( $activity_id);261 $text =sprintf( __( '%1$s replied to one your activity comments', 'buddypress' ), $user_fullname );261 $link = add_query_arg( 'nid', (int) $id, bp_activity_get_permalink( $activity_id ) ); 262 $text = sprintf( __( '%1$s replied to one your activity comments', 'buddypress' ), $user_fullname ); 262 263 } 263 264 break; … … 366 367 bp_notifications_add_notification( array( 367 368 'user_id' => $activity->user_id, 368 'item_id' => $ activity->id,369 'item_id' => $comment_id, 369 370 'secondary_item_id' => $commenter_id, 370 371 'component_name' => buddypress()->activity->id, … … 390 391 bp_notifications_add_notification( array( 391 392 'user_id' => $activity_comment->user_id, 392 'item_id' => $ activity_comment->item_id,393 'item_id' => $comment_id, 393 394 'secondary_item_id' => $commenter_id, 394 395 'component_name' => buddypress()->activity->id, … … 427 428 * 428 429 * @since 2.0.0 429 * @since 2.6.0 Mark notifications for 'update_reply' and 'comment_reply' actions430 430 * 431 431 * @param BP_Activity_Activity $activity Activity object. … … 440 440 } 441 441 442 /** 443 * Filter here to add the notification actions to mark as read 444 * when the single activity is displayed. 445 * 446 * @since 2.6.0 447 * 448 * @param array $value List of notification actions to mark as read. 449 */ 450 $notification_actions = apply_filters( 'bp_activity_notification_actions_single_activity', array( 451 'new_at_mention', 452 'update_reply', 453 'comment_reply', 454 ) ); 455 456 $user_id = bp_loggedin_user_id(); 457 $component = buddypress()->activity->id; 458 459 foreach ( $notification_actions as $action ) { 460 // Mark as read any notifications for the current user related to this activity item. 461 bp_notifications_mark_notifications_by_item_id( $user_id, $activity->id, $component, $action ); 462 } 442 // Mark as read any notifications for the current user related to this activity item. 443 bp_notifications_mark_notifications_by_item_id( bp_loggedin_user_id(), $activity->id, buddypress()->activity->id, 'new_at_mention' ); 463 444 } 464 445 add_action( 'bp_activity_screen_single_activity_permalink', 'bp_activity_remove_screen_notifications_single_activity_permalink' ); 446 447 /** 448 * Mark non-mention notifications as read when user visits our read permalink. 449 * 450 * In particular, 'update_reply' and 'comment_reply' notifications are handled 451 * here. See {@link bp_activity_format_notifications()} for more info. 452 * 453 * @since 2.6.0 454 */ 455 function bp_activity_remove_screen_notifications_for_non_mentions() { 456 if ( false === bp_is_active( 'notifications' ) || false === is_singular() || false === is_user_logged_in() || empty( $_GET['nid'] ) ) { 457 return; 458 } 459 460 // Mark notification as read. 461 BP_Notifications_Notification::update( 462 array( 463 'is_new' => false 464 ), 465 array( 466 'user_id' => bp_loggedin_user_id(), 467 'id' => (int) $_GET['nid'] 468 ) 469 ); 470 } 471 add_action( 'bp_screens', 'bp_activity_remove_screen_notifications_for_non_mentions' ); 465 472 466 473 /** … … 481 488 } 482 489 add_action( 'bp_activity_deleted_activities', 'bp_activity_at_mention_delete_notification', 10 ); 490 491 /** 492 * Add a notification for post comments to the post author or post commenter. 493 * 494 * Requires "activity stream commenting on blog and forum posts" to be enabled. 495 * 496 * @since 2.6.0 497 * 498 * @param int $activity_id The activity comment ID. 499 * @param WP_Comment $post_type_comment WP Comment object. 500 * @param array $activity_args Activity comment arguments. 501 * @param object $activity_post_object The post type tracking args object. 502 */ 503 function bp_activity_add_notification_for_synced_blog_comment( $activity_id, $post_type_comment, $activity_args, $activity_post_object ) { 504 // If activity comments are disabled for WP posts, stop now! 505 if ( bp_disable_blogforum_comments() || empty( $activity_id ) || false === bp_is_active( 'notifications' ) ) { 506 return; 507 } 508 509 // Send a notification to the blog post author. 510 if ( (int) $post_type_comment->post->post_author !== (int) $activity_args['user_id'] ) { 511 // Only add a notification if comment author is a registered user. 512 // @todo Should we remove this restriction? 513 if ( ! empty( $post_type_comment->user_id ) ) { 514 bp_notifications_add_notification( array( 515 'user_id' => $post_type_comment->post->post_author, 516 'item_id' => $activity_id, 517 'secondary_item_id' => $post_type_comment->user_id, 518 'component_name' => buddypress()->activity->id, 519 'component_action' => 'update_reply', 520 'date_notified' => $post_type_comment->comment_date_gmt, 521 'is_new' => 1, 522 ) ); 523 } 524 } 525 526 // Send a notification to the parent comment author for follow-up comments. 527 if ( ! empty( $post_type_comment->comment_parent ) ) { 528 $parent_comment = get_comment( $post_type_comment->comment_parent ); 529 530 if ( ! empty( $parent_comment->user_id ) && (int) $parent_comment->user_id !== (int) $activity_args['user_id'] ) { 531 bp_notifications_add_notification( array( 532 'user_id' => $parent_comment->user_id, 533 'item_id' => $activity_id, 534 'secondary_item_id' => $post_type_comment->user_id, 535 'component_name' => buddypress()->activity->id, 536 'component_action' => 'comment_reply', 537 'date_notified' => $post_type_comment->comment_date_gmt, 538 'is_new' => 1, 539 ) ); 540 } 541 } 542 } 543 add_action( 'bp_blogs_comment_sync_activity_comment', 'bp_activity_add_notification_for_synced_blog_comment', 10, 4 );
Note: See TracChangeset
for help on using the changeset viewer.