Changeset 5262

Timestamp:

11/01/2011 11:21:59 PM (15 years ago)

Author:

djpaul

Message:

Second pass of Akismet support for the Activity component. See #3660

Location:

trunk

Files:

• bp-activity/bp-activity-actions.php (modified) (2 diffs)
• bp-activity/bp-activity-admin.php (added)
• bp-activity/bp-activity-akismet.php (modified) (11 diffs)
• bp-activity/bp-activity-classes.php (modified) (7 diffs)
• bp-activity/bp-activity-functions.php (modified) (4 diffs)
• bp-activity/bp-activity-loader.php (modified) (1 diff)
• bp-activity/bp-activity-template.php (modified) (4 diffs)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-actions.php

@@ -195 +195 @@
 
         // Is the current user allowed to spam items?
-        if ( !BP_Akismet::user_can_mark_spam() )
+        if ( !bp_activity_user_can_mark_spam() )
                 return false;
 
@@ -210 +210 @@
 
         // Mark as spam
-        $bp->activity->akismet->mark_as_spam( $activity );
+        bp_activity_mark_as_spam( $activity );
         $activity->save();
 

trunk/bp-activity/bp-activity-akismet.php

@@ -47 +47 @@
                 add_action( 'bp_activity_before_save',     array( $this, 'check_activity' ), 1, 1 );
 
-                // Update activity meta after a spam check
-                add_action( 'bp_activity_after_save',      array( $this, 'update_activity_meta' ), 1, 1 );
-
                 // Tidy up member's latest (activity) update
                 add_action( 'bp_activity_posted_update',   array( $this, 'check_member_activity_update' ), 1, 3 );
+
+                // Hooks to extend Activity core spam/ham functions for Akismet
+                add_action( 'bp_activity_mark_as_spam',    array( $this, 'mark_as_spam' ), 10, 2 );
+                add_action( 'bp_activity_mark_as_ham',     array( $this, 'mark_as_ham' ),  10, 2 );
+
+                // Hook into the Activity wp-admin screen
+                //add_action( 'bp_activity_admin_comment_row_actions', array( $this, 'add_activity_status_row' ), 10, 2 );
         }
 
@@ -90 +94 @@
                         return;
 
-                // Was this $activity_id just marked as spam?
-                if ( !$this->last_activity->id || $activity_id != $this->last_activity->id )
+                // Was this $activity_id just marked as spam? If not, bail out.
+                if ( !$this->last_activity->id || $activity_id != $this->last_activity->id || 'false' == $this->last_activity->akismet_submission['bp_as_result'] )
                         return;
 
@@ -103 +107 @@
          * This function is intended to be used inside the activity stream loop.
          *
