Skip to content

Commit

Permalink
Merge pull request #2524 from buddyboss/fix/api-1.6.4
Browse files Browse the repository at this point in the history 
API Fixes
  • Loading branch information
@sourabhmatolia
sourabhmatolia authored Jun 24, 2021
2 parents 46b43f8 + a9e372b commit e8b7cc6
Show file tree
Hide file tree
Showing 47 changed files with 2,245 additions and 2,543 deletions.
41 changes: 20 additions & 21 deletions src/bp-activity/classes/class-bp-rest-activity-comment-endpoint.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,28 +306,27 @@ public function create_item( $request ) {
* @since 0.1.0
*/
public function create_item_permissions_check( $request ) {
$retval = true;

if ( ! is_user_logged_in() ) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to create an activity comment.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
}

$activity = $this->get_activity_object( $request );
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to create an activity comment.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);

if ( empty( $activity ) || empty( $activity->id ) ) {
return new WP_Error(
'bp_rest_invalid_id',
__( 'Invalid activity ID.', 'buddyboss' ),
array(
'status' => 404,
)
);
if ( is_user_logged_in() ) {
$retval = true;
$activity = $this->get_activity_object( $request );

if ( empty( $activity ) || empty( $activity->id ) ) {
$retval = new WP_Error(
'bp_rest_invalid_id',
__( 'Invalid activity ID.', 'buddyboss' ),
array(
'status' => 404,
)
);
}
}

/**
Expand Down
20 changes: 10 additions & 10 deletions src/bp-activity/classes/class-bp-rest-activity-details-endpoint.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,22 @@ public function get_items( $request ) {
* @since 0.1.0
*/
public function get_items_permissions_check( $request ) {
$retval = true;
$retval = new WP_Error(
'bp_rest_component_required',
__( 'Sorry, Activity component was not enabled.', 'buddyboss' ),
array(
'status' => '404',
)
);

if ( ! bp_is_active( 'activity' ) ) {
$retval = new WP_Error(
'bp_rest_component_required',
__( 'Sorry, Activity component was not enabled.', 'buddyboss' ),
array(
'status' => '404',
)
);
if ( bp_is_active( 'activity' ) ) {
$retval = true;
}

/**
* Filter the activity details permissions check.
*
* @param bool|WP_Error $retval Returned value.
* @param bool|WP_Error $retval Returned value.
* @param WP_REST_Request $request The request sent to the API.
*
* @since 0.1.0
Expand Down
206 changes: 103 additions & 103 deletions src/bp-activity/classes/class-bp-rest-activity-endpoint.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,30 +620,31 @@ public function create_item( $request ) {
* @since 0.1.0
*/
public function create_item_permissions_check( $request ) {
$retval = true;
$error = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to create activities.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);

if ( ! is_user_logged_in() ) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to create activities.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
}
$retval = $error;

$item_id = $request['primary_item_id'];
$component = $request['component'];
if ( is_user_logged_in() ) {
$user_id = $request->get_param( 'user_id' );

if ( true === $retval && bp_is_active( 'groups' ) && buddypress()->groups->id === $component && ! is_null( $item_id ) ) {
if ( ! $this->show_hidden( $component, $item_id ) ) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to create activities.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
if ( empty( $user_id ) || (int) bp_loggedin_user_id() === (int) $user_id ) {
$item_id = $request->get_param( 'primary_item_id' );
$component = $request->get_param( 'component' );

// The current user can create an activity.
$retval = true;

if ( bp_is_active( 'groups' ) && buddypress()->groups->id === $component && ! is_null( $item_id ) ) {
if ( ! $this->show_hidden( $component, $item_id ) ) {
$retval = $error;
}
}
}
}

Expand Down Expand Up @@ -808,54 +809,41 @@ public function update_item( $request ) {
* @since 0.1.0
*/
public function update_item_permissions_check( $request ) {
$retval = true;

if ( ! is_user_logged_in() ) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to update this activity.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
}

$activity = $this->get_activity_object( $request );
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to update this activity.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);

if ( true === $retval && empty( $activity->id ) ) {
$retval = new WP_Error(
'bp_rest_invalid_id',
__( 'Invalid activity ID.', 'buddyboss' ),
array(
'status' => 404,
)
);
}
if ( is_user_logged_in() ) {
$activity = $this->get_activity_object( $request );

if ( true === $retval && (
if ( empty( $activity->id ) ) {
$retval = new WP_Error(
'bp_rest_invalid_id',
__( 'Invalid activity ID.', 'buddyboss' ),
array(
'status' => 404,
)
);
} elseif (
function_exists( 'bp_is_activity_edit_enabled' )
&& ! bp_is_activity_edit_enabled()
&& function_exists( 'bp_activity_user_can_edit' )
&& ! bp_activity_user_can_edit( $activity )
)
) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to update this activity.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
}

if ( true === $retval && ! bp_activity_user_can_delete( $activity ) ) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to update this activity.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to update this activity.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
} elseif ( bp_activity_user_can_delete( $activity ) ) {
$retval = true;
}
}

/**
Expand Down Expand Up @@ -945,38 +933,28 @@ public function delete_item( $request ) {
* @since 0.1.0
*/
public function delete_item_permissions_check( $request ) {
$retval = true;

if ( ! is_user_logged_in() ) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to delete this activity.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
}

$activity = $this->get_activity_object( $request );
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to delete this activity.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);

if ( true === $retval && empty( $activity->id ) ) {
$retval = new WP_Error(
'bp_rest_invalid_id',
__( 'Invalid activity ID.', 'buddyboss' ),
array(
'status' => 404,
)
);
}
if ( is_user_logged_in() ) {
$activity = $this->get_activity_object( $request );

if ( true === $retval && ! bp_activity_user_can_delete( $activity ) ) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to delete this activity.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
if ( empty( $activity->id ) ) {
$retval = new WP_Error(
'bp_rest_invalid_id',
__( 'Invalid activity ID.', 'buddyboss' ),
array(
'status' => 404,
)
);
} elseif ( bp_activity_user_can_delete( $activity ) ) {
$retval = true;
}
}

/**
Expand Down Expand Up @@ -1100,19 +1078,19 @@ public function update_favorite( $request ) {
* @since 0.1.0
*/
public function update_favorite_permissions_check( $request ) {
$retval = true;
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to update favorites.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);

if (
! ( is_user_logged_in() && bp_activity_can_favorite() )
|| function_exists( 'bp_is_activity_like_active' ) && true !== bp_is_activity_like_active()
is_user_logged_in() && bp_activity_can_favorite()
&& ( ! function_exists( 'bp_is_activity_like_active' ) || true === bp_is_activity_like_active() )
) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to update favorites.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
$retval = true;
}

