modified file enshrined

wp-content/upgrade-temp-backup/plugins/activitypub/includes/model/class-application-user.php

@@ -1,79 +0,0 @@
-<?php
-namespace Activitypub\Model;
-
-use WP_Query;
-use Activitypub\Signature;
-use Activitypub\Collection\Users;
-
-use function Activitypub\get_rest_url_by_path;
-
-class Application_User extends Blog_User {
-	/**
-	 * The User-ID
-	 *
-	 * @var int
-	 */
-	protected $_id = Users::APPLICATION_USER_ID; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
-
-	public function get_type() {
-		return 'Application';
-	}
-
-	public function get_discoverable() {
-		return false;
-	}
-
-	public function get_manually_approves_followers() {
-		return true;
-	}
-
-	/**
-	 * Get the User-Url.
-	 *
-	 * @return string The User-Url.
-	 */
-	public function get_url() {
-		return get_rest_url_by_path( 'application' );
-	}
-
-	/**
-	 * Returns the User-URL with @-Prefix for the username.
-	 *
-	 * @return string The User-URL with @-Prefix for the username.
-	 */
-	public function get_alternate_url() {
-		return \esc_url( \trailingslashit( get_home_url() ) . '@' . $this->get_preferred_username() );
-	}
-
-	public function get_name() {
-		return 'application';
-	}
-
-	public function get_preferred_username() {
-		return $this->get_name();
-	}
-
-	public function get_followers() {
-		return null;
-	}
-
-	public function get_following() {
-		return null;
-	}
-
-	public function get_attachment() {
-		return null;
-	}
-
-	public function get_featured() {
-		return null;
-	}
-
-	public function get_moderators() {
-		return null;
-	}
-
-	public function get_indexable() {
-		return false;
-	}
-}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/model/class-application.php

