Ticket #5328: 5328.02.diff

bp-activity/bp-activity-classes.php

@@ -1114 +1114 @@
 
                 $filter_sql = array();
 
-                if ( !empty( $filter_array['user_id'] ) ) {
+                if ( ! empty( $filter_array['user_id'] ) ) {
                         $user_sql = BP_Activity_Activity::get_in_operator_sql( 'a.user_id', $filter_array['user_id'] );
-                        if ( !empty( $user_sql ) )
+                        if ( ! empty( $user_sql ) )
                                 $filter_sql[] = $user_sql;
                 }
 
-                if ( !empty( $filter_array['object'] ) ) {
+                if ( ! empty( $filter_array['object'] ) ) {
                         $object_sql = BP_Activity_Activity::get_in_operator_sql( 'a.component', $filter_array['object'] );
-                        if ( !empty( $object_sql ) )
+                        if ( ! empty( $object_sql ) )
                                 $filter_sql[] = $object_sql;
                 }
 
-                if ( !empty( $filter_array['action'] ) ) {
+                if ( ! empty( $filter_array['action'] ) ) {
                         $action_sql = BP_Activity_Activity::get_in_operator_sql( 'a.type', $filter_array['action'] );
                         if ( ! empty( $action_sql ) )
                                 $filter_sql[] = $action_sql;
                 }
 
-                if ( !empty( $filter_array['primary_id'] ) ) {
+                if ( ! empty( $filter_array['primary_id'] ) ) {
                         $pid_sql = BP_Activity_Activity::get_in_operator_sql( 'a.item_id', $filter_array['primary_id'] );
-                        if ( !empty( $pid_sql ) )
+                        if ( ! empty( $pid_sql ) )
                                 $filter_sql[] = $pid_sql;
                 }
 
-                if ( !empty( $filter_array['secondary_id'] ) ) {
+                if ( ! empty( $filter_array['secondary_id'] ) ) {
                         $sid_sql = BP_Activity_Activity::get_in_operator_sql( 'a.secondary_item_id', $filter_array['secondary_id'] );
-                        if ( !empty( $sid_sql ) )
+                        if ( ! empty( $sid_sql ) )
                                 $filter_sql[] = $sid_sql;
                 }
 
+                if ( ! empty( $filter_array['id'] ) ) {
+                        $sid_sql = absint( $filter_array['id'] );
+                        $filter_sql[] = "a.id > {$sid_sql}";
+                } 
+
                 if ( empty( $filter_sql ) )
                         return false;
 
@@ -1154 +1159 @@
          * Get the date/time of last recorded activity.
          *
          * @since BuddyPress (1.2)
-         *
+         *      
+         * @param array $args
          * @return string ISO timestamp.
          */
-        public static function get_last_updated() {
+        public static function get_last_updated( $args = array() ) {
                 global $bp, $wpdb;
 
-                return $wpdb->get_var( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded DESC LIMIT 1" );
+                $r = bp_parse_args( $args, 
+                        array(
+                                'field_name'       => 'date_recorded',
+                                'search_terms'     => false,
+                                'filter'           => false,      // See self::get_filter_sql()
+                                'display_comments' => 'threaded', // or stream or false
+                                'show_hidden'      => false,      // Show items marked hide_sitewide
+                        ), 
+                        'activity_last_updated' 
+                );
+                extract( $r );
+
+                if ( 'id' != $field_name ) {
+                        return $wpdb->get_var( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded DESC LIMIT 1" );
+                }
+
+                $select_sql = "SELECT a.id FROM {$bp->activity->table_name} a";
+                $order_sql  = "ORDER BY a.id DESC";
+                $limit_sql  = "LIMIT 1";
+                $exclude_types = array();
+
+                $where_conditions['spam_sql'] = 'a.is_spam = 0';
+
+                // Searching
+                if ( $search_terms ) {
+                        $search_terms = esc_sql( $search_terms );
+                        $where_conditions['search_sql'] = "a.content LIKE '%%" . esc_sql( like_escape( $search_terms ) ) . "%%'";
+                }
+                // Filtering
+                if ( $filter && $filter_sql = BP_Activity_Activity::get_filter_sql( $filter ) )
+                        $where_conditions['filter_sql'] = $filter_sql;
+
+                if ( ! $show_hidden )
+                        $where_conditions['hidden_sql'] = "a.hide_sitewide = 0";
+
+                if ( empty( $filter_array['action'] ) )
+                        $exclude_types[] = 'last_activity';
+
+                if ( false === $display_comments || 'threaded' === $display_comments )
+                        $exclude_types[] = 'activity_comment';
+
+                if ( ! empty( $exclude_types ) && $excluded_type = BP_Activity_Activity::get_in_operator_sql( 'a.type', $exclude_types ) ) {
+                        $excluded_type = str_replace( 'a.type IN', 'a.type NOT IN', $excluded_type );
+                        $where_conditions[] = $excluded_type;
+                }       
+
+                // Filter the where conditions
+                $where_conditions = apply_filters( 'bp_activity_get_last_updated_recorded_where', $where_conditions, $r );
+
+                // Join the where conditions together
+                $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
+
+                $last_updated = $wpdb->get_var( apply_filters( 'bp_activity_get_last_updated_sql', "{$select_sql} {$where_sql} {$order_sql} {$limit_sql}", $select_sql, $where_sql, $order_sql ) );
+
+                return absint( $last_updated );
         }
 
         /**

bp-activity/bp-activity-filters.php

@@ -376 +376 @@
 
         return apply_filters( 'bp_activity_truncate_entry', $excerpt, $text, $append_text );
 }
+
+/**
+ * Include extra javascript dependencies for activity component.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @uses bp_activity_do_heartbeat() to check if heartbeat is required
+ *
+ * @param array $js_handles The original dependencies.
+ * @return array $js_handles The new dependencies.
+ */
+function bp_activity_get_js_dependencies( $js_handles = array() ) {
+        if ( bp_activity_do_heartbeat() ) {
+                $js_handles[] = 'heartbeat';
+        }
+
+        return $js_handles;
+}
+add_filter( 'bp_core_get_js_dependencies', 'bp_activity_get_js_dependencies', 10, 1 );
+
+/**
+ * Adds a just-posted class to avoid some mess in activity ajax pagination
+ *
+ * @since  BuddyPress (2.0.0)
+ * @param  string $classes
+ * @return string $classes
+ */
+function bp_activity_newest_class( $classes = '' ) {
+        $new_update_id = buddypress()->activity->new_update_id;
+        
+        if ( $new_update_id == bp_get_activity_id() )
+                $classes .= ' new-update';
+        
+        $classes .= ' just-posted';
+        return $classes;
+}
+
+/**
+ * Uses WordPress Heartbeat API to check for latest activity update in BP Activity Admin screen
+ * 
+ * @since BuddyPress (2.0.0)
+ * 
+ * @uses  bp_activity_get_last_updated() to get the recorded date of the last activity
+ * @param  array  $response
+ * @param  array  $data
+ * @return array  $response 
+ */
+function bp_activity_heartbeat_last_recorded( $response = array(), $data = array() ) {
+        $bp = buddypress();
+
+        if ( isset( $data['bp_last_activity_update'] ) && 'bp_activity_heartbeat_front' == $data['bp_last_activity_update']['id'] ) {
+                $filter = array();
+                $show_hidden = false;
+
+                if ( ! empty( $data['bp_last_activity_update']['action'] ) && '-1' != $data['bp_last_activity_update']['action'] )
+                        $filter['action'] = $data['bp_last_activity_update']['action'];
+
+                if ( ! empty( $data['bp_last_activity_update']['scope'] ) && 'all' != $data['bp_last_activity_update']['scope'] )
+                        $filter['object'] = $data['bp_last_activity_update']['scope'];
+
+                // Group filtering
+                if ( ! empty( $bp->groups->current_group ) ) {
+                        $filter['object'] = $bp->groups->id;
+                        $filter['primary_id'] = $bp->groups->current_group->id;
+
+                        if ( ( 'public' != $bp->groups->current_group->status ) && ( groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) || bp_current_user_can( 'bp_moderate' ) ) )
+                                $show_hidden = true;
+                }
+
+                $response['last_id_recorded'] = bp_activity_get_last_updated(
+                        array(
+                                'field_name'   => 'id',
+                                'search_terms' => $data['bp_last_activity_update']['search'],
+                                'filter'       => $filter,
+                                'show_hidden'  => $show_hidden
+                ) );
+        }
+
+        return $response;
+}
+add_filter( 'heartbeat_received', 'bp_activity_heartbeat_last_recorded', 10, 2 );
+add_filter( 'heartbeat_nopriv_received', 'bp_activity_heartbeat_last_recorded', 10, 2 );
+
+/**
+ * Changes the pulse of the WP HeartBeat API where needed
+ * 
+ * The filter should be initialized elsewhere to avoid the long check
+ * 
+ * @since  BuddyPress (2.0.0)
+ * 
+ * @param  array  $settings HeartBeat settings
+ * @return array  HeartBeat settings
+ */
+function bp_activity_heartbeat_settings( $settings = array() ) {
+        if ( bp_activity_do_heartbeat() )
+                $settings['interval'] = apply_filters( 'bp_activity_heartbeat_pulse', 15 );
+
+        return $settings;
+}
+add_filter( 'heartbeat_settings', 'bp_activity_heartbeat_settings', 10, 1 );

bp-activity/bp-activity-functions.php

@@ -508 +508 @@
  * @uses BP_Activity_Activity::get_last_updated() {@link BP_Activity_Activity}
  * @uses apply_filters() To call the 'bp_activity_get_last_updated' hook.
  *
+ * @param array $args
  * @return string Date last updated.
  */
-function bp_activity_get_last_updated() {
-        return apply_filters( 'bp_activity_get_last_updated', BP_Activity_Activity::get_last_updated() );
+function bp_activity_get_last_updated( $args = array() ) {
+        return apply_filters( 'bp_activity_get_last_updated', BP_Activity_Activity::get_last_updated( $args ) );
 }
 
 /**
@@ -1845 +1846 @@
 function bp_embed_activity_save_cache( $cache, $cachekey, $id ) {
         bp_activity_update_meta( $id, $cachekey, $cache );
 }
+
+
+/**
+ * Should we use HeartBeat to refresh activities every 15 s.
+ *
+ * @since BuddyPress (2.0.0)
+ * 
+ * @uses bp_is_activity_heartbeat_active() to check if heatbeat setting is on
+ * @uses bp_is_activity_directory() to check if the current page is the activity directory
+ * @uses bp_is_active() to check if the group component is active
+ * @uses bp_is_group_activity() to check if on a single group, the current page is the group activities
+ * @uses bp_is_group_home() to check if the current page is a single group home page
+ * @return bool True on success, false on failure.
+ */
+function bp_activity_do_heartbeat() {
+        $retval = false;
+
+        if ( ! bp_is_activity_heartbeat_active() )
+                return $retval;
+
+        if ( bp_is_activity_directory() )
+                $retval = true;
+
+        if ( bp_is_active( 'groups') ) {
+                // If no custom front, then activities are loaded in group's home
+                $has_custom_front = bp_locate_template( array( 'groups/single/front.php' ), false, true );
+
+                if ( bp_is_group_activity() || ( ! $has_custom_front && bp_is_group_home() ) )
+                        $retval = true;
+        }
+
+        return $retval;
+}

bp-activity/bp-activity-screens.php

@@ -28 +28 @@
  * @uses apply_filters() To call the 'bp_activity_screen_index' hook.
  */
 function bp_activity_screen_index() {
-        if ( !bp_displayed_user_id() && bp_is_activity_component() && !bp_current_action() ) {
+        if ( bp_is_activity_directory() ) {
                 bp_update_is_directory( true, 'activity' );
 
                 do_action( 'bp_activity_screen_index' );

bp-activity/bp-activity-template.php

@@ -515 +515 @@
                 'action'           => false,        // action to filter on e.g. activity_update, new_forum_post, profile_updated
                 'primary_id'       => $primary_id,  // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
                 'secondary_id'     => false,        // secondary object ID to filter on e.g. a post_id
+                'id'               => false,        // activity id to get newer updates
 
                 'meta_query'       => false,        // filter on activity meta. See WP_Meta_Query for format
 
@@ -532 +533 @@
                 $display_comments = false;
         }
 
+        // reset pagination to get all new activities 
+        if ( ! empty( $id ) )
+                $page = 0;
+
         if ( empty( $search_terms ) && ! empty( $_REQUEST['s'] ) )
                 $search_terms = $_REQUEST['s'];
 
@@ -603 +608 @@
         // into bp-custom.php or your theme's functions.php
         if ( isset( $_GET['afilter'] ) && apply_filters( 'bp_activity_enable_afilter_support', false ) )
                 $filter = array( 'object' => $_GET['afilter'] );
-        else if ( !empty( $user_id ) || !empty( $object ) || !empty( $action ) || !empty( $primary_id ) || !empty( $secondary_id ) )
-                $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
+        else if ( ! empty( $user_id ) || ! empty( $object ) || ! empty( $action ) || ! empty( $primary_id ) || ! empty( $secondary_id ) || ! empty( $id ) )
+                $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id, 'id' => $id );
         else
                 $filter = false;
 
@@ -737 +742 @@
 function bp_activity_has_more_items() {
         global $activities_template;
 
-        $remaining_pages = floor( ( $activities_template->total_activity_count - 1 ) / ( $activities_template->pag_num * $activities_template->pag_page ) );
+        $remaining_pages = 0;
+
+        if ( ! empty( $activities_template->pag_page ) ) {
+                $remaining_pages = floor( ( $activities_template->total_activity_count - 1 ) / ( $activities_template->pag_num * $activities_template->pag_page ) );
+        }
+
         $has_more_items  = (int) $remaining_pages ? true : false;
 
         return apply_filters( 'bp_activity_has_more_items', $has_more_items );

bp-core/admin/bp-core-settings.php

@@ -104 +104 @@
 }
 
 /**
+ * Allow Heartbeat to refresh activity stream
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_admin_setting_callback_heartbeat() {
+?>
+
+        <input id="_bp_enable_heartbeat_refresh" name="_bp_enable_heartbeat_refresh" type="checkbox" value="1" <?php checked( bp_is_activity_heartbeat_active( false ) ); ?> />
+        <label for="_bp_enable_heartbeat_refresh"><?php _e( 'Allow activity stream to be refreshed every 15 seconds', 'buddypress' ); ?></label>
+
+<?php
+}
+
+/**
  * Sanitization for _bp_force_buddyvar
  *
  * If upgraded to 1.6 and you chose to keep the BuddyBar, a checkbox asks if you want to switch to

bp-core/bp-core-admin.php

@@ -330 +330 @@
                         add_settings_field( 'bp-disable-blogforum-comments', __( 'Blog & Forum Comments', 'buddypress' ), 'bp_admin_setting_callback_blogforum_comments', 'buddypress', 'bp_activity' );
                         register_setting( 'buddypress', 'bp-disable-blogforum-comments', 'bp_admin_sanitize_callback_blogforum_comments' );
 
+                        // Activity Heartbeat refresh
+                        add_settings_field( '_bp_enable_heartbeat_refresh', __( 'Activity auto-refresh', 'buddypress' ), 'bp_admin_setting_callback_heartbeat', 'buddypress', 'bp_activity' );
+                        register_setting( 'buddypress', '_bp_enable_heartbeat_refresh', 'intval' );
+
                         // Allow activity akismet
                         if ( is_plugin_active( 'akismet/akismet.php' ) && defined( 'AKISMET_VERSION' ) ) {
                                 add_settings_field( '_bp_enable_akismet', __( 'Akismet',          'buddypress' ), 'bp_admin_setting_callback_activity_akismet', 'buddypress', 'bp_activity' );

bp-core/bp-core-functions.php

@@ -1852 +1852 @@
 
         return $nav_item_url;
 }
+
+/**
+ * Get the javascript dependencies for buddypress.js
+ *
+ * @since BuddyPress (2.0.0)
+ * 
+ * @uses apply_filters() to allow other component to load extra dependencies
+ * @return array the javascript dependencies.
+ */
+function bp_core_get_js_dependencies() {
+        return apply_filters( 'bp_core_get_js_dependencies', array( 'jquery' ) );
+}
+

bp-core/bp-core-options.php

@@ -559 +559 @@
 }
 
 /**
+ * Check whether Activity Heartbeat refresh is enabled.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @uses bp_get_option() To get the Heartbeat option.
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ *        Default: false.
+ * @return bool True if Heartbeat refresh is enabled, otherwise false.
+ */
+function bp_is_activity_heartbeat_active( $default = false ) {
+        return (bool) apply_filters( 'bp_is_activity_heartbeat_active', (bool) bp_get_option( '_bp_enable_heartbeat_refresh', $default ) );
+}
+
+/**
  * Get the current theme package ID.
  *
  * @since BuddyPress (1.7.0)

bp-core/bp-core-template.php

@@ -1491 +1491 @@
 /** Activity ******************************************************************/
 
 /**
+ * Is the current page the activity directory ?
+ *
+ * @since BuddyPress (2.0.0)
+ * 
+ * @return True if the current page is the activity directory.
+ */
+function bp_is_activity_directory() {
+        if( ! bp_displayed_user_id() && bp_is_activity_component() && ! bp_current_action() )
+                return true;
+
+        return false;
+}
+
+/**
  * Is the current page a single activity item permalink?
  *
  * @return True if the current page is a single activity item permalink.

bp-templates/bp-legacy/buddypress-functions.php

@@ -145 +145 @@
 
                         // Activity
                         'activity_get_older_updates'  => 'bp_legacy_theme_activity_template_loader',
+                        'activity_get_newer_updates'  => 'bp_legacy_theme_activity_template_loader',
                         'activity_mark_fav'           => 'bp_legacy_theme_mark_activity_favorite',
                         'activity_mark_unfav'         => 'bp_legacy_theme_unmark_activity_favorite',
                         'activity_widget_filter'      => 'bp_legacy_theme_activity_template_loader',
@@ -223 +224 @@
                 // Enqueue the global JS, if found - AJAX will not work
                 // without it
                 if ( isset( $asset['location'], $asset['handle'] ) ) {
-                        wp_enqueue_script( $asset['handle'], $asset['location'], array( 'jquery' ), $this->version );
+                        wp_enqueue_script( $asset['handle'], $asset['location'], bp_core_get_js_dependencies(), $this->version );
                 }
 
                 // Add words that we need to use in JS to the end of the page
@@ -242 +243 @@
                         'show_x_comments'     => __( 'Show all %d comments', 'buddypress' ),
                         'unsaved_changes'     => __( 'Your profile has unsaved changes. If you leave the page, the changes will be lost.', 'buddypress' ),
                         'view'                => __( 'View', 'buddypress' ),
+                        'newest'              => __( 'Load Newest', 'buddypress' ),
                 );
                 wp_localize_script( $asset['handle'], 'BP_DTheme', $params );
 
@@ -480 +482 @@
                 $qs[] = 'exclude=' . implode( ',', $just_posted );
         }
 
+        // to get newest activities
+        if ( ! empty( $_POST['id'] ) )
+                $qs[] = 'id=' . intval( $_POST['id'] );
+
         $object_search_text = bp_get_search_default_text( $object );
         if ( ! empty( $_POST['search_terms'] ) && $object_search_text != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
                 $qs[] = 'search_terms=' . $_POST['search_terms'];
@@ -594 +600 @@
                         break;
         }
 
+        // are we loading the newest updates ?
+        $is_newest_request = ! empty( $_POST['action'] ) && 'activity_get_newer_updates' == $_POST['action'];
+
+        if ( $is_newest_request )
+                add_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
+
         // Buffer the loop in the template to a var for JS to spit out.
         ob_start();
         bp_get_template_part( 'activity/activity-loop' );
@@ -601 +613 @@
         $result['feed_url'] = apply_filters( 'bp_legacy_theme_activity_feed_url', $feed_url, $scope );
         ob_end_clean();
 
+        if ( $is_newest_request )
+                remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
+
         exit( json_encode( $result ) );
 }
 
@@ -611 +626 @@
  * @since BuddyPress (1.2)
  */
 function bp_legacy_theme_post_update() {
+        $bp = buddypress();
+
         // Bail if not a POST action
         if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) )
                 return;
@@ -639 +656 @@
         if ( empty( $activity_id ) )
                 exit( '-1<div id="message" class="error"><p>' . __( 'There was a problem posting your update, please try again.', 'buddypress' ) . '</p></div>' );
 
-        if ( bp_has_activities ( 'include=' . $activity_id ) ) {
+        if ( ! empty( $_POST['id'] ) && $last_id = absint( $_POST['id'] ) ) {
+                $activity_args = array( 'id' => $last_id );
+                $bp->activity->new_update_id = $activity_id;
+                add_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
+        } else {
+                $activity_args = array( 'include' => $activity_id );
+        }
+        
+        if ( bp_has_activities ( $activity_args ) ) {
                 while ( bp_activities() ) {
                         bp_the_activity();
                         bp_get_template_part( 'activity/entry' );
                 }
         }
 
+        if ( ! empty( $last_id ) ) {
+                remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
+        }
+        
         exit;
 }
 

bp-templates/bp-legacy/css/buddypress.css

@@ -290 +290 @@
         margin-left: 1em;
         white-space: nowrap;
 }
-#buddypress .activity-list li.load-more {
+#buddypress .activity-list li.load-more,
+#buddypress .activity-list li.load-newest {
         background: #f0f0f0;
         font-size: 110%;
         margin: 15px 0;
         padding: 10px 15px;
         text-align: center;
 }
-#buddypress .activity-list li.load-more a {
+#buddypress .activity-list li.load-more a,
+#buddypress .activity-list li.load-newest a {
         color: #4D4D4D;
 }
 

bp-templates/bp-legacy/js/buddypress.js

@@ -53 +53 @@
                 if ( $whats_new_form.hasClass("submitted") ) {
                         $whats_new_form.removeClass("submitted");       
                 }
+
+                /* If the scope is not all, the activity update can temporarly be displayed 
+                   in the wrong tab which can be annoying with the load newest feature */
+                if ( jq( '#activity-all' ).length  ) {
+
+                        if ( ! jq( '#activity-all' ).hasClass( 'selected' ) ) {
+                                // reset to everyting
+                                jq( '#activity-filter-select select' ).val( '-1' );
+                                jq( '#activity-all a' ).trigger( "click" );
+                        } else if ( '-1' != jq( '#activity-filter-select select' ).val() ) {
+                                jq( '#activity-filter-select select' ).val( '-1' );
+                                jq( '#activity-filter-select select' ).trigger( 'change' );
+                        }
+                }
         });
 
         /* On blur, shrink if it's empty */
@@ -71 +85 @@
 
         /* New posts */
         jq("#aw-whats-new-submit").on( 'click', function() {
-                var button = jq(this);
+                var last_displayed_id, button = jq(this);
                 var form = button.closest("form#whats-new-form");
 
                 form.children().each( function() {
@@ -89 +103 @@
                 var object = '';
                 var item_id = jq("#whats-new-post-in").val();
                 var content = jq("#whats-new").val();
+                var firstrow = jq( '#buddypress ul.activity-list li' ).first();
+
+        if ( firstrow.hasClass( 'load-newest' ) ) {
+                last_displayed_id = firstrow.next().prop( 'id' ).replace( 'activity-','' );
+        } else {
+                last_displayed_id = firstrow.prop( 'id' ).replace( 'activity-','' );
+        }
 
                 /* Set object for non-profile posts */
                 if ( item_id > 0 ) {
@@ -102 +123 @@
                         'content': content,
                         'object': object,
                         'item_id': item_id,
+                        'id': last_displayed_id,
                         '_bp_as_nonce': jq('#_bp_as_nonce').val() || ''
                 },
                 function(response) {
@@ -123 +145 @@
                                         jq("div.activity").append( '<ul id="activity-stream" class="activity-list item-list">' );
                                 }
 
+                                if ( firstrow.hasClass( 'load-newest' ) )
+                                        firstrow.remove();
+
                                 jq("#activity-stream").prepend(response);
-                                jq("#activity-stream li:first").addClass('new-update just-posted');
+
+                                if ( ! last_displayed_id )
+                                        jq("#activity-stream li:first").addClass('new-update just-posted');
 
                                 if ( 0 != jq("#latest-update").length ) {
                                         var l = jq("#activity-stream li.new-update .activity-content .activity-inner p").html();
@@ -351 +378 @@
 
                         return false;
                 }
+
+                /* Load newest updates at the top of the list */
+                if ( target.parent().hasClass('load-newest') ) {
+
+                        event.preventDefault();
+                        last_displayed_id = target.parent().next().prop( 'id' ).replace( 'activity-','' );
+
+                        jq( '#buddypress li.load-newest' ).addClass( 'loading' );
+
+                        jq.post( ajaxurl, {
+                                action: 'activity_get_newer_updates',
+                                'cookie': bp_get_cookies(),
+                                'page':-1,
+                                'id': last_displayed_id
+                        },
+                        function(response)
+                        {
+                                jq( '#buddypress li.load-newest' ).removeClass( 'loading' );
+                                jq( '#buddypress ul.activity-list' ).prepend( response.contents );
+
+                                target.parent().hide();
+                        }, 'json' );
+                }
         });
 
         // Activity "Read More" links
@@ -1345 +1395 @@
         /* if js is enabled then replace the no-js class by a js one */
         if( jq('body').hasClass('no-js') )
                 jq('body').attr('class', jq('body').attr('class').replace( /no-js/,'js' ) );
+
+        /* Activity HeartBeat */
+        jq( document ).on( 'heartbeat-send', function( e, data ) {
+        data['bp_last_activity_update'] = {
+                'id'    : 'bp_activity_heartbeat_front', 
+                'action': jq.cookie('bp-activity-filter'), 
+                'search'   : '',
+                'scope' : jq.cookie('bp-activity-scope')
+        }
+    });
+
+        jq(document).on( 'heartbeat-tick', function(e, data) {
+
+                 // Only proceed if we have a last recorded date
+        if ( ! data['last_id_recorded'] )
+            return;
+
+        // the first row is the oldest activity
+        var firstrow = jq( '#buddypress ul.activity-list li' ).first();
+
+        if ( firstrow.hasClass( 'load-newest' ) )
+                return;
+
+        var last_displayed_id = firstrow.prop( 'id' ).replace( 'activity-','' );
+        
+        if ( Number( data['last_id_recorded'] ) > Number( last_displayed_id ) ) {
+                jq( '#buddypress ul.activity-list' ).prepend( '<li class="load-newest"><a href="#newest">' + BP_DTheme.newest + '</a></li>' );
+        }
+
+    });
                 
 });