Skip to content

fix: assorted error handling fixes #52

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

Merged
adekbadek merged 2 commits into from
Feb 14, 2024
Merged

fix: assorted error handling fixes #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c082e62
fix: assorted error handling fixes
adekbadek Feb 14, 2024
b06c14d
chore: lint fixes
adekbadek Feb 14, 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
4 changes: 1 addition & 3 deletions includes/class-crypto.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ public static function generate_secret_key() {
* @return string|false The decrypted message or false if the message could not be decrypted.
*/
public static function decrypt_message( $message, $secret_key, $nonce ) {

if ( ! $secret_key || ! is_string( $secret_key ) || ! $nonce || ! is_string( $nonce ) ) {
if ( ! $secret_key || ! is_string( $secret_key ) || ! $nonce || ! is_string( $nonce ) || ! is_string( $message ) ) {
return false;
}

Expand All @@ -54,7 +53,6 @@ public static function decrypt_message( $message, $secret_key, $nonce ) {
* @return string|WP_Error The encrypted message or WP_Error if the message could not be encrypted.
*/
public static function encrypt_message( $message, $secret_key, $nonce ) {

if ( ! $secret_key || ! is_string( $secret_key ) || ! $nonce || ! is_string( $nonce ) ) {
return false;
}
Expand Down
1 change: 0 additions & 1 deletion includes/distributor-customizations/class-cache-bug-workaround.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,4 @@ public static function init() {
public static function workaround() {
wp_cache_delete( 'dt_media::{$post_id}', 'dt::post' );
}

}
2 changes: 0 additions & 2 deletions includes/distributor-customizations/class-sync-post-status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,4 @@ public static function filter_subscription_post_args( $post_body, $post ) {
}
return $post_body;
}


}
1 change: 0 additions & 1 deletion includes/distributor-customizations/class-yoast-primary-cat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,4 @@ public static function filter_subscription_post_args( $post_body, $post ) {
public static function pull_post( $new_post_id ) {
self::process_attributes( get_post( $new_post_id ) );
}

}
4 changes: 2 additions & 2 deletions includes/incoming-events/class-user-updated.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public function maybe_update_user() {
Debugger::log( 'Updating user meta: ' . $meta_key );
update_user_meta( $existing_user->ID, $meta_key, $meta_value );
}
}

User_Utils::maybe_sideload_avatar( $existing_user->ID, $data->meta, true );
User_Utils::maybe_sideload_avatar( $existing_user->ID, $data->meta, true );
}
}
}
9 changes: 7 additions & 2 deletions includes/node/class-pulling.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,15 @@ public static function make_request() {
return $response;
}
$response_code = wp_remote_retrieve_response_code( $response );
$response_body = wp_remote_retrieve_body( $response );
if ( 200 !== $response_code ) {
return new \WP_Error( 'newspack-network-node-pulling-error', __( 'Error pulling data from the Hub', 'newspack-network-node' ) );
$error_message = __( 'Error pulling data from the Hub', 'newspack-network-node' );
if ( $response_body ) {
$error_message .= ': ' . $response_body;
}
return new \WP_Error( 'newspack-network-node-pulling-error', $error_message );
}
return wp_remote_retrieve_body( $response );
return $response_body;
}

/**
Expand Down