Skip to content

Fix post search #56

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
toolstack wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix post search #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b683b
Fix post search
toolstack Jan 8, 2024
bb08445
Use logged in permissions instead of token
toolstack Jan 11, 2024
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
32 changes: 16 additions & 16 deletions includes/class-mastodon-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ public function add_rest_routes() {
array(
'methods' => array( 'GET', 'OPTIONS' ),
'callback' => array( $this, 'api_search' ),
'permission_callback' => array( $this, 'have_token_permission' ),
'permission_callback' => array( $this, 'logged_in_permission' ),
)
);

Expand Down Expand Up @@ -774,18 +774,6 @@ public function logged_in_permission( $request ) {
return is_user_logged_in();
}

public function have_token_permission( $request ) {
$this->allow_cors();
$token = $this->oauth->get_token();
if ( ! $token ) {
return is_user_logged_in();
}
OAuth2\AccessTokenStorage::was_used( $token['access_token'] );
$this->app = Mastodon_App::get_by_client_id( $token['client_id'] );
$this->app->was_used( $request );
return true;
}

public function logged_in_for_private_permission( $request ) {
$post_id = $request->get_param( 'post_id' );
if ( ! $post_id ) {
Expand Down Expand Up @@ -1575,9 +1563,21 @@ public function api_search( $request ) {
}
}
} elseif ( is_user_logged_in() ) {
$args['s'] = $request->get_param( 'q' );
$args['offset'] = $request->get_param( 'offset' );
$args['posts_per_page'] = $request->get_param( 'limit' );
$q_param = $request->get_param( 'q' );
if ( null !== $q_param ) {
$args['s'] = $q_param;
}

$offset_param = $request->get_param( 'offset' );
if ( null !== $offset_param ) {
$args['offset'] = $offset_param;
}

$ppp_param = $request->get_param( 'limit' );
if ( null !== $ppp_param ) {
$args['posts_per_page'] = $ppp_param;
}

$ret['statuses'] = array_merge( $ret['statuses'], $this->get_posts( $args ) );
}
}
Expand Down