updated plugin ActivityPub
version 2.6.1
This commit is contained in:
@ -46,7 +46,10 @@ class Webfinger {
|
||||
return new WP_Error(
|
||||
'webfinger_missing_links',
|
||||
__( 'No valid Link elements found.', 'activitypub' ),
|
||||
$data
|
||||
array(
|
||||
'status' => 400,
|
||||
'data' => $data,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@ -65,7 +68,10 @@ class Webfinger {
|
||||
return new WP_Error(
|
||||
'webfinger_url_no_activitypub',
|
||||
__( 'The Site supports WebFinger but not ActivityPub', 'activitypub' ),
|
||||
$data
|
||||
array(
|
||||
'status' => 400,
|
||||
'data' => $data,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@ -103,7 +109,10 @@ class Webfinger {
|
||||
return new WP_Error(
|
||||
'webfinger_url_no_acct',
|
||||
__( 'No acct URI found.', 'activitypub' ),
|
||||
$data
|
||||
array(
|
||||
'status' => 400,
|
||||
'data' => $data,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@ -117,6 +126,17 @@ class Webfinger {
|
||||
* identifier and host as values
|
||||
*/
|
||||
public static function get_identifier_and_host( $url ) {
|
||||
if ( ! $url ) {
|
||||
return new WP_Error(
|
||||
'webfinger_invalid_identifier',
|
||||
__( 'Invalid Identifier', 'activitypub' ),
|
||||
array(
|
||||
'status' => 400,
|
||||
'data' => $url,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
// remove leading @
|
||||
$url = ltrim( $url, '@' );
|
||||
|
||||
@ -144,7 +164,14 @@ class Webfinger {
|
||||
}
|
||||
|
||||
if ( empty( $host ) ) {
|
||||
return new WP_Error( 'webfinger_invalid_identifier', __( 'Invalid Identifier', 'activitypub' ) );
|
||||
return new WP_Error(
|
||||
'webfinger_invalid_identifier',
|
||||
__( 'Invalid Identifier', 'activitypub' ),
|
||||
array(
|
||||
'status' => 400,
|
||||
'data' => $url,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
return array( $identifier, $host );
|
||||
@ -174,7 +201,7 @@ class Webfinger {
|
||||
return $data;
|
||||
}
|
||||
|
||||
$webfinger_url = 'https://' . $host . '/.well-known/webfinger?resource=' . rawurlencode( $identifier );
|
||||
$webfinger_url = sprintf( 'https://%s/.well-known/webfinger?resource=%s', $host, rawurlencode( $identifier ) );
|
||||
|
||||
$response = wp_safe_remote_get(
|
||||
$webfinger_url,
|
||||
@ -187,7 +214,10 @@ class Webfinger {
|
||||
return new WP_Error(
|
||||
'webfinger_url_not_accessible',
|
||||
__( 'The WebFinger Resource is not accessible.', 'activitypub' ),
|
||||
$webfinger_url
|
||||
array(
|
||||
'status' => 400,
|
||||
'data' => $webfinger_url,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@ -215,7 +245,10 @@ class Webfinger {
|
||||
return new WP_Error(
|
||||
'webfinger_missing_links',
|
||||
__( 'No valid Link elements found.', 'activitypub' ),
|
||||
$data
|
||||
array(
|
||||
'status' => 400,
|
||||
'data' => $data,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@ -228,7 +261,10 @@ class Webfinger {
|
||||
return new WP_Error(
|
||||
'webfinger_missing_remote_follow_endpoint',
|
||||
__( 'No valid Remote-Follow endpoint found.', 'activitypub' ),
|
||||
$data
|
||||
array(
|
||||
'status' => 400,
|
||||
'data' => $data,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user