Ticket #3430: 3430.03.patch

src/bp-groups/bp-groups-classes.php

@@ -1711 +1711 @@
                 // the order according to the query performed in
                 // BP_Group_Member_Query::get_group_members(). Otherwise, fall
                 // through and let BP_User_Query do its own ordering.
-                if ( in_array( $query->query_vars['type'], array( 'last_joined', 'first_joined' ) ) ) {
+                if ( in_array( $query->query_vars['type'], array( 'last_joined', 'first_joined', 'group_activity' ) ) ) {
+
+                        // Group Activity DESC
+                        if ( 'group_activity' == $query->query_vars['type'] ) {
+                                $gm_ids = $this->get_gm_ids_ordered_by_activity( $query, $gm_ids );
+                        }
 
                         // The first param in the FIELD() clause is the sort column id
                         $gm_ids = array_merge( array( 'u.id' ), wp_parse_id_list( $gm_ids ) );
@@ -1766 +1771 @@
                 // Don't filter other BP_User_Query objects on the same page
                 remove_action( 'bp_user_query_populate_extras', array( $this, 'populate_group_member_extras' ), 10, 2 );
         }
+
+        /**
+         * Return Group member ids ordered by latest group activity.
+         *
+         * @since  BuddyPress (2.1.0)
+         *
+         * @global $wpdb
+         * @uses  buddypress()
+         * @uses  wp_list_pluck()
+         * @param BP_User_Query $query BP_User_Query object.
+         * @param array $gm_ids array of group member ids.
+         */
+        public function get_gm_ids_ordered_by_activity( $query, $gm_ids = array() ) {
+                global $wpdb;
+
+                if ( empty( $gm_ids ) ) {
+                        return false;
+                }
+
+                $activity_table = buddypress()->activity->table_name;
+
+                $sql = array(
+                        'select'  => "SELECT user_id, max( date_recorded ) as date_recorded FROM {$activity_table}",
+                        'where'   => array(),
+                        'groupby' => 'GROUP BY user_id',
+                        'orderby' => 'ORDER BY date_recorded',
+                        'order'   => 'DESC',
+                );
+
+                $sql['where'] = array( 
+                        'user_id IN (' . implode( ',', $gm_ids ) . ')',
+                        'item_id = ' . absint( $query->query_vars['group_id'] ),
+                        "component = 'groups'",
+                );
+                
+                $sql['where'] = ! empty( $sql['where'] ) ? 'WHERE ' . implode( ' AND ', $sql['where'] ) : '';
+
+                $group_user_ids = $wpdb->get_results( "{$sql['select']} {$sql['where']} {$sql['groupby']} {$sql['orderby']} {$sql['order']}" );
+
+                return wp_list_pluck( $group_user_ids, 'user_id' );
+        }
 }
 
 /**

src/bp-groups/bp-groups-template.php

@@ -2437 +2437 @@
                 <select id="group_members-order-by">
                         <option value="last_joined"><?php _e( 'Newest', 'buddypress' ); ?></option>
                         <option value="first_joined"><?php _e( 'Oldest', 'buddypress' ); ?></option>
+
+                        <?php if ( bp_is_active( 'activity' ) ) : ?>
+                                <option value="group_activity"><?php _e( 'Group Activity', 'buddypress' ); ?></option>
+                        <?php endif; ?>
+
                         <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
 
                         <?php do_action( 'bp_groups_members_order_options' ); ?>

tests/phpunit/testcases/groups/class-bp-group-member-query.php

@@ -403 +403 @@
         /**
          * @group type
          */
+        public function test_get_with_type_group_activity() {
+                $g = $this->factory->group->create();
+                $u1 = $this->create_user();
+                $u2 = $this->create_user();
+                $u3 = $this->create_user();
+                $c = buddypress()->groups->id;
+                $time = time();
+
+                $this->add_user_to_group( $u1, $g, array(
+                        'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 500 ),
+                ) );
+
+                $this->add_user_to_group( $u2, $g, array(
+                        'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 400 ),
+                ) );
+
+                $this->add_user_to_group( $u3, $g, array(
+                        'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 300 ),
+                ) );
+
+                $this->factory->activity->create( array(
+                        'component' => $c,
+                        'type' => 'activity_update',
+                        'user_id' => $u3,
+                        'item_id' => $g,
+                        'recorded_time' => gmdate( 'Y-m-d H:i:s', $time - 250 ),
+                ) );
+
+                $this->factory->activity->create( array(
+                        'component' => $c,
+                        'type' => 'activity_update',
+                        'user_id' => $u1,
+                        'item_id' => $g,
+                        'recorded_time' => gmdate( 'Y-m-d H:i:s', $time - 200 ),
+                ) );
+
+                $this->factory->activity->create( array(
+                        'component' => $c,
+                        'type' => 'activity_update',
+                        'user_id' => $u2,
+                        'item_id' => $g,
+                        'recorded_time' => gmdate( 'Y-m-d H:i:s', $time - 100 ),
+                ) );
+
+                $query_members = new BP_Group_Member_Query( array(
+                        'group_id' => $g,
+                        'type' => 'group_activity',
+                ) );
+
+                $ids = wp_parse_id_list( array_keys( $query_members->results ) );
+                $this->assertEquals( array( $u2, $u1, $u3 ), $ids );
+        }
+
+        /**
+         * @group type
+         */
         public function test_get_with_type_alphabetical() {
                 $g = $this->factory->group->create();
                 $u1 = $this->create_user( array(