Skip to content

Update follow return types and error handling #2094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: trunk
Choose a base branch
from
Open

Update follow return types and error handling #2094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cd15158
Update follow return types and error handling
pfefferle Aug 26, 2025
0a25386
Add changelog
matticbot Aug 26, 2025
33caee1
Update includes/collection/class-following.php
pfefferle Aug 26, 2025
a55ace0
Remove obsolete changelog entry 2094-from-description
pfefferle Aug 26, 2025
183e5da
Add follow activity to outbox with private visibility
pfefferle Aug 26, 2025
38aa151
Update CLI example to use underscore in command
pfefferle Aug 26, 2025
51ece21
Revert "Update CLI example to use underscore in command"
pfefferle Aug 26, 2025
d45c63c
Merge branch 'trunk' into change/simplify-follow-returns
pfefferle Sep 24, 2025
5cecd4b
Merge branch 'trunk' into change/simplify-follow-returns
pfefferle Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions includes/collection/class-following.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class Following {
* @param \WP_Post|int $post The ID of the remote Actor.
* @param int $user_id The ID of the WordPress User.
*
* @return int|false|\WP_Post|\WP_Error The Outbox ID or false on failure, the Actor post or a WP_Error.
* @return \WP_Post|\WP_Error The Actor post or a WP_Error.
*/
public static function follow( $post, $user_id ) {
$post = \get_post( $post );
Expand Down Expand Up @@ -88,7 +88,11 @@ public static function follow( $post, $user_id ) {
$follow->set_object( $post->guid );
$follow->set_to( array( $post->guid ) );

return add_to_outbox( $follow, null, $user_id, ACTIVITYPUB_CONTENT_VISIBILITY_PRIVATE );
$id = add_to_outbox( $follow, null, $user_id, ACTIVITYPUB_CONTENT_VISIBILITY_PRIVATE );

if ( ! $id || \is_wp_error( $id ) ) {
return new \WP_Error( 'activitypub_follow_failed', 'Failed to add follow to outbox' );
}
}

return $post;
Expand Down
2 changes: 1 addition & 1 deletion includes/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@ function add_to_outbox( $data, $activity_type = null, $user_id = 0, $content_vis
* @param string|int $remote_actor The Actor URL, WebFinger Resource or Post-ID of the remote Actor.
* @param int $user_id The ID of the WordPress User.
*
* @return int|false|\WP_Post|\WP_Error The Outbox ID or false on failure, the Actor post or a WP_Error.
* @return \WP_Post|\WP_Error The Actor post or a WP_Error.
*/
function follow( $remote_actor, $user_id ) {
if ( \is_numeric( $remote_actor ) ) {
Expand Down
Loading