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

Announce all posts through the application actor

Browse source
This commit is contained in:
André Menrath 2023-12-23 09:52:03 +01:00
parent 54c18b2ac9
commit a3a918c54c
2 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
includes/class-activity-dispatcher.php
View file

@ -10,6 +10,7 @@ use Activitypub\Transformer\Factory;
use Activitypub\Transformer\Post; use Activitypub\Transformer\Post;
use Activitypub\Transformer\Comment; use Activitypub\Transformer\Comment;
use function Activitypub\get_rest_url_by_path;
use function Activitypub\is_single_user; use function Activitypub\is_single_user;
use function Activitypub\is_user_disabled; use function Activitypub\is_user_disabled;
use function Activitypub\safe_remote_post; use function Activitypub\safe_remote_post;
@ -49,8 +50,10 @@ class Activity_Dispatcher {
if ( is_single_user() ) { if ( is_single_user() ) {
self::send_activity( $wp_object, $type, Users::BLOG_USER_ID ); self::send_activity( $wp_object, $type, Users::BLOG_USER_ID );
self::send_announce( $wp_object, $type, Users::APPLICATION_USER_ID );
} else { } else {
self::send_announce( $wp_object, $type ); self::send_announce( $wp_object, $type, Users::BLOG_USER_ID );
self::send_announce( $wp_object, $type, Users::APPLICATION_USER_ID );
} }
} }
@ -88,21 +91,36 @@ class Activity_Dispatcher {
* *
* @return void * @return void
*/ */
public static function send_announce( $wp_object, $type ) { public static function send_announce( $wp_object, $type, $user_id = null ) {
if ( ! in_array( $type, array( 'Create', 'Update' ), true ) ) { if ( ! in_array( $type, array( 'Create', 'Update' ), true ) ) {
return; return;
} }
if ( is_user_disabled( Users::BLOG_USER_ID ) ) { $transformer = Factory::instance()->get_transformer( $wp_object );
if ( null !== $user_id && Users::APPLICATION_USER_ID !== $user_id ) {
$transformer->change_wp_user_id( $user_id );
}
if ( ! $user_id ) {
$user_id = $transformer->get_wp_user_id();
}
if ( is_user_disabled( $user_id ) ) {
return; return;
} }
$transformer = Factory::get_transformer( $wp_object );
$transformer->change_wp_user_id( Users::BLOG_USER_ID );
$user_id = $transformer->get_wp_user_id();
$activity = $transformer->to_activity( 'Announce' ); $activity = $transformer->to_activity( 'Announce' );
// TODO: properly fix this for the instance-to-instance federation with Mobilizon.
// Error:
// Failed to map identity from signature (payload actor mismatch)
// key_id=http://wp.lan/wp-json/activitypub/1.0/application, actor=http://wp.lan/@blog
// Of course, the announce must be sent as the Application actor because he also signed it!
if ( Users::APPLICATION_USER_ID === $user_id ) {
$activity->set_actor( get_rest_url_by_path( 'application' ) );
}
self::send_activity_to_inboxes( $activity, $user_id ); self::send_activity_to_inboxes( $activity, $user_id );
} }

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

@ -7,6 +7,7 @@ use Activitypub\Model\User;
use Activitypub\Model\Blog_User; use Activitypub\Model\Blog_User;
use Activitypub\Model\Application_User; use Activitypub\Model\Application_User;
use function Activitypub\get_rest_url_by_path;
use function Activitypub\url_to_authorid; use function Activitypub\url_to_authorid;
use function Activitypub\is_user_disabled; use function Activitypub\is_user_disabled;
@ -176,6 +177,11 @@ class Users {
return self::get_by_id( self::BLOG_USER_ID ); return self::get_by_id( self::BLOG_USER_ID );
} }
// check for application actor
if ( self::normalize_url( get_rest_url_by_path( 'application' ) ) === self::normalize_url( $resource ) ) {
return self::get_by_id( self::APPLICATION_USER_ID );
}
return new WP_Error( return new WP_Error(
'activitypub_no_user_found', 'activitypub_no_user_found',
\__( 'User not found', 'activitypub' ), \__( 'User not found', 'activitypub' ),