/**
Expand Down Expand Up @@ -1204,6 +1182,16 @@ public function prepare_item_for_response( $activity, $request ) {
$activities_template = new \stdClass();
$activities_template->disable_blogforum_replies = (bool) bp_core_get_root_option( 'bp-disable-blogforum-comments' );
$activities_template->activity = $activity;

// Remove feature image from content from the activity feed which added last in the content.
$blog_id = '';
if ( 'blogs' === $activity->component && isset( $activity->secondary_item_id ) && 'new_blog_' . get_post_type( $activity->secondary_item_id ) === $activity->type ) {
$blog_post = get_post( $activity->secondary_item_id );
if ( ! empty( $blog_post->ID ) ) {
$blog_id = $blog_post->ID;
remove_filter( 'bb_add_feature_image_blog_post_as_activity_content', 'bb_add_feature_image_blog_post_as_activity_content_callback' );
}
}

$data = array(
'user_id' => $activity->user_id,
Expand Down Expand Up @@ -1241,8 +1229,14 @@ function_exists( 'bp_is_activity_edit_enabled' )
'content_stripped' => html_entity_decode( wp_strip_all_tags( $activity->content ) ),
'privacy' => ( isset( $activity->privacy ) ? $activity->privacy : false ),
'activity_data' => $this->bp_rest_activitiy_edit_data( $activity ),
'feature_media' => '',
);

// Add feature image as separate object which added last in the content.
if ( ! empty( $blog_id ) && ! empty( get_post_thumbnail_id( $blog_id ) ) ) {
$data['feature_media'] = wp_get_attachment_image_url( get_post_thumbnail_id( $blog_id ), 'full' );
}

// Get item schema.
$schema = $this->get_item_schema();

Expand Down Expand Up @@ -1790,6 +1784,12 @@ public function get_item_schema() {
'description' => __( 'Activity data for allow edit or not.', 'buddyboss' ),
'type' => 'object',
),
'feature_media' => array(
'context' => array( 'embed', 'view', 'edit' ),
'description' => __( 'Feature media image which added last in the content for blog post as well as custom post type.', 'buddyboss' ),
'type' => 'string',
'format' => 'uri',
),
),
);

Expand Down
26 changes: 13 additions & 13 deletions src/bp-activity/classes/class-bp-rest-activity-link-preview-endpoint.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,32 +132,32 @@ public function get_items( $request ) {
* @since 0.1.0
*/
public function get_items_permissions_check( $request ) {
$retval = true;
$retval = new WP_Error(
'bp_rest_component_required',
__( 'Sorry, Activity component was not enabled.', 'buddyboss' ),
array(
'status' => '404',
)
);

if ( ! bp_is_active( 'activity' ) ) {
$retval = new WP_Error(
'bp_rest_component_required',
__( 'Sorry, Activity component was not enabled.', 'buddyboss' ),
array(
'status' => '404',
)
);
if ( bp_is_active( 'activity' ) ) {
$retval = true;
}

if ( true === $retval && function_exists( 'bp_is_activity_link_preview_active' ) && true !== bp_is_activity_link_preview_active() ) {
if ( true === $retval && ! is_user_logged_in() ) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, Link Previews is disabled.', 'buddyboss' ),
__( 'Sorry, you are not allowed to generate link preview in the activity.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
);
}

if ( true === $retval && ! is_user_logged_in() ) {
if ( true === $retval && function_exists( 'bp_is_activity_link_preview_active' ) && true !== bp_is_activity_link_preview_active() ) {
$retval = new WP_Error(
'bp_rest_authorization_required',
__( 'Sorry, you are not allowed to generate link preview in the activity.', 'buddyboss' ),
__( 'Sorry, Link Previews is disabled.', 'buddyboss' ),
array(
'status' => rest_authorization_required_code(),
)
Expand Down
Loading

0 comments on commit e8b7cc6

Please sign in to comment.