Event-Federation/wordpress-activitypub
Event-Federation/wordpress-activitypub
7
1
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity Actions

some refactorings

Browse source
This commit is contained in:
Matthias Pfefferle 2023-07-11 09:09:37 +02:00
parent 0ab61b6441
commit a461ea3b1f
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/collection/class-users.php
View file

@ -7,6 +7,8 @@ use Activitypub\Model\User;
use Activitypub\Model\Blog_User;
use Activitypub\Model\Application_User;
use function Activitypub\is_user_disabled;
class Users {
/**
* The ID of the Blog User
@ -34,6 +36,14 @@ class Users {
$user_id = (int) $user_id;
}
if ( is_user_disabled( $user_id ) ) {
return new WP_Error(
'activitypub_user_not_found',
\__( 'User not found', 'activitypub' ),
array( 'status' => 404 )
);
}
if ( self::BLOG_USER_ID === $user_id ) {
return Blog_User::from_wp_user( $user_id );
} elseif ( self::APPLICATION_USER_ID === $user_id ) {

5
includes/functions.php
View file

@ -299,6 +299,11 @@ function is_user_disabled( $user_id ) {
break;
// if the user is any other user, it's enabled if it can publish posts.
default:
if ( ! \get_user_by( 'id', $user_id ) ) {
$return = true;
break;
}
if ( defined( 'ACTIVITYPUB_DISABLE_USER' ) ) {
$return = ACTIVITYPUB_DISABLE_USER;
break;

5
includes/model/class-user.php
View file

@ -26,10 +26,7 @@ class User extends Actor {
protected $type = 'Person';
public static function from_wp_user( $user_id ) {
if (
is_user_disabled( $user_id ) ||
! get_user_by( 'id', $user_id )
) {
if ( is_user_disabled( $user_id ) ) {
return new WP_Error(
'activitypub_user_not_found',
\__( 'User not found', 'activitypub' ),

2
includes/rest/class-inbox.php
View file

@ -124,7 +124,6 @@ class Inbox {
* @return WP_REST_Response
*/
public static function user_inbox_post( $request ) {
$user_id = $request->get_param( 'user_id' );
$user = User_Collection::get_by_various( $user_id );
@ -150,7 +149,6 @@ class Inbox {
* @return WP_REST_Response
*/
public static function shared_inbox_post( $request ) {
$data = $request->get_params();
$type = $request->get_param( 'type' );
$users = self::extract_recipients( $data );