Ticket #6932: 6932.10.diff

src/bp-activity/bp-activity-notifications.php

@@ -54 +54 @@
                         $group_name = bp_get_current_group_name();
                 }
 
+                $unsubscribe_args = array(
+                        'user_id'           => $receiver_user_id,
+                        'notification_type' => $email_type,
+                );
+
                 $args = array(
                         'tokens' => array(
                                 'activity'         => $activity,
@@ -62 +67 @@
                                 'mentioned.url'    => $message_link,
                                 'poster.name'      => $poster_name,
                                 'receiver-user.id' => $receiver_user_id,
+                                'unsubscribe'      => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),
                         ),
                 );
 
@@ -113 +119 @@
 
                 // Send an email if the user hasn't opted-out.
                 if ( 'no' != bp_get_user_meta( $original_activity->user_id, 'notification_activity_new_reply', true ) ) {
+
+                        $unsubscribe_args = array(
+                                'user_id'           => $original_activity->user_id,
+                                'notification_type' => 'activity-comment',
+                        );
+
                         $args = array(
                                 'tokens' => array(
                                         'comment.id'                => $comment_id,
@@ -121 +133 @@
                                         'original_activity.user_id' => $original_activity->user_id,
                                         'poster.name'               => $poster_name,
                                         'thread.url'                => esc_url( $thread_link ),
+                                        'unsubscribe'               => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),
                                 ),
                         );
 
@@ -155 +168 @@
 
                 // Send an email if the user hasn't opted-out.
                 if ( 'no' != bp_get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply', true ) ) {
+
+                        $unsubscribe_args = array(
+                                'user_id'           => $parent_comment->user_id,
+                                'notification_type' => 'activity-comment-author',
+                        );
+
                         $args = array(
                                 'tokens' => array(
                                         'comment.id'             => $comment_id,
@@ -163 +182 @@
                                         'parent-comment-user.id' => $parent_comment->user_id,
                                         'poster.name'            => $poster_name,
                                         'thread.url'             => esc_url( $thread_link ),
+                                        'unsubscribe'            => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),
                                 ),
                         );
 
@@ -178 +198 @@
                  * @param int                  $comment_id     ID for the newly received comment.
                  * @param int                  $commenter_id   ID of the user who made the comment.
                  * @param array                $params         Arguments used with the original activity comment.
-                 */
+                 */
                 do_action( 'bp_activity_sent_reply_to_reply_notification', $parent_comment, $comment_id, $commenter_id, $params );
         }
 }

src/bp-core/admin/bp-core-admin-schema.php

@@ -500 +500 @@
         );
 
         $emails       = bp_email_get_schema();
-        $descriptions = bp_email_get_type_schema();
+        $descriptions = bp_email_get_type_schema( 'description' );
 
         // Add these emails to the database.
         foreach ( $emails as $id => $email ) {

src/bp-core/bp-core-actions.php

@@ -110 +110 @@
 
 // Activation redirect.
 add_action( 'bp_activation', 'bp_add_activation_redirect' );
+
+// Email unsubscribe.
+add_action( 'bp_get_request_unsubscribe', 'bp_email_unsubscribe_handler' );

src/bp-core/bp-core-filters.php

@@ -1030 +1030 @@
         $tokens['recipient.email']     = '';
         $tokens['recipient.name']      = '';
         $tokens['recipient.username']  = '';
-        $tokens['unsubscribe']         = site_url( 'wp-login.php' );
 
 
         // Who is the email going to?
@@ -1047 +1046 @@
                 }
 
                 if ( $user_obj ) {
-                        // Unsubscribe link.
-                        $tokens['unsubscribe'] = esc_url( sprintf(
-                                '%s%s/notifications/',
-                                bp_core_get_user_domain( $user_obj->ID ),
-                                function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings'
-                        ) );
                         $tokens['recipient.username'] = $user_obj->user_login;
-                }
+                        if ( bp_is_active( 'settings' ) && empty( $tokens['unsubscribe'] ) ) {
+                            $tokens['unsubscribe'] = esc_url( sprintf(
+                                '%s%s/notifications/',
+                                bp_core_get_user_domain( $user_obj->ID ),
+                                bp_get_settings_slug()
+                            ) );
+                        }
+                }
         }
 