@@ -0,0 +1,200 @@
+<?php
+namespace Activitypub\Model;
+
+use WP_Query;
+use Activitypub\Signature;
+use Activitypub\Activity\Actor;
+use Activitypub\Collection\Users;
+
+use function Activitypub\get_rest_url_by_path;
+
+class Application extends Actor {
+	/**
+	 * The User-ID
+	 *
+	 * @var int
+	 */
+	protected $_id = Users::APPLICATION_USER_ID; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
+
+	/**
+	 * If the User is discoverable.
+	 *
+	 * @see https://docs.joinmastodon.org/spec/activitypub/#discoverable
+	 *
+	 * @context http://joinmastodon.org/ns#discoverable
+	 *
+	 * @var boolean
+	 */
+	protected $discoverable = false;
+
+	/**
+	 * If the User is indexable.
+	 *
+	 * @context http://joinmastodon.org/ns#indexable
+	 *
+	 * @var boolean
+	 */
+	protected $indexable = false;
+
+	/**
+	 * The WebFinger Resource.
+	 *
+	 * @var string<url>
+	 */
+	protected $webfinger;
+
+	public function get_type() {
+		return 'Application';
+	}
+
+	public function get_manually_approves_followers() {
+		return true;
+	}
+
+	public function get_id() {
+		return get_rest_url_by_path( 'application' );
+	}
+
+	/**
+	 * Get the User-Url.
+	 *
+	 * @return string The User-Url.
+	 */
+	public function get_url() {
+		return $this->get_id();
+	}
+
+	/**
+	 * Returns the User-URL with @-Prefix for the username.
+	 *
+	 * @return string The User-URL with @-Prefix for the username.
+	 */
+	public function get_alternate_url() {
+		return $this->get_url();
+	}
+
+	public function get_name() {
+		return 'application';
+	}
+
+	public function get_preferred_username() {
+		return $this->get_name();
+	}
+
+		/**
+	 * Get the User-Icon.
+	 *
+	 * @return array The User-Icon.
+	 */
+	public function get_icon() {
+		// try site icon first
+		$icon_id = get_option( 'site_icon' );
+
+		// try custom logo second
+		if ( ! $icon_id ) {
+			$icon_id = get_theme_mod( 'custom_logo' );
+		}
+
+		$icon_url = false;
+
+		if ( $icon_id ) {
+			$icon = wp_get_attachment_image_src( $icon_id, 'full' );
+			if ( $icon ) {
+				$icon_url = $icon[0];
+			}
+		}
+
+		if ( ! $icon_url ) {
+			// fallback to default icon
+			$icon_url = plugins_url( '/assets/img/wp-logo.png', ACTIVITYPUB_PLUGIN_FILE );
+		}
+
+		return array(
+			'type' => 'Image',
+			'url'  => esc_url( $icon_url ),
+		);
+	}
+
+	/**
+	 * Get the User-Header-Image.
+	 *
+	 * @return array|null The User-Header-Image.
+	 */
+	public function get_header_image() {
+		if ( \has_header_image() ) {
+			return array(
+				'type' => 'Image',
+				'url'  => esc_url( \get_header_image() ),
+			);
+		}
+
+		return null;
+	}
+
+	public function get_published() {
+		$first_post = new WP_Query(
+			array(
+				'orderby' => 'date',
+				'order'   => 'ASC',
+				'number'  => 1,
+			)
+		);
+
+		if ( ! empty( $first_post->posts[0] ) ) {
+			$time = \strtotime( $first_post->posts[0]->post_date_gmt );
+		} else {
+			$time = \time();
+		}
+
+		return \gmdate( 'Y-m-d\TH:i:s\Z', $time );
+	}
+
+	/**
+	 * Returns the Inbox-API-Endpoint.
+	 *
+	 * @return string The Inbox-Endpoint.
+	 */
+	public function get_inbox() {
+		return get_rest_url_by_path( sprintf( 'actors/%d/inbox', $this->get__id() ) );
+	}
+
+	/**
+	 * Returns the Outbox-API-Endpoint.
+	 *
+	 * @return string The Outbox-Endpoint.
+	 */
+	public function get_outbox() {
+		return get_rest_url_by_path( sprintf( 'actors/%d/outbox', $this->get__id() ) );
+	}
+
+	/**
+	 * Returns a user@domain type of identifier for the user.
+	 *
+	 * @return string The Webfinger-Identifier.
+	 */
+	public function get_webfinger() {
+		return $this->get_preferred_username() . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST );
+	}
+
+	public function get_public_key() {
+		return array(
+			'id'       => $this->get_id() . '#main-key',
+			'owner'    => $this->get_id(),
+			'publicKeyPem' => Signature::get_public_key_for( Users::APPLICATION_USER_ID ),
+		);
+	}
+
+	/**
+	 * Get the User-Description.
+	 *
+	 * @return string The User-Description.
+	 */
+	public function get_summary() {
+		return \wpautop(
+			\wp_kses(
+				\get_bloginfo( 'description' ),
+				'default'
+			)
+		);
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/model/class-blog.php

@@ -4,13 +4,38 @@ namespace Activitypub\Model;
 use WP_Query;
 use WP_Error;
 
+use Activitypub\Signature;
+use Activitypub\Activity\Actor;
 use Activitypub\Collection\Users;
 
 use function Activitypub\is_single_user;
 use function Activitypub\is_user_disabled;
 use function Activitypub\get_rest_url_by_path;
 
-class Blog_User extends User {
+class Blog extends Actor {
+	/**
+	 * The Featured-Posts.
+	 *
+	 * @see https://docs.joinmastodon.org/spec/activitypub/#featured
+	 *
+	 * @context {
+	 *   "@id": "http://joinmastodon.org/ns#featured",
+	 *   "@type": "@id"
+	 * }
+	 *
+	 * @var string
+	 */
+	protected $featured;
+
+	/**
+	 * Moderators endpoint.
+	 *
+	 * @see https://join-lemmy.org/docs/contributors/05-federation.html
+	 *
+	 * @var string
+	 */
+	protected $moderators;
+
 	/**
 	 * The User-ID
 	 *
@@ -18,6 +43,42 @@ class Blog_User extends User {
 	 */
 	protected $_id = Users::BLOG_USER_ID; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
 
+	/**
+	 * If the User is indexable.
+	 *
+	 * @context http://joinmastodon.org/ns#indexable
+	 *
+	 * @var boolean
+	 */
+	protected $indexable;
+
+	/**
+	 * The WebFinger Resource.
+	 *
+	 * @var string<url>
+	 */
+	protected $webfinger;
+
+	/**
+	 * If the User is discoverable.
+	 *
+	 * @see https://docs.joinmastodon.org/spec/activitypub/#discoverable
+	 *
+	 * @context http://joinmastodon.org/ns#discoverable
+	 *
+	 * @var boolean
+	 */
+	protected $discoverable;
+
+	/**
+	 * Restrict posting to mods
+	 *
+	 * @see https://join-lemmy.org/docs/contributors/05-federation.html
+	 *
+	 * @var boolean
+	 */
+	protected $posting_restricted_to_mods;
+
 	public function get_manually_approves_followers() {
 		return false;
 	}
@@ -26,19 +87,13 @@ class Blog_User extends User {
 		return true;
 	}
 
-	public static function from_wp_user( $user_id ) {
-		if ( is_user_disabled( $user_id ) ) {
-			return new WP_Error(
-				'activitypub_user_not_found',
-				\__( 'User not found', 'activitypub' ),
-				array( 'status' => 404 )
-			);
-		}
-
-		$object = new static();
-		$object->_id = $user_id;
-
-		return $object;
+	/**
+	 * Get the User-ID.
+	 *
+	 * @return string The User-ID.
+	 */
+	public function get_id() {
+		return $this->get_url();
 	}
 
 	/**
@@ -204,10 +259,6 @@ class Blog_User extends User {
 		return \gmdate( 'Y-m-d\TH:i:s\Z', $time );
 	}
 
-	public function get_attachment() {
-		return array();
-	}
-
 	public function get_canonical_url() {
 		return \home_url();
 	}
@@ -228,6 +279,14 @@ class Blog_User extends User {
 		return get_rest_url_by_path( 'collections/moderators' );
 	}
 
+	public function get_public_key() {
+		return array(
+			'id'       => $this->get_id() . '#main-key',
+			'owner'    => $this->get_id(),
+			'publicKeyPem' => Signature::get_public_key_for( $this->get__id() ),
+		);
+	}
+
 	public function get_posting_restricted_to_mods() {
 		if ( 'Group' === $this->get_type() ) {
 			return true;
@@ -235,4 +294,78 @@ class Blog_User extends User {
 
 		return null;
 	}
+
+	/**
+	 * Returns the Inbox-API-Endpoint.
+	 *
+	 * @return string The Inbox-Endpoint.
+	 */
+	public function get_inbox() {
+		return get_rest_url_by_path( sprintf( 'actors/%d/inbox', $this->get__id() ) );
+	}
+
+	/**
+	 * Returns the Outbox-API-Endpoint.
+	 *
+	 * @return string The Outbox-Endpoint.
+	 */
+	public function get_outbox() {
+		return get_rest_url_by_path( sprintf( 'actors/%d/outbox', $this->get__id() ) );
+	}
+
+	/**
+	 * Returns the Followers-API-Endpoint.
+	 *
+	 * @return string The Followers-Endpoint.
+	 */
+	public function get_followers() {
+		return get_rest_url_by_path( sprintf( 'actors/%d/followers', $this->get__id() ) );
+	}
+
+	/**
+	 * Returns the Following-API-Endpoint.
+	 *
+	 * @return string The Following-Endpoint.
+	 */
+	public function get_following() {
+		return get_rest_url_by_path( sprintf( 'actors/%d/following', $this->get__id() ) );
+	}
+
+	public function get_endpoints() {
+		$endpoints = null;
+
+		if ( ACTIVITYPUB_SHARED_INBOX_FEATURE ) {
+			$endpoints = array(
+				'sharedInbox' => get_rest_url_by_path( 'inbox' ),
+			);
+		}
+
+		return $endpoints;
+	}
+
+	/**
+	 * Returns a user@domain type of identifier for the user.
+	 *
+	 * @return string The Webfinger-Identifier.
+	 */
+	public function get_webfinger() {
+		return $this->get_preferred_username() . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST );
+	}
+
+	/**
+	 * Returns the Featured-API-Endpoint.
+	 *
+	 * @return string The Featured-Endpoint.
+	 */
+	public function get_featured() {
+		return get_rest_url_by_path( sprintf( 'actors/%d/collections/featured', $this->get__id() ) );
+	}
+
+	public function get_indexable() {
+		if ( \get_option( 'blog_public', 1 ) ) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 }

wp-content/upgrade-temp-backup/plugins/activitypub/includes/model/class-post.php

@@ -2,7 +2,7 @@
 namespace Activitypub\Model;
 
 use Activitypub\Collection\Users;
-use Activitypub\Transformer\Post as Post_Transformer;
+use Activitypub\Transformer\Factory;
 
 /**
  * ActivityPub Post Class
@@ -32,10 +32,14 @@ class Post {
 	 */
 	// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed, VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 	public function __construct( $post, $post_author = null ) {
-		_deprecated_function( __CLASS__, '1.0.0', '\Activitypub\Transformer\Post' );
+		_deprecated_function( __METHOD__, '1.0.0', '\Activitypub\Transformer\Factory::get_transformer' );
 
-		$this->post   = $post;
-		$this->object = Post_Transformer::transform( $post )->to_object();
+		$transformer = Factory::get_transformer( $post );
+
+		if ( ! \is_wp_error( $transformer ) ) {
+			$this->post   = $post;
+			$this->object = $transformer->to_object();
+		}
 	}
 
 	/**

wp-content/upgrade-temp-backup/plugins/activitypub/includes/model/class-user.php

@@ -4,8 +4,9 @@ namespace Activitypub\Model;
 use WP_Query;
 use WP_Error;
 use Activitypub\Signature;
-use Activitypub\Collection\Users;
+use Activitypub\Model\Blog;
 use Activitypub\Activity\Actor;
+use Activitypub\Collection\Users;
 
 use function Activitypub\is_user_disabled;
 use function Activitypub\get_rest_url_by_path;
@@ -32,19 +33,6 @@ class User extends Actor {
 	 */
 	protected $featured;
 
-	/**
-	 * Moderators endpoint.
-	 *
-	 * @see https://join-lemmy.org/docs/contributors/05-federation.html
-	 *
-	 * @var string
-	 */
-	protected $moderators;
-
-	public function get_type() {
-		return 'Person';
-	}
-
 	/**
 	 * If the User is discoverable.
 	 *
@@ -72,14 +60,9 @@ class User extends Actor {
 	 */
 	protected $webfinger;
 
-	/**
-	 * Restrict posting to mods
-	 *
-	 * @see https://join-lemmy.org/docs/contributors/05-federation.html
-	 *
-	 * @var boolean
-	 */
-	protected $posting_restricted_to_mods = null;
+	public function get_type() {
+		return 'Person';
+	}
 
 	public static function from_wp_user( $user_id ) {
 		if ( is_user_disabled( $user_id ) ) {
@@ -193,7 +176,7 @@ class User extends Actor {
 	 * @return string The Inbox-Endpoint.
 	 */
 	public function get_inbox() {
-		return get_rest_url_by_path( sprintf( 'users/%d/inbox', $this->get__id() ) );
+		return get_rest_url_by_path( sprintf( 'actors/%d/inbox', $this->get__id() ) );
 	}
 
 	/**
@@ -202,7 +185,7 @@ class User extends Actor {
 	 * @return string The Outbox-Endpoint.
 	 */
 	public function get_outbox() {
-		return get_rest_url_by_path( sprintf( 'users/%d/outbox', $this->get__id() ) );
+		return get_rest_url_by_path( sprintf( 'actors/%d/outbox', $this->get__id() ) );
 	}
 
 	/**
@@ -211,7 +194,7 @@ class User extends Actor {
 	 * @return string The Followers-Endpoint.
 	 */
 	public function get_followers() {
-		return get_rest_url_by_path( sprintf( 'users/%d/followers', $this->get__id() ) );
+		return get_rest_url_by_path( sprintf( 'actors/%d/followers', $this->get__id() ) );
 	}
 
 	/**
@@ -220,7 +203,7 @@ class User extends Actor {
 	 * @return string The Following-Endpoint.
 	 */
 	public function get_following() {
-		return get_rest_url_by_path( sprintf( 'users/%d/following', $this->get__id() ) );
+		return get_rest_url_by_path( sprintf( 'actors/%d/following', $this->get__id() ) );
 	}
 
 	/**
@@ -229,7 +212,7 @@ class User extends Actor {
 	 * @return string The Featured-Endpoint.
 	 */
 	public function get_featured() {
-		return get_rest_url_by_path( sprintf( 'users/%d/collections/featured', $this->get__id() ) );
+		return get_rest_url_by_path( sprintf( 'actors/%d/collections/featured', $this->get__id() ) );
 	}
 
 	public function get_endpoints() {
@@ -296,10 +279,6 @@ class User extends Actor {
 		return $this->get_preferred_username() . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST );
 	}
 
-	public function get_resource() {
-		return $this->get_webfinger();
-	}
-
 	public function get_canonical_url() {
 		return $this->get_url();
 	}