Changeset 12408

Timestamp:

07/23/2019 04:12:32 AM (7 years ago)

Author:

imath

Message:

Respect user preferences about friends restriction group invites

NB: This is specific to BP Nouveau.

(4.0 branch)

Location:

branches/4.0/src/bp-templates/bp-nouveau/includes/groups

Files:

• ajax.php (modified) (2 diffs)
• template-tags.php (modified) (2 diffs)

branches/4.0/src/bp-templates/bp-nouveau/includes/groups/ajax.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 4.4.0
  */
 
@@ -385 +385 @@
 
         // For feedback
-        $invited = array();
+        $invited           = array();
+        $is_friends_active = bp_is_active( 'friends' );
 
         foreach ( (array) $_POST['users'] as $user_id ) {
-                $invited[ (int) $user_id ] = groups_invite_user(
-                        array(
-                                'user_id'  => $user_id,
-                                'group_id' => $group_id,
-                        )
-                );
+                $user_id = (int) $user_id;
+
+                if ( $is_friends_active && bp_nouveau_groups_get_group_invites_setting( $user_id ) && 'is_friend' !== BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $user_id ) ) {
+                        continue;
+                } else {
+                        $invited[ $user_id ] = groups_invite_user(
+                                array(
+                                        'user_id'  => $user_id,
+                                        'group_id' => $group_id,
+                                )
+                        );
+                }
+        }
+
+        if ( ! $invited ) {
+                wp_send_json_error( $response );
         }
 

branches/4.0/src/bp-templates/bp-nouveau/includes/groups/template-tags.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.2.0
+ * @version 4.4.0
  */
 
@@ -193 +193 @@
  *
  * @since 3.0.0
- *
- * @return int Returns 1 if user chose to restrict to friends, 0 otherwise.
- */
-function bp_nouveau_groups_get_group_invites_setting() {
-        return (int) bp_get_user_meta( bp_displayed_user_id(), '_bp_nouveau_restrict_invites_to_friends' );
+ * @since 4.4.0
+ *
+ * @param  int $user_id The user ID to check group invites preference for.
+ * @return int          Returns 1 if user chose to restrict to friends, 0 otherwise.
+ */
+function bp_nouveau_groups_get_group_invites_setting( $user_id = 0 ) {
+        if ( ! $user_id ) {
+                $user_id = bp_displayed_user_id();
+        }
+
+        return (int) bp_get_user_meta( $user_id, '_bp_nouveau_restrict_invites_to_friends' );
 }