-         * @since 1.2
+         * @since 1.6
          */
         public function add_activity_spam_button() {
-                if ( !BP_Akismet::user_can_mark_spam() )
+                if ( !bp_activity_user_can_mark_spam() )
                         return;
 
@@ -131 +135 @@
          * This function is intended to be used inside the activity stream loop.
          *
-         * @since 1.2
+         * @since 1.6
          */
         public function add_activity_comment_spam_button() {
-                if ( !BP_Akismet::user_can_mark_spam() )
+                if ( !bp_activity_user_can_mark_spam() )
                         return;
 
@@ -156 +160 @@
 
         /**
-         * Convenience function to control whether the current user is allowed to mark activity items as spam
-         *
-         * @global object $bp BuddyPress global settings
-         * @return bool True if user is allowed to mark activity items as spam
-         * @since 1.6
-         * @static
-         */
-        public static function user_can_mark_spam() {
-                global $bp;
-                return apply_filters( 'bp_activity_akismet_user_can_mark_spam', $bp->loggedin_user->is_site_admin );
-        }
-
-        /**
          * Get a list of filterable types of activity item that we want Akismet to automatically check for spam.
          *
@@ -183 +174 @@
          *
          * @param BP_Activity_Activity $activity
-         * @since 1.6
-         */
-        public function mark_as_spam( &$activity ) {
-                $activity->is_spam = 1;
-
+         * @param string $source Either "by_a_person" (e.g. a person has manually marked the activity as spam) or "by_akismet" (automatically spammed).
+         * @since 1.6
+         */
+        public function mark_as_spam( $activity, $source ) {
                 // Record this item so we can do some tidyup in BP_Akismet::check_member_activity_update()
                 $this->last_activity = $activity;
 
-                // Clear the activity stream first page cache
-                wp_cache_delete( 'bp_activity_sitewide_front', 'bp' );
-
-                // Clear the activity comment cache for this activity item
-                wp_cache_delete( 'bp_activity_comments_' . $activity->id, 'bp' );
-
-                do_action( 'bp_activity_akismet_mark_as_spam', $activity );
+                do_action( 'bp_activity_akismet_mark_as_spam', $activity, $source );
         }
 
@@ -204 +188 @@
          *
          * @param BP_Activity_Activity $activity
-         * @since 1.6
-         */
-        public function mark_as_ham( &$activity ) {
-                $activity->is_spam = 0;
-
-                // Clear the activity stream first page cache
-                wp_cache_delete( 'bp_activity_sitewide_front', 'bp' );
-
-                // Clear the activity comment cache for this activity item
-                wp_cache_delete( 'bp_activity_comments_' . $activity->id, 'bp' );
-
-                //bp_activity_delete_meta( $activity->id, 'bpla_spam' );
-                do_action( 'bp_activity_akismet_mark_as_ham', $activity );
-
+         * @param string $source Either "by_a_person" (e.g. a person has manually marked the activity as spam) or "by_akismet" (automatically spammed).
+         * @since 1.6
+         */
+        public function mark_as_ham( $activity, $source ) {
                 //DJPAULTODO: Run bp_activity_at_name_filter() somehow... but not twice, if we can help it. Maybe check if it was auto-spammed by Akismet?
+
+                do_action( 'bp_activity_akismet_mark_as_ham', $activity, $source );
         } 
 
         /**
-         * Check if the activity item is spam or ham
-         *
-         * @param BP_Activity_Activity $activity The activity item to check
-         * @see http://akismet.com/development/api/
-         * @since 1.6
-         * @todo Spam counter?
-         * @todo Auto-delete old spam?
-         */
-        public function check_activity( $activity ) {
-                // By default, only handle activity updates and activity comments.
-                if ( !in_array( $activity->type, BP_Akismet::get_activity_types() ) )
-                        return;
-
-                $this->last_activity = null;
-                $userdata            = get_userdata( $activity->user_id );
-
-                // Build up a data package for the Akismet service to inspect
+         * Build a data package for the Akismet service to inspect
+         *
+         * @param BP_Activity_Activity $activity
+         * @see http://akismet.com/development/api/#comment-check
+         * @since 1.6
+         * @static
+         */
+        public static function build_akismet_data_package( $activity ) {
+                $userdata = get_userdata( $activity->user_id );
+
                 $activity_data                          = array();
                 $activity_data['akismet_comment_nonce'] = 'inactive';
@@ -264 +233 @@
                         $activity_data['akismet_comment_nonce'] = wp_verify_nonce( $_POST["_bp_as_nonce_{$activity->secondary_item_id}"], "_bp_as_nonce_{$userdata->ID}_{$activity->secondary_item_id}" ) ? 'passed' : 'failed';
 
+                return apply_filters( 'bp_akismet_build_akismet_data_package', $activity_data, $activity );
+        }
+
+        /**
+         * Check if the activity item is spam or ham
+         *
+         * @param BP_Activity_Activity $activity The activity item to check
+         * @see http://akismet.com/development/api/
+         * @since 1.6
+         * @todo Spam counter?
+         * @todo Auto-delete old spam?
+         */
+        public function check_activity( $activity ) {
+                // By default, only handle activity updates and activity comments.
+                if ( !in_array( $activity->type, BP_Akismet::get_activity_types() ) )
+                        return;
+
+                // Make sure last_activity is clear to avoid any confusion
+                $this->last_activity = null;
+
+                // Build data package for Akismet
+                $activity_data = BP_Akismet::build_akismet_data_package( $activity );
+
                 // Check with Akismet to see if this is spam
-                $activity_data = $this->maybe_spam( $activity_data );
+                $activity_data = $this->send_akismet_request( $activity_data, 'check', 'spam' );
 
                 // Record this item
@@ -279 +271 @@
 
                         // Mark as spam
-                        $this->mark_as_spam( $activity );
+                        bp_activity_mark_as_spam( $activity, 'by_akismet' );
                 }
-        }
-
-        /**
-         * Update activity meta after a spam check
-         *
+
+                // Update activity meta after a spam check
+                add_action( 'bp_activity_after_save', array( $this, 'update_activity_akismet_meta' ), 1, 1 );
+        }
+
+        /**
+         * Update activity meta after a manual spam change (user initiated)
+         *
+         * @global object $bp BuddyPress global settings
          * @param BP_Activity_Activity $activity The activity to check
          * @since 1.6
          */
-        public function update_activity_meta( $activity ) {
+        public function update_activity_spam_meta( $activity ) {
+                global $bp;
+
+                // By default, only handle activity updates and activity comments.
+                if ( !in_array( $activity->type, BP_Akismet::get_activity_types() ) )
+                        return;
+
+                $this->update_activity_history( $activity->id, sprintf( __( '%s reported this activity as spam', 'buddypress' ), $bp->loggedin_user->fullname ), 'report-spam' );
+                bp_activity_update_meta( $activity->id, '_bp_akismet_user_result', 'true' );
+                bp_activity_update_meta( $activity->id, '_bp_akismet_user', $bp->loggedin_user->fullname );
+        }
+
+        /**
+         * Update activity meta after a manual ham change (user initiated)
+         *
+         * @global object $bp BuddyPress global settings
+         * @param BP_Activity_Activity $activity The activity to check
+         * @since 1.6
+         */
+        public function update_activity_ham_meta( $activity ) {
+                global $bp;
+
+                // By default, only handle activity updates and activity comments.
+                if ( !in_array( $activity->type, BP_Akismet::get_activity_types() ) )
+                        return;
+
+                $this->update_activity_history( $activity->id, sprintf( __( '%s reported this activity as not spam', 'buddypress' ), $bp->loggedin_user->fullname ), 'report-ham' );
+                bp_activity_update_meta( $activity->id, '_bp_akismet_user_result', 'false' );
+                bp_activity_update_meta( $activity->id, '_bp_akismet_user', $bp->loggedin_user->fullname );
+        }
+
+        /**
+         * Update activity meta after an automatic spam check (not user initiated)
+         *
+         * @param BP_Activity_Activity $activity The activity to check
+         * @since 1.6
+         */
+        public function update_activity_akismet_meta( $activity ) {
                 // Check we're dealing with what was last updated by Akismet
                 if ( empty( $this->last_activity ) || !empty( $this->last_activity ) && $activity->id != $this->last_activity->id )
@@ -330 +363 @@
          * @since 1.6
          */
-        protected function maybe_spam( $activity_data, $check = 'check', $spam = 'spam' ) {
+        public function send_akismet_request( $activity_data, $check = 'check', $spam = 'spam' ) {
                 global $akismet_api_host, $akismet_api_port;
 
@@ -481 +514 @@
          * @since 1.6
          */
-        private function update_activity_history( $activity_id = 0, $message = '', $event = '' ) {
+        public function update_activity_history( $activity_id = 0, $message = '', $event = '' ) {
                 $event = array(
                         'event'   => $event,

trunk/bp-activity/bp-activity-classes.php

@@ -99 +99 @@
 
         // Static Functions
-        function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false, $in = false, $hide_spam = true ) {
+        function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false, $in = false, $spam = 'ham_only' ) {
                 global $wpdb, $bp;
 
@@ -111 +111 @@
 
                 // Spam
-                if ( $hide_spam )
+                if ( 'ham_only' == $spam )
                         $where_conditions['spam_sql'] = 'a.is_spam = 0';
+                elseif ( 'spam_only' == $spam )
+                        $where_conditions['spam_sql'] = 'a.is_spam = 1';
 
                 // Searching
@@ -191 +193 @@
 
                 if ( $activities && $display_comments )
-                        $activities = BP_Activity_Activity::append_comments( $activities, $hide_spam );
+                        $activities = BP_Activity_Activity::append_comments( $activities, $spam );
 
                 // If $max is set, only return up to the max results
@@ -362 +364 @@
          * @global wpdb $wpdb WordPress database object
          * @param array $activities
-         * @param bool $hide_spam Optional. Defaults to true (don't retrieve spammed items).
+         * @param bool $spam Optional; 'ham_only' (default), 'spam_only' or 'all'.
          * @return array The updated activities with nested comments
          * @since 1.2
          */
-        function append_comments( $activities, $hide_spam = true ) {
+        function append_comments( $activities, $spam = 'ham_only' ) {
                 global $bp, $wpdb;
 
@@ -374 +376 @@
                 foreach( (array)$activities as $activity ) {
                         if ( 'activity_comment' != $activity->type && $activity->mptt_left && $activity->mptt_right )
-                                $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right, $hide_spam );
+                                $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right, $spam );
                 }
 
@@ -393 +395 @@
          * @param int $left Left-most node boundary
          * @param into $right Right-most node boundary
-         * @param bool $hide_spam Optional. Defaults to true (don't retrieve spammed items).
+         * @param bool $spam Optional; 'ham_only' (default), 'spam_only' or 'all'.
          * @return array The updated activities with nested comments
          * @since 1.2
          */
-        function get_activity_comments( $activity_id, $left, $right, $hide_spam = true ) {
+        function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only' ) {
                 global $wpdb, $bp;
 
@@ -413 +415 @@
 
                         // Don't retrieve activity comments marked as spam
-                        if ( $hide_spam )
+                        if ( 'ham_only' == $spam )
                                 $spam_sql = 'AND a.is_spam = 0';
+                        elseif ( 'spam_only' == $spam )
+                                $spam_sql = 'AND a.is_spam = 1';
                         else
                                 $spam_sql = '';
 
-                        $sql = apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' ${spam_sql} AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ), $activity_id, $left, $right, $hide_spam );
+                        $sql = apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' ${spam_sql} AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ), $activity_id, $left, $right, $spam_sql );
 
                         // Retrieve all descendants of the $root node

trunk/bp-activity/bp-activity-functions.php

@@ -692 +692 @@
 function bp_activity_get( $args = '' ) {
         $defaults = array(
-                'max'              => false,  // Maximum number of results to return
-                'page'             => 1,      // page 1 without a per_page will result in no pagination.
-                'per_page'         => false,  // results per page
-                'sort'             => 'DESC', // sort ASC or DESC
-                'display_comments' => false,  // false for no comments. 'stream' for within stream display, 'threaded' for below each activity item
-
-                'search_terms'     => false,  // Pass search terms as a string
-                'show_hidden'      => false,  // Show activity items that are hidden site-wide?
-                'exclude'          => false,  // Comma-separated list of activity IDs to exclude
-                'in'               => false,  // Comma-separated list or array of activity IDs to which you want to limit the query
-                'hide_spam'        => true,   // Don't retrieve items marked as spam?
+                'max'              => false,        // Maximum number of results to return
+                'page'             => 1,            // page 1 without a per_page will result in no pagination.
+                'per_page'         => false,        // results per page
+                'sort'             => 'DESC',       // sort ASC or DESC
+                'display_comments' => false,        // false for no comments. 'stream' for within stream display, 'threaded' for below each activity item
+
+                'search_terms'     => false,        // Pass search terms as a string
+                'show_hidden'      => false,        // Show activity items that are hidden site-wide?
+                'exclude'          => false,        // Comma-separated list of activity IDs to exclude
+                'in'               => false,        // Comma-separated list or array of activity IDs to which you want to limit the query
+                'spam'             => 'ham_only',   // 'ham_only' (default), 'spam_only' or 'all'.
 
                 /**
@@ -720 +720 @@
 
         // Attempt to return a cached copy of the first page of sitewide activity.
-        if ( 1 == (int)$page && empty( $max ) && empty( $search_terms ) && empty( $filter ) && 'DESC' == $sort && empty( $exclude ) ) {
+        if ( 1 == (int)$page && empty( $max ) && empty( $search_terms ) && empty( $filter ) && empty( $exclude ) && empty( $in ) && 'DESC' == $sort && empty( $exclude ) && 'ham_only' == $spam ) {
                 if ( !$activity = wp_cache_get( 'bp_activity_sitewide_front', 'bp' ) ) {
-                        $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden, false, false, $hide_spam );
+                        $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden, false, false, $spam );
                         wp_cache_set( 'bp_activity_sitewide_front', $activity, 'bp' );
                 }
 
         } else {
-                $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden, $exclude, $in, $hide_spam );
+                $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden, $exclude, $in, $spam );
         }
 
@@ -748 +748 @@
 function bp_activity_get_specific( $args = '' ) {
         $defaults = array(
-                'activity_ids'     => false,  // A single activity_id or array of IDs.
-                'display_comments' => false,  // true or false to display threaded comments for these specific activity items
-                'hide_spam'        => false,  // Retrieve items marked as spam
-                'max'              => false,  // Maximum number of results to return
-                'page'             => 1,      // page 1 without a per_page will result in no pagination.
-                'per_page'         => false,  // results per page
-                'show_hidden'      => true,   // When fetching specific items, show all
-                'sort'             => 'DESC', // sort ASC or DESC
+                'activity_ids'     => false,       // A single activity_id or array of IDs.
+                'display_comments' => false,       // true or false to display threaded comments for these specific activity items
+                'max'              => false,       // Maximum number of results to return
+                'page'             => 1,           // page 1 without a per_page will result in no pagination.
+                'per_page'         => false,       // results per page
+                'show_hidden'      => true,        // When fetching specific items, show all
+                'sort'             => 'DESC',      // sort ASC or DESC
+                'spam'             => 'ham_only',  // Retrieve items marked as spam
         );
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
 
-        return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get( $max, $page, $per_page, $sort, false, false, $display_comments, $show_hidden, false, $activity_ids, $hide_spam ) );
+        return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get( $max, $page, $per_page, $sort, false, false, $display_comments, $show_hidden, false, $activity_ids, $spam ) );
 }
 
@@ -1327 +1327 @@
 }
 
+/**
+ * Convenience function to control whether the current user is allowed to mark activity items as spam
+ *
+ * @global object $bp BuddyPress global settings
+ * @return bool True if user is allowed to mark activity items as spam
+ * @since 1.6
+ * @static
+ */
+function bp_activity_user_can_mark_spam() {
+        global $bp;
+        return apply_filters( 'bp_activity_user_can_mark_spam', $bp->loggedin_user->is_site_admin );
+}
+
+/**
+ * Mark activity item as spam
+ *
+ * @global object $bp BuddyPress global settings
+ * @param BP_Activity_Activity $activity
+ * @param string $source Optional; default is "by_a_person" (e.g. a person has manually marked the activity as spam).
+ * @since 1.6
+ */
+function bp_activity_mark_as_spam( &$activity, $source = 'by_a_person' ) {
+        global $bp;
+
+        $activity->is_spam = 1;
+
+        // Clear the activity stream first page cache
+        wp_cache_delete( 'bp_activity_sitewide_front', 'bp' );
+
+        // Clear the activity comment cache for this activity item
+        wp_cache_delete( 'bp_activity_comments_' . $activity->id, 'bp' );
+
+        // If Akismet is active, and this was a manual spam/ham request, stop Akismet checking the activity
+        if ( 'by_a_person' == $source && !empty( $bp->activity->akismet ) ) {
+                remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 1, 1 );
+
+                // Build data package for Akismet
+                $activity_data = BP_Akismet::build_akismet_data_package( $activity );
+
+                // Tell Akismet this is spam
+                $activity_data = $bp->activity->akismet->send_akismet_request( $activity_data, 'submit', 'spam' );
+
+                // Update meta
+                add_action( 'bp_activity_after_save', array( $bp->activity->akismet, 'update_activity_spam_meta' ), 1, 1 );
+        }
+
+        do_action( 'bp_activity_mark_as_spam', $activity, $source );
+}
+
+/**
+ * Mark activity item as ham
+ *
+ * @global object $bp BuddyPress global settings
+ * @param BP_Activity_Activity $activity
+ * @param string $source Optional; default is "by_a_person" (e.g. a person has manually marked the activity as spam).
+ * @since 1.6
+ */
+function bp_activity_mark_as_ham( &$activity, $source = 'by_a_person' ) {
+        global $bp;
+
+        $activity->is_spam = 0;
+
+        // Clear the activity stream first page cache
+        wp_cache_delete( 'bp_activity_sitewide_front', 'bp' );
+
+        // Clear the activity comment cache for this activity item
+        wp_cache_delete( 'bp_activity_comments_' . $activity->id, 'bp' );
+
+        // If Akismet is active, and this was a manual spam/ham request, stop Akismet checking the activity
+        if ( 'by_a_person' == $source && !empty( $bp->activity->akismet ) ) {
+                remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 1, 1 );
+
+                // Build data package for Akismet
+                $activity_data = BP_Akismet::build_akismet_data_package( $activity );
+
+                // Tell Akismet this is spam
+                $activity_data = $bp->activity->akismet->send_akismet_request( $activity_data, 'submit', 'ham' );
+
+                // Update meta
+                add_action( 'bp_activity_after_save', array( $bp->activity->akismet, 'update_activity_ham_meta' ), 1, 1 );
+        }
+
+        //DJPAULTODO: Run bp_activity_at_name_filter() somehow... but not twice, if we can help it. Maybe check if it was auto-spammed by Akismet?
+        do_action( 'bp_activity_mark_as_ham', $activity, $source );
+} 
+
+
 /** Embeds *******************************************************************/
 

trunk/bp-activity/bp-activity-loader.php

@@ -54 +54 @@
                 if ( defined( 'AKISMET_VERSION' ) && ( !empty( $akismet_key ) || defined( 'WPCOM_API_KEY' ) ) )
                         $includes[] = 'akismet';
+
+                if ( is_admin() )
+                        $includes[] = 'admin';
 
                 parent::includes( $includes );

trunk/bp-activity/bp-activity-template.php

@@ -105 +105 @@
         var $full_name;
 
-        function __construct( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude = false, $in = false, $hide_spam = true ) {
+        function __construct( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude = false, $in = false, $spam = 'ham_only' ) {
                 global $bp;
 
@@ -119 +119 @@
                 // Fetch specific activity items based on ID's
                 if ( !empty( $include ) )
-                        $this->activities = bp_activity_get_specific( array( 'activity_ids' => explode( ',', $include ), 'max' => $max, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'sort' => $sort, 'display_comments' => $display_comments, 'show_hidden' => $show_hidden, 'hide_spam' => $hide_spam ) );
+                        $this->activities = bp_activity_get_specific( array( 'activity_ids' => explode( ',', $include ), 'max' => $max, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'sort' => $sort, 'display_comments' => $display_comments, 'show_hidden' => $show_hidden, 'spam' => $spam ) );
 
                 // Fetch all activity items
                 else
-                        $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden, 'exclude' => $exclude, 'in' => $in, 'hide_spam' => $hide_spam ) );
+                        $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden, 'exclude' => $exclude, 'in' => $in, 'spam' => $spam ) );
 
                 if ( !$max || $max >= (int)$this->activities['total'] )
@@ -299 +299 @@
                 'max'              => false,        // max number to return
                 'show_hidden'      => $show_hidden, // Show activity items that are hidden site-wide?
-                'hide_spam'        => true,         // Don't retrieve items marked as spam?
+                'spam'             => 'ham_only',   // Hide spammed items
 
                 // Scope - pre-built activity filters for a user (friends/groups/favorites/mentions)
@@ -384 +384 @@
 
         // If specific activity items have been requested, override the $hide_spam argument. This prevents backpat errors with AJAX.
-        if ( !empty( $include ) && $hide_spam )
-                $hide_spam = false;
-
-        $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude, $in, $hide_spam );
+        if ( !empty( $include ) && 'ham_only' == $spam )
+                $spam = 'all';
+
+        $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude, $in, $spam );
 
         return apply_filters( 'bp_has_activities', $activities_template->has_activities(), $activities_template );

trunk/bp-core/bp-core-cssjs.php

@@ -27 +27 @@
                 ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a,
                 ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a {
+                        background-position: -1px 0;
+                }
+
+                /* Activity Icon */
+                ul#adminmenu li.toplevel_page_bp-activity-settings .wp-menu-image a img { display: none; }
+                ul#adminmenu li.toplevel_page_bp-activity-settings .wp-menu-image a { background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px; }
+                ul#adminmenu li.toplevel_page_bp-activity-settings:hover .wp-menu-image a,
+                ul#adminmenu li.toplevel_page_bp-activity-settings.wp-has-current-submenu .wp-menu-image a {
                         background-position: -1px 0;
                 }

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -340 +340 @@
 
         // Is the current user allowed to spam items?
-        if ( !BP_Akismet::user_can_mark_spam() )
+        if ( !bp_activity_user_can_mark_spam() )
                 return false;
 
@@ -357 +357 @@
 
         // Mark as spam
-        $bp->activity->akismet->mark_as_spam( $activity );
+        bp_activity_mark_as_spam( $activity );
         $activity->save();