Skip to content

Change Rewrite Rule loading #269

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

Draft
akirk wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Change Rewrite Rule loading #269

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
054a120
Change Rewrite Rule loading
akirk May 9, 2025
f6e71f2
Bump minorminor version
akirk May 9, 2025
e7dfc2d
Revert version bump
akirk May 26, 2025
3e8babe
Try directly modifying the rules array
akirk May 26, 2025
a8e5c99
Try a different style
akirk May 26, 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
24 changes: 6 additions & 18 deletions includes/class-mastodon-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function __construct() {
}

public function register_hooks() {
add_action( 'wp_loaded', array( $this, 'rewrite_rules' ) );
add_action( 'generate_rewrite_rules', array( $this, 'generate_rewrite_rules' ) );
add_action( 'query_vars', array( $this, 'query_vars' ) );
add_action( 'rest_api_init', array( $this, 'add_rest_routes' ) );
add_filter( 'rest_post_dispatch', array( $this, 'send_http_links' ), 10, 3 );
Expand Down Expand Up @@ -298,10 +298,7 @@ public function activitypub_support_post_types( $post_types ) {
return $post_types;
}

public function rewrite_rules() {
$existing_rules = get_option( 'rewrite_rules' );
$needs_flush = false;

public function generate_rewrite_rules( $wp_rewrite ) {
$generic = apply_filters(
'mastodon_api_generic_routes',
array(
Expand Down Expand Up @@ -369,26 +366,17 @@ public function rewrite_rules() {
'api/v[12]/search' => 'api/v2/search',
)
);
$new_rules = array();

foreach ( $generic as $rule ) {
if ( empty( $existing_rules[ '^' . $rule ] ) ) {
// Add a specific rewrite rule so that we can also catch requests without our prefix.
$needs_flush = true;
}
add_rewrite_rule( '^' . $rule, 'index.php?rest_route=/' . self::PREFIX . '/' . $rule, 'top' );
$new_rules[ '^' . $rule ] = 'index.php?rest_route=/' . self::PREFIX . '/' . $rule;
}

foreach ( $parametrized as $rule => $rewrite ) {
if ( empty( $existing_rules[ '^' . $rule ] ) ) {
// Add a specific rewrite rule so that we can also catch requests without our prefix.
$needs_flush = true;
}
add_rewrite_rule( '^' . $rule, 'index.php?rest_route=/' . self::PREFIX . '/' . $rewrite, 'top' );
$new_rules[ '^' . $rule ] = 'index.php?rest_route=/' . self::PREFIX . '/' . $rewrite;
}

if ( $needs_flush ) {
flush_rewrite_rules();
}
$wp_rewrite->rules = $new_rules + $wp_rewrite->rules;
}

public function add_rest_routes() {
Expand Down