+        // Set default unsubscribe link if not passed.
+    if ( empty( $tokens['unsubscribe'] ) ) {
+         $tokens['unsubscribe'] = site_url( 'wp-login.php' );
+    }
+
         // Email preheader.
         $post = $email->get_post_object();
         if ( $post ) {

src/bp-core/bp-core-functions.php

@@ -3369 +3369 @@
  * Get a list of emails for populating email type taxonomy terms.
  *
  * @since 2.5.1
+ * @since 2.7.0 $field argument added.
+ *
+ * @param string $field Optional; defaults to "description" for backwards compatibility. Other values: "all".
+ * @return array {
+ *     The array of email types and their schema.
+ *
+ *     @type string $description The description of the action which causes this to trigger.
+ *     @type array  $unsubscribe {
+ *         Replacing this with false indicates that a user cannot unsubscribe from this type.
+ *
+ *         @type string $meta_key The meta_key used to toggle the email setting for this notification.
+ *         @type string $message  The message shown when the user has successfully unsubscribed.
+ *     }
+ */
+function bp_email_get_type_schema( $field = 'description' ) {
+        $activity_comment = array(
+                'description'   => __( 'A member has replied to an activity update that the recipient posted.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_activity_new_reply',
+                        'message'       => __( 'You will no longer receive emails when someone replies to an update or comment you posted.', 'buddypress' ),
+                        ),
+        );
+
+        $activity_comment_author = array(
+                'description'   => __( 'A member has replied to a comment on an activity update that the recipient posted.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_activity_new_reply',
+                        'message'       => __( 'You will no longer receive emails when someone replies to an update or comment you posted.', 'buddypress' ),
+                        ),
+        );
+
+        $activity_at_message = array(
+                'description'   => __( 'Recipient was mentioned in an activity update.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_activity_new_mention',
+                        'message'       => __( 'You will no longer receive emails when someone mentions you in an update.', 'buddypress' ),
+                ),
+        );
+
+        $groups_at_message = array(
+                'description'   => __( 'Recipient was mentioned in a group activity update.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_activity_new_mention',
+                        'message'       => __( 'You will no longer receive emails when someone mentions you in an update.', 'buddypress' ),
+                ),
+        );
+
+        $core_user_registration = array(
+                'description'   => __( 'Recipient has registered for an account.', 'buddypress' ),
+                'unsubscribe'   => false,
+        );
+
+        $core_user_registration_with_blog = array(
+                'description'   => __( 'Recipient has registered for an account and site.', 'buddypress' ),
+                'unsubscribe'   => false,
+        );
+
+        $friends_request = array(
+                'description'   => __( 'A member has sent a friend request to the recipient.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_friends_friendship_request',
+                        'message'       => __( 'You will no longer receive emails when someone sends you a friend request.', 'buddypress' ),
+                ),
+        );
+
+        $friends_request_accepted = array(
+                'description'   => __( 'Recipient has had a friend request accepted by a member.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_friends_friendship_accepted',
+                        'message'       => __( 'You will no longer receive emails when someone accepts your friendship request.', 'buddypress' ),
+                ),
+        );
+
+        $groups_details_updated = array(
+                'description'   => __( "A group's details were updated.", 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_groups_group_updated',
+                        'message'       => __( 'You will no longer receive emails when one of your groups is updated.', 'buddypress' ),
+                ),
+        );
+
+        $groups_details_updated = array(
+                'description'   => __( "A group's details were updated.", 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_groups_group_updated',
+                        'message'       => __( 'You will no longer receive emails when one of your groups is updated.', 'buddypress' ),
+                ),
+        );
+
+        $groups_invitation = array(
+                'description'   => __( 'A member has sent a group invitation to the recipient.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_groups_invite',
+                        'message'       => __( 'You will no longer receive emails when you are invited to join a group.', 'buddypress' ),
+                ),
+        );
+
+        $groups_member_promoted = array(
+                'description'   => __( "Recipient's status within a group has changed.", 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_groups_admin_promotion',
+                        'message'       => __( 'You will no longer receive emails when you have been promoted in a group.', 'buddypress' ),
+                ),
+        );
+
+        $groups_member_promoted = array(
+                'description'   => __( "Recipient's status within a group has changed.", 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_groups_admin_promotion',
+                        'message'       => __( 'You will no longer receive emails when you have been promoted in a group.', 'buddypress' ),
+                ),
+        );
+
+        $groups_membership_request = array(
+                'description'   => __( 'A member has requested permission to join a group.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_groups_membership_request',
+                        'message'       => __( 'You will no longer receive emails when someone requests to be a member of your group.', 'buddypress' ),
+                ),
+        );
+
+        $messages_unread = array(
+                'description'   => __( 'Recipient has received a private message.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_messages_new_message',
+                        'message'       => __( 'You will no longer receive emails when someone sends you a message.', 'buddypress' ),
+                ),
+        );
+
+        $settings_verify_email_change = array(
+                'description'   => __( 'Recipient has changed their email address.', 'buddypress' ),
+                'unsubscribe'   => false,
+        );
+
+        $groups_membership_request_accepted = array(
+                'description'   => __( 'Recipient had requested to join a group, which was accepted.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_membership_request_completed',
+                        'message'       => __( 'You will no longer receive emails when your request to join a group has been accepted or denied.', 'buddypress' ),
+                ),
+        );
+
+        $groups_membership_request_rejected = array(
+                'description'   => __( 'Recipient had requested to join a group, which was rejected.', 'buddypress' ),
+                'unsubscribe'   => array(
+                        'meta_key'      => 'notification_membership_request_completed',
+                        'message'       => __( 'You will no longer receive emails when your request to join a group has been accepted or denied.', 'buddypress' ),
+                ),
+        );
+
+        $types = array(
+                'activity-comment'                   => $activity_comment,
+                'activity-comment-author'            => $activity_comment_author,
+                'activity-at-message'                => $activity_at_message,
+                'groups-at-message'                  => $groups_at_message,
+                'core-user-registration'             => $core_user_registration,
+                'core-user-registration-with-blog'   => $core_user_registration_with_blog,
+                'friends-request'                    => $friends_request,
+                'friends-request-accepted'           => $friends_request_accepted,
+                'groups-details-updated'             => $groups_details_updated,
+                'groups-invitation'                  => $groups_invitation,
+                'groups-member-promoted'             => $groups_member_promoted,
+                'groups-membership-request'          => $groups_membership_request,
+                'messages-unread'                    => $messages_unread,
+                'settings-verify-email-change'       => $settings_verify_email_change,
+                'groups-membership-request-accepted' => $groups_membership_request_accepted,
+                'groups-membership-request-rejected' => $groups_membership_request_rejected,
+        );
+
+        if ( $field !== 'all' ) {
+                return wp_list_pluck( $types, $field );
+        } else {
+                return $types;
+        }
+}
+
+/**
+ * Handles unsubscribing user from notification emails.
  *
- * @return array
+ * @since 2.7.0
  */
-function bp_email_get_type_schema() {
-        return array(
-                'activity-comment'                   => __( 'A member has replied to an activity update that the recipient posted.', 'buddypress' ),
-                'activity-comment-author'            => __( 'A member has replied to a comment on an activity update that the recipient posted.', 'buddypress' ),
-                'activity-at-message'                => __( 'Recipient was mentioned in an activity update.', 'buddypress' ),
-                'groups-at-message'                  => __( 'Recipient was mentioned in a group activity update.', 'buddypress' ),
-                'core-user-registration'             => __( 'Recipient has registered for an account.', 'buddypress' ),
-                'core-user-registration-with-blog'   => __( 'Recipient has registered for an account and site.', 'buddypress' ),
-                'friends-request'                    => __( 'A member has sent a friend request to the recipient.', 'buddypress' ),
-                'friends-request-accepted'           => __( 'Recipient has had a friend request accepted by a member.', 'buddypress' ),
-                'groups-details-updated'             => __( "A group's details were updated.", 'buddypress' ),
-                'groups-invitation'                  => __( 'A member has sent a group invitation to the recipient.', 'buddypress' ),
-                'groups-member-promoted'             => __( "Recipient's status within a group has changed.", 'buddypress' ),
-                'groups-membership-request'          => __( 'A member has requested permission to join a group.', 'buddypress' ),
-                'messages-unread'                    => __( 'Recipient has received a private message.', 'buddypress' ),
-                'settings-verify-email-change'       => __( 'Recipient has changed their email address.', 'buddypress' ),
-                'groups-membership-request-accepted' => __( 'Recipient had requested to join a group, which was accepted.', 'buddypress' ),
-                'groups-membership-request-rejected' => __( 'Recipient had requested to join a group, which was rejected.', 'buddypress' ),
+function bp_email_unsubscribe_handler() {
+        $emails         = bp_email_get_type_schema();
+        $raw_email_type = ! empty( $_GET['nt'] ) ? sanitize_text_field( $_GET['nt'] ) : '';
+        $raw_nonce      = ! empty( $_GET['nn'] ) ? sanitize_text_field( $_GET['nn'] ) : '';
+        $raw_user_id    = ! empty( $_GET['uid'] ) ? absint( $_GET['uid'] ) : 0;
+        $settings_slug  = bp_is_active( 'settings' ) ? bp_get_settings_slug() : 'settings';
+        $check_nonce    = hash_hmac( 'sha1', "{$raw_email_type}:{$raw_user_id}", bp_email_get_salt() );
+
+        // Check required values.
+        if ( ! $raw_user_id || ! $raw_email_type || ! $raw_nonce || ! array_key_exists( $raw_email_type, $emails ) ) {
+                $redirect_to = site_url( 'wp-login.php' );
+                $result_msg  = __( 'Something has gone wrong.', 'buddypress' );
+                $unsub_msg   = __( 'Please log in and go to your settings to unsubscribe from notification emails.', 'buddypress' );
+
+        // Check valid hash.
+        } elseif ( ! hash_equals( $check_nonce, $raw_nonce ) ) {
+                $redirect_to = site_url( 'wp-login.php' );
+                $result_msg  = __( 'Something has gone wrong.', 'buddypress' );
+                $unsub_msg   = __( 'Please log in and go to your settings to unsubscribe from notification emails.', 'buddypress' );
+
+        // Don't let authenticated users unsubscribe other users' email notifications.
+        } elseif ( is_user_logged_in() && get_current_user_id() !== $raw_user_id ) {
+                $result_msg  = __( 'Something has gone wrong.', 'buddypress' );
+                $unsub_msg   = __( 'Please go to your settings to unsubscribe from notification emails.', 'buddypress' );
+                $redirect_to = sprintf(
+                        '%s%s/notifications/',
+                        bp_core_get_user_domain( get_current_user_id() ),
+                        $settings_slug
+                );
+
+        } else {
+                $redirect_to =  sprintf(
+                        '%s%s/notifications/',
+                        bp_core_get_user_domain( $raw_user_id ),
+                        $settings_slug
+                );
+
+                // Unsubscribe.
+                $meta_key = $emails[ $raw_email_type ]['unsubscribe']['meta_key'];
+                bp_update_user_meta( $raw_user_id, $meta_key, 'no' );
+
+                $result_msg = $emails[ $raw_email_type ]['unsubscribe']['message'];
+                $unsub_msg  = __( 'You can change this or any other email notification preferences in your email settings.', 'buddypress' );
+        }
+
+        $message = sprintf(
+                '%1$s <a href="%2$s">%3$s</a>',
+                $result_msg,
+                esc_url( $redirect_to ),
+                esc_html( $unsub_msg )
+        );
+
+        bp_core_add_message( $message );
+        bp_core_redirect( bp_core_get_user_domain( $raw_user_id ) );
+
+        exit;
+}
+
+/**
+ * Creates unsubscribe link for notification emails.
+ *
+ * @since 2.7.0
+ *
+ * @param string $redirect_to The URL to which the unsubscribe query string is appended.
+ * @param array $args {
+ *    Used to build unsubscribe query string.
+ *
+ *    @type string $notification_type Which notification type is being sent.
+ *    @type string $user_id           The ID of the user to whom the notification is sent.
+ *    @type string $redirect_to       Optional. The url to which the user will be redirected. Default is the activity directory.
+ * }
+ * @return string The unsubscribe link.
+ */
+function bp_email_get_unsubscribe_link( $args ) {
+        $emails = bp_email_get_type_schema();
+
+        if ( empty( $args['notification_type'] ) || ! array_key_exists( $args['notification_type'], $emails ) ) {
+                return site_url( 'wp-login.php' );
+        }
+
+        $email_type  = $args['notification_type'];
+        $redirect_to = ! empty( $args['redirect_to'] ) ? $args['redirect_to'] : bp_get_activity_directory_permalink();
+        $user_id     = (int) $args['user_id'];
+
+        // Bail out if the activity type is not un-unsubscribable.
+        if ( empty( $emails[ $email_type ]['unsubscribe'] ) ) {
+                return '';
+        }
+
+        $link = add_query_arg(
+                array(
+                        'action' => 'unsubscribe',
+                        'nn'     => hash_hmac( 'sha1', "{$email_type}:{$user_id}", bp_email_get_salt() ),
+                ),
+                $redirect_to
         );
+
+        /**
+         * Filters the unsubscribe link.
+         *
+         * @since 2.7.0
+         */
+        return apply_filters( 'bp_email_get_link', $link, $redirect_to, $args );
+}
+
+/**
+ * Get a persistent salt for email unsubscribe links.
+ *
+ * @since 2.7.0
+ *
+ * @return string
+ */
+function bp_email_get_salt() {
+        $salt = bp_get_option( 'bp-emails-unsubscribe-salt', null );
+
+        if ( is_null( $salt ) ) {
+                $salt = base64_encode( wp_generate_password( 12, true, true ) );
+                bp_add_option( 'bp-emails-unsubscribe-salt', $salt );
+        }
+
+        return $salt;
 }

src/bp-friends/bp-friends-notifications.php

@@ -32 +32 @@
                 return;
         }
 
+        $unsubscribe_args = array(
+                'user_id'           => $friend_id,
+                'notification_type' => 'friends-request',
+        );
+
         $args = array(
                 'tokens' => array(
                         'friend-requests.url' => esc_url( bp_core_get_user_domain( $friend_id ) . bp_get_friends_slug() . '/requests/' ),
@@ -40 +45 @@
                         'initiator.id'        => $initiator_id,
                         'initiator.url'       => esc_url( bp_core_get_user_domain( $initiator_id ) ),
                         'initiator.name'      => bp_core_get_user_displayname( $initiator_id ),
+                        'unsubscribe'         => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),
                 ),
         );
         bp_send_email( 'friends-request', $friend_id, $args );
@@ -63 +69 @@
                 return;
         }
 
+        $unsubscribe_args = array(
+                'user_id'           => $initiator_id,
+                'notification_type' => 'friends-request-accepted',
+        );
+
         $args = array(
                 'tokens' => array(
                         'friend.id'      => $friend_id,
@@ -70 +81 @@
                         'friend.name'    => bp_core_get_user_displayname( $friend_id ),
                         'friendship.id'  => $friendship_id,
                         'initiator.id'   => $initiator_id,
+                        'unsubscribe'      => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),
                 ),
         );
         bp_send_email( 'friends-request-accepted', $initiator_id, $args );

