Changeset 10715 for trunk/src/bp-activity/bp-activity-notifications.php
- Timestamp:
- 04/21/2016 07:44:45 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-activity/bp-activity-notifications.php
r10500 r10715 149 149 add_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 ); 150 150 151 if ( $original_activity->user_id != $commenter_id && 'no' != bp_get_user_meta( $original_activity->user_id, 'notification_activity_new_reply', true ) ) { 152 $args = array( 153 'tokens' => array( 154 'comment.id' => $comment_id, 155 'commenter.id' => $commenter_id, 156 'usermessage' => wp_strip_all_tags( $content ), 157 'original_activity.user_id' => $original_activity->user_id, 158 'poster.name' => $poster_name, 159 'thread.url' => esc_url( $thread_link ), 160 ), 161 ); 162 163 bp_send_email( 'activity-comment', $original_activity->user_id, $args ); 151 if ( $original_activity->user_id != $commenter_id ) { 152 153 // Send an email if the user hasn't opted-out. 154 if ( 'no' != bp_get_user_meta( $original_activity->user_id, 'notification_activity_new_reply', true ) ) { 155 $args = array( 156 'tokens' => array( 157 'comment.id' => $comment_id, 158 'commenter.id' => $commenter_id, 159 'usermessage' => wp_strip_all_tags( $content ), 160 'original_activity.user_id' => $original_activity->user_id, 161 'poster.name' => $poster_name, 162 'thread.url' => esc_url( $thread_link ), 163 ), 164 ); 165 166 bp_send_email( 'activity-comment', $original_activity->user_id, $args ); 167 } 168 169 /** 170 * Fires at the point that notifications should be sent for activity comments. 171 * 172 * @since 2.6.0 173 * 174 * @param BP_Activity_Activity $original_activity The original activity. 175 * @param int $comment_id ID for the newly received comment. 176 * @param int $commenter_id ID of the user who made the comment. 177 * @param array $params Arguments used with the original activity comment. 178 */ 179 do_action( 'bp_activity_sent_reply_to_update_notification', $original_activity, $comment_id, $commenter_id, $params ); 164 180 } 165 181 … … 175 191 $parent_comment = new BP_Activity_Activity( $params['parent_id'] ); 176 192 177 if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != bp_get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply', true ) ) { 178 $args = array( 179 'tokens' => array( 180 'comment.id' => $comment_id, 181 'commenter.id' => $commenter_id, 182 'usermessage' => wp_strip_all_tags( $content ), 183 'parent-comment-user.id' => $parent_comment->user_id, 184 'poster.name' => $poster_name, 185 'thread.url' => esc_url( $thread_link ), 186 ), 187 ); 188 189 bp_send_email( 'activity-comment-author', $parent_comment->user_id, $args ); 193 if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id ) { 194 195 // Send an email if the user hasn't opted-out. 196 if ( 'no' != bp_get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply', true ) ) { 197 $args = array( 198 'tokens' => array( 199 'comment.id' => $comment_id, 200 'commenter.id' => $commenter_id, 201 'usermessage' => wp_strip_all_tags( $content ), 202 'parent-comment-user.id' => $parent_comment->user_id, 203 'poster.name' => $poster_name, 204 'thread.url' => esc_url( $thread_link ), 205 ), 206 ); 207 208 bp_send_email( 'activity-comment-author', $parent_comment->user_id, $args ); 209 } 210 211 /** 212 * Fires at the point that notifications should be sent for comments on activity replies. 213 * 214 * @since 2.6.0 215 * 216 * @param BP_Activity_Activity $parent_comment The parent activity. 217 * @param int $comment_id ID for the newly received comment. 218 * @param int $commenter_id ID of the user who made the comment. 219 * @param array $params Arguments used with the original activity comment. 220 */ 221 do_action( 'bp_activity_sent_reply_to_reply_notification', $parent_comment, $comment_id, $commenter_id, $params ); 190 222 } 191 223 } … … 226 258 */ 227 259 function bp_activity_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) { 260 $action_filter = $action; 261 $return = false; 262 $activity_id = $item_id; 263 $user_id = $secondary_item_id; 264 $user_fullname = bp_core_get_user_displayname( $user_id ); 228 265 229 266 switch ( $action ) { 230 267 case 'new_at_mention': 231 $activity_id = $item_id; 232 $poster_user_id = $secondary_item_id; 233 $at_mention_link = bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/'; 234 $at_mention_title = sprintf( __( '@%s Mentions', 'buddypress' ), bp_get_loggedin_user_username() ); 235 $amount = 'single'; 268 $action_filter = 'at_mentions'; 269 $link = bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/'; 270 $title = sprintf( __( '@%s Mentions', 'buddypress' ), bp_get_loggedin_user_username() ); 271 $amount = 'single'; 236 272 237 273 if ( (int) $total_items > 1 ) { … … 239 275 $amount = 'multiple'; 240 276 } else { 241 $user_fullname = bp_core_get_user_displayname( $poster_user_id );242 277 $text = sprintf( __( '%1$s mentioned you', 'buddypress' ), $user_fullname ); 243 278 } 244 279 break; 280 281 case 'update_reply': 282 $link = bp_get_notifications_permalink(); 283 $title = __( 'New Activity reply', 'buddypress' ); 284 $amount = 'single'; 285 286 if ( (int) $total_items > 1 ) { 287 $link = add_query_arg( 'type', $action, $link ); 288 $text = sprintf( __( 'You have %1$d new replies', 'buddypress' ), (int) $total_items ); 289 $amount = 'multiple'; 290 } else { 291 $link = bp_activity_get_permalink( $activity_id ); 292 $text = sprintf( __( '%1$s commented on one of your updates', 'buddypress' ), $user_fullname ); 293 } 294 break; 295 296 case 'comment_reply': 297 $link = bp_get_notifications_permalink(); 298 $title = __( 'New Activity comment reply', 'buddypress' ); 299 $amount = 'single'; 300 301 if ( (int) $total_items > 1 ) { 302 $link = add_query_arg( 'type', $action, $link ); 303 $text = sprintf( __( 'You have %1$d new comment replies', 'buddypress' ), (int) $total_items ); 304 $amount = 'multiple'; 305 } else { 306 $link = bp_activity_get_permalink( $activity_id ); 307 $text = sprintf( __( '%1$s replied to one your activity comments', 'buddypress' ), $user_fullname ); 308 } 309 break; 245 310 } 246 311 … … 248 313 249 314 /** 250 * Filters the @mentionnotification for the string format.315 * Filters the activity notification for the string format. 251 316 * 252 317 * This is a variable filter that is dependent on how many items … … 255 320 * 256 321 * @since 1.5.0 257 * 258 * @param string $string HTML anchor tag for the mention. 259 * @param string $at_mention_link The permalink for the mention. 322 * @since 2.6.0 use the $action_filter as a new dynamic portion of the filter name. 323 * 324 * @param string $string HTML anchor tag for the interaction. 325 * @param string $link The permalink for the interaction. 260 326 * @param int $total_items How many items being notified about. 261 327 * @param int $activity_id ID of the activity item being formatted. 262 * @param int $ poster_user_id ID of the user posting the mention.328 * @param int $user_id ID of the user who inited the interaction. 263 329 */ 264 $return = apply_filters( 'bp_activity_' . $amount . '_ at_mentions_notification', '<a href="' . esc_url( $at_mention_link ) . '" title="' . esc_attr( $at_mention_title ) . '">' . esc_html( $text ) . '</a>', $at_mention_link, (int) $total_items, $activity_id, $poster_user_id );330 $return = apply_filters( 'bp_activity_' . $amount . '_' . $action_filter . '_notification', '<a href="' . esc_url( $link ) . '" title="' . esc_attr( $title ) . '">' . esc_html( $text ) . '</a>', $link, (int) $total_items, $activity_id, $user_id ); 265 331 } else { 266 332 267 333 /** 268 * Filters the @mentionnotification for any non-string format.334 * Filters the activity notification for any non-string format. 269 335 * 270 336 * This is a variable filter that is dependent on how many items need notified about. … … 273 339 * 274 340 * @since 1.5.0 275 * 276 * @param array $array Array holding the content and permalink for the mention notification. 277 * @param string $at_mention_link The permalink for the mention. 341 * @since 2.6.0 use the $action_filter as a new dynamic portion of the filter name. 342 * 343 * @param array $array Array holding the content and permalink for the interaction notification. 344 * @param string $link The permalink for the interaction. 278 345 * @param int $total_items How many items being notified about. 279 346 * @param int $activity_id ID of the activity item being formatted. 280 * @param int $ poster_user_id ID of the user posting the mention.347 * @param int $user_id ID of the user who inited the interaction. 281 348 */ 282 $return = apply_filters( 'bp_activity_' . $amount . '_ at_mentions_notification', array(349 $return = apply_filters( 'bp_activity_' . $amount . '_' . $action_filter . '_notification', array( 283 350 'text' => $text, 284 'link' => $ at_mention_link285 ), $ at_mention_link, (int) $total_items, $activity_id, $poster_user_id );351 'link' => $link 352 ), $link, (int) $total_items, $activity_id, $user_id ); 286 353 } 287 354 … … 293 360 * @param string $action The type of activity item. 294 361 * @param int $item_id The activity ID. 295 * @param int $secondary_item_id @mention mentioner ID.362 * @param int $secondary_item_id The user ID who inited the interaction. 296 363 * @param int $total_items Total amount of items to format. 297 364 */ … … 333 400 334 401 /** 402 * Notify a member one of their activity received a reply. 403 * 404 * @since 2.6.0 405 * 406 * @param BP_Activity_Activity $activity The original activity. 407 * @param int $comment_id ID for the newly received comment. 408 * @param int $commenter_id ID of the user who made the comment. 409 */ 410 function bp_activity_update_reply_add_notification( $activity, $comment_id, $commenter_id ) { 411 if ( bp_is_active( 'notifications' ) ) { 412 bp_notifications_add_notification( array( 413 'user_id' => $activity->user_id, 414 'item_id' => $activity->id, 415 'secondary_item_id' => $commenter_id, 416 'component_name' => buddypress()->activity->id, 417 'component_action' => 'update_reply', 418 'date_notified' => bp_core_current_time(), 419 'is_new' => 1, 420 ) ); 421 } 422 } 423 add_action( 'bp_activity_sent_reply_to_update_notification', 'bp_activity_update_reply_add_notification', 10, 3 ); 424 425 /** 426 * Notify a member one of their activity comment received a reply. 427 * 428 * @since 2.6.0 429 * 430 * @param BP_Activity_Activity $activity_comment The parent activity. 431 * @param int $comment_id ID for the newly received comment. 432 * @param int $commenter_id ID of the user who made the comment. 433 */ 434 function bp_activity_comment_reply_add_notification( $activity_comment, $comment_id, $commenter_id ) { 435 if ( bp_is_active( 'notifications' ) ) { 436 bp_notifications_add_notification( array( 437 'user_id' => $activity_comment->user_id, 438 'item_id' => $activity_comment->item_id, 439 'secondary_item_id' => $commenter_id, 440 'component_name' => buddypress()->activity->id, 441 'component_action' => 'comment_reply', 442 'date_notified' => bp_core_current_time(), 443 'is_new' => 1, 444 ) ); 445 } 446 } 447 add_action( 'bp_activity_sent_reply_to_reply_notification', 'bp_activity_comment_reply_add_notification', 10, 3 ); 448 449 /** 335 450 * Mark at-mention notifications as read when users visit their Mentions page. 336 451 * … … 359 474 * 360 475 * @since 2.0.0 476 * @since 2.6.0 Mark notifications for 'update_reply' and 'comment_reply' actions 361 477 * 362 478 * @param BP_Activity_Activity $activity Activity object. … … 371 487 } 372 488 373 // Mark as read any notifications for the current user related to this activity item. 374 bp_notifications_mark_notifications_by_item_id( bp_loggedin_user_id(), $activity->id, buddypress()->activity->id, 'new_at_mention' ); 489 /** 490 * Filter here to add the notification actions to mark as read 491 * when the single activity is displayed. 492 * 493 * @since 2.6.0 494 * 495 * @param array $value List of notification actions to mark as read. 496 */ 497 $notification_actions = apply_filters( 'bp_activity_notification_actions_single_activity', array( 498 'new_at_mention', 499 'update_reply', 500 'comment_reply', 501 ) ); 502 503 $user_id = bp_loggedin_user_id(); 504 $component = buddypress()->activity->id; 505 506 foreach ( $notification_actions as $action ) { 507 // Mark as read any notifications for the current user related to this activity item. 508 bp_notifications_mark_notifications_by_item_id( $user_id, $activity->id, $component, $action ); 509 } 375 510 } 376 511 add_action( 'bp_activity_screen_single_activity_permalink', 'bp_activity_remove_screen_notifications_single_activity_permalink' );
Note: See TracChangeset
for help on using the changeset viewer.