Skip to content

Fix: Invalidate retries with the invalidation of an Outbox Item #1519

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 6 commits into
base: trunk
Choose a base branch
from
Open

Fix: Invalidate retries with the invalidation of an Outbox Item #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f47c95
Fix: Also invalidate retries
pfefferle Mar 28, 2025
8c2cf98
Add changelog
matticbot Mar 28, 2025
62c5d80
fix phpcs
pfefferle Mar 28, 2025
77015dd
Merge branch 'fix/invalidate-retries' of https://github.com/Automatti…
pfefferle Mar 28, 2025
198a265
remove test code
pfefferle Mar 28, 2025
7912cac
Merge branch 'trunk' into fix/invalidate-retries
pfefferle Mar 28, 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
4 changes: 4 additions & 0 deletions .github/changelog/1519-from-description
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Properly remove retries schedules, with the invalidation of an Outbox-Item.
18 changes: 18 additions & 0 deletions includes/collection/class-outbox.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,24 @@ private static function invalidate_existing_items( $object_id, $activity_type, $
$timestamp = \wp_next_scheduled( 'activitypub_process_outbox', array( $existing_item_id ) );
\wp_unschedule_event( $timestamp, 'activitypub_process_outbox', array( $existing_item_id ) );

// Invalidate any retries for this outbox item.
$crons = _get_cron_array();
foreach ( $crons as $timestamp => $cron ) {
if ( ! isset( $cron['activitypub_async_batch'] ) ) {
continue;
}
foreach ( $cron['activitypub_async_batch'] as $event ) {
if (
isset( $event['args'][0][1] ) &&
'retry_send_to_followers' === $event['args'][0][1] &&
isset( $event['args'][2] ) &&
$existing_item_id === $event['args'][2]
) {
\wp_unschedule_event( $timestamp, 'activitypub_async_batch', $event['args'] );
}
}
}

\wp_publish_post( $existing_item_id );
\delete_post_meta( $existing_item_id, '_activitypub_outbox_offset' );
}
Expand Down
Loading