src/bp-groups/bp-groups-notifications.php

@@ -68 +68 @@
                         continue;
                 }
 
+                $unsubscribe_args = array(
+                        'user_id'           => $user_id,
+                        'notification_type' => 'groups-details-updated',
+                );
+
                 $args = array(
                         'tokens' => array(
                                 'changed_text' => $changed_text,
@@ -75 +80 @@
                                 'group.id'     => $group_id,
                                 'group.url'    => esc_url( bp_get_group_permalink( $group ) ),
                                 'group.name'   => $group->name,
+                                'unsubscribe'  => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),
                         ),
                 );
                 bp_send_email( 'groups-details-updated', (int) $user_id, $args );
@@ -115 +121 @@
                         'item_id'           => $group_id,
                         'secondary_item_id' => $requesting_user_id,
                         'component_name'    => buddypress()->groups->id,
-                        'component_action'  => 'new_membership_request'
+                        'component_action'  => 'new_membership_request',
                 ) );
         }
 
@@ -124 +130 @@
                 return;
         }
 
+        $unsubscribe_args = array(
+                'user_id'           => $admin_id,
+                'notification_type' => 'groups-membership-request',
+        );
+
         $group = groups_get_group( array( 'group_id' => $group_id ) );
         $args  = array(
                 'tokens' => array(
@@ -136 +147 @@
                         'profile.url'          => esc_url( bp_core_get_user_domain( $requesting_user_id ) ),
                         'requesting-user.id'   => $requesting_user_id,
                         'requesting-user.name' => bp_core_get_user_displayname( $requesting_user_id ),
+                        'unsubscribe'          => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),
                 ),
         );
         bp_send_email( 'groups-membership-request', (int) $admin_id, $args );
