Enable Mastodon Apps: support profile editing, blog user

includes/class-admin.php

@@ -113,7 +113,11 @@ public static function admin_notices() {
 		if ( 'edit' === $current_screen->base && Extra_Fields::is_extra_fields_post_type( $current_screen->post_type ) ) {
 			?>
 			<div class="notice" style="margin: 0; background: none; border: none; box-shadow: none; padding: 15px 0 0 0; font-size: 14px;">
-				<?php esc_html_e( 'These are extra fields that are used for your ActivityPub profile. You can use your homepage, social profiles, pronouns, age, anything you want.', 'activitypub' ); ?>
+				<?php
+					esc_html_e( 'These are extra fields that are used for your ActivityPub profile. You can use your homepage, social profiles, pronouns, age, anything you want.', 'activitypub' );
+					echo '<br />';
+					esc_html_e( 'Note that Mastodon clients will only show four fields.', 'activitypub' );
+				?>
 			</div>
 			<?php
 		}

includes/collection/class-extra-fields.php

@@ -6,6 +6,8 @@
 use WP_Query;
 use Activitypub\Collection\Users;
 
+use function Activitypub\site_supports_blocks;
+
 class Extra_Fields {
 
 	const USER_POST_TYPE = 'ap_extrafield';
@@ -37,6 +39,23 @@ public static function get_actor_fields( $user_id ) {
 		return apply_filters( 'activitypub_get_actor_extra_fields', $fields, $user_id );
 	}
 
+	private static function get_formatted_content( $post ) {
+		$content = \get_the_content( null, false, $post );
+		$content = Link::the_content( $content, true );
+		if ( site_supports_blocks() ) {
+			$content = \do_blocks( $content );
+		}
+		$content = \wptexturize( $content );
+		$content = \wp_filter_content_tags( $content );
+		// replace script and style elements
+		$content = \preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $content );
+		$content = \strip_shortcodes( $content );
+		$content = \trim( \preg_replace( '/[\n\r\t]/', '', $content ) );
+		$content = \apply_filters( 'activitypub_extra_field_content', $content, $post );
+
+		return $content;
+	}
+
 	/**
 	 * Transforms the Extra Fields (Cutom Post Types) to ActivityPub Actor-Attachments.
 	 *
@@ -56,16 +75,7 @@ function( $rel ) {
 		);
 
 		foreach ( $fields as $post ) {
-			$content = \get_the_content( null, false, $post );
-			$content = \do_blocks( $content );
-			$content = \wptexturize( $content );
-			$content = \wp_filter_content_tags( $content );
-			// replace script and style elements
-			$content = \preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $content );
-			$content = \strip_shortcodes( $content );
-			$content = \trim( \preg_replace( '/[\n\r\t]/', '', $content ) );
-			$content = \apply_filters( 'activitypub_extra_field_content', $content, $post );
-
+			$content = self::get_formatted_content( $post );
 			$attachments[] = array(
 				'type' => 'PropertyValue',
 				'name' => \get_the_title( $post ),
@@ -211,10 +221,7 @@ function( $rel ) {
 				'post_title'     => $title,
 				'post_status'    => 'publish',
 				'post_author'    => $user_id,
-				'post_content'   => sprintf(
-					'<!-- wp:paragraph --><p>%s</p><!-- /wp:paragraph -->',
-					Link::the_content( $url )
-				),
+				'post_content'   => self::make_paragraph_block( Link::the_content( $url ) ),
 				'comment_status' => 'closed',
 				'menu_order'     => $menu_order,
 			);
@@ -231,6 +238,64 @@ function( $rel ) {
 		return $extra_fields;
 	}
 
+	public static function get_extra_fields_for_mastodon_api( $user_id ) {
+		$ret    = array();
+		$fields = self::get_actor_fields( $user_id );
+
+		foreach ( $fields as $field ) {
+			$ret[] = array(
+				'name'   => $field->post_title,
+				'value'  => self::get_formatted_content( $field ),
+			);
+		}
+
+		return $ret;
+	}
+
+	private static function make_paragraph_block( $content ) {
+		if ( ! site_supports_blocks() ) {
+			return $content;
+		}
+		return '<!-- wp:paragraph --><p>' . $content . '</p><!-- /wp:paragraph -->';
+	}
+
+	public static function set_extra_fields_from_mastodon_api( $user_id, $fields ) {
+		// The Mastodon API submits a simple hash, every field.
+		// We can reasonably assume a similar order for our operations below.
+		$ids       = wp_list_pluck( self::get_actor_fields( $user_id ), 'ID' );
+		$is_blog   = self::is_blog( $user_id );
+		$post_type = $is_blog ? self::BLOG_POST_TYPE : self::USER_POST_TYPE;
+
+		foreach ( $fields as $i => $field ) {
+			$post_id  = $ids[ $i ] ?? null;
+			$has_post = $post_id && \get_post( $post_id );
+			$args     = array(
+				'post_title'   => $field['name'],
+				'post_content' => self::make_paragraph_block( $field['value'] ),
+			);
+
+			if ( $has_post ) {
+				$args['ID'] = $ids[ $i ];
+				\wp_update_post( $args );
+			} else {
+				$args['post_type']   = $post_type;
+				$args['post_status'] = 'publish';
+				if ( ! $is_blog ) {
+					$args['post_author'] = $user_id;
+				}
+				\wp_insert_post( $args );
+			}
+		}
+
+		// Delete any remaining fields.
+		if ( \count( $fields ) < \count( $ids ) ) {
+			$to_delete = \array_slice( $ids, \count( $fields ) );
+			foreach ( $to_delete as $id ) {
+				\wp_delete_post( $id, true );
+			}
+		}
+	}
+
 	/**
 	 * Checks if the user is the blog user.
 	 * @param int $user_id The user ID.

includes/model/class-blog.php

@@ -206,8 +206,8 @@ public function get_preferred_username() {
 	 * @return array The User-Icon.
 	 */
 	public function get_icon() {
-		// try site icon first
-		$icon_id = get_option( 'site_icon' );
+		// try site_logo, falling back to site_icon, first
+		$icon_id = get_option( 'site_logo', get_option( 'site_icon' ) );
 
 		// try custom logo second
 		if ( ! $icon_id ) {
@@ -390,11 +390,57 @@ public function get_indexable() {
 	}
 
 	/**
-	 * Get the User-Hashtags.
+	 * Update the User-Name.
+	 *
+	 * @param mixed $value The new value.
+	 * @return bool True if the attribute was updated, false otherwise.
+	 */
+	public function update_name( $value ) {
+		return \update_option( 'blogname', $value );
+	}
+
+	/**
+	* Update the User-Description.
+	*
+	* @param mixed $value The new value.
+	* @return bool True if the attribute was updated, false otherwise.
+	*/
+	public function update_summary( $value ) {
+		return \update_option( 'blogdescription', $value );
+	}
+
+	/**
+	* Update the User-Icon.
+	*
+	* @param mixed $value The new value.
+	* @return bool True if the attribute was updated, false otherwise.
+	*/
+	public function update_icon( $value ) {
+		if ( ! wp_attachment_is_image( $value ) ) {
+			return false;
+		}
+		return \update_option( 'site_logo', $value ) && \update_option( 'site_icon', $value );
+	}
+
+	/**
+	* Update the User-Header-Image.
+	*
+	* @param mixed $value The new value.
+	* @return bool True if the attribute was updated, false otherwise.
+	*/
+	public function update_header( $value ) {
+		if ( ! wp_attachment_is_image( $value ) ) {
+			return false;
+		}
+		return \update_option( 'activitypub_header_image', $value );
+	}
+
+	/**
+	 * Get the User - Hashtags .
 	 *
 	 * @see https://docs.joinmastodon.org/spec/activitypub/#Hashtag
 	 *
-	 * @return array The User-Hashtags.
+	 * @return array The User - Hashtags .
 	 */
 	public function get_tag() {
 		$hashtags = array();

includes/model/class-user.php

@@ -136,6 +136,14 @@ public function get_preferred_username() {
 	}
 
 	public function get_icon() {
+		$icon = \get_user_option( 'activitypub_icon', $this->_id );
+		if ( wp_attachment_is_image( $icon ) ) {
+			return array(
+				'type' => 'Image',
+				'url'  => esc_url( wp_get_attachment_url( $icon ) ),
+			);
+		}
+
 		$icon = \esc_url(
 			\get_avatar_url(
 				$this->_id,
@@ -153,12 +161,12 @@ public function get_image() {
 		$header_image = get_user_option( 'activitypub_header_image', $this->_id );
 		$image_url    = null;
 
-		if ( $header_image ) {
-			$image_url = \wp_get_attachment_url( $header_image );
+		if ( ! $header_image && \has_header_image() ) {
+			$image_url = \get_header_image();
 		}
 
-		if ( ! $image_url && \has_header_image() ) {
-			$image_url = \get_header_image();
+		if ( $header_image ) {
+			$image_url = \wp_get_attachment_url( $header_image );
 		}
 
 		if ( $image_url ) {
@@ -278,4 +286,52 @@ public function get_indexable() {
 			return false;
 		}
 	}
+
+
+	/**
+	 * Update the User-Name.
+	 *
+	 * @param mixed $value The new value.
+	 * @return bool True if the attribute was updated, false otherwise.
+	 */
+	public function update_name( $value ) {
+		$userdata = [ 'ID' => $this->_id, 'display_name' => $value ];
+		return \wp_update_user( $userdata );
+	}
+
+	/**
+	 * Update the User-Description.
+	 *
+	 * @param mixed $value The new value.
+	 * @return bool True if the attribute was updated, false otherwise.
+	 */
+	public function update_summary( $value ) {
+		return \update_user_option( $this->_id, 'activitypub_description', $value );
+	}
+
+	/**
+	 * Update the User-Icon.
+	 *
+	 * @param mixed $value The new value. Should be an attachment ID.
+	 * @return bool True if the attribute was updated, false otherwise.
+	 */
+	public function update_icon( $value ) {
+		if ( ! wp_attachment_is_image( $value ) ) {
+			return false;
+		}
+		return update_user_option( $this->_id, 'activitypub_icon', $value );
+	}
+
+	/**
+	 * Update the User-Header-Image.
+	 *
+	 * @param mixed $value The new value. Should be an attachment ID.
+	 * @return bool True if the attribute was updated, false otherwise.
+	 */
+	public function update_header( $value ) {
+		if ( ! wp_attachment_is_image( $value ) ) {
+			return false;
+		}
+		return \update_user_option( $this->_id, 'activitypub_header_image', $value );
+	}
 }