Ticket #2794: 2794.03.patch

src/includes/extend/buddypress/activity.php

@@ -104 +104 @@
         private function setup_globals() {
 
                 // The name of the BuddyPress component, used in activity streams
-                $this->component    = 'bbpress';
+                $this->component = 'bbpress';
 
+                // Groups
+                if ( bp_is_active( 'groups' ) ) {
+                        $this->groups_component = buddypress()->groups->id;
+                }
+
                 // Forums
                 $this->forum_create = 'bbp_forum_create';
 
@@ -196 +201 @@
         public function register_activity_actions() {
 
                 // Sitewide activity stream items
-                bp_activity_set_action( $this->component, $this->topic_create, esc_html__( 'New forum topic', 'bbpress' ) );
-                bp_activity_set_action( $this->component, $this->reply_create, esc_html__( 'New forum reply', 'bbpress' ) );
+                bp_activity_set_action(
+                        $this->component,
+                        $this->topic_create,
+                        esc_html__( 'New forum topic', 'bbpress' ),
+                        'bbp_bp_format_activity_action_new_topic',
+                        __( 'Topics', 'bbpress' ),
+                        array( 'activity', 'member', 'member_groups', 'group' )
+                );
+
+                bp_activity_set_action(
+                        $this->component,
+                        $this->reply_create,
+                        esc_html__( 'New forum reply', 'bbpress' ),
+                        'bbp_bp_format_activity_action_new_reply',
+                        __( 'Replies', 'bbpress' ),
+                        array( 'activity', 'member', 'member_groups', 'group' )
+                );
+
+                // Group forum activity stream items
+                if ( bp_is_active( 'groups' ) ) {
+                        bp_activity_set_action(
+                                $this->groups_component,
+                                $this->topic_create,
+                                esc_html__( 'New forum topic', 'bbpress' ),
+                                'bbp_bp_format_activity_action_new_topic',
+                                __( 'Topics', 'bbpress' ),
+                                array( 'activity', 'member', 'member_groups', 'group' )
+                        );
+
+                        bp_activity_set_action(
+                                $this->groups_component,
+                                $this->reply_create,
+                                esc_html__( 'New forum reply', 'bbpress' ),
+                                'bbp_bp_format_activity_action_new_reply',
+                                __( 'Replies', 'bbpress' ),
+                                array( 'activity', 'member', 'member_groups', 'group' )
+                        );
+                }
         }
 
         /**

src/includes/extend/buddypress/functions.php

@@ -711 +711 @@
         // Return the value
         return (bool) $bbp->current_user->is_group_creator;
 }
+
+/** BuddyPress Activity Action Callbacks **************************************/
+
+/**
+ * Genereic function to format the dynamic BuddyPress activity action for new
+ * topics/replies.
+ *
+ * @since 2.6.0 bbPress (rXXXX)
+ *
+ * @param null|string $type     The type of post. Currently `topic` or `reply`.
+ * @param string      $action   The current action string.
+ * @param object      $activity The BuddyPress activity object.
+ *
+ * @uses bbp_get_topic_id() To get the topic id of the activity.
+ * @uses bbp_get_forum_id() To get the forum id of the activity item.
+ * @uses bbp_get_topic_forum_id() To get the forum id of the activity item.
+ * @uses bbp_get_user_profile_link() To get the user profile link.
+ * @uses bbp_get_topic_permalink() To get the topic permalink.
+ * @uses get_post_field() To get the post title.
+ * @uses bbp_get_forum_permalink() To get the forum permalink.
+ *
+ * @return string The formatted activity action.
+ */
+function bbp_bp_format_activity_action_new_post( $type = null, $action, $activity ) {
+
+        // Bail early if we don't have a valid type.
+        if ( ! in_array( $type, array( 'topic', 'reply' ) ) ) {
+                return $action;
+        }
+
+        if ( 'groups' === $activity->component ) {
+                if ( 'topic' === $type ) {
+                        $topic_id = bbp_get_topic_id( $activity->secondary_item_id );
+                        $forum_id = bbp_get_topic_forum_id( $topic_id );
+                } else {
+                        $topic_id = bbp_get_reply_topic_id( $activity->secondary_item_id );
+                        $forum_id = bbp_get_topic_forum_id( $topic_id );
+                }
+        } else {
+                if ( 'topic' === $type ) {
+                        $topic_id = bbp_get_topic_id( $activity->item_id );
+                        $forum_id = bbp_get_forum_id( $activity->secondary_item_id );
+                } else {
+                        $topic_id = bbp_get_topic_id( $activity->secondary_item_id );
+                        $forum_id = bbp_get_topic_forum_id( $topic_id );
+                }
+        }
+
+        // Setup our post type args.
+        $actions = array(
+                'topic' => __( '%1$s started the topic %2$s in the forum %3$s', 'bbpress' ),
+                'reply' => __( '%1$s replied to the topic %2$s in the forum %3$s', 'bbpress' ),
+        );
+
+        // User link for topic author.
+        $user_link = bbp_get_user_profile_link( $activity->user_id );
+
+        // Topic link.
+        $topic_permalink = bbp_get_topic_permalink( $topic_id );
+        $topic_title     = get_post_field( 'post_title', $topic_id, 'raw' );
+        $topic_link      = '<a href="' . $topic_permalink . '">' . $topic_title . '</a>';
+
+        // Forum link.
+        $forum_permalink = bbp_get_forum_permalink( $forum_id );
+        $forum_title     = get_post_field( 'post_title', $forum_id, 'raw' );
+        $forum_link      = '<a href="' . $forum_permalink . '">' . $forum_title . '</a>';
+
+        return sprintf( $actions[ $type ], $user_link, $topic_link, $forum_link );
+}
+
+/**
+ * Formats the dynamic BuddyPress activity action for new topics.
+ *
+ * @since 2.6.0 bbPress (rXXXX)
+ *
+ * @param string $action   The current action string.
+ * @param object $activity The BuddyPress activity object.
+ *
+ * @uses bbp_bp_format_activity_action_new_post() To get the formatted action string.
+ *
+ * @return string The formatted activity action.
+ */
+function bbp_bp_format_activity_action_new_topic( $action, $activity ) {
+
+        $action = bbp_bp_format_activity_action_new_post( 'topic', $action, $activity );
+
+        /**
+         * Filters the formatted activity action new topic string.
+         *
+         * @since 2.6.0 bbPress (rXXXX)
+         *
+         * @param string               $action   Activity action string value.
+         * @param BP_Activity_Activity $activity Activity item object.
+         */
+        return apply_filters( 'bbp_bp_format_activity_action_new_topic', $action, $activity );
+}
+
+/**
+ * Formats the dynamic BuddyPress activity action for new replies.
+ *
+ * @since 2.6.0 bbPress (rXXXX)
+ *
+ * @param string $action   The current action string.
+ * @param object $activity The BuddyPress activity object.
+ *
+ * @uses bbp_bp_format_activity_action_new_post() To get the formatted action string.
+ *
+ * @return string The formatted activity action.
+ */
+function bbp_bp_format_activity_action_new_reply( $action, $activity ) {
+
+        $action = bbp_bp_format_activity_action_new_post( 'reply', $action, $activity );
+
+        /**
+         * Filters the formatted activity action new reply string.
+         *
+         * @since 2.6.0 bbPress (rXXXX)
+         *
+         * @param string               $action   Activity action string value.
+         * @param BP_Activity_Activity $activity Activity item object.
+         */
+        return apply_filters( 'bbp_bp_format_activity_action_new_reply', $action, $activity );
+}