@@ -184 +196 @@
         );
 
         if ( ! empty( $accepted ) ) {
+
+                $unsubscribe_args = array(
+                        'user_id'           => $requesting_user_id,
+                        'notification_type' => 'groups-membership-request-accepted',
+                );
+
+                $args['tokens']['unsubscribe'] = esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) );
+
                 bp_send_email( 'groups-membership-request-accepted', (int) $requesting_user_id, $args );
+
         } else {
+
+                $unsubscribe_args = array(
+                        'user_id'           => $requesting_user_id,
+                        'notification_type' => 'groups-membership-request-rejected',
+                );
+
+                $args['tokens']['unsubscribe'] = esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) );
+
                 bp_send_email( 'groups-membership-request-rejected', (int) $requesting_user_id, $args );
         }
 }
@@ -226 +255 @@
                 return;
         }
 
+        $unsubscribe_args = array(
+                'user_id'           => $user_id,
+                'notification_type' => 'groups-member-promoted',
+        );
+
         $group = groups_get_group( array( 'group_id' => $group_id ) );
         $args  = array(
                 'tokens' => array(
@@ -235 +269 @@
                         'group.name'  => $group->name,
                         'promoted_to' => $promoted_to,
                         'user.id'     => $user_id,
+                        'unsubscribe' => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),
                 ),
         );
         bp_send_email( 'groups-member-promoted', (int) $user_id, $args );
@@ -277 +312 @@
         }
 
         $invited_link = bp_core_get_user_domain( $invited_user_id ) . bp_get_groups_slug();
+
+        $unsubscribe_args = array(
+                'user_id'           => $invited_user_id,
+                'notification_type' => 'groups-invitation',
+        );
+
         $args         = array(
                 'tokens' => array(
                         'group'        => $group,
@@ -286 +327 @@
                         'inviter.url'  => bp_core_get_user_domain( $inviter_user_id ),
                         'inviter.id'   => $inviter_user_id,
                         'invites.url'  => esc_url( $invited_link . '/invites/' ),
+                        'unsubscribe'  => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),
                 ),
         );
         bp_send_email( 'groups-invitation', (int) $invited_user_id, $args );

src/bp-messages/bp-messages-notifications.php

@@ -58 +58 @@
                         continue;
                 }
 
+                $unsubscribe_args = array(
+                        'user_id'           => $recipient->user_id,
+                        'notification_type' => 'messages-unread',
+                );
+
                 $args = array(
                         'tokens' => array(
                                 'usermessage' => wp_strip_all_tags( stripslashes( $message ) ),
                                 'message.url' => esc_url( bp_core_get_user_domain( $recipient->user_id ) . bp_get_messages_slug() . '/view/' . $thread_id . '/' ),
                                 'sender.name' => $sender_name,
                                 'usersubject' => sanitize_text_field( stripslashes( $subject ) ),
+                                'unsubscribe' => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),
                         ),
                 );
                 bp_send_email( 'messages-unread', $ud, $args );

tests/phpunit/testcases/admin/functions.php

@@ -252 +252 @@
                         'hide_empty' => false,
                 ) );
 
-                $correct_descriptions = bp_email_get_type_schema();
+                $correct_descriptions = bp_email_get_type_schema( 'description' );
                 foreach ( $d_terms as $d_term ) {
                         $correct_description = $correct_descriptions[ $d_term->slug ];
                         $this->assertSame( $correct_description, $d_term->description );