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

Merge branch 'add/catchall' into rewrite-user-management

Browse source
This commit is contained in:
Matthias Pfefferle 2023-07-03 18:03:42 +02:00 committed by GitHub
commit f1c1eff267
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ use Activitypub\Collection\Users;
use Activitypub\Collection\Followers; use Activitypub\Collection\Followers;
use Activitypub\Transformer\Post; use Activitypub\Transformer\Post;
use function Activitypub\is_user_disabled;
use function Activitypub\safe_remote_post; use function Activitypub\safe_remote_post;
/** /**
@ -21,9 +22,6 @@ class Activity_Dispatcher {
* Initialize the class, registering WordPress hooks. * Initialize the class, registering WordPress hooks.
*/ */
public static function init() { public static function init() {
// legacy
\add_action( 'activitypub_send_post_activity', array( self::class, 'send_create_activity' ) );
\add_action( 'activitypub_send_activity', array( self::class, 'send_user_activity' ), 10, 2 ); \add_action( 'activitypub_send_activity', array( self::class, 'send_user_activity' ), 10, 2 );
\add_action( 'activitypub_send_activity', array( self::class, 'send_blog_activity' ), 10, 2 ); \add_action( 'activitypub_send_activity', array( self::class, 'send_blog_activity' ), 10, 2 );
} }
@ -31,24 +29,27 @@ class Activity_Dispatcher {
/** /**
* Send Activities to followers and mentioned users. * Send Activities to followers and mentioned users.
* *
* @param WP_Post $post The ActivityPub Post. * @param WP_Post $wp_post The ActivityPub Post.
* @param string $type The Activity-Type. * @param string $activity_type The Activity-Type.
* *
* @return void * @return void
*/ */
public static function send_user_activity( WP_Post $post, $type ) { public static function send_user_activity( WP_Post $wp_post, $activity_type ) {
// check if a migration is needed before sending new posts // check if a migration is needed before sending new posts
Migration::maybe_migrate(); Migration::maybe_migrate();
$object = Post::transform( $post )->to_object(); if ( is_user_disabled( $wp_post->post_author ) ) {
return;
}
$activity = new Activity(); $post = new Post( $wp_post );
$activity->set_type( $type );
$activity->set_object( $object );
$user_id = $post->post_author; $activitypub_activity = new Activity( $activity_type );
$activitypub_activity->from_post( $post );
$user_id = $wp_post->post_author;
$follower_inboxes = Followers::get_inboxes( $user_id ); $follower_inboxes = Followers::get_inboxes( $user_id );
$mentioned_inboxes = Mention::get_inboxes( $activity->get_cc() ); $mentioned_inboxes = Mention::get_inboxes( $activitypub_activity->get_cc() );
$inboxes = array_merge( $follower_inboxes, $mentioned_inboxes ); $inboxes = array_merge( $follower_inboxes, $mentioned_inboxes );
$inboxes = array_unique( $inboxes ); $inboxes = array_unique( $inboxes );
@ -60,34 +61,35 @@ class Activity_Dispatcher {
} }
} }
/** /**
* Send Activities to followers and mentioned users. * Send Activities to followers and mentioned users.
* *
* @param WP_Post $post The ActivityPub Post. * @param WP_Post $wp_post The ActivityPub Post.
* @param string $type The Activity-Type. * @param string $activity_type The Activity-Type.
* *
* @return void * @return void
*/ */
public static function send_blog_activity( WP_Post $post, $type ) { public static function send_blog_activity( WP_Post $wp_post, $activity_type ) {
// check if a migration is needed before sending new posts // check if a migration is needed before sending new posts
Migration::maybe_migrate(); Migration::maybe_migrate();
$user = Users::get_by_id( Users::BLOG_USER_ID ); if ( is_user_disabled( User_Factory::BLOG_USER_ID ) ) {
return;
}
$object = Post::transform( $post )->to_object(); $post = new Post( $wp_post, User_Factory::BLOG_USER_ID );
$object->set_attributed_to( $user->get_url() );
$activity = new Activity(); $activitypub_activity = new Activity( $activity_type );
$activity->set_type( $type ); $activitypub_activity->from_post( $post );
$activity->set_object( $object );
$follower_inboxes = Followers::get_inboxes( $user->get__id() ); $user_id = User_Factory::BLOG_USER_ID;
$mentioned_inboxes = Mention::get_inboxes( $activity->get_cc() ); $follower_inboxes = Followers::get_inboxes( $user_id );
$mentioned_inboxes = Mention::get_inboxes( $activitypub_activity->get_cc() );
$inboxes = array_merge( $follower_inboxes, $mentioned_inboxes ); $inboxes = array_merge( $follower_inboxes, $mentioned_inboxes );
$inboxes = array_unique( $inboxes ); $inboxes = array_unique( $inboxes );
$array = $activity->to_array(); $array = $activity->to_json();
foreach ( $inboxes as $inbox ) { foreach ( $inboxes as $inbox ) {
safe_remote_post( $inbox, $array, $user_id ); safe_remote_post( $inbox, $array, $user_id );