From c54fa007bdb1cfa8c419e4d4f6fa2c159e3a8ab3 Mon Sep 17 00:00:00 2001 From: Lai Power Date: Wed, 9 Oct 2024 12:44:17 +0000 Subject: [PATCH] updated plugin `ActivityPub` version 3.3.3 --- .../plugins/activitypub/activitypub.php | 78 +-- .../assets/css/activitypub-admin.css | 14 +- .../assets/js/activitypub-header-image.js | 261 +++++++ .../build/editor-plugin/block.json | 8 + .../build/editor-plugin/plugin.asset.php | 1 + .../activitypub/build/editor-plugin/plugin.js | 1 + .../activitypub/build/follow-me/block.json | 4 + .../build/follow-me/index.asset.php | 2 +- .../activitypub/build/follow-me/index.js | 3 +- .../build/follow-me/view.asset.php | 2 +- .../activitypub/build/follow-me/view.js | 2 +- .../activitypub/build/followers/block.json | 4 + .../build/followers/index.asset.php | 2 +- .../activitypub/build/followers/index.js | 7 +- .../build/remote-reply/index.asset.php | 2 +- .../activitypub/build/remote-reply/index.js | 2 +- .../activitypub/build/reply-intent/block.json | 12 + .../build/reply-intent/plugin.asset.php | 1 + .../activitypub/build/reply-intent/plugin.js | 1 + .../activitypub/build/reply/block.json | 21 + .../activitypub/build/reply/index.asset.php | 1 + .../plugins/activitypub/build/reply/index.js | 1 + .../includes/activity/class-activity.php | 67 +- .../includes/activity/class-actor.php | 47 +- .../includes/activity/class-base-object.php | 84 ++- .../activity/extended-object/class-event.php | 79 ++- .../activity/extended-object/class-place.php | 14 +- .../includes/class-activity-dispatcher.php | 200 ++++-- .../includes/class-activitypub.php | 287 ++++---- .../activitypub/includes/class-admin.php | 355 +++++++--- .../activitypub/includes/class-blocks.php | 230 ++++++- .../activitypub/includes/class-cli.php | 201 ++++++ .../activitypub/includes/class-comment.php | 296 ++++++-- .../activitypub/includes/class-debug.php | 57 +- .../activitypub/includes/class-handler.php | 18 +- .../activitypub/includes/class-hashtag.php | 129 ++-- .../includes/class-health-check.php | 87 +-- .../activitypub/includes/class-http.php | 102 ++- .../activitypub/includes/class-link.php | 127 ++++ .../activitypub/includes/class-mention.php | 122 ++-- .../activitypub/includes/class-migration.php | 111 ++- .../includes/class-notification.php | 24 +- .../activitypub/includes/class-scheduler.php | 104 +-- .../activitypub/includes/class-shortcodes.php | 205 ++---- .../activitypub/includes/class-signature.php | 115 ++-- .../activitypub/includes/class-webfinger.php | 64 +- .../collection/class-extra-fields.php | 283 ++++++++ .../includes/collection/class-followers.php | 119 ++-- .../collection/class-interactions.php | 286 +++++--- .../includes/collection/class-replies.php | 181 +++++ .../includes/collection/class-users.php | 91 +-- .../plugins/activitypub/includes/compat.php | 26 +- .../plugins/activitypub/includes/debug.php | 17 +- .../activitypub/includes/functions.php | 559 +++++++++++---- .../includes/handler/class-announce.php | 98 ++- .../includes/handler/class-create.php | 106 ++- .../includes/handler/class-delete.php | 61 +- .../includes/handler/class-follow.php | 51 +- .../includes/handler/class-like.php | 70 ++ .../includes/handler/class-undo.php | 51 +- .../includes/handler/class-update.php | 60 +- .../plugins/activitypub/includes/help.php | 11 +- .../includes/model/class-application.php | 71 +- .../activitypub/includes/model/class-blog.php | 238 +++++-- .../includes/model/class-follower.php | 76 +-- .../activitypub/includes/model/class-post.php | 136 ---- .../activitypub/includes/model/class-user.php | 258 ++++--- .../includes/rest/class-actors.php | 41 +- .../includes/rest/class-collection.php | 124 +++- .../includes/rest/class-comment.php | 29 +- .../includes/rest/class-followers.php | 64 +- .../includes/rest/class-following.php | 62 +- .../activitypub/includes/rest/class-inbox.php | 190 +++--- .../includes/rest/class-interaction.php | 118 ++++ .../includes/rest/class-nodeinfo.php | 82 +-- .../includes/rest/class-outbox.php | 73 +- .../includes/rest/class-server.php | 83 ++- .../includes/rest/class-webfinger.php | 78 +-- .../includes/table/class-followers.php | 106 ++- .../includes/transformer/class-attachment.php | 11 +- .../includes/transformer/class-base.php | 47 +- .../includes/transformer/class-comment.php | 79 ++- .../includes/transformer/class-factory.php | 39 +- .../includes/transformer/class-post.php | 642 +++++++++++------- .../integration/class-buddypress.php | 48 +- .../class-enable-mastodon-apps.php | 439 ++++++++---- .../activitypub/integration/class-jetpack.php | 33 +- .../integration/class-nodeinfo.php | 34 +- .../integration/class-opengraph.php | 24 +- .../class-seriously-simple-podcasting.php | 68 ++ .../integration/class-stream-connector.php | 82 +++ .../integration/class-webfinger.php | 93 ++- .../plugins/activitypub/integration/load.php | 155 +++++ wp-content/plugins/activitypub/readme.txt | 138 ++-- .../activitypub/templates/admin-header.php | 27 +- ...owers-list.php => blog-followers-list.php} | 11 +- .../activitypub/templates/blog-json.php | 14 +- .../activitypub/templates/blog-settings.php | 190 ++++++ .../activitypub/templates/comment-json.php | 16 +- .../activitypub/templates/post-json.php | 17 +- .../activitypub/templates/settings.php | 86 ++- .../plugins/activitypub/templates/toolbox.php | 74 ++ .../templates/user-followers-list.php | 5 + .../{author-json.php => user-json.php} | 14 +- .../activitypub/templates/user-settings.php | 95 ++- .../plugins/activitypub/templates/welcome.php | 53 +- 106 files changed, 7070 insertions(+), 2918 deletions(-) create mode 100644 wp-content/plugins/activitypub/assets/js/activitypub-header-image.js create mode 100644 wp-content/plugins/activitypub/build/editor-plugin/block.json create mode 100644 wp-content/plugins/activitypub/build/editor-plugin/plugin.asset.php create mode 100644 wp-content/plugins/activitypub/build/editor-plugin/plugin.js create mode 100644 wp-content/plugins/activitypub/build/reply-intent/block.json create mode 100644 wp-content/plugins/activitypub/build/reply-intent/plugin.asset.php create mode 100644 wp-content/plugins/activitypub/build/reply-intent/plugin.js create mode 100644 wp-content/plugins/activitypub/build/reply/block.json create mode 100644 wp-content/plugins/activitypub/build/reply/index.asset.php create mode 100644 wp-content/plugins/activitypub/build/reply/index.js create mode 100644 wp-content/plugins/activitypub/includes/class-cli.php create mode 100644 wp-content/plugins/activitypub/includes/class-link.php create mode 100644 wp-content/plugins/activitypub/includes/collection/class-extra-fields.php create mode 100644 wp-content/plugins/activitypub/includes/collection/class-replies.php create mode 100644 wp-content/plugins/activitypub/includes/handler/class-like.php delete mode 100644 wp-content/plugins/activitypub/includes/model/class-post.php create mode 100644 wp-content/plugins/activitypub/includes/rest/class-interaction.php create mode 100644 wp-content/plugins/activitypub/integration/class-seriously-simple-podcasting.php create mode 100644 wp-content/plugins/activitypub/integration/class-stream-connector.php create mode 100644 wp-content/plugins/activitypub/integration/load.php rename wp-content/plugins/activitypub/templates/{blog-user-followers-list.php => blog-followers-list.php} (84%) create mode 100644 wp-content/plugins/activitypub/templates/blog-settings.php create mode 100644 wp-content/plugins/activitypub/templates/toolbox.php rename wp-content/plugins/activitypub/templates/{author-json.php => user-json.php} (58%) diff --git a/wp-content/plugins/activitypub/activitypub.php b/wp-content/plugins/activitypub/activitypub.php index 478486ef..145f5182 100644 --- a/wp-content/plugins/activitypub/activitypub.php +++ b/wp-content/plugins/activitypub/activitypub.php @@ -3,7 +3,7 @@ * Plugin Name: ActivityPub * Plugin URI: https://github.com/pfefferle/wordpress-activitypub/ * Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format. - * Version: 2.6.1 + * Version: 3.3.3 * Author: Matthias Pfefferle & Automattic * Author URI: https://automattic.com/ * License: MIT @@ -11,17 +11,18 @@ * Requires PHP: 7.0 * Text Domain: activitypub * Domain Path: /languages + * + * @package Activitypub */ namespace Activitypub; -use function Activitypub\is_blog_public; -use function Activitypub\site_supports_blocks; +use WP_CLI; require_once __DIR__ . '/includes/compat.php'; require_once __DIR__ . '/includes/functions.php'; -\define( 'ACTIVITYPUB_PLUGIN_VERSION', '2.6.1' ); +\define( 'ACTIVITYPUB_PLUGIN_VERSION', '3.3.3' ); /** * Initialize the plugin constants. @@ -32,10 +33,13 @@ require_once __DIR__ . '/includes/functions.php'; \defined( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS' ) || \define( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS', 3 ); \defined( 'ACTIVITYPUB_HASHTAGS_REGEXP' ) || \define( 'ACTIVITYPUB_HASHTAGS_REGEXP', '(?:(?<=\s)|(?<=

)|(?<=
)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))' ); \defined( 'ACTIVITYPUB_USERNAME_REGEXP' ) || \define( 'ACTIVITYPUB_USERNAME_REGEXP', '(?:([A-Za-z0-9\._-]+)@((?:[A-Za-z0-9_-]+\.)+[A-Za-z]+))' ); +\defined( 'ACTIVITYPUB_URL_REGEXP' ) || \define( 'ACTIVITYPUB_URL_REGEXP', '(https?:|www\.)\S+[\w\/]' ); \defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "

[ap_title]

\n\n[ap_content]\n\n[ap_hashtags]\n\n[ap_shortlink]" ); \defined( 'ACTIVITYPUB_AUTHORIZED_FETCH' ) || \define( 'ACTIVITYPUB_AUTHORIZED_FETCH', false ); \defined( 'ACTIVITYPUB_DISABLE_REWRITES' ) || \define( 'ACTIVITYPUB_DISABLE_REWRITES', false ); \defined( 'ACTIVITYPUB_DISABLE_INCOMING_INTERACTIONS' ) || \define( 'ACTIVITYPUB_DISABLE_INCOMING_INTERACTIONS', false ); +// Disable reactions like `Like` and `Announce` by default. +\defined( 'ACTIVITYPUB_DISABLE_REACTIONS' ) || \define( 'ACTIVITYPUB_DISABLE_REACTIONS', true ); \defined( 'ACTIVITYPUB_DISABLE_OUTGOING_INTERACTIONS' ) || \define( 'ACTIVITYPUB_DISABLE_OUTGOING_INTERACTIONS', false ); \defined( 'ACTIVITYPUB_SHARED_INBOX_FEATURE' ) || \define( 'ACTIVITYPUB_SHARED_INBOX_FEATURE', false ); \defined( 'ACTIVITYPUB_SEND_VARY_HEADER' ) || \define( 'ACTIVITYPUB_SEND_VARY_HEADER', false ); @@ -59,8 +63,9 @@ function rest_init() { Rest\Comment::init(); Rest\Server::init(); Rest\Collection::init(); + Rest\Interaction::init(); - // load NodeInfo endpoints only if blog is public + // Load NodeInfo endpoints only if blog is public. if ( is_blog_public() ) { Rest\NodeInfo::init(); } @@ -81,6 +86,7 @@ function plugin_init() { \add_action( 'init', array( __NAMESPACE__ . '\Health_Check', 'init' ) ); \add_action( 'init', array( __NAMESPACE__ . '\Scheduler', 'init' ) ); \add_action( 'init', array( __NAMESPACE__ . '\Comment', 'init' ) ); + \add_action( 'init', array( __NAMESPACE__ . '\Link', 'init' ) ); if ( site_supports_blocks() ) { \add_action( 'init', array( __NAMESPACE__ . '\Blocks', 'init' ) ); @@ -91,29 +97,12 @@ function plugin_init() { require_once $debug_file; Debug::init(); } - - require_once __DIR__ . '/integration/class-webfinger.php'; - Integration\Webfinger::init(); - - require_once __DIR__ . '/integration/class-nodeinfo.php'; - Integration\Nodeinfo::init(); - - require_once __DIR__ . '/integration/class-enable-mastodon-apps.php'; - Integration\Enable_Mastodon_Apps::init(); - - require_once __DIR__ . '/integration/class-opengraph.php'; - Integration\Opengraph::init(); - - if ( \defined( 'JETPACK__VERSION' ) && ! \defined( 'IS_WPCOM' ) ) { - require_once __DIR__ . '/integration/class-jetpack.php'; - Integration\Jetpack::init(); - } } \add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_init' ); /** - * Class Autoloader + * Class Autoloader. */ \spl_autoload_register( function ( $full_class ) { @@ -122,7 +111,7 @@ function plugin_init() { if ( strncmp( $full_class, $base, strlen( $base ) ) === 0 ) { $maybe_uppercase = str_replace( $base, '', $full_class ); - $class = strtolower( $maybe_uppercase ); + $class = strtolower( $maybe_uppercase ); // All classes should be capitalized. If this is instead looking for a lowercase method, we ignore that. if ( $maybe_uppercase === $class ) { return; @@ -141,18 +130,22 @@ function plugin_init() { if ( file_exists( $file ) && is_readable( $file ) ) { require_once $file; } else { - // translators: %s is the class name - \wp_die( sprintf( esc_html__( 'Required class not found or not readable: %s', 'activitypub' ), esc_html( $full_class ) ) ); + // translators: %s is the class name. + $message = sprintf( esc_html__( 'Required class not found or not readable: %s', 'activitypub' ), esc_html( $full_class ) ); + Debug::write_log( $message ); + \wp_die( $message ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped } } } ); /** - * Add plugin settings link + * Add plugin settings link. + * + * @param array $actions The current actions. */ function plugin_settings_link( $actions ) { - $settings_link = array(); + $settings_link = array(); $settings_link[] = \sprintf( '%2s', \menu_page_url( 'activitypub', false ), @@ -187,22 +180,14 @@ function plugin_settings_link( $actions ) { ) ); -/** - * Only load code that needs BuddyPress to run once BP is loaded and initialized. - */ -add_action( - 'bp_include', - function () { - require_once __DIR__ . '/integration/class-buddypress.php'; - Integration\Buddypress::init(); - }, - 0 -); +// Load integrations. +require_once __DIR__ . '/integration/load.php'; /** - * `get_plugin_data` wrapper + * `get_plugin_data` wrapper. * - * @return array The plugin metadata array + * @param array $default_headers Optional. The default plugin headers. Default empty array. + * @return array The plugin metadata array. */ function get_plugin_meta( $default_headers = array() ) { if ( ! $default_headers ) { @@ -237,3 +222,14 @@ function get_plugin_version() { return $meta['Version']; } + +// Check for CLI env, to add the CLI commands. +if ( defined( 'WP_CLI' ) && WP_CLI ) { + WP_CLI::add_command( + 'activitypub', + '\Activitypub\Cli', + array( + 'shortdesc' => __( 'ActivityPub related commands: Meta-Infos, Delete and soon Self-Destruct.', 'activitypub' ), + ) + ); +} diff --git a/wp-content/plugins/activitypub/assets/css/activitypub-admin.css b/wp-content/plugins/activitypub/assets/css/activitypub-admin.css index 7c7589e4..29e78ee2 100644 --- a/wp-content/plugins/activitypub/assets/css/activitypub-admin.css +++ b/wp-content/plugins/activitypub/assets/css/activitypub-admin.css @@ -34,10 +34,10 @@ .activitypub-settings-tabs-wrapper { display: -ms-inline-grid; - -ms-grid-columns: auto auto auto; + -ms-grid-columns: auto auto auto auto; vertical-align: top; display: inline-grid; - grid-template-columns: auto auto auto; + grid-template-columns: auto auto auto auto; } .activitypub-settings-tab.active { @@ -202,3 +202,13 @@ input.blog-user-identifier { content: "\f307"; font-family: dashicons; } + +.repost .dashboard-comment-wrap, +.like .dashboard-comment-wrap { + padding-inline-start: 63px; +} + +.repost .dashboard-comment-wrap .comment-author, +.like .dashboard-comment-wrap .comment-author { + margin-block: 0; +} diff --git a/wp-content/plugins/activitypub/assets/js/activitypub-header-image.js b/wp-content/plugins/activitypub/assets/js/activitypub-header-image.js new file mode 100644 index 00000000..8da23ed9 --- /dev/null +++ b/wp-content/plugins/activitypub/assets/js/activitypub-header-image.js @@ -0,0 +1,261 @@ +/** + * Handle the header image setting in + * + * This is based on site-icon.js + * + * @see wp-admin/js/site-icon.js + */ + +/* global jQuery, wp */ + +( function ( $ ) { + var $chooseButton = $( '#activitypub-choose-from-library-button' ), + $headerImagePreviewWrapper = $( '#activitypub-header-image-preview-wrapper' ), + $headerImagePreview = $( '#activitypub-header-image-preview' ), + $hiddenDataField = $( '#activitypub_header_image' ), + $removeButton = $( '#activitypub-remove-header-image' ), + frame, + ImageCropperNoCustomizer; + + /** + * We register our own handler because the Core one invokes the Customizer, which fails the request unnecessarily + * for users who don't have the 'customize' capability. + * See https://github.com/Automattic/wordpress-activitypub/issues/846 + */ + ImageCropperNoCustomizer = wp.media.controller.CustomizeImageCropper.extend( { + doCrop: function( attachment ) { + var cropDetails = attachment.get( 'cropDetails' ), + control = this.get( 'control' ), + ratio = cropDetails.width / cropDetails.height; + + // Use crop measurements when flexible in both directions. + if ( control.params.flex_width && control.params.flex_height ) { + cropDetails.dst_width = cropDetails.width; + cropDetails.dst_height = cropDetails.height; + + // Constrain flexible side based on image ratio and size of the fixed side. + } else { + cropDetails.dst_width = control.params.flex_width ? control.params.height * ratio : control.params.width; + cropDetails.dst_height = control.params.flex_height ? control.params.width / ratio : control.params.height; + } + + return wp.ajax.post( 'crop-image', { + // where wp_customize: 'on' would be in Core, for no good reason I understand. + nonce: attachment.get( 'nonces' ).edit, + id: attachment.get( 'id' ), + context: control.id, + cropDetails: cropDetails + } ); + } + } ); + + + + /** + * Calculate image selection options based on the attachment dimensions. + * + * @since 6.5.0 + * + * @param {Object} attachment The attachment object representing the image. + * @return {Object} The image selection options. + */ + function calculateImageSelectOptions( attachment ) { + var realWidth = attachment.get( 'width' ), + realHeight = attachment.get( 'height' ), + xInit = 1500, + yInit = 500, + ratio = xInit / yInit, + xImg = xInit, + yImg = yInit, + x1, + y1, + imgSelectOptions; + + if ( realWidth / realHeight > ratio ) { + yInit = realHeight; + xInit = yInit * ratio; + } else { + xInit = realWidth; + yInit = xInit / ratio; + } + + x1 = ( realWidth - xInit ) / 2; + y1 = ( realHeight - yInit ) / 2; + + imgSelectOptions = { + aspectRatio: xInit + ':' + yInit, + handles: true, + keys: true, + instance: true, + persistent: true, + imageWidth: realWidth, + imageHeight: realHeight, + minWidth: xImg > xInit ? xInit : xImg, + minHeight: yImg > yInit ? yInit : yImg, + x1: x1, + y1: y1, + x2: xInit + x1, + y2: yInit + y1, + }; + + return imgSelectOptions; + } + + /** + * Initializes the media frame for selecting or cropping an image. + * + * @since 6.5.0 + */ + $chooseButton.on( 'click', function () { + var $el = $( this ); + var userId = $el.data( 'userId' ); + var mediaQuery = { type: 'image' }; + if ( userId ) { + mediaQuery.author = userId; + } + + // Create the media frame. + frame = wp.media( { + button: { + // Set the text of the button. + text: $el.data( 'update' ), + + // Don't close, we might need to crop. + close: false, + }, + states: [ + new wp.media.controller.Library( { + title: $el.data( 'choose-text' ), + library: wp.media.query( mediaQuery ), + date: false, + suggestedWidth: $el.data( 'size' ), + suggestedHeight: $el.data( 'size' ), + } ), + new ImageCropperNoCustomizer( { + control: { + params: { + width: $el.data( 'size' ), + height: $el.data( 'size' ), + }, + }, + imgSelectOptions: calculateImageSelectOptions, + } ), + ], + } ); + + frame.on( 'cropped', function ( attachment ) { + $hiddenDataField.val( attachment.id ); + switchToUpdate( attachment ); + frame.close(); + + // Start over with a frame that is so fresh and so clean clean. + frame = null; + } ); + + // When an image is selected, run a callback. + frame.on( 'select', function () { + // Grab the selected attachment. + var attachment = frame.state().get( 'selection' ).first(); + + if ( + attachment.attributes.height === $el.data( 'size' ) && + $el.data( 'size' ) === attachment.attributes.width + ) { + switchToUpdate( attachment.attributes ); + frame.close(); + + // Set the value of the hidden input to the attachment id. + $hiddenDataField.val( attachment.id ); + } else { + frame.setState( 'cropper' ); + } + } ); + + frame.open(); + } ); + + /** + * Update the UI when a header is selected. + * + * @since 6.5.0 + * + * @param {array} attributes The attributes for the attachment. + */ + function switchToUpdate( attributes ) { + var i18nAppAlternativeString, i18nBrowserAlternativeString; + + if ( attributes.alt ) { + i18nBrowserAlternativeString = wp.i18n.sprintf( + /* translators: %s: The selected image alt text. */ + wp.i18n.__( 'Header Image preview: Current image: %s' ), + attributes.alt + ); + } else { + i18nAppAlternativeString = wp.i18n.sprintf( + /* translators: %s: The selected image filename. */ + wp.i18n.__( + 'Header Image preview: The current image has no alternative text. The file name is: %s' + ), + attributes.filename + ); + i18nBrowserAlternativeString = wp.i18n.sprintf( + /* translators: %s: The selected image filename. */ + wp.i18n.__( + 'Header Image preview: The current image has no alternative text. The file name is: %s' + ), + attributes.filename + ); + } + + // Set activitypub-header-image-preview src. + $headerImagePreview.attr( { + src: attributes.url, + alt: i18nAppAlternativeString, + } ); + + // Remove hidden class from header image preview div and remove button. + $headerImagePreviewWrapper.removeClass( 'hidden' ); + $removeButton.removeClass( 'hidden' ); + + // If the choose button is not in the update state, swap the classes. + if ( $chooseButton.attr( 'data-state' ) !== '1' ) { + $chooseButton.attr( { + class: $chooseButton.attr( 'data-alt-classes' ), + 'data-alt-classes': $chooseButton.attr( 'class' ), + 'data-state': '1', + } ); + } + + // Swap the text of the choose button. + $chooseButton.text( $chooseButton.attr( 'data-update-text' ) ); + } + + /** + * Handles the click event of the remove button. + * + * @since 6.5.0 + */ + $removeButton.on( 'click', function () { + $hiddenDataField.val( 'false' ); + $( this ).toggleClass( 'hidden' ); + $headerImagePreviewWrapper.toggleClass( 'hidden' ); + $headerImagePreview.attr( { + src: '', + alt: '', + } ); + + /** + * Resets state to the button, for correct visual style and state. + * Updates the text of the button. + * Sets focus state to the button. + */ + $chooseButton + .attr( { + class: $chooseButton.attr( 'data-alt-classes' ), + 'data-alt-classes': $chooseButton.attr( 'class' ), + 'data-state': '', + } ) + .text( $chooseButton.attr( 'data-choose-text' ) ) + .trigger( 'focus' ); + } ); +} )( jQuery ); diff --git a/wp-content/plugins/activitypub/build/editor-plugin/block.json b/wp-content/plugins/activitypub/build/editor-plugin/block.json new file mode 100644 index 00000000..f41effc5 --- /dev/null +++ b/wp-content/plugins/activitypub/build/editor-plugin/block.json @@ -0,0 +1,8 @@ +{ + "name": "editor-plugin", + "title": "Editor Plugin: not a block, but block.json is very useful.", + "category": "widgets", + "icon": "admin-comments", + "keywords": [], + "editorScript": "file:./plugin.js" +} \ No newline at end of file diff --git a/wp-content/plugins/activitypub/build/editor-plugin/plugin.asset.php b/wp-content/plugins/activitypub/build/editor-plugin/plugin.asset.php new file mode 100644 index 00000000..67a3f181 --- /dev/null +++ b/wp-content/plugins/activitypub/build/editor-plugin/plugin.asset.php @@ -0,0 +1 @@ + array('react', 'wp-components', 'wp-core-data', 'wp-data', 'wp-editor', 'wp-i18n', 'wp-plugins'), 'version' => '88603987940fec29730d'); diff --git a/wp-content/plugins/activitypub/build/editor-plugin/plugin.js b/wp-content/plugins/activitypub/build/editor-plugin/plugin.js new file mode 100644 index 00000000..c16cd66e --- /dev/null +++ b/wp-content/plugins/activitypub/build/editor-plugin/plugin.js @@ -0,0 +1 @@ +(()=>{"use strict";const t=window.React,e=window.wp.editor,n=window.wp.plugins,i=window.wp.components,o=window.wp.data,a=window.wp.coreData,r=window.wp.i18n;(0,n.registerPlugin)("activitypub-editor-plugin",{render:()=>{const n=(0,o.useSelect)((t=>t("core/editor").getCurrentPostType()),[]),[w,c]=(0,a.useEntityProp)("postType",n,"meta");return(0,t.createElement)(e.PluginDocumentSettingPanel,{name:"activitypub",title:(0,r.__)("Fediverse","activitypub")},(0,t.createElement)(i.TextControl,{label:(0,r.__)("Content Warning","activitypub"),value:w?.activitypub_content_warning,onChange:t=>{c({...w,activitypub_content_warning:t})},placeholder:(0,r.__)("Optional content warning","activitypub")}))}})})(); \ No newline at end of file diff --git a/wp-content/plugins/activitypub/build/follow-me/block.json b/wp-content/plugins/activitypub/build/follow-me/block.json index 6e685671..edeb67c7 100644 --- a/wp-content/plugins/activitypub/build/follow-me/block.json +++ b/wp-content/plugins/activitypub/build/follow-me/block.json @@ -38,6 +38,10 @@ "default": "site" } }, + "usesContext": [ + "postType", + "postId" + ], "editorScript": "file:./index.js", "viewScript": "file:./view.js", "style": [ diff --git a/wp-content/plugins/activitypub/build/follow-me/index.asset.php b/wp-content/plugins/activitypub/build/follow-me/index.asset.php index dd3f4529..57106a2a 100644 --- a/wp-content/plugins/activitypub/build/follow-me/index.asset.php +++ b/wp-content/plugins/activitypub/build/follow-me/index.asset.php @@ -1 +1 @@ - array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '7be9f9b97d08a20bde26'); + array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '1ec66c1edf3d9b0b6678'); diff --git a/wp-content/plugins/activitypub/build/follow-me/index.js b/wp-content/plugins/activitypub/build/follow-me/index.js index 873ed24f..8253fede 100644 --- a/wp-content/plugins/activitypub/build/follow-me/index.js +++ b/wp-content/plugins/activitypub/build/follow-me/index.js @@ -1 +1,2 @@ -(()=>{"use strict";var e,t={17:(e,t,r)=>{const o=window.wp.blocks,n=window.wp.primitives;var l=r(848);const a=(0,l.jsx)(n.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,l.jsx)(n.Path,{d:"M15.5 9.5a1 1 0 100-2 1 1 0 000 2zm0 1.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm-2.25 6v-2a2.75 2.75 0 00-2.75-2.75h-4A2.75 2.75 0 003.75 15v2h1.5v-2c0-.69.56-1.25 1.25-1.25h4c.69 0 1.25.56 1.25 1.25v2h1.5zm7-2v2h-1.5v-2c0-.69-.56-1.25-1.25-1.25H15v-1.5h2.5A2.75 2.75 0 0120.25 15zM9.5 8.5a1 1 0 11-2 0 1 1 0 012 0zm1.5 0a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z",fillRule:"evenodd"})});var i=r(609);const c=window.wp.blockEditor,s=window.wp.i18n,u=window.wp.components,p=window.wp.data,m=window.wp.element,v=window._activityPubOptions?.enabled,d=window.wp.apiFetch;var f=r.n(d);function y(e){return`var(--wp--preset--color--${e})`}function b(e){if("string"!=typeof e)return null;if(e.match(/^#/))return e.substring(0,7);const[,,t]=e.split("|");return y(t)}function _(e,t,r=null,o=""){return r?`${e}${o} { ${t}: ${r}; }\n`:""}function w(e,t,r,o){return _(e,"background-color",t)+_(e,"color",r)+_(e,"background-color",o,":hover")+_(e,"background-color",o,":focus")}function h({selector:e,style:t,backgroundColor:r}){const o=function(e,t,r){const o=`${e} .components-button`,n=("string"==typeof(l=r)?y(l):l?.color?.background||null)||t?.color?.background;var l;return w(o,b(t?.elements?.link?.color?.text),n,b(t?.elements?.link?.[":hover"]?.color?.text))}(e,t,r);return(0,i.createElement)("style",null,o)}const g=(0,l.jsx)(n.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,l.jsx)(n.Path,{fillRule:"evenodd",clipRule:"evenodd",d:"M5 4.5h11a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5H5a.5.5 0 0 1-.5-.5V5a.5.5 0 0 1 .5-.5ZM3 5a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5Zm17 3v10.75c0 .69-.56 1.25-1.25 1.25H6v1.5h12.75a2.75 2.75 0 0 0 2.75-2.75V8H20Z"})}),E=(0,l.jsx)(n.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,l.jsx)(n.Path,{d:"M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"})}),k=(0,m.forwardRef)((function({icon:e,size:t=24,...r},o){return(0,m.cloneElement)(e,{width:t,height:t,...r,ref:o})})),x=window.wp.compose,S="fediverse-remote-user";function O(e){try{return new URL(e),!0}catch(e){return!1}}function C({actionText:e,copyDescription:t,handle:r,resourceUrl:o,myProfile:n=!1,rememberProfile:l=!1}){const c=(0,s.__)("Loading...","activitypub"),p=(0,s.__)("Opening...","activitypub"),v=(0,s.__)("Error","activitypub"),d=(0,s.__)("Invalid","activitypub"),y=n||(0,s.__)("My Profile","activitypub"),[b,_]=(0,m.useState)(e),[w,h]=(0,m.useState)(g),C=(0,x.useCopyToClipboard)(r,(()=>{h(E),setTimeout((()=>h(g)),1e3)})),[N,R]=(0,m.useState)(""),[U,P]=(0,m.useState)(!0),{setRemoteUser:I}=function(){const[e,t]=(0,m.useState)(function(){const e=localStorage.getItem(S);return e?JSON.parse(e):{}}()),r=(0,m.useCallback)((e=>{!function(e){localStorage.setItem(S,JSON.stringify(e))}(e),t(e)}),[]),o=(0,m.useCallback)((()=>{localStorage.removeItem(S),t({})}),[]);return{template:e?.template||!1,profileURL:e?.profileURL||!1,setRemoteUser:r,deleteRemoteUser:o}}(),$=(0,m.useCallback)((()=>{let t;if(!O(N)&&!function(e){const t=e.replace(/^@/,"").split("@");return 2===t.length&&O(`https://${t[1]}`)}(N))return _(d),t=setTimeout((()=>_(e)),2e3),()=>clearTimeout(t);const r=o+N;_(c),f()({path:r}).then((({url:t,template:r})=>{U&&I({profileURL:N,template:r}),_(p),setTimeout((()=>{window.open(t,"_blank"),_(e)}),200)})).catch((()=>{_(v),setTimeout((()=>_(e)),2e3)}))}),[N]);return(0,i.createElement)("div",{className:"activitypub__dialog"},(0,i.createElement)("div",{className:"activitypub-dialog__section"},(0,i.createElement)("h4",null,y),(0,i.createElement)("div",{className:"activitypub-dialog__description"},t),(0,i.createElement)("div",{className:"activitypub-dialog__button-group"},(0,i.createElement)("input",{type:"text",value:r,readOnly:!0}),(0,i.createElement)(u.Button,{ref:C},(0,i.createElement)(k,{icon:w}),(0,s.__)("Copy","activitypub")))),(0,i.createElement)("div",{className:"activitypub-dialog__section"},(0,i.createElement)("h4",null,(0,s.__)("Your Profile","activitypub")),(0,i.createElement)("div",{className:"activitypub-dialog__description"},(0,m.createInterpolateElement)((0,s.__)("Or, if you know your own profile, we can start things that way! (eg yourusername@example.com)","activitypub"),{code:(0,i.createElement)("code",null)})),(0,i.createElement)("div",{className:"activitypub-dialog__button-group"},(0,i.createElement)("input",{type:"text",value:N,onKeyDown:e=>{"Enter"===e?.code&&$()},onChange:e=>R(e.target.value)}),(0,i.createElement)(u.Button,{onClick:$},(0,i.createElement)(k,{icon:a}),b)),l&&(0,i.createElement)("div",{className:"activitypub-dialog__remember"},(0,i.createElement)(u.CheckboxControl,{checked:U,label:(0,s.__)("Remember me for easier comments","activitypub"),onChange:()=>{P(!U)}}))))}const{namespace:N}=window._activityPubOptions,R={avatar:"",webfinger:"@well@hello.dolly",name:(0,s.__)("Hello Dolly Fan Account","activitypub"),url:"#"};function U(e){if(!e)return R;const t={...R,...e};return t.avatar=t?.icon?.url,t}function P({profile:e,popupStyles:t,userId:r}){const{avatar:o,name:n,webfinger:l}=e;return(0,i.createElement)("div",{className:"activitypub-profile"},(0,i.createElement)("img",{className:"activitypub-profile__avatar",src:o,alt:n}),(0,i.createElement)("div",{className:"activitypub-profile__content"},(0,i.createElement)("div",{className:"activitypub-profile__name"},n),(0,i.createElement)("div",{className:"activitypub-profile__handle",title:l},l)),(0,i.createElement)(I,{profile:e,popupStyles:t,userId:r}))}function I({profile:e,popupStyles:t,userId:r}){const[o,n]=(0,m.useState)(!1),l=(0,s.sprintf)((0,s.__)("Follow %s","activitypub"),e?.name);return(0,i.createElement)(i.Fragment,null,(0,i.createElement)(u.Button,{className:"activitypub-profile__follow",onClick:()=>n(!0)},(0,s.__)("Follow","activitypub")),o&&(0,i.createElement)(u.Modal,{className:"activitypub-profile__confirm activitypub__modal",onRequestClose:()=>n(!1),title:l},(0,i.createElement)($,{profile:e,userId:r}),(0,i.createElement)("style",null,t)))}function $({profile:e,userId:t}){const{webfinger:r}=e,o=(0,s.__)("Follow","activitypub"),n=`/${N}/actors/${t}/remote-follow?resource=`,l=(0,s.__)("Copy and paste my profile into the search field of your favorite fediverse app or server.","activitypub");return(0,i.createElement)(C,{actionText:o,copyDescription:l,handle:r,resourceUrl:n})}function T({selectedUser:e,style:t,backgroundColor:r,id:o,useId:n=!1,profileData:l=!1}){const[a,c]=(0,m.useState)(U()),s="site"===e?0:e,u=function(e){return w(".apfmd__button-group .components-button",b(e?.elements?.link?.color?.text)||"#111","#fff",b(e?.elements?.link?.[":hover"]?.color?.text)||"#333")}(t),p=n?{id:o}:{};function v(e){c(U(e))}return(0,m.useEffect)((()=>{if(l)return v(l);(function(e){const t={headers:{Accept:"application/activity+json"},path:`/${N}/actors/${e}`};return f()(t)})(s).then(v)}),[s,l]),(0,i.createElement)("div",{...p},(0,i.createElement)(h,{selector:`#${o}`,style:t,backgroundColor:r}),(0,i.createElement)(P,{profile:a,userId:s,popupStyles:u}))}(0,o.registerBlockType)("activitypub/follow-me",{edit:function({attributes:e,setAttributes:t}){const r=(0,c.useBlockProps)({className:"activitypub-follow-me-block-wrapper"}),o=function(){const e=v?.users?(0,p.useSelect)((e=>e("core").getUsers({who:"authors"}))):[];return(0,m.useMemo)((()=>{if(!e)return[];const t=v?.site?[{label:(0,s.__)("Whole Site","activitypub"),value:"site"}]:[];return e.reduce(((e,t)=>(e.push({label:t.name,value:`${t.id}`}),e)),t)}),[e])}(),{selectedUser:n}=e;return(0,m.useEffect)((()=>{o.length&&(o.find((({value:e})=>e===n))||t({selectedUser:o[0].value}))}),[n,o]),(0,i.createElement)("div",{...r},o.length>1&&(0,i.createElement)(c.InspectorControls,{key:"setting"},(0,i.createElement)(u.PanelBody,{title:(0,s.__)("Followers Options","activitypub")},(0,i.createElement)(u.SelectControl,{label:(0,s.__)("Select User","activitypub"),value:e.selectedUser,options:o,onChange:e=>t({selectedUser:e})}))),(0,i.createElement)(T,{...e,id:r.id}))},save:()=>null,icon:a})},20:(e,t,r)=>{var o=r(609),n=Symbol.for("react.element"),l=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),a=o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,i={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,r){var o,c={},s=null,u=null;for(o in void 0!==r&&(s=""+r),void 0!==t.key&&(s=""+t.key),void 0!==t.ref&&(u=t.ref),t)l.call(t,o)&&!i.hasOwnProperty(o)&&(c[o]=t[o]);if(e&&e.defaultProps)for(o in t=e.defaultProps)void 0===c[o]&&(c[o]=t[o]);return{$$typeof:n,type:e,key:s,ref:u,props:c,_owner:a.current}}},848:(e,t,r)=>{e.exports=r(20)},609:e=>{e.exports=window.React}},r={};function o(e){var n=r[e];if(void 0!==n)return n.exports;var l=r[e]={exports:{}};return t[e](l,l.exports,o),l.exports}o.m=t,e=[],o.O=(t,r,n,l)=>{if(!r){var a=1/0;for(u=0;u=l)&&Object.keys(o.O).every((e=>o.O[e](r[c])))?r.splice(c--,1):(i=!1,l0&&e[u-1][2]>l;u--)e[u]=e[u-1];e[u]=[r,n,l]},o.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return o.d(t,{a:t}),t},o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={338:0,301:0};o.O.j=t=>0===e[t];var t=(t,r)=>{var n,l,[a,i,c]=r,s=0;if(a.some((t=>0!==e[t]))){for(n in i)o.o(i,n)&&(o.m[n]=i[n]);if(c)var u=c(o)}for(t&&t(r);so(17)));n=o.O(n)})(); \ No newline at end of file +(()=>{"use strict";var e,t={399:(e,t,r)=>{const o=window.wp.blocks,n=window.wp.primitives;var a=r(848);const l=(0,a.jsx)(n.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,a.jsx)(n.Path,{d:"M15.5 9.5a1 1 0 100-2 1 1 0 000 2zm0 1.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm-2.25 6v-2a2.75 2.75 0 00-2.75-2.75h-4A2.75 2.75 0 003.75 15v2h1.5v-2c0-.69.56-1.25 1.25-1.25h4c.69 0 1.25.56 1.25 1.25v2h1.5zm7-2v2h-1.5v-2c0-.69-.56-1.25-1.25-1.25H15v-1.5h2.5A2.75 2.75 0 0120.25 15zM9.5 8.5a1 1 0 11-2 0 1 1 0 012 0zm1.5 0a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z",fillRule:"evenodd"})});var i=r(609);const c=window.wp.blockEditor,s=window.wp.i18n,u=window.wp.data,p=window.wp.coreData,m=window.wp.components,d=window.wp.element,v=window._activityPubOptions?.enabled,f=window.wp.apiFetch;var y=r.n(f);function b(e){return`var(--wp--preset--color--${e})`}function _(e){if("string"!=typeof e)return null;if(e.match(/^#/))return e.substring(0,7);const[,,t]=e.split("|");return b(t)}function w(e,t,r=null,o=""){return r?`${e}${o} { ${t}: ${r}; }\n`:""}function h(e,t,r,o){return w(e,"background-color",t)+w(e,"color",r)+w(e,"background-color",o,":hover")+w(e,"background-color",o,":focus")}function g({selector:e,style:t,backgroundColor:r}){const o=function(e,t,r){const o=`${e} .components-button`,n=("string"==typeof(a=r)?b(a):a?.color?.background||null)||t?.color?.background;var a;return h(o,_(t?.elements?.link?.color?.text),n,_(t?.elements?.link?.[":hover"]?.color?.text))}(e,t,r);return(0,i.createElement)("style",null,o)}const E=(0,a.jsx)(n.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,a.jsx)(n.Path,{fillRule:"evenodd",clipRule:"evenodd",d:"M5 4.5h11a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5H5a.5.5 0 0 1-.5-.5V5a.5.5 0 0 1 .5-.5ZM3 5a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5Zm17 3v10.75c0 .69-.56 1.25-1.25 1.25H6v1.5h12.75a2.75 2.75 0 0 0 2.75-2.75V8H20Z"})}),k=(0,a.jsx)(n.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,a.jsx)(n.Path,{d:"M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"})}),x=(0,d.forwardRef)((function({icon:e,size:t=24,...r},o){return(0,d.cloneElement)(e,{width:t,height:t,...r,ref:o})})),S=window.wp.compose,O="fediverse-remote-user";function C(e){try{return new URL(e),!0}catch(e){return!1}}function I({actionText:e,copyDescription:t,handle:r,resourceUrl:o,myProfile:n=!1,rememberProfile:a=!1}){const c=(0,s.__)("Loading...","activitypub"),u=(0,s.__)("Opening...","activitypub"),p=(0,s.__)("Error","activitypub"),v=(0,s.__)("Invalid","activitypub"),f=n||(0,s.__)("My Profile","activitypub"),[b,_]=(0,d.useState)(e),[w,h]=(0,d.useState)(E),g=(0,S.useCopyToClipboard)(r,(()=>{h(k),setTimeout((()=>h(E)),1e3)})),[I,N]=(0,d.useState)(""),[R,U]=(0,d.useState)(!0),{setRemoteUser:P}=function(){const[e,t]=(0,d.useState)(function(){const e=localStorage.getItem(O);return e?JSON.parse(e):{}}()),r=(0,d.useCallback)((e=>{!function(e){localStorage.setItem(O,JSON.stringify(e))}(e),t(e)}),[]),o=(0,d.useCallback)((()=>{localStorage.removeItem(O),t({})}),[]);return{template:e?.template||!1,profileURL:e?.profileURL||!1,setRemoteUser:r,deleteRemoteUser:o}}(),T=(0,d.useCallback)((()=>{let t;if(!C(I)&&!function(e){const t=e.replace(/^@/,"").split("@");return 2===t.length&&C(`https://${t[1]}`)}(I))return _(v),t=setTimeout((()=>_(e)),2e3),()=>clearTimeout(t);const r=o+I;_(c),y()({path:r}).then((({url:t,template:r})=>{R&&P({profileURL:I,template:r}),_(u),setTimeout((()=>{window.open(t,"_blank"),_(e)}),200)})).catch((()=>{_(p),setTimeout((()=>_(e)),2e3)}))}),[I]);return(0,i.createElement)("div",{className:"activitypub__dialog"},(0,i.createElement)("div",{className:"activitypub-dialog__section"},(0,i.createElement)("h4",null,f),(0,i.createElement)("div",{className:"activitypub-dialog__description"},t),(0,i.createElement)("div",{className:"activitypub-dialog__button-group"},(0,i.createElement)("input",{type:"text",value:r,readOnly:!0}),(0,i.createElement)(m.Button,{ref:g},(0,i.createElement)(x,{icon:w}),(0,s.__)("Copy","activitypub")))),(0,i.createElement)("div",{className:"activitypub-dialog__section"},(0,i.createElement)("h4",null,(0,s.__)("Your Profile","activitypub")),(0,i.createElement)("div",{className:"activitypub-dialog__description"},(0,d.createInterpolateElement)((0,s.__)("Or, if you know your own profile, we can start things that way! (eg @yourusername@example.com)","activitypub"),{code:(0,i.createElement)("code",null)})),(0,i.createElement)("div",{className:"activitypub-dialog__button-group"},(0,i.createElement)("input",{type:"text",value:I,onKeyDown:e=>{"Enter"===e?.code&&T()},onChange:e=>N(e.target.value)}),(0,i.createElement)(m.Button,{onClick:T},(0,i.createElement)(x,{icon:l}),b)),a&&(0,i.createElement)("div",{className:"activitypub-dialog__remember"},(0,i.createElement)(m.CheckboxControl,{checked:R,label:(0,s.__)("Remember me for easier comments","activitypub"),onChange:()=>{U(!R)}}))))}const{namespace:N}=window._activityPubOptions,R={avatar:"",webfinger:"@well@hello.dolly",name:(0,s.__)("Hello Dolly Fan Account","activitypub"),url:"#"};function U(e){if(!e)return R;const t={...R,...e};return t.avatar=t?.icon?.url,t}function P({profile:e,popupStyles:t,userId:r}){const{webfinger:o,avatar:n,name:a}=e,l=o.startsWith("@")?o:`@${o}`;return(0,i.createElement)("div",{className:"activitypub-profile"},(0,i.createElement)("img",{className:"activitypub-profile__avatar",src:n,alt:a}),(0,i.createElement)("div",{className:"activitypub-profile__content"},(0,i.createElement)("div",{className:"activitypub-profile__name"},a),(0,i.createElement)("div",{className:"activitypub-profile__handle",title:l},l)),(0,i.createElement)(T,{profile:e,popupStyles:t,userId:r}))}function T({profile:e,popupStyles:t,userId:r}){const[o,n]=(0,d.useState)(!1),a=(0,s.sprintf)((0,s.__)("Follow %s","activitypub"),e?.name);return(0,i.createElement)(i.Fragment,null,(0,i.createElement)(m.Button,{className:"activitypub-profile__follow",onClick:()=>n(!0)},(0,s.__)("Follow","activitypub")),o&&(0,i.createElement)(m.Modal,{className:"activitypub-profile__confirm activitypub__modal",onRequestClose:()=>n(!1),title:a},(0,i.createElement)($,{profile:e,userId:r}),(0,i.createElement)("style",null,t)))}function $({profile:e,userId:t}){const{webfinger:r}=e,o=(0,s.__)("Follow","activitypub"),n=`/${N}/actors/${t}/remote-follow?resource=`,a=(0,s.__)("Copy and paste my profile into the search field of your favorite fediverse app or server.","activitypub"),l=r.startsWith("@")?r:`@${r}`;return(0,i.createElement)(I,{actionText:o,copyDescription:a,handle:l,resourceUrl:n})}function j({selectedUser:e,style:t,backgroundColor:r,id:o,useId:n=!1,profileData:a=!1}){const[l,c]=(0,d.useState)(U()),s="site"===e?0:e,u=function(e){return h(".apfmd__button-group .components-button",_(e?.elements?.link?.color?.text)||"#111","#fff",_(e?.elements?.link?.[":hover"]?.color?.text)||"#333")}(t),p=n?{id:o}:{};function m(e){c(U(e))}return(0,d.useEffect)((()=>{if(a)return m(a);(function(e){const t={headers:{Accept:"application/activity+json"},path:`/${N}/actors/${e}`};return y()(t)})(s).then(m)}),[s,a]),(0,i.createElement)("div",{...p},(0,i.createElement)(g,{selector:`#${o}`,style:t,backgroundColor:r}),(0,i.createElement)(P,{profile:l,userId:s,popupStyles:u}))}function B({name:e}){const t=(0,s.sprintf)(/* translators: %s: block name */ +"This %s block will adapt to the page it is on, displaying the user profile associated with a post author (in a loop) or a user archive. It will be empty in other non-author contexts.",e);return(0,i.createElement)(m.Card,null,(0,i.createElement)(m.CardBody,null,(0,d.createInterpolateElement)(t,{strong:(0,i.createElement)("strong",null)})))}(0,o.registerBlockType)("activitypub/follow-me",{edit:function({attributes:e,setAttributes:t,context:{postType:r,postId:o}}){const n=(0,c.useBlockProps)({className:"activitypub-follow-me-block-wrapper"}),a=function({withInherit:e=!1}){const t=v?.users?(0,u.useSelect)((e=>e("core").getUsers({who:"authors"}))):[];return(0,d.useMemo)((()=>{if(!t)return[];const r=[];return v?.site&&r.push({label:(0,s.__)("Site","activitypub"),value:"site"}),e&&v?.users&&r.push({label:(0,s.__)("Dynamic User","activitypub"),value:"inherit"}),t.reduce(((e,t)=>(e.push({label:t.name,value:`${t.id}`}),e)),r)}),[t])}({withInherit:!0}),{selectedUser:l}=e,f="inherit"===l,y=(0,u.useSelect)((e=>{const{getEditedEntityRecord:t}=e(p.store),n=t("postType",r,o)?.author;return null!=n?n:null}),[r,o]);return(0,d.useEffect)((()=>{a.length&&(a.find((({value:e})=>e===l))||t({selectedUser:a[0].value}))}),[l,a]),(0,i.createElement)("div",{...n},a.length>1&&(0,i.createElement)(c.InspectorControls,{key:"setting"},(0,i.createElement)(m.PanelBody,{title:(0,s.__)("Followers Options","activitypub")},(0,i.createElement)(m.SelectControl,{label:(0,s.__)("Select User","activitypub"),value:e.selectedUser,options:a,onChange:e=>t({selectedUser:e})}))),f?y?(0,i.createElement)(j,{...e,id:n.id,selectedUser:y}):(0,i.createElement)(B,{name:(0,s.__)("Follow Me","activitypub")}):(0,i.createElement)(j,{...e,id:n.id}))},save:()=>null,icon:l})},20:(e,t,r)=>{var o=r(609),n=Symbol.for("react.element"),a=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),l=o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,i={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,r){var o,c={},s=null,u=null;for(o in void 0!==r&&(s=""+r),void 0!==t.key&&(s=""+t.key),void 0!==t.ref&&(u=t.ref),t)a.call(t,o)&&!i.hasOwnProperty(o)&&(c[o]=t[o]);if(e&&e.defaultProps)for(o in t=e.defaultProps)void 0===c[o]&&(c[o]=t[o]);return{$$typeof:n,type:e,key:s,ref:u,props:c,_owner:l.current}}},848:(e,t,r)=>{e.exports=r(20)},609:e=>{e.exports=window.React}},r={};function o(e){var n=r[e];if(void 0!==n)return n.exports;var a=r[e]={exports:{}};return t[e](a,a.exports,o),a.exports}o.m=t,e=[],o.O=(t,r,n,a)=>{if(!r){var l=1/0;for(u=0;u=a)&&Object.keys(o.O).every((e=>o.O[e](r[c])))?r.splice(c--,1):(i=!1,a0&&e[u-1][2]>a;u--)e[u]=e[u-1];e[u]=[r,n,a]},o.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return o.d(t,{a:t}),t},o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={338:0,301:0};o.O.j=t=>0===e[t];var t=(t,r)=>{var n,a,[l,i,c]=r,s=0;if(l.some((t=>0!==e[t]))){for(n in i)o.o(i,n)&&(o.m[n]=i[n]);if(c)var u=c(o)}for(t&&t(r);so(399)));n=o.O(n)})(); \ No newline at end of file diff --git a/wp-content/plugins/activitypub/build/follow-me/view.asset.php b/wp-content/plugins/activitypub/build/follow-me/view.asset.php index da6b09c1..b2652268 100644 --- a/wp-content/plugins/activitypub/build/follow-me/view.asset.php +++ b/wp-content/plugins/activitypub/build/follow-me/view.asset.php @@ -1 +1 @@ - array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => 'ab8c0dad126bb0a61ed6'); + array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => 'bc272e3d4aaa7992f4c7'); diff --git a/wp-content/plugins/activitypub/build/follow-me/view.js b/wp-content/plugins/activitypub/build/follow-me/view.js index 7fd3cb16..4b77f8c0 100644 --- a/wp-content/plugins/activitypub/build/follow-me/view.js +++ b/wp-content/plugins/activitypub/build/follow-me/view.js @@ -1 +1 @@ -(()=>{"use strict";var e,t={729:(e,t,r)=>{var o=r(609);const n=window.wp.element,a=window.wp.domReady;var l=r.n(a);const i=window.wp.apiFetch;var c=r.n(i);const s=window.wp.components,u=window.wp.i18n;function p(e){return`var(--wp--preset--color--${e})`}function m(e){if("string"!=typeof e)return null;if(e.match(/^#/))return e.substring(0,7);const[,,t]=e.split("|");return p(t)}function v(e,t,r=null,o=""){return r?`${e}${o} { ${t}: ${r}; }\n`:""}function d(e,t,r,o){return v(e,"background-color",t)+v(e,"color",r)+v(e,"background-color",o,":hover")+v(e,"background-color",o,":focus")}function f({selector:e,style:t,backgroundColor:r}){const n=function(e,t,r){const o=`${e} .components-button`,n=("string"==typeof(a=r)?p(a):a?.color?.background||null)||t?.color?.background;var a;return d(o,m(t?.elements?.link?.color?.text),n,m(t?.elements?.link?.[":hover"]?.color?.text))}(e,t,r);return(0,o.createElement)("style",null,n)}const y=window.wp.primitives;var _=r(848);const b=(0,_.jsx)(y.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,_.jsx)(y.Path,{fillRule:"evenodd",clipRule:"evenodd",d:"M5 4.5h11a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5H5a.5.5 0 0 1-.5-.5V5a.5.5 0 0 1 .5-.5ZM3 5a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5Zm17 3v10.75c0 .69-.56 1.25-1.25 1.25H6v1.5h12.75a2.75 2.75 0 0 0 2.75-2.75V8H20Z"})}),w=(0,_.jsx)(y.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,_.jsx)(y.Path,{d:"M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"})}),h=(0,n.forwardRef)((function({icon:e,size:t=24,...r},o){return(0,n.cloneElement)(e,{width:t,height:t,...r,ref:o})})),g=(0,_.jsx)(y.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,_.jsx)(y.Path,{d:"M15.5 9.5a1 1 0 100-2 1 1 0 000 2zm0 1.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm-2.25 6v-2a2.75 2.75 0 00-2.75-2.75h-4A2.75 2.75 0 003.75 15v2h1.5v-2c0-.69.56-1.25 1.25-1.25h4c.69 0 1.25.56 1.25 1.25v2h1.5zm7-2v2h-1.5v-2c0-.69-.56-1.25-1.25-1.25H15v-1.5h2.5A2.75 2.75 0 0120.25 15zM9.5 8.5a1 1 0 11-2 0 1 1 0 012 0zm1.5 0a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z",fillRule:"evenodd"})}),E=window.wp.compose,k="fediverse-remote-user";function x(e){try{return new URL(e),!0}catch(e){return!1}}function O({actionText:e,copyDescription:t,handle:r,resourceUrl:a,myProfile:l=!1,rememberProfile:i=!1}){const p=(0,u.__)("Loading...","activitypub"),m=(0,u.__)("Opening...","activitypub"),v=(0,u.__)("Error","activitypub"),d=(0,u.__)("Invalid","activitypub"),f=l||(0,u.__)("My Profile","activitypub"),[y,_]=(0,n.useState)(e),[O,S]=(0,n.useState)(b),C=(0,E.useCopyToClipboard)(r,(()=>{S(w),setTimeout((()=>S(b)),1e3)})),[N,R]=(0,n.useState)(""),[I,P]=(0,n.useState)(!0),{setRemoteUser:$}=function(){const[e,t]=(0,n.useState)(function(){const e=localStorage.getItem(k);return e?JSON.parse(e):{}}()),r=(0,n.useCallback)((e=>{!function(e){localStorage.setItem(k,JSON.stringify(e))}(e),t(e)}),[]),o=(0,n.useCallback)((()=>{localStorage.removeItem(k),t({})}),[]);return{template:e?.template||!1,profileURL:e?.profileURL||!1,setRemoteUser:r,deleteRemoteUser:o}}(),j=(0,n.useCallback)((()=>{let t;if(!x(N)&&!function(e){const t=e.replace(/^@/,"").split("@");return 2===t.length&&x(`https://${t[1]}`)}(N))return _(d),t=setTimeout((()=>_(e)),2e3),()=>clearTimeout(t);const r=a+N;_(p),c()({path:r}).then((({url:t,template:r})=>{I&&$({profileURL:N,template:r}),_(m),setTimeout((()=>{window.open(t,"_blank"),_(e)}),200)})).catch((()=>{_(v),setTimeout((()=>_(e)),2e3)}))}),[N]);return(0,o.createElement)("div",{className:"activitypub__dialog"},(0,o.createElement)("div",{className:"activitypub-dialog__section"},(0,o.createElement)("h4",null,f),(0,o.createElement)("div",{className:"activitypub-dialog__description"},t),(0,o.createElement)("div",{className:"activitypub-dialog__button-group"},(0,o.createElement)("input",{type:"text",value:r,readOnly:!0}),(0,o.createElement)(s.Button,{ref:C},(0,o.createElement)(h,{icon:O}),(0,u.__)("Copy","activitypub")))),(0,o.createElement)("div",{className:"activitypub-dialog__section"},(0,o.createElement)("h4",null,(0,u.__)("Your Profile","activitypub")),(0,o.createElement)("div",{className:"activitypub-dialog__description"},(0,n.createInterpolateElement)((0,u.__)("Or, if you know your own profile, we can start things that way! (eg yourusername@example.com)","activitypub"),{code:(0,o.createElement)("code",null)})),(0,o.createElement)("div",{className:"activitypub-dialog__button-group"},(0,o.createElement)("input",{type:"text",value:N,onKeyDown:e=>{"Enter"===e?.code&&j()},onChange:e=>R(e.target.value)}),(0,o.createElement)(s.Button,{onClick:j},(0,o.createElement)(h,{icon:g}),y)),i&&(0,o.createElement)("div",{className:"activitypub-dialog__remember"},(0,o.createElement)(s.CheckboxControl,{checked:I,label:(0,u.__)("Remember me for easier comments","activitypub"),onChange:()=>{P(!I)}}))))}const{namespace:S}=window._activityPubOptions,C={avatar:"",webfinger:"@well@hello.dolly",name:(0,u.__)("Hello Dolly Fan Account","activitypub"),url:"#"};function N(e){if(!e)return C;const t={...C,...e};return t.avatar=t?.icon?.url,t}function R({profile:e,popupStyles:t,userId:r}){const{avatar:n,name:a,webfinger:l}=e;return(0,o.createElement)("div",{className:"activitypub-profile"},(0,o.createElement)("img",{className:"activitypub-profile__avatar",src:n,alt:a}),(0,o.createElement)("div",{className:"activitypub-profile__content"},(0,o.createElement)("div",{className:"activitypub-profile__name"},a),(0,o.createElement)("div",{className:"activitypub-profile__handle",title:l},l)),(0,o.createElement)(I,{profile:e,popupStyles:t,userId:r}))}function I({profile:e,popupStyles:t,userId:r}){const[a,l]=(0,n.useState)(!1),i=(0,u.sprintf)((0,u.__)("Follow %s","activitypub"),e?.name);return(0,o.createElement)(o.Fragment,null,(0,o.createElement)(s.Button,{className:"activitypub-profile__follow",onClick:()=>l(!0)},(0,u.__)("Follow","activitypub")),a&&(0,o.createElement)(s.Modal,{className:"activitypub-profile__confirm activitypub__modal",onRequestClose:()=>l(!1),title:i},(0,o.createElement)(P,{profile:e,userId:r}),(0,o.createElement)("style",null,t)))}function P({profile:e,userId:t}){const{webfinger:r}=e,n=(0,u.__)("Follow","activitypub"),a=`/${S}/actors/${t}/remote-follow?resource=`,l=(0,u.__)("Copy and paste my profile into the search field of your favorite fediverse app or server.","activitypub");return(0,o.createElement)(O,{actionText:n,copyDescription:l,handle:r,resourceUrl:a})}function $({selectedUser:e,style:t,backgroundColor:r,id:a,useId:l=!1,profileData:i=!1}){const[s,u]=(0,n.useState)(N()),p="site"===e?0:e,v=function(e){return d(".apfmd__button-group .components-button",m(e?.elements?.link?.color?.text)||"#111","#fff",m(e?.elements?.link?.[":hover"]?.color?.text)||"#333")}(t),y=l?{id:a}:{};function _(e){u(N(e))}return(0,n.useEffect)((()=>{if(i)return _(i);(function(e){const t={headers:{Accept:"application/activity+json"},path:`/${S}/actors/${e}`};return c()(t)})(p).then(_)}),[p,i]),(0,o.createElement)("div",{...y},(0,o.createElement)(f,{selector:`#${a}`,style:t,backgroundColor:r}),(0,o.createElement)(R,{profile:s,userId:p,popupStyles:v}))}let j=1;l()((()=>{[].forEach.call(document.querySelectorAll(".activitypub-follow-me-block-wrapper"),(e=>{const t=JSON.parse(e.dataset.attrs);(0,n.createRoot)(e).render((0,o.createElement)($,{...t,id:"activitypub-follow-me-block-"+j++,useId:!0}))}))}))},20:(e,t,r)=>{var o=r(609),n=Symbol.for("react.element"),a=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),l=o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,i={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,r){var o,c={},s=null,u=null;for(o in void 0!==r&&(s=""+r),void 0!==t.key&&(s=""+t.key),void 0!==t.ref&&(u=t.ref),t)a.call(t,o)&&!i.hasOwnProperty(o)&&(c[o]=t[o]);if(e&&e.defaultProps)for(o in t=e.defaultProps)void 0===c[o]&&(c[o]=t[o]);return{$$typeof:n,type:e,key:s,ref:u,props:c,_owner:l.current}}},848:(e,t,r)=>{e.exports=r(20)},609:e=>{e.exports=window.React}},r={};function o(e){var n=r[e];if(void 0!==n)return n.exports;var a=r[e]={exports:{}};return t[e](a,a.exports,o),a.exports}o.m=t,e=[],o.O=(t,r,n,a)=>{if(!r){var l=1/0;for(u=0;u=a)&&Object.keys(o.O).every((e=>o.O[e](r[c])))?r.splice(c--,1):(i=!1,a0&&e[u-1][2]>a;u--)e[u]=e[u-1];e[u]=[r,n,a]},o.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return o.d(t,{a:t}),t},o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={41:0,301:0};o.O.j=t=>0===e[t];var t=(t,r)=>{var n,a,[l,i,c]=r,s=0;if(l.some((t=>0!==e[t]))){for(n in i)o.o(i,n)&&(o.m[n]=i[n]);if(c)var u=c(o)}for(t&&t(r);so(729)));n=o.O(n)})(); \ No newline at end of file +(()=>{"use strict";var e,t={729:(e,t,r)=>{var o=r(609);const n=window.wp.element,a=window.wp.domReady;var l=r.n(a);const i=window.wp.apiFetch;var c=r.n(i);const s=window.wp.components,u=window.wp.i18n;function p(e){return`var(--wp--preset--color--${e})`}function m(e){if("string"!=typeof e)return null;if(e.match(/^#/))return e.substring(0,7);const[,,t]=e.split("|");return p(t)}function v(e,t,r=null,o=""){return r?`${e}${o} { ${t}: ${r}; }\n`:""}function d(e,t,r,o){return v(e,"background-color",t)+v(e,"color",r)+v(e,"background-color",o,":hover")+v(e,"background-color",o,":focus")}function f({selector:e,style:t,backgroundColor:r}){const n=function(e,t,r){const o=`${e} .components-button`,n=("string"==typeof(a=r)?p(a):a?.color?.background||null)||t?.color?.background;var a;return d(o,m(t?.elements?.link?.color?.text),n,m(t?.elements?.link?.[":hover"]?.color?.text))}(e,t,r);return(0,o.createElement)("style",null,n)}const y=window.wp.primitives;var _=r(848);const b=(0,_.jsx)(y.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,_.jsx)(y.Path,{fillRule:"evenodd",clipRule:"evenodd",d:"M5 4.5h11a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5H5a.5.5 0 0 1-.5-.5V5a.5.5 0 0 1 .5-.5ZM3 5a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5Zm17 3v10.75c0 .69-.56 1.25-1.25 1.25H6v1.5h12.75a2.75 2.75 0 0 0 2.75-2.75V8H20Z"})}),w=(0,_.jsx)(y.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,_.jsx)(y.Path,{d:"M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"})}),h=(0,n.forwardRef)((function({icon:e,size:t=24,...r},o){return(0,n.cloneElement)(e,{width:t,height:t,...r,ref:o})})),g=(0,_.jsx)(y.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,_.jsx)(y.Path,{d:"M15.5 9.5a1 1 0 100-2 1 1 0 000 2zm0 1.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm-2.25 6v-2a2.75 2.75 0 00-2.75-2.75h-4A2.75 2.75 0 003.75 15v2h1.5v-2c0-.69.56-1.25 1.25-1.25h4c.69 0 1.25.56 1.25 1.25v2h1.5zm7-2v2h-1.5v-2c0-.69-.56-1.25-1.25-1.25H15v-1.5h2.5A2.75 2.75 0 0120.25 15zM9.5 8.5a1 1 0 11-2 0 1 1 0 012 0zm1.5 0a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z",fillRule:"evenodd"})}),E=window.wp.compose,k="fediverse-remote-user";function x(e){try{return new URL(e),!0}catch(e){return!1}}function O({actionText:e,copyDescription:t,handle:r,resourceUrl:a,myProfile:l=!1,rememberProfile:i=!1}){const p=(0,u.__)("Loading...","activitypub"),m=(0,u.__)("Opening...","activitypub"),v=(0,u.__)("Error","activitypub"),d=(0,u.__)("Invalid","activitypub"),f=l||(0,u.__)("My Profile","activitypub"),[y,_]=(0,n.useState)(e),[O,S]=(0,n.useState)(b),C=(0,E.useCopyToClipboard)(r,(()=>{S(w),setTimeout((()=>S(b)),1e3)})),[N,R]=(0,n.useState)(""),[I,$]=(0,n.useState)(!0),{setRemoteUser:P}=function(){const[e,t]=(0,n.useState)(function(){const e=localStorage.getItem(k);return e?JSON.parse(e):{}}()),r=(0,n.useCallback)((e=>{!function(e){localStorage.setItem(k,JSON.stringify(e))}(e),t(e)}),[]),o=(0,n.useCallback)((()=>{localStorage.removeItem(k),t({})}),[]);return{template:e?.template||!1,profileURL:e?.profileURL||!1,setRemoteUser:r,deleteRemoteUser:o}}(),j=(0,n.useCallback)((()=>{let t;if(!x(N)&&!function(e){const t=e.replace(/^@/,"").split("@");return 2===t.length&&x(`https://${t[1]}`)}(N))return _(d),t=setTimeout((()=>_(e)),2e3),()=>clearTimeout(t);const r=a+N;_(p),c()({path:r}).then((({url:t,template:r})=>{I&&P({profileURL:N,template:r}),_(m),setTimeout((()=>{window.open(t,"_blank"),_(e)}),200)})).catch((()=>{_(v),setTimeout((()=>_(e)),2e3)}))}),[N]);return(0,o.createElement)("div",{className:"activitypub__dialog"},(0,o.createElement)("div",{className:"activitypub-dialog__section"},(0,o.createElement)("h4",null,f),(0,o.createElement)("div",{className:"activitypub-dialog__description"},t),(0,o.createElement)("div",{className:"activitypub-dialog__button-group"},(0,o.createElement)("input",{type:"text",value:r,readOnly:!0}),(0,o.createElement)(s.Button,{ref:C},(0,o.createElement)(h,{icon:O}),(0,u.__)("Copy","activitypub")))),(0,o.createElement)("div",{className:"activitypub-dialog__section"},(0,o.createElement)("h4",null,(0,u.__)("Your Profile","activitypub")),(0,o.createElement)("div",{className:"activitypub-dialog__description"},(0,n.createInterpolateElement)((0,u.__)("Or, if you know your own profile, we can start things that way! (eg @yourusername@example.com)","activitypub"),{code:(0,o.createElement)("code",null)})),(0,o.createElement)("div",{className:"activitypub-dialog__button-group"},(0,o.createElement)("input",{type:"text",value:N,onKeyDown:e=>{"Enter"===e?.code&&j()},onChange:e=>R(e.target.value)}),(0,o.createElement)(s.Button,{onClick:j},(0,o.createElement)(h,{icon:g}),y)),i&&(0,o.createElement)("div",{className:"activitypub-dialog__remember"},(0,o.createElement)(s.CheckboxControl,{checked:I,label:(0,u.__)("Remember me for easier comments","activitypub"),onChange:()=>{$(!I)}}))))}const{namespace:S}=window._activityPubOptions,C={avatar:"",webfinger:"@well@hello.dolly",name:(0,u.__)("Hello Dolly Fan Account","activitypub"),url:"#"};function N(e){if(!e)return C;const t={...C,...e};return t.avatar=t?.icon?.url,t}function R({profile:e,popupStyles:t,userId:r}){const{webfinger:n,avatar:a,name:l}=e,i=n.startsWith("@")?n:`@${n}`;return(0,o.createElement)("div",{className:"activitypub-profile"},(0,o.createElement)("img",{className:"activitypub-profile__avatar",src:a,alt:l}),(0,o.createElement)("div",{className:"activitypub-profile__content"},(0,o.createElement)("div",{className:"activitypub-profile__name"},l),(0,o.createElement)("div",{className:"activitypub-profile__handle",title:i},i)),(0,o.createElement)(I,{profile:e,popupStyles:t,userId:r}))}function I({profile:e,popupStyles:t,userId:r}){const[a,l]=(0,n.useState)(!1),i=(0,u.sprintf)((0,u.__)("Follow %s","activitypub"),e?.name);return(0,o.createElement)(o.Fragment,null,(0,o.createElement)(s.Button,{className:"activitypub-profile__follow",onClick:()=>l(!0)},(0,u.__)("Follow","activitypub")),a&&(0,o.createElement)(s.Modal,{className:"activitypub-profile__confirm activitypub__modal",onRequestClose:()=>l(!1),title:i},(0,o.createElement)($,{profile:e,userId:r}),(0,o.createElement)("style",null,t)))}function $({profile:e,userId:t}){const{webfinger:r}=e,n=(0,u.__)("Follow","activitypub"),a=`/${S}/actors/${t}/remote-follow?resource=`,l=(0,u.__)("Copy and paste my profile into the search field of your favorite fediverse app or server.","activitypub"),i=r.startsWith("@")?r:`@${r}`;return(0,o.createElement)(O,{actionText:n,copyDescription:l,handle:i,resourceUrl:a})}function P({selectedUser:e,style:t,backgroundColor:r,id:a,useId:l=!1,profileData:i=!1}){const[s,u]=(0,n.useState)(N()),p="site"===e?0:e,v=function(e){return d(".apfmd__button-group .components-button",m(e?.elements?.link?.color?.text)||"#111","#fff",m(e?.elements?.link?.[":hover"]?.color?.text)||"#333")}(t),y=l?{id:a}:{};function _(e){u(N(e))}return(0,n.useEffect)((()=>{if(i)return _(i);(function(e){const t={headers:{Accept:"application/activity+json"},path:`/${S}/actors/${e}`};return c()(t)})(p).then(_)}),[p,i]),(0,o.createElement)("div",{...y},(0,o.createElement)(f,{selector:`#${a}`,style:t,backgroundColor:r}),(0,o.createElement)(R,{profile:s,userId:p,popupStyles:v}))}let j=1;l()((()=>{[].forEach.call(document.querySelectorAll(".activitypub-follow-me-block-wrapper"),(e=>{const t=JSON.parse(e.dataset.attrs);(0,n.createRoot)(e).render((0,o.createElement)(P,{...t,id:"activitypub-follow-me-block-"+j++,useId:!0}))}))}))},20:(e,t,r)=>{var o=r(609),n=Symbol.for("react.element"),a=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),l=o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,i={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,r){var o,c={},s=null,u=null;for(o in void 0!==r&&(s=""+r),void 0!==t.key&&(s=""+t.key),void 0!==t.ref&&(u=t.ref),t)a.call(t,o)&&!i.hasOwnProperty(o)&&(c[o]=t[o]);if(e&&e.defaultProps)for(o in t=e.defaultProps)void 0===c[o]&&(c[o]=t[o]);return{$$typeof:n,type:e,key:s,ref:u,props:c,_owner:l.current}}},848:(e,t,r)=>{e.exports=r(20)},609:e=>{e.exports=window.React}},r={};function o(e){var n=r[e];if(void 0!==n)return n.exports;var a=r[e]={exports:{}};return t[e](a,a.exports,o),a.exports}o.m=t,e=[],o.O=(t,r,n,a)=>{if(!r){var l=1/0;for(u=0;u=a)&&Object.keys(o.O).every((e=>o.O[e](r[c])))?r.splice(c--,1):(i=!1,a0&&e[u-1][2]>a;u--)e[u]=e[u-1];e[u]=[r,n,a]},o.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return o.d(t,{a:t}),t},o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={41:0,301:0};o.O.j=t=>0===e[t];var t=(t,r)=>{var n,a,[l,i,c]=r,s=0;if(l.some((t=>0!==e[t]))){for(n in i)o.o(i,n)&&(o.m[n]=i[n]);if(c)var u=c(o)}for(t&&t(r);so(729)));n=o.O(n)})(); \ No newline at end of file diff --git a/wp-content/plugins/activitypub/build/followers/block.json b/wp-content/plugins/activitypub/build/followers/block.json index c7015d33..078b82f3 100644 --- a/wp-content/plugins/activitypub/build/followers/block.json +++ b/wp-content/plugins/activitypub/build/followers/block.json @@ -33,6 +33,10 @@ ] } }, + "usesContext": [ + "postType", + "postId" + ], "styles": [ { "name": "default", diff --git a/wp-content/plugins/activitypub/build/followers/index.asset.php b/wp-content/plugins/activitypub/build/followers/index.asset.php index fb5c1d96..e147e810 100644 --- a/wp-content/plugins/activitypub/build/followers/index.asset.php +++ b/wp-content/plugins/activitypub/build/followers/index.asset.php @@ -1 +1 @@ - array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => '3d39b46b3415c2d57654'); + array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => '28a5bef9295566598f5c'); diff --git a/wp-content/plugins/activitypub/build/followers/index.js b/wp-content/plugins/activitypub/build/followers/index.js index a47e3cac..2a5e6cf3 100644 --- a/wp-content/plugins/activitypub/build/followers/index.js +++ b/wp-content/plugins/activitypub/build/followers/index.js @@ -1,3 +1,4 @@ -(()=>{var e={20:(e,t,a)=>{"use strict";var r=a(609),n=Symbol.for("react.element"),l=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),o=r.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,i={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,a){var r,c={},s=null,p=null;for(r in void 0!==a&&(s=""+a),void 0!==t.key&&(s=""+t.key),void 0!==t.ref&&(p=t.ref),t)l.call(t,r)&&!i.hasOwnProperty(r)&&(c[r]=t[r]);if(e&&e.defaultProps)for(r in t=e.defaultProps)void 0===c[r]&&(c[r]=t[r]);return{$$typeof:n,type:e,key:s,ref:p,props:c,_owner:o.current}}},848:(e,t,a)=>{"use strict";e.exports=a(20)},609:e=>{"use strict";e.exports=window.React},942:(e,t)=>{var a;!function(){"use strict";var r={}.hasOwnProperty;function n(){for(var e="",t=0;t{var t=e&&e.__esModule?()=>e.default:()=>e;return a.d(t,{a:t}),t},a.d=(e,t)=>{for(var r in t)a.o(t,r)&&!a.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},a.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{"use strict";const e=window.wp.blocks,t=window.wp.primitives;var r=a(848);const n=(0,r.jsx)(t.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,r.jsx)(t.Path,{d:"M15.5 9.5a1 1 0 100-2 1 1 0 000 2zm0 1.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm-2.25 6v-2a2.75 2.75 0 00-2.75-2.75h-4A2.75 2.75 0 003.75 15v2h1.5v-2c0-.69.56-1.25 1.25-1.25h4c.69 0 1.25.56 1.25 1.25v2h1.5zm7-2v2h-1.5v-2c0-.69-.56-1.25-1.25-1.25H15v-1.5h2.5A2.75 2.75 0 0120.25 15zM9.5 8.5a1 1 0 11-2 0 1 1 0 012 0zm1.5 0a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z",fillRule:"evenodd"})});var l=a(609);const o=window.wp.components,i=window.wp.element,c=window.wp.blockEditor,s=window.wp.i18n,p=window.wp.apiFetch;var u=a.n(p);const v=window.wp.url;var m=a(942),w=a.n(m);function d({active:e,children:t,page:a,pageClick:r,className:n}){const o=w()("wp-block activitypub-pager",n,{current:e});return(0,l.createElement)("a",{className:o,onClick:t=>{t.preventDefault(),!e&&r(a)}},t)}const f={outlined:"outlined",minimal:"minimal"};function b({compact:e,nextLabel:t,page:a,pageClick:r,perPage:n,prevLabel:o,total:i,variant:c=f.outlined}){const s=((e,t)=>{let a=[1,e-2,e-1,e,e+1,e+2,t];a.sort(((e,t)=>e-t)),a=a.filter(((e,a,r)=>e>=1&&e<=t&&r.lastIndexOf(e)===a));for(let e=a.length-2;e>=0;e--)a[e]===a[e+1]&&a.splice(e+1,1);return a})(a,Math.ceil(i/n)),p=w()("alignwide wp-block-query-pagination is-content-justification-space-between is-layout-flex wp-block-query-pagination-is-layout-flex",`is-${c}`,{"is-compact":e});return(0,l.createElement)("nav",{className:p},o&&(0,l.createElement)(d,{key:"prev",page:a-1,pageClick:r,active:1===a,"aria-label":o,className:"wp-block-query-pagination-previous block-editor-block-list__block"},o),!e&&(0,l.createElement)("div",{className:"block-editor-block-list__block wp-block wp-block-query-pagination-numbers"},s.map((e=>(0,l.createElement)(d,{key:e,page:e,pageClick:r,active:e===a,className:"page-numbers"},e)))),t&&(0,l.createElement)(d,{key:"next",page:a+1,pageClick:r,active:a===Math.ceil(i/n),"aria-label":t,className:"wp-block-query-pagination-next block-editor-block-list__block"},t))}const{namespace:y}=window._activityPubOptions;function g({selectedUser:e,per_page:t,order:a,title:r,page:n,setPage:o,className:c="",followLinks:p=!0,followerData:m=!1}){const w="site"===e?0:e,[d,f]=(0,l.useState)([]),[g,k]=(0,l.useState)(0),[h,E]=(0,l.useState)(0),[x,N]=function(){const[e,t]=(0,l.useState)(1);return[e,t]}(),S=n||x,C=o||N,O=(0,i.createInterpolateElement)(/* translators: arrow for previous followers link */ /* translators: arrow for previous followers link */ -(0,s.__)("← Less","activitypub"),{span:(0,l.createElement)("span",{className:"wp-block-query-pagination-previous-arrow is-arrow-arrow","aria-hidden":"true"})}),P=(0,i.createInterpolateElement)(/* translators: arrow for next followers link */ /* translators: arrow for next followers link */ -(0,s.__)("More →","activitypub"),{span:(0,l.createElement)("span",{className:"wp-block-query-pagination-next-arrow is-arrow-arrow","aria-hidden":"true"})}),L=(e,a)=>{f(e),E(a),k(Math.ceil(a/t))};return(0,l.useEffect)((()=>{if(m&&1===S)return L(m.followers,m.total);const e=function(e,t,a,r){const n=`/${y}/actors/${e}/followers`,l={per_page:t,order:a,page:r,context:"full"};return(0,v.addQueryArgs)(n,l)}(w,t,a,S);u()({path:e}).then((e=>L(e.orderedItems,e.totalItems))).catch((()=>{}))}),[w,t,a,S,m]),(0,l.createElement)("div",{className:"activitypub-follower-block "+c},(0,l.createElement)("h3",null,r),(0,l.createElement)("ul",null,d&&d.map((e=>(0,l.createElement)("li",{key:e.url},(0,l.createElement)(_,{...e,followLinks:p}))))),g>1&&(0,l.createElement)(b,{page:S,perPage:t,total:h,pageClick:C,nextLabel:P,prevLabel:O,compact:"is-style-compact"===c}))}function _({name:e,icon:t,url:a,preferredUsername:r,followLinks:n=!0}){const i=`@${r}`,c={};return n||(c.onClick=e=>e.preventDefault()),(0,l.createElement)(o.ExternalLink,{className:"activitypub-link",href:a,title:i,...c},(0,l.createElement)("img",{width:"40",height:"40",src:t.url,className:"avatar activitypub-avatar",alt:e}),(0,l.createElement)("span",{className:"activitypub-actor"},(0,l.createElement)("strong",{className:"activitypub-name"},e),(0,l.createElement)("span",{className:"sep"},"/"),(0,l.createElement)("span",{className:"activitypub-handle"},i)))}const k=window.wp.data,h=window._activityPubOptions?.enabled;(0,e.registerBlockType)("activitypub/followers",{edit:function({attributes:e,setAttributes:t}){const{order:a,per_page:r,selectedUser:n,title:p}=e,u=(0,c.useBlockProps)(),[v,m]=(0,i.useState)(1),w=[{label:(0,s.__)("New to old","activitypub"),value:"desc"},{label:(0,s.__)("Old to new","activitypub"),value:"asc"}],d=function(){const e=h?.users?(0,k.useSelect)((e=>e("core").getUsers({who:"authors"}))):[];return(0,i.useMemo)((()=>{if(!e)return[];const t=h?.site?[{label:(0,s.__)("Whole Site","activitypub"),value:"site"}]:[];return e.reduce(((e,t)=>(e.push({label:t.name,value:`${t.id}`}),e)),t)}),[e])}(),f=e=>a=>{m(1),t({[e]:a})};return(0,i.useEffect)((()=>{d.length&&(d.find((({value:e})=>e===n))||t({selectedUser:d[0].value}))}),[n,d]),(0,l.createElement)("div",{...u},(0,l.createElement)(c.InspectorControls,{key:"setting"},(0,l.createElement)(o.PanelBody,{title:(0,s.__)("Followers Options","activitypub")},(0,l.createElement)(o.TextControl,{label:(0,s.__)("Title","activitypub"),help:(0,s.__)("Title to display above the list of followers. Blank for none.","activitypub"),value:p,onChange:e=>t({title:e})}),d.length>1&&(0,l.createElement)(o.SelectControl,{label:(0,s.__)("Select User","activitypub"),value:n,options:d,onChange:f("selectedUser")}),(0,l.createElement)(o.SelectControl,{label:(0,s.__)("Sort","activitypub"),value:a,options:w,onChange:f("order")}),(0,l.createElement)(o.RangeControl,{label:(0,s.__)("Number of Followers","activitypub"),value:r,onChange:f("per_page"),min:1,max:10}))),(0,l.createElement)(g,{...e,page:v,setPage:m,followLinks:!1}))},save:()=>null,icon:n})})()})(); \ No newline at end of file +(()=>{var e={20:(e,t,a)=>{"use strict";var r=a(609),n=Symbol.for("react.element"),l=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),o=r.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,i={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,a){var r,s={},c=null,p=null;for(r in void 0!==a&&(c=""+a),void 0!==t.key&&(c=""+t.key),void 0!==t.ref&&(p=t.ref),t)l.call(t,r)&&!i.hasOwnProperty(r)&&(s[r]=t[r]);if(e&&e.defaultProps)for(r in t=e.defaultProps)void 0===s[r]&&(s[r]=t[r]);return{$$typeof:n,type:e,key:c,ref:p,props:s,_owner:o.current}}},848:(e,t,a)=>{"use strict";e.exports=a(20)},609:e=>{"use strict";e.exports=window.React},942:(e,t)=>{var a;!function(){"use strict";var r={}.hasOwnProperty;function n(){for(var e="",t=0;t{var t=e&&e.__esModule?()=>e.default:()=>e;return a.d(t,{a:t}),t},a.d=(e,t)=>{for(var r in t)a.o(t,r)&&!a.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},a.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{"use strict";const e=window.wp.blocks,t=window.wp.primitives;var r=a(848);const n=(0,r.jsx)(t.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,r.jsx)(t.Path,{d:"M15.5 9.5a1 1 0 100-2 1 1 0 000 2zm0 1.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm-2.25 6v-2a2.75 2.75 0 00-2.75-2.75h-4A2.75 2.75 0 003.75 15v2h1.5v-2c0-.69.56-1.25 1.25-1.25h4c.69 0 1.25.56 1.25 1.25v2h1.5zm7-2v2h-1.5v-2c0-.69-.56-1.25-1.25-1.25H15v-1.5h2.5A2.75 2.75 0 0120.25 15zM9.5 8.5a1 1 0 11-2 0 1 1 0 012 0zm1.5 0a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z",fillRule:"evenodd"})});var l=a(609);const o=window.wp.components,i=window.wp.element,s=window.wp.blockEditor,c=window.wp.data,p=window.wp.coreData,u=window.wp.i18n,m=window.wp.apiFetch;var v=a.n(m);const d=window.wp.url;var w=a(942),f=a.n(w);function b({active:e,children:t,page:a,pageClick:r,className:n}){const o=f()("wp-block activitypub-pager",n,{current:e});return(0,l.createElement)("a",{className:o,onClick:t=>{t.preventDefault(),!e&&r(a)}},t)}const y={outlined:"outlined",minimal:"minimal"};function g({compact:e,nextLabel:t,page:a,pageClick:r,perPage:n,prevLabel:o,total:i,variant:s=y.outlined}){const c=((e,t)=>{let a=[1,e-2,e-1,e,e+1,e+2,t];a.sort(((e,t)=>e-t)),a=a.filter(((e,a,r)=>e>=1&&e<=t&&r.lastIndexOf(e)===a));for(let e=a.length-2;e>=0;e--)a[e]===a[e+1]&&a.splice(e+1,1);return a})(a,Math.ceil(i/n)),p=f()("alignwide wp-block-query-pagination is-content-justification-space-between is-layout-flex wp-block-query-pagination-is-layout-flex",`is-${s}`,{"is-compact":e});return(0,l.createElement)("nav",{className:p},o&&(0,l.createElement)(b,{key:"prev",page:a-1,pageClick:r,active:1===a,"aria-label":o,className:"wp-block-query-pagination-previous block-editor-block-list__block"},o),!e&&(0,l.createElement)("div",{className:"block-editor-block-list__block wp-block wp-block-query-pagination-numbers"},c.map((e=>(0,l.createElement)(b,{key:e,page:e,pageClick:r,active:e===a,className:"page-numbers"},e)))),t&&(0,l.createElement)(b,{key:"next",page:a+1,pageClick:r,active:a===Math.ceil(i/n),"aria-label":t,className:"wp-block-query-pagination-next block-editor-block-list__block"},t))}const{namespace:h}=window._activityPubOptions;function _({selectedUser:e,per_page:t,order:a,title:r,page:n,setPage:o,className:s="",followLinks:c=!0,followerData:p=!1}){const m="site"===e?0:e,[w,f]=(0,l.useState)([]),[b,y]=(0,l.useState)(0),[_,E]=(0,l.useState)(0),[x,S]=function(){const[e,t]=(0,l.useState)(1);return[e,t]}(),N=n||x,C=o||S,O=(0,i.createInterpolateElement)(/* translators: arrow for previous followers link */ /* translators: arrow for previous followers link */ +(0,u.__)("← Less","activitypub"),{span:(0,l.createElement)("span",{className:"wp-block-query-pagination-previous-arrow is-arrow-arrow","aria-hidden":"true"})}),P=(0,i.createInterpolateElement)(/* translators: arrow for next followers link */ /* translators: arrow for next followers link */ +(0,u.__)("More →","activitypub"),{span:(0,l.createElement)("span",{className:"wp-block-query-pagination-next-arrow is-arrow-arrow","aria-hidden":"true"})}),I=(e,a)=>{f(e),E(a),y(Math.ceil(a/t))};return(0,l.useEffect)((()=>{if(p&&1===N)return I(p.followers,p.total);const e=function(e,t,a,r){const n=`/${h}/actors/${e}/followers`,l={per_page:t,order:a,page:r,context:"full"};return(0,d.addQueryArgs)(n,l)}(m,t,a,N);v()({path:e}).then((e=>I(e.orderedItems,e.totalItems))).catch((()=>{}))}),[m,t,a,N,p]),(0,l.createElement)("div",{className:"activitypub-follower-block "+s},(0,l.createElement)("h3",null,r),(0,l.createElement)("ul",null,w&&w.map((e=>(0,l.createElement)("li",{key:e.url},(0,l.createElement)(k,{...e,followLinks:c}))))),b>1&&(0,l.createElement)(g,{page:N,perPage:t,total:_,pageClick:C,nextLabel:P,prevLabel:O,compact:"is-style-compact"===s}))}function k({name:e,icon:t,url:a,preferredUsername:r,followLinks:n=!0}){const i=`@${r}`,s={};return n||(s.onClick=e=>e.preventDefault()),(0,l.createElement)(o.ExternalLink,{className:"activitypub-link",href:a,title:i,...s},(0,l.createElement)("img",{width:"40",height:"40",src:t.url,className:"avatar activitypub-avatar",alt:e}),(0,l.createElement)("span",{className:"activitypub-actor"},(0,l.createElement)("strong",{className:"activitypub-name"},e),(0,l.createElement)("span",{className:"sep"},"/"),(0,l.createElement)("span",{className:"activitypub-handle"},i)))}const E=window._activityPubOptions?.enabled;function x({name:e}){const t=(0,u.sprintf)(/* translators: %s: block name */ +"This %s block will adapt to the page it is on, displaying the user profile associated with a post author (in a loop) or a user archive. It will be empty in other non-author contexts.",e);return(0,l.createElement)(o.Card,null,(0,l.createElement)(o.CardBody,null,(0,i.createInterpolateElement)(t,{strong:(0,l.createElement)("strong",null)})))}(0,e.registerBlockType)("activitypub/followers",{edit:function({attributes:e,setAttributes:t,context:{postType:a,postId:r}}){const{order:n,per_page:m,selectedUser:v,title:d}=e,w=(0,s.useBlockProps)(),[f,b]=(0,i.useState)(1),y=[{label:(0,u.__)("New to old","activitypub"),value:"desc"},{label:(0,u.__)("Old to new","activitypub"),value:"asc"}],g=function({withInherit:e=!1}){const t=E?.users?(0,c.useSelect)((e=>e("core").getUsers({who:"authors"}))):[];return(0,i.useMemo)((()=>{if(!t)return[];const a=[];return E?.site&&a.push({label:(0,u.__)("Site","activitypub"),value:"site"}),e&&E?.users&&a.push({label:(0,u.__)("Dynamic User","activitypub"),value:"inherit"}),t.reduce(((e,t)=>(e.push({label:t.name,value:`${t.id}`}),e)),a)}),[t])}({withInherit:!0}),h=e=>a=>{b(1),t({[e]:a})},k=(0,c.useSelect)((e=>{const{getEditedEntityRecord:t}=e(p.store),n=t("postType",a,r)?.author;return null!=n?n:null}),[a,r]);return(0,i.useEffect)((()=>{g.length&&(g.find((({value:e})=>e===v))||t({selectedUser:g[0].value}))}),[v,g]),(0,l.createElement)("div",{...w},(0,l.createElement)(s.InspectorControls,{key:"setting"},(0,l.createElement)(o.PanelBody,{title:(0,u.__)("Followers Options","activitypub")},(0,l.createElement)(o.TextControl,{label:(0,u.__)("Title","activitypub"),help:(0,u.__)("Title to display above the list of followers. Blank for none.","activitypub"),value:d,onChange:e=>t({title:e})}),g.length>1&&(0,l.createElement)(o.SelectControl,{label:(0,u.__)("Select User","activitypub"),value:v,options:g,onChange:h("selectedUser")}),(0,l.createElement)(o.SelectControl,{label:(0,u.__)("Sort","activitypub"),value:n,options:y,onChange:h("order")}),(0,l.createElement)(o.RangeControl,{label:(0,u.__)("Number of Followers","activitypub"),value:m,onChange:h("per_page"),min:1,max:10}))),"inherit"===v?k?(0,l.createElement)(_,{...e,page:f,setPage:b,followLinks:!1,selectedUser:k}):(0,l.createElement)(x,{name:(0,u.__)("Followers","activitypub")}):(0,l.createElement)(_,{...e,page:f,setPage:b,followLinks:!1}))},save:()=>null,icon:n})})()})(); \ No newline at end of file diff --git a/wp-content/plugins/activitypub/build/remote-reply/index.asset.php b/wp-content/plugins/activitypub/build/remote-reply/index.asset.php index 6afb3060..c68fef98 100644 --- a/wp-content/plugins/activitypub/build/remote-reply/index.asset.php +++ b/wp-content/plugins/activitypub/build/remote-reply/index.asset.php @@ -1 +1 @@ - array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => 'ab787305c7ed07812b96'); + array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '45f08e094782c24c4c34'); diff --git a/wp-content/plugins/activitypub/build/remote-reply/index.js b/wp-content/plugins/activitypub/build/remote-reply/index.js index a0584f57..dcbd0732 100644 --- a/wp-content/plugins/activitypub/build/remote-reply/index.js +++ b/wp-content/plugins/activitypub/build/remote-reply/index.js @@ -1 +1 @@ -(()=>{"use strict";var e,t={456:(e,t,r)=>{var o=r(609);const a=window.wp.element,n=window.wp.domReady;var i=r.n(n);const l=window.wp.components,c=window.wp.i18n,s=(0,a.forwardRef)((function({icon:e,size:t=24,...r},o){return(0,a.cloneElement)(e,{width:t,height:t,...r,ref:o})})),m=window.wp.primitives;var p=r(848);const u=(0,p.jsx)(m.SVG,{viewBox:"0 0 24 24",xmlns:"http://www.w3.org/2000/svg",children:(0,p.jsx)(m.Path,{d:"M12 21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3C7.02944 3 3 7.02944 3 12C3 16.9706 7.02944 21 12 21ZM15.5303 8.46967C15.8232 8.76256 15.8232 9.23744 15.5303 9.53033L13.0607 12L15.5303 14.4697C15.8232 14.7626 15.8232 15.2374 15.5303 15.5303C15.2374 15.8232 14.7626 15.8232 14.4697 15.5303L12 13.0607L9.53033 15.5303C9.23744 15.8232 8.76256 15.8232 8.46967 15.5303C8.17678 15.2374 8.17678 14.7626 8.46967 14.4697L10.9393 12L8.46967 9.53033C8.17678 9.23744 8.17678 8.76256 8.46967 8.46967C8.76256 8.17678 9.23744 8.17678 9.53033 8.46967L12 10.9393L14.4697 8.46967C14.7626 8.17678 15.2374 8.17678 15.5303 8.46967Z"})}),v=window.wp.apiFetch;var d=r.n(v);const y=(0,p.jsx)(m.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,p.jsx)(m.Path,{fillRule:"evenodd",clipRule:"evenodd",d:"M5 4.5h11a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5H5a.5.5 0 0 1-.5-.5V5a.5.5 0 0 1 .5-.5ZM3 5a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5Zm17 3v10.75c0 .69-.56 1.25-1.25 1.25H6v1.5h12.75a2.75 2.75 0 0 0 2.75-2.75V8H20Z"})}),_=(0,p.jsx)(m.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,p.jsx)(m.Path,{d:"M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"})}),f=(0,p.jsx)(m.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,p.jsx)(m.Path,{d:"M15.5 9.5a1 1 0 100-2 1 1 0 000 2zm0 1.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm-2.25 6v-2a2.75 2.75 0 00-2.75-2.75h-4A2.75 2.75 0 003.75 15v2h1.5v-2c0-.69.56-1.25 1.25-1.25h4c.69 0 1.25.56 1.25 1.25v2h1.5zm7-2v2h-1.5v-2c0-.69-.56-1.25-1.25-1.25H15v-1.5h2.5A2.75 2.75 0 0120.25 15zM9.5 8.5a1 1 0 11-2 0 1 1 0 012 0zm1.5 0a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z",fillRule:"evenodd"})}),w=window.wp.compose,b="fediverse-remote-user";function h(){const[e,t]=(0,a.useState)(function(){const e=localStorage.getItem(b);return e?JSON.parse(e):{}}()),r=(0,a.useCallback)((e=>{!function(e){localStorage.setItem(b,JSON.stringify(e))}(e),t(e)}),[]),o=(0,a.useCallback)((()=>{localStorage.removeItem(b),t({})}),[]);return{template:e?.template||!1,profileURL:e?.profileURL||!1,setRemoteUser:r,deleteRemoteUser:o}}function g(e){try{return new URL(e),!0}catch(e){return!1}}function E({actionText:e,copyDescription:t,handle:r,resourceUrl:n,myProfile:i=!1,rememberProfile:m=!1}){const p=(0,c.__)("Loading...","activitypub"),u=(0,c.__)("Opening...","activitypub"),v=(0,c.__)("Error","activitypub"),b=(0,c.__)("Invalid","activitypub"),E=i||(0,c.__)("My Profile","activitypub"),[C,R]=(0,a.useState)(e),[x,O]=(0,a.useState)(y),k=(0,w.useCopyToClipboard)(r,(()=>{O(_),setTimeout((()=>O(y)),1e3)})),[L,S]=(0,a.useState)(""),[U,N]=(0,a.useState)(!0),{setRemoteUser:P}=h(),j=(0,a.useCallback)((()=>{let t;if(!g(L)&&!function(e){const t=e.replace(/^@/,"").split("@");return 2===t.length&&g(`https://${t[1]}`)}(L))return R(b),t=setTimeout((()=>R(e)),2e3),()=>clearTimeout(t);const r=n+L;R(p),d()({path:r}).then((({url:t,template:r})=>{U&&P({profileURL:L,template:r}),R(u),setTimeout((()=>{window.open(t,"_blank"),R(e)}),200)})).catch((()=>{R(v),setTimeout((()=>R(e)),2e3)}))}),[L]);return(0,o.createElement)("div",{className:"activitypub__dialog"},(0,o.createElement)("div",{className:"activitypub-dialog__section"},(0,o.createElement)("h4",null,E),(0,o.createElement)("div",{className:"activitypub-dialog__description"},t),(0,o.createElement)("div",{className:"activitypub-dialog__button-group"},(0,o.createElement)("input",{type:"text",value:r,readOnly:!0}),(0,o.createElement)(l.Button,{ref:k},(0,o.createElement)(s,{icon:x}),(0,c.__)("Copy","activitypub")))),(0,o.createElement)("div",{className:"activitypub-dialog__section"},(0,o.createElement)("h4",null,(0,c.__)("Your Profile","activitypub")),(0,o.createElement)("div",{className:"activitypub-dialog__description"},(0,a.createInterpolateElement)((0,c.__)("Or, if you know your own profile, we can start things that way! (eg yourusername@example.com)","activitypub"),{code:(0,o.createElement)("code",null)})),(0,o.createElement)("div",{className:"activitypub-dialog__button-group"},(0,o.createElement)("input",{type:"text",value:L,onKeyDown:e=>{"Enter"===e?.code&&j()},onChange:e=>S(e.target.value)}),(0,o.createElement)(l.Button,{onClick:j},(0,o.createElement)(s,{icon:f}),C)),m&&(0,o.createElement)("div",{className:"activitypub-dialog__remember"},(0,o.createElement)(l.CheckboxControl,{checked:U,label:(0,c.__)("Remember me for easier comments","activitypub"),onChange:()=>{N(!U)}}))))}const{namespace:C}=window._activityPubOptions;function R({selectedComment:e,commentId:t}){const r=(0,c.__)("Reply","activitypub"),a=`/${C}/comments/${t}/remote-reply?resource=`,n=(0,c.__)("Copy and paste the Comment URL into the search field of your favorite fediverse app or server.","activitypub");return(0,o.createElement)(E,{actionText:r,copyDescription:n,handle:e,resourceUrl:a,myProfile:(0,c.__)("Original Comment URL","activitypub"),rememberProfile:!0})}function x({profileURL:e,template:t,commentURL:r,deleteRemoteUser:a}){return(0,o.createElement)(o.Fragment,null,(0,o.createElement)(l.Button,{variant:"link",className:"comment-reply-link activitypub-remote-reply__button",onClick:()=>{const e=t.replace("{uri}",r);window.open(e,"_blank")}},(0,c.sprintf)((0,c.__)("Reply as %s","activitypub"),e)),(0,o.createElement)(l.Button,{className:"activitypub-remote-profile-delete",onClick:a,title:(0,c.__)("Delete Remote Profile","activitypub")},(0,o.createElement)(s,{icon:u,size:18})))}function O({selectedComment:e,commentId:t}){const[r,n]=(0,a.useState)(!1),i=(0,c.__)("Remote Reply","activitypub"),{profileURL:s,template:m,deleteRemoteUser:p}=h(),u=s&&m;return(0,o.createElement)(o.Fragment,null,u?(0,o.createElement)(x,{profileURL:s,template:m,commentURL:e,deleteRemoteUser:p}):(0,o.createElement)(l.Button,{variant:"link",className:"comment-reply-link activitypub-remote-reply__button",onClick:()=>n(!0)},(0,c.__)("Reply on the Fediverse","activitypub")),r&&(0,o.createElement)(l.Modal,{className:"activitypub-remote-reply__modal activitypub__modal",onRequestClose:()=>n(!1),title:i},(0,o.createElement)(R,{selectedComment:e,commentId:t})))}let k=1;i()((()=>{[].forEach.call(document.querySelectorAll(".activitypub-remote-reply"),(e=>{const t=JSON.parse(e.dataset.attrs);(0,a.createRoot)(e).render((0,o.createElement)(O,{...t,id:"activitypub-remote-reply-link-"+k++,useId:!0}))}))}))},20:(e,t,r)=>{var o=r(609),a=Symbol.for("react.element"),n=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),i=o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,l={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,r){var o,c={},s=null,m=null;for(o in void 0!==r&&(s=""+r),void 0!==t.key&&(s=""+t.key),void 0!==t.ref&&(m=t.ref),t)n.call(t,o)&&!l.hasOwnProperty(o)&&(c[o]=t[o]);if(e&&e.defaultProps)for(o in t=e.defaultProps)void 0===c[o]&&(c[o]=t[o]);return{$$typeof:a,type:e,key:s,ref:m,props:c,_owner:i.current}}},848:(e,t,r)=>{e.exports=r(20)},609:e=>{e.exports=window.React}},r={};function o(e){var a=r[e];if(void 0!==a)return a.exports;var n=r[e]={exports:{}};return t[e](n,n.exports,o),n.exports}o.m=t,e=[],o.O=(t,r,a,n)=>{if(!r){var i=1/0;for(m=0;m=n)&&Object.keys(o.O).every((e=>o.O[e](r[c])))?r.splice(c--,1):(l=!1,n0&&e[m-1][2]>n;m--)e[m]=e[m-1];e[m]=[r,a,n]},o.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return o.d(t,{a:t}),t},o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={227:0,739:0};o.O.j=t=>0===e[t];var t=(t,r)=>{var a,n,[i,l,c]=r,s=0;if(i.some((t=>0!==e[t]))){for(a in l)o.o(l,a)&&(o.m[a]=l[a]);if(c)var m=c(o)}for(t&&t(r);so(456)));a=o.O(a)})(); \ No newline at end of file +(()=>{"use strict";var e,t={456:(e,t,r)=>{var o=r(609);const a=window.wp.element,n=window.wp.domReady;var i=r.n(n);const l=window.wp.components,c=window.wp.i18n,s=(0,a.forwardRef)((function({icon:e,size:t=24,...r},o){return(0,a.cloneElement)(e,{width:t,height:t,...r,ref:o})})),m=window.wp.primitives;var p=r(848);const u=(0,p.jsx)(m.SVG,{viewBox:"0 0 24 24",xmlns:"http://www.w3.org/2000/svg",children:(0,p.jsx)(m.Path,{d:"M12 21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3C7.02944 3 3 7.02944 3 12C3 16.9706 7.02944 21 12 21ZM15.5303 8.46967C15.8232 8.76256 15.8232 9.23744 15.5303 9.53033L13.0607 12L15.5303 14.4697C15.8232 14.7626 15.8232 15.2374 15.5303 15.5303C15.2374 15.8232 14.7626 15.8232 14.4697 15.5303L12 13.0607L9.53033 15.5303C9.23744 15.8232 8.76256 15.8232 8.46967 15.5303C8.17678 15.2374 8.17678 14.7626 8.46967 14.4697L10.9393 12L8.46967 9.53033C8.17678 9.23744 8.17678 8.76256 8.46967 8.46967C8.76256 8.17678 9.23744 8.17678 9.53033 8.46967L12 10.9393L14.4697 8.46967C14.7626 8.17678 15.2374 8.17678 15.5303 8.46967Z"})}),v=window.wp.apiFetch;var d=r.n(v);const y=(0,p.jsx)(m.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,p.jsx)(m.Path,{fillRule:"evenodd",clipRule:"evenodd",d:"M5 4.5h11a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5H5a.5.5 0 0 1-.5-.5V5a.5.5 0 0 1 .5-.5ZM3 5a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5Zm17 3v10.75c0 .69-.56 1.25-1.25 1.25H6v1.5h12.75a2.75 2.75 0 0 0 2.75-2.75V8H20Z"})}),_=(0,p.jsx)(m.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,p.jsx)(m.Path,{d:"M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"})}),f=(0,p.jsx)(m.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24",children:(0,p.jsx)(m.Path,{d:"M15.5 9.5a1 1 0 100-2 1 1 0 000 2zm0 1.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm-2.25 6v-2a2.75 2.75 0 00-2.75-2.75h-4A2.75 2.75 0 003.75 15v2h1.5v-2c0-.69.56-1.25 1.25-1.25h4c.69 0 1.25.56 1.25 1.25v2h1.5zm7-2v2h-1.5v-2c0-.69-.56-1.25-1.25-1.25H15v-1.5h2.5A2.75 2.75 0 0120.25 15zM9.5 8.5a1 1 0 11-2 0 1 1 0 012 0zm1.5 0a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z",fillRule:"evenodd"})}),w=window.wp.compose,b="fediverse-remote-user";function h(){const[e,t]=(0,a.useState)(function(){const e=localStorage.getItem(b);return e?JSON.parse(e):{}}()),r=(0,a.useCallback)((e=>{!function(e){localStorage.setItem(b,JSON.stringify(e))}(e),t(e)}),[]),o=(0,a.useCallback)((()=>{localStorage.removeItem(b),t({})}),[]);return{template:e?.template||!1,profileURL:e?.profileURL||!1,setRemoteUser:r,deleteRemoteUser:o}}function g(e){try{return new URL(e),!0}catch(e){return!1}}function E({actionText:e,copyDescription:t,handle:r,resourceUrl:n,myProfile:i=!1,rememberProfile:m=!1}){const p=(0,c.__)("Loading...","activitypub"),u=(0,c.__)("Opening...","activitypub"),v=(0,c.__)("Error","activitypub"),b=(0,c.__)("Invalid","activitypub"),E=i||(0,c.__)("My Profile","activitypub"),[C,R]=(0,a.useState)(e),[x,O]=(0,a.useState)(y),k=(0,w.useCopyToClipboard)(r,(()=>{O(_),setTimeout((()=>O(y)),1e3)})),[L,S]=(0,a.useState)(""),[U,N]=(0,a.useState)(!0),{setRemoteUser:P}=h(),j=(0,a.useCallback)((()=>{let t;if(!g(L)&&!function(e){const t=e.replace(/^@/,"").split("@");return 2===t.length&&g(`https://${t[1]}`)}(L))return R(b),t=setTimeout((()=>R(e)),2e3),()=>clearTimeout(t);const r=n+L;R(p),d()({path:r}).then((({url:t,template:r})=>{U&&P({profileURL:L,template:r}),R(u),setTimeout((()=>{window.open(t,"_blank"),R(e)}),200)})).catch((()=>{R(v),setTimeout((()=>R(e)),2e3)}))}),[L]);return(0,o.createElement)("div",{className:"activitypub__dialog"},(0,o.createElement)("div",{className:"activitypub-dialog__section"},(0,o.createElement)("h4",null,E),(0,o.createElement)("div",{className:"activitypub-dialog__description"},t),(0,o.createElement)("div",{className:"activitypub-dialog__button-group"},(0,o.createElement)("input",{type:"text",value:r,readOnly:!0}),(0,o.createElement)(l.Button,{ref:k},(0,o.createElement)(s,{icon:x}),(0,c.__)("Copy","activitypub")))),(0,o.createElement)("div",{className:"activitypub-dialog__section"},(0,o.createElement)("h4",null,(0,c.__)("Your Profile","activitypub")),(0,o.createElement)("div",{className:"activitypub-dialog__description"},(0,a.createInterpolateElement)((0,c.__)("Or, if you know your own profile, we can start things that way! (eg @yourusername@example.com)","activitypub"),{code:(0,o.createElement)("code",null)})),(0,o.createElement)("div",{className:"activitypub-dialog__button-group"},(0,o.createElement)("input",{type:"text",value:L,onKeyDown:e=>{"Enter"===e?.code&&j()},onChange:e=>S(e.target.value)}),(0,o.createElement)(l.Button,{onClick:j},(0,o.createElement)(s,{icon:f}),C)),m&&(0,o.createElement)("div",{className:"activitypub-dialog__remember"},(0,o.createElement)(l.CheckboxControl,{checked:U,label:(0,c.__)("Remember me for easier comments","activitypub"),onChange:()=>{N(!U)}}))))}const{namespace:C}=window._activityPubOptions;function R({selectedComment:e,commentId:t}){const r=(0,c.__)("Reply","activitypub"),a=`/${C}/comments/${t}/remote-reply?resource=`,n=(0,c.__)("Copy and paste the Comment URL into the search field of your favorite fediverse app or server.","activitypub");return(0,o.createElement)(E,{actionText:r,copyDescription:n,handle:e,resourceUrl:a,myProfile:(0,c.__)("Original Comment URL","activitypub"),rememberProfile:!0})}function x({profileURL:e,template:t,commentURL:r,deleteRemoteUser:a}){return(0,o.createElement)(o.Fragment,null,(0,o.createElement)(l.Button,{variant:"link",className:"comment-reply-link activitypub-remote-reply__button",onClick:()=>{const e=t.replace("{uri}",r);window.open(e,"_blank")}},(0,c.sprintf)((0,c.__)("Reply as %s","activitypub"),e)),(0,o.createElement)(l.Button,{className:"activitypub-remote-profile-delete",onClick:a,title:(0,c.__)("Delete Remote Profile","activitypub")},(0,o.createElement)(s,{icon:u,size:18})))}function O({selectedComment:e,commentId:t}){const[r,n]=(0,a.useState)(!1),i=(0,c.__)("Remote Reply","activitypub"),{profileURL:s,template:m,deleteRemoteUser:p}=h(),u=s&&m;return(0,o.createElement)(o.Fragment,null,u?(0,o.createElement)(x,{profileURL:s,template:m,commentURL:e,deleteRemoteUser:p}):(0,o.createElement)(l.Button,{variant:"link",className:"comment-reply-link activitypub-remote-reply__button",onClick:()=>n(!0)},(0,c.__)("Reply on the Fediverse","activitypub")),r&&(0,o.createElement)(l.Modal,{className:"activitypub-remote-reply__modal activitypub__modal",onRequestClose:()=>n(!1),title:i},(0,o.createElement)(R,{selectedComment:e,commentId:t})))}let k=1;i()((()=>{[].forEach.call(document.querySelectorAll(".activitypub-remote-reply"),(e=>{const t=JSON.parse(e.dataset.attrs);(0,a.createRoot)(e).render((0,o.createElement)(O,{...t,id:"activitypub-remote-reply-link-"+k++,useId:!0}))}))}))},20:(e,t,r)=>{var o=r(609),a=Symbol.for("react.element"),n=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),i=o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,l={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,r){var o,c={},s=null,m=null;for(o in void 0!==r&&(s=""+r),void 0!==t.key&&(s=""+t.key),void 0!==t.ref&&(m=t.ref),t)n.call(t,o)&&!l.hasOwnProperty(o)&&(c[o]=t[o]);if(e&&e.defaultProps)for(o in t=e.defaultProps)void 0===c[o]&&(c[o]=t[o]);return{$$typeof:a,type:e,key:s,ref:m,props:c,_owner:i.current}}},848:(e,t,r)=>{e.exports=r(20)},609:e=>{e.exports=window.React}},r={};function o(e){var a=r[e];if(void 0!==a)return a.exports;var n=r[e]={exports:{}};return t[e](n,n.exports,o),n.exports}o.m=t,e=[],o.O=(t,r,a,n)=>{if(!r){var i=1/0;for(m=0;m=n)&&Object.keys(o.O).every((e=>o.O[e](r[c])))?r.splice(c--,1):(l=!1,n0&&e[m-1][2]>n;m--)e[m]=e[m-1];e[m]=[r,a,n]},o.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return o.d(t,{a:t}),t},o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={227:0,739:0};o.O.j=t=>0===e[t];var t=(t,r)=>{var a,n,[i,l,c]=r,s=0;if(i.some((t=>0!==e[t]))){for(a in l)o.o(l,a)&&(o.m[a]=l[a]);if(c)var m=c(o)}for(t&&t(r);so(456)));a=o.O(a)})(); \ No newline at end of file diff --git a/wp-content/plugins/activitypub/build/reply-intent/block.json b/wp-content/plugins/activitypub/build/reply-intent/block.json new file mode 100644 index 00000000..c2817199 --- /dev/null +++ b/wp-content/plugins/activitypub/build/reply-intent/block.json @@ -0,0 +1,12 @@ +{ + "name": "reply-handler", + "title": "Reply Handler: not a block, but block.json is very useful.", + "category": "widgets", + "icon": "admin-comments", + "keywords": [ + "reply", + "handler", + "comments" + ], + "editorScript": "file:./plugin.js" +} \ No newline at end of file diff --git a/wp-content/plugins/activitypub/build/reply-intent/plugin.asset.php b/wp-content/plugins/activitypub/build/reply-intent/plugin.asset.php new file mode 100644 index 00000000..79765ae6 --- /dev/null +++ b/wp-content/plugins/activitypub/build/reply-intent/plugin.asset.php @@ -0,0 +1 @@ + array('wp-block-editor', 'wp-blocks', 'wp-data', 'wp-element', 'wp-plugins'), 'version' => '488f0199fb69ddcf6c53'); diff --git a/wp-content/plugins/activitypub/build/reply-intent/plugin.js b/wp-content/plugins/activitypub/build/reply-intent/plugin.js new file mode 100644 index 00000000..2a26b0f9 --- /dev/null +++ b/wp-content/plugins/activitypub/build/reply-intent/plugin.js @@ -0,0 +1 @@ +(()=>{"use strict";const t=window.wp.plugins,e=window.wp.blocks,n=window.wp.data,i=window.wp.blockEditor,r=window.wp.element;(0,t.registerPlugin)("activitypub-reply-intent",{render:()=>{const[t,o]=(0,r.useState)(!1);return(0,r.useEffect)((()=>{if(t)return;const r=new URLSearchParams(window.location.search).get("in_reply_to");r&&setTimeout((()=>{const t=(0,e.createBlock)("activitypub/reply",{url:r}),o=(0,n.dispatch)(i.store);o.insertBlock(t),o.insertAfterBlock(t.clientId)}),200),o(!0)}),[t]),null}})})(); \ No newline at end of file diff --git a/wp-content/plugins/activitypub/build/reply/block.json b/wp-content/plugins/activitypub/build/reply/block.json new file mode 100644 index 00000000..0e949165 --- /dev/null +++ b/wp-content/plugins/activitypub/build/reply/block.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 3, + "name": "activitypub/reply", + "version": "0.1.0", + "title": "Federated Reply", + "category": "widgets", + "icon": "commentReplyLink", + "description": "Respond to posts, notes, videos, and other content on the fediverse. Ensure the URL originates from a federated social network like Mastodon, as other URLs might not function as expected.", + "supports": { + "html": false + }, + "textdomain": "activitypub", + "editorScript": "file:./index.js", + "editorStyle": "file:./edit.css", + "attributes": { + "url": { + "type": "string" + } + } +} \ No newline at end of file diff --git a/wp-content/plugins/activitypub/build/reply/index.asset.php b/wp-content/plugins/activitypub/build/reply/index.asset.php new file mode 100644 index 00000000..2e7cd843 --- /dev/null +++ b/wp-content/plugins/activitypub/build/reply/index.asset.php @@ -0,0 +1 @@ + array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '808c98599517db815fc5'); diff --git a/wp-content/plugins/activitypub/build/reply/index.js b/wp-content/plugins/activitypub/build/reply/index.js new file mode 100644 index 00000000..9cabdce1 --- /dev/null +++ b/wp-content/plugins/activitypub/build/reply/index.js @@ -0,0 +1 @@ +(()=>{"use strict";var e={20:(e,t,r)=>{var o=r(609),n=Symbol.for("react.element"),i=(Symbol.for("react.fragment"),Object.prototype.hasOwnProperty),a=o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,s={key:!0,ref:!0,__self:!0,__source:!0};t.jsx=function(e,t,r){var o,l={},p=null,c=null;for(o in void 0!==r&&(p=""+r),void 0!==t.key&&(p=""+t.key),void 0!==t.ref&&(c=t.ref),t)i.call(t,o)&&!s.hasOwnProperty(o)&&(l[o]=t[o]);if(e&&e.defaultProps)for(o in t=e.defaultProps)void 0===l[o]&&(l[o]=t[o]);return{$$typeof:n,type:e,key:p,ref:c,props:l,_owner:a.current}}},848:(e,t,r)=>{e.exports=r(20)},609:e=>{e.exports=window.React}},t={};function r(o){var n=t[o];if(void 0!==n)return n.exports;var i=t[o]={exports:{}};return e[o](i,i.exports,r),i.exports}const o=window.wp.blocks,n=window.wp.primitives;var i=r(848);const a=(0,i.jsx)(n.SVG,{width:"24",height:"24",viewBox:"0 0 24 24",xmlns:"http://www.w3.org/2000/svg",children:(0,i.jsx)(n.Path,{d:"M6.68822 10.625L6.24878 11.0649L5.5 11.8145L5.5 5.5L12.5 5.5V8L14 6.5V5C14 4.44772 13.5523 4 13 4H5C4.44772 4 4 4.44771 4 5V13.5247C4 13.8173 4.16123 14.086 4.41935 14.2237C4.72711 14.3878 5.10601 14.3313 5.35252 14.0845L7.31 12.125H8.375L9.875 10.625H7.31H6.68822ZM14.5605 10.4983L11.6701 13.75H16.9975C17.9963 13.75 18.7796 14.1104 19.3553 14.7048C19.9095 15.2771 20.2299 16.0224 20.4224 16.7443C20.7645 18.0276 20.7543 19.4618 20.7487 20.2544C20.7481 20.345 20.7475 20.4272 20.7475 20.4999L19.2475 20.5001C19.2475 20.4191 19.248 20.3319 19.2484 20.2394V20.2394C19.2526 19.4274 19.259 18.2035 18.973 17.1307C18.8156 16.5401 18.586 16.0666 18.2778 15.7483C17.9909 15.4521 17.5991 15.25 16.9975 15.25H11.8106L14.5303 17.9697L13.4696 19.0303L8.96956 14.5303L13.4394 9.50171L14.5605 10.4983Z"})});var s=r(609);const l=window.wp.i18n,p=window.wp.blockEditor,c=window.wp.components,w=window.wp.element,u=window.wp.data;(0,o.registerBlockType)("activitypub/reply",{edit:function({attributes:e,setAttributes:t,clientId:r,isSelected:o}){const[n,i]=(0,w.useState)(""),{insertAfterBlock:a,removeBlock:d}=(0,u.useDispatch)(p.store),v=(0,l.__)("For example: Paste a URL from a Mastodon post or note into the field above to leave a comment.","activitypub"),[f,y]=(0,w.useState)(v);return(0,s.createElement)("div",{...(0,p.useBlockProps)()},(0,s.createElement)(c.TextControl,{label:(0,l.__)("This post is a reply to the following URL","activitypub"),value:e.url,onChange:e=>{!function(e){try{return new URL(e),!0}catch(e){return!1}}(e)?(i("error"),y((0,l.__)("Please enter a valid URL.","activitypub"))):(i(""),y(v)),t({url:e})},onKeyDown:t=>{"Enter"===t.key&&a(r),!e.url&&["Backspace","Delete"].includes(t.key)&&d(r)},type:"url",placeholder:"https://example.org/path",className:n,help:o?f:""}))},save:()=>null,icon:a})})(); \ No newline at end of file diff --git a/wp-content/plugins/activitypub/includes/activity/class-activity.php b/wp-content/plugins/activitypub/includes/activity/class-activity.php index fcc35e46..b8418315 100644 --- a/wp-content/plugins/activitypub/includes/activity/class-activity.php +++ b/wp-content/plugins/activitypub/includes/activity/class-activity.php @@ -3,11 +3,13 @@ * Inspired by the PHP ActivityPub Library by @Landrok * * @link https://github.com/landrok/activitypub + * + * @package Activitypub */ namespace Activitypub\Activity; -use Activitypub\Activity\Base_Object; +use Activitypub\Link; /** * \Activitypub\Activity\Activity implements the common @@ -22,6 +24,8 @@ class Activity extends Base_Object { ); /** + * The type of the object. + * * @var string */ protected $type = 'Activity'; @@ -90,6 +94,21 @@ class Activity extends Base_Object { */ protected $result; + /** + * Identifies a Collection containing objects considered to be responses + * to this object. + * WordPress has a strong core system of approving replies. We only include + * approved replies here. + * + * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-replies + * + * @var array + * | ObjectType + * | Link + * | null + */ + protected $replies; + /** * An indirect object of the activity from which the * activity is directed. @@ -128,45 +147,49 @@ class Activity extends Base_Object { * * @see https://www.w3.org/TR/activitypub/#object-without-create * - * @param string|Base_Objectr|Link|null $object + * @param array|string|Base_Object|Link|null $data Activity object. * * @return void */ - public function set_object( $object ) { - // convert array to object - if ( is_array( $object ) ) { - $object = self::init_from_array( $object ); + public function set_object( $data ) { + // Convert array to object. + if ( is_array( $data ) ) { + $data = self::init_from_array( $data ); } - // set object - $this->set( 'object', $object ); + // Set object. + $this->set( 'object', $data ); - if ( ! is_object( $object ) ) { + if ( ! is_object( $data ) ) { return; } foreach ( array( 'to', 'bto', 'cc', 'bcc', 'audience' ) as $i ) { - $this->set( $i, $object->get( $i ) ); + $this->set( $i, $data->get( $i ) ); } - if ( $object->get_published() && ! $this->get_published() ) { - $this->set( 'published', $object->get_published() ); + if ( $data->get_published() && ! $this->get_published() ) { + $this->set( 'published', $data->get_published() ); } - if ( $object->get_updated() && ! $this->get_updated() ) { - $this->set( 'updated', $object->get_updated() ); + if ( $data->get_updated() && ! $this->get_updated() ) { + $this->set( 'updated', $data->get_updated() ); } - if ( $object->get_attributed_to() && ! $this->get_actor() ) { - $this->set( 'actor', $object->get_attributed_to() ); + if ( $data->get_attributed_to() && ! $this->get_actor() ) { + $this->set( 'actor', $data->get_attributed_to() ); } - if ( $object->get_id() && ! $this->get_id() ) { - $id = strtok( $object->get_id(), '#' ); - if ( $object->get_updated() ) { - $updated = $object->get_updated(); + if ( $data->get_in_reply_to() ) { + $this->set( 'in_reply_to', $data->get_in_reply_to() ); + } + + if ( $data->get_id() && ! $this->get_id() ) { + $id = strtok( $data->get_id(), '#' ); + if ( $data->get_updated() ) { + $updated = $data->get_updated(); } else { - $updated = $object->get_published(); + $updated = $data->get_published(); } $this->set( 'id', $id . '#activity-' . strtolower( $this->get_type() ) . '-' . $updated ); } @@ -181,7 +204,7 @@ class Activity extends Base_Object { if ( $this->object instanceof Base_Object ) { $class = get_class( $this->object ); if ( $class && $class::JSON_LD_CONTEXT ) { - // Without php 5.6 support this could be just: 'return $this->object::JSON_LD_CONTEXT;' + // Without php 5.6 support this could be just: 'return $this->object::JSON_LD_CONTEXT;'. return $class::JSON_LD_CONTEXT; } } diff --git a/wp-content/plugins/activitypub/includes/activity/class-actor.php b/wp-content/plugins/activitypub/includes/activity/class-actor.php index 64631888..ddbef8ea 100644 --- a/wp-content/plugins/activitypub/includes/activity/class-actor.php +++ b/wp-content/plugins/activitypub/includes/activity/class-actor.php @@ -3,6 +3,8 @@ * Inspired by the PHP ActivityPub Library by @Landrok * * @link https://github.com/landrok/activitypub + * + * @package Activitypub */ namespace Activitypub\Activity; @@ -22,34 +24,34 @@ class Actor extends Base_Object { 'https://w3id.org/security/v1', 'https://purl.archive.org/socialweb/webfinger', array( - 'schema' => 'http://schema.org#', - 'toot' => 'http://joinmastodon.org/ns#', - 'webfinger' => 'https://webfinger.net/#', - 'lemmy' => 'https://join-lemmy.org/ns#', + 'schema' => 'http://schema.org#', + 'toot' => 'http://joinmastodon.org/ns#', + 'lemmy' => 'https://join-lemmy.org/ns#', 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', - 'PropertyValue' => 'schema:PropertyValue', - 'value' => 'schema:value', - 'Hashtag' => 'as:Hashtag', - 'featured' => array( - '@id' => 'toot:featured', + 'PropertyValue' => 'schema:PropertyValue', + 'value' => 'schema:value', + 'Hashtag' => 'as:Hashtag', + 'featured' => array( + '@id' => 'toot:featured', '@type' => '@id', ), - 'featuredTags' => array( - '@id' => 'toot:featuredTags', + 'featuredTags' => array( + '@id' => 'toot:featuredTags', '@type' => '@id', ), - 'moderators' => array( - '@id' => 'lemmy:moderators', + 'moderators' => array( + '@id' => 'lemmy:moderators', '@type' => '@id', ), - 'postingRestrictedToMods' => 'lemmy:postingRestrictedToMods', - 'discoverable' => 'toot:discoverable', - 'indexable' => 'toot:indexable', - 'resource' => 'webfinger:resource', + 'postingRestrictedToMods' => 'lemmy:postingRestrictedToMods', + 'discoverable' => 'toot:discoverable', + 'indexable' => 'toot:indexable', ), ); /** + * The type of the object. + * * @var string */ protected $type; @@ -171,4 +173,15 @@ class Actor extends Base_Object { * @var boolean */ protected $manually_approves_followers = false; + + /** + * Used to mark an object as containing sensitive content. + * Mastodon displays a content warning, requiring users to click + * through to view the content. + * + * @see https://docs.joinmastodon.org/spec/activitypub/#sensitive + * + * @var boolean + */ + protected $sensitive = null; } diff --git a/wp-content/plugins/activitypub/includes/activity/class-base-object.php b/wp-content/plugins/activitypub/includes/activity/class-base-object.php index 9a5cd3f8..ab765174 100644 --- a/wp-content/plugins/activitypub/includes/activity/class-base-object.php +++ b/wp-content/plugins/activitypub/includes/activity/class-base-object.php @@ -3,6 +3,8 @@ * Inspired by the PHP ActivityPub Library by @Landrok * * @link https://github.com/landrok/activitypub + * + * @package Activitypub */ namespace Activitypub\Activity; @@ -30,7 +32,8 @@ class Base_Object { const JSON_LD_CONTEXT = array( 'https://www.w3.org/ns/activitystreams', array( - 'Hashtag' => 'as:Hashtag', + 'Hashtag' => 'as:Hashtag', + 'sensitive' => 'as:sensitive', ), ); @@ -44,6 +47,8 @@ class Base_Object { protected $id; /** + * The type of the object. + * * @var string */ protected $type = 'Object'; @@ -428,7 +433,7 @@ class Base_Object { * * @see https://www.w3.org/TR/activitypub/#source-property * - * @var ObjectType + * @var array */ protected $source; @@ -446,12 +451,21 @@ class Base_Object { protected $replies; /** - * Magic function to implement getter and setter + * Used to mark an object as containing sensitive content. + * Mastodon displays a content warning, requiring users to click + * through to view the content. + * + * @see https://docs.joinmastodon.org/spec/activitypub/#sensitive + * + * @var boolean + */ + protected $sensitive = false; + + /** + * Magic function to implement getter and setter. * * @param string $method The method name. * @param string $params The method params. - * - * @return void */ public function __call( $method, $params ) { $var = \strtolower( \substr( $method, 4 ) ); @@ -563,9 +577,9 @@ class Base_Object { /** * Convert JSON input to an array. * - * @return string The JSON string. + * @param string $json The JSON string. * - * @return \Activitypub\Activity\Base_Object An Object built from the JSON string. + * @return Base_Object An Object built from the JSON string. */ public static function init_from_json( $json ) { $array = \json_decode( $json, true ); @@ -578,20 +592,20 @@ class Base_Object { } /** - * Convert JSON input to an array. + * Convert input array to a Base_Object. * - * @return string The object array. + * @param array $data The object array. * - * @return \Activitypub\Activity\Base_Object An Object built from the JSON string. + * @return Base_Object|WP_Error An Object built from the input array or WP_Error when it's not an array. */ - public static function init_from_array( $array ) { - if ( ! is_array( $array ) ) { + public static function init_from_array( $data ) { + if ( ! is_array( $data ) ) { return new WP_Error( 'invalid_array', __( 'Invalid array', 'activitypub' ), array( 'status' => 404 ) ); } $object = new static(); - foreach ( $array as $key => $value ) { + foreach ( $data as $key => $value ) { $key = camel_to_snake_case( $key ); call_user_func( array( $object, 'set_' . $key ), $value ); } @@ -613,10 +627,10 @@ class Base_Object { /** * Convert JSON input to an array and pre-fill the object. * - * @param array $array The array. + * @param array $data The array. */ - public function from_array( $array ) { - foreach ( $array as $key => $value ) { + public function from_array( $data ) { + foreach ( $data as $key => $value ) { if ( $value ) { $key = camel_to_snake_case( $key ); call_user_func( array( $this, 'set_' . $key ), $value ); @@ -639,12 +653,12 @@ class Base_Object { $vars = get_object_vars( $this ); foreach ( $vars as $key => $value ) { - // ignotre all _prefixed keys. + // Ignore all _prefixed keys. if ( '_' === substr( $key, 0, 1 ) ) { continue; } - // if value is empty, try to get it from a getter. + // If value is empty, try to get it from a getter. if ( ! $value ) { $value = call_user_func( array( $this, 'get_' . $key ) ); } @@ -653,7 +667,7 @@ class Base_Object { $value = $value->to_array( false ); } - // if value is still empty, ignore it for the array and continue. + // If value is still empty, ignore it for the array and continue. if ( isset( $value ) ) { $array[ snake_to_camel_case( $key ) ] = $value; } @@ -667,10 +681,28 @@ class Base_Object { $class = new ReflectionClass( $this ); $class = strtolower( $class->getShortName() ); + /** + * Filter the array of the ActivityPub object. + * + * @param array $array The array of the ActivityPub object. + * @param string $class The class of the ActivityPub object. + * @param int $id The ID of the ActivityPub object. + * @param Base_Object $object The ActivityPub object. + * + * @return array The filtered array of the ActivityPub object. + */ $array = \apply_filters( 'activitypub_activity_object_array', $array, $class, $this->id, $this ); - $array = \apply_filters( "activitypub_activity_{$class}_object_array", $array, $this->id, $this ); - return $array; + /** + * Filter the array of the ActivityPub object by class. + * + * @param array $array The array of the ActivityPub object. + * @param int $id The ID of the ActivityPub object. + * @param Base_Object $object The ActivityPub object. + * + * @return array The filtered array of the ActivityPub object. + */ + return \apply_filters( "activitypub_activity_{$class}_object_array", $array, $this->id, $this ); } /** @@ -684,11 +716,11 @@ class Base_Object { $array = $this->to_array( $include_json_ld_context ); $options = \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT; - /* - * Options to be passed to json_encode() - * - * @param int $options The current options flags - */ + /** + * Options to be passed to json_encode() + * + * @param int $options The current options flags. + */ $options = \apply_filters( 'activitypub_json_encode_options', $options ); return \wp_json_encode( $array, $options ); diff --git a/wp-content/plugins/activitypub/includes/activity/extended-object/class-event.php b/wp-content/plugins/activitypub/includes/activity/extended-object/class-event.php index b0adb84f..9ddb46ff 100644 --- a/wp-content/plugins/activitypub/includes/activity/extended-object/class-event.php +++ b/wp-content/plugins/activitypub/includes/activity/extended-object/class-event.php @@ -19,8 +19,8 @@ use Activitypub\Activity\Base_Object; class Event extends Base_Object { // Human friendly minimal context for full Mobilizon compatible ActivityPub events. const JSON_LD_CONTEXT = array( - 'https://schema.org/', // The base context is schema.org, cause it is used a lot. - 'https://www.w3.org/ns/activitystreams', // The ActivityStreams context overrides everyting also defined in schema.org. + 'https://schema.org/', // The base context is schema.org, because it is used a lot. + 'https://www.w3.org/ns/activitystreams', // The ActivityStreams context overrides everything also defined in schema.org. array( // The keys here override/extend the context even more. 'pt' => 'https://joinpeertube.org/ns#', 'mz' => 'https://joinmobilizon.org/ns#', @@ -51,6 +51,7 @@ class Event extends Base_Object { /** * Mobilizon compatible values for repliesModertaionOption. + * * @var array */ const REPLIES_MODERATION_OPTION_TYPES = array( 'allow_all', 'closed' ); @@ -58,10 +59,11 @@ class Event extends Base_Object { /** * Mobilizon compatible values for joinModeTypes. */ - const JOIN_MODE_TYPES = array( 'free', 'restricted', 'external' ); // and 'invite', but not used by mobilizon atm + const JOIN_MODE_TYPES = array( 'free', 'restricted', 'external' ); // and 'invite', but not used by mobilizon atm. /** * Allowed values for ical VEVENT STATUS. + * * @var array */ const ICAL_EVENT_STATUS_TYPES = array( 'TENTATIVE', 'CONFIRMED', 'CANCELLED' ); @@ -70,6 +72,7 @@ class Event extends Base_Object { * Default event categories. * * These values currently reflect the default set as proposed by Mobilizon to maximize interoperability. + * * @var array */ const DEFAULT_EVENT_CATEGORIES = array( @@ -106,8 +109,7 @@ class Event extends Base_Object { ); /** - * Event is an implementation of one of the - * Activity Streams + * Event is an implementation of one of the Activity Streams. * * @var string */ @@ -115,11 +117,13 @@ class Event extends Base_Object { /** * The Title of the event. + * + * @var string */ protected $name; /** - * The events contacts + * The events contacts. * * @context { * '@id' => 'mz:contacts', @@ -142,12 +146,16 @@ class Event extends Base_Object { protected $comments_enabled; /** + * Timezone of the event. + * * @context https://joinmobilizon.org/ns#timezone * @var string */ protected $timezone; /** + * Moderation option for replies. + * * @context https://joinmobilizon.org/ns#repliesModerationOption * @see https://docs.joinmobilizon.org/contribute/activity_pub/#repliesmoderation * @var string @@ -155,6 +163,8 @@ class Event extends Base_Object { protected $replies_moderation_option; /** + * Whether anonymous participation is enabled. + * * @context https://joinmobilizon.org/ns#anonymousParticipationEnabled * @see https://docs.joinmobilizon.org/contribute/activity_pub/#anonymousparticipationenabled * @var bool @@ -162,26 +172,34 @@ class Event extends Base_Object { protected $anonymous_participation_enabled; /** + * The event's category. + * * @context https://schema.org/category - * @var enum + * @var string */ protected $category; /** + * Language of the event. + * * @context https://schema.org/inLanguage - * @var + * @var string */ protected $in_language; /** + * Whether the event is online. + * * @context https://joinmobilizon.org/ns#isOnline * @var bool */ protected $is_online; /** + * The event's status. + * * @context https://www.w3.org/2002/12/cal/ical#status - * @var enum + * @var string */ protected $status; @@ -196,25 +214,33 @@ class Event extends Base_Object { protected $actor; /** + * The external participation URL. + * * @context https://joinmobilizon.org/ns#externalParticipationUrl * @var string */ protected $external_participation_url; /** + * Indicator of how new members may be able to join. + * * @context https://joinmobilizon.org/ns#joinMode * @see https://docs.joinmobilizon.org/contribute/activity_pub/#joinmode - * @var + * @var string */ protected $join_mode; /** + * The participant count of the event. + * * @context https://joinmobilizon.org/ns#participantCount * @var int */ protected $participant_count; /** + * How many places there can be for an event. + * * @context https://schema.org/maximumAttendeeCapacity * @see https://docs.joinmobilizon.org/contribute/activity_pub/#maximumattendeecapacity * @var int @@ -222,6 +248,8 @@ class Event extends Base_Object { protected $maximum_attendee_capacity; /** + * The number of attendee places for an event that remain unallocated. + * * @context https://schema.org/remainingAttendeeCapacity * @see https://docs.joinmobilizon.org/contribute/activity_pub/#remainignattendeecapacity * @var int @@ -234,6 +262,7 @@ class Event extends Base_Object { * The passed timezone is only set when it is a valid one, otherwise the site's timezone is used. * * @param string $timezone The timezone string to be set, e.g. 'Europe/Berlin'. + * @return Event */ public function set_timezone( $timezone ) { if ( in_array( $timezone, timezone_identifiers_list(), true ) ) { @@ -246,14 +275,16 @@ class Event extends Base_Object { } /** - * Custom setter for repliesModerationOption which also directy sets commentsEnabled accordingly. + * Custom setter for repliesModerationOption which also directly sets commentsEnabled accordingly. * - * @param string $type + * @param string $type The type of the replies moderation option. + * + * @return Event */ public function set_replies_moderation_option( $type ) { if ( in_array( $type, self::REPLIES_MODERATION_OPTION_TYPES, true ) ) { $this->replies_moderation_option = $type; - $this->comments_enabled = ( 'allow_all' === $type ) ? true : false; + $this->comments_enabled = ( 'allow_all' === $type ) ? true : false; } else { _doing_it_wrong( __METHOD__, @@ -268,11 +299,13 @@ class Event extends Base_Object { /** * Custom setter for commentsEnabled which also directly sets repliesModerationOption accordingly. * - * @param bool $comments_enabled + * @param bool $comments_enabled Whether comments are enabled. + * + * @return Event */ public function set_comments_enabled( $comments_enabled ) { if ( is_bool( $comments_enabled ) ) { - $this->comments_enabled = $comments_enabled; + $this->comments_enabled = $comments_enabled; $this->replies_moderation_option = $comments_enabled ? 'allow_all' : 'closed'; } else { _doing_it_wrong( @@ -288,7 +321,9 @@ class Event extends Base_Object { /** * Custom setter for the ical status that checks whether the status is an ical event status. * - * @param string $status + * @param string $status The status of the event. + * + * @return Event */ public function set_status( $status ) { if ( in_array( $status, self::ICAL_EVENT_STATUS_TYPES, true ) ) { @@ -309,8 +344,10 @@ class Event extends Base_Object { * * Falls back to Mobilizons default category. * - * @param string $category - * @param bool $mobilizon_compatibilty Whether the category must be compatibly with Mobilizon. + * @param string $category The category of the event. + * @param bool $mobilizon_compatibilty Optional. Whether the category must be compatibly with Mobilizon. Default true. + * + * @return Event */ public function set_category( $category, $mobilizon_compatibilty = true ) { if ( $mobilizon_compatibilty ) { @@ -327,12 +364,14 @@ class Event extends Base_Object { * * Automatically sets the joinMode to true if called. * - * @param string $url + * @param string $url The URL for external participation. + * + * @return Event */ public function set_external_participation_url( $url ) { if ( preg_match( '/^https?:\/\/.*/i', $url ) ) { $this->external_participation_url = $url; - $this->join_mode = 'external'; + $this->join_mode = 'external'; } return $this; diff --git a/wp-content/plugins/activitypub/includes/activity/extended-object/class-place.php b/wp-content/plugins/activitypub/includes/activity/extended-object/class-place.php index f84013df..8b66cdcd 100644 --- a/wp-content/plugins/activitypub/includes/activity/extended-object/class-place.php +++ b/wp-content/plugins/activitypub/includes/activity/extended-object/class-place.php @@ -63,22 +63,34 @@ class Place extends Base_Object { protected $longitude; /** + * The radius from the given latitude and longitude for a Place. + * * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-radius * @var float */ protected $radius; /** + * Specifies the measurement units for the `radius` and `altitude` properties. + * * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-units * @var string */ protected $units; /** - * @var Postal_Address|string + * The address of the place. + * + * @see https://schema.org/PostalAddress + * @var array|string */ protected $address; + /** + * Set the address of the place. + * + * @param array|string $address The address of the place. + */ public function set_address( $address ) { if ( is_string( $address ) || is_array( $address ) ) { $this->address = $address; diff --git a/wp-content/plugins/activitypub/includes/class-activity-dispatcher.php b/wp-content/plugins/activitypub/includes/class-activity-dispatcher.php index 32c91a7b..17281a33 100644 --- a/wp-content/plugins/activitypub/includes/class-activity-dispatcher.php +++ b/wp-content/plugins/activitypub/includes/class-activity-dispatcher.php @@ -1,22 +1,21 @@ set_id( $user->get_url() . '#update' ); $activity->set_type( 'Update' ); $activity->set_actor( $user->get_url() ); $activity->set_object( $user->get_url() ); $activity->set_to( 'https://www.w3.org/ns/activitystreams#Public' ); - // send the update + // Send the update. self::send_activity_to_followers( $activity, $user_id, $user ); } /** * Send an Activity to all followers and mentioned users. * - * @param Activity $activity The ActivityPub Activity. - * @param int $user_id The user ID. - * @param WP_User|WP_Post|WP_Comment $wp_object The WordPress object. - * - * @return void + * @param Activity $activity The ActivityPub Activity. + * @param int $user_id The user ID. + * @param \WP_User|WP_Post|WP_Comment $wp_object The WordPress object. */ private static function send_activity_to_followers( $activity, $user_id, $wp_object ) { - // check if the Activity should be send to the followers + /** + * Filter to prevent sending an Activity to followers. + * + * @param bool $send_activity_to_followers Whether to send the Activity to followers. + * @param Activity $activity The ActivityPub Activity. + * @param int $user_id The user ID. + * @param \WP_User|WP_Post|WP_Comment $wp_object The WordPress object. + */ if ( ! apply_filters( 'activitypub_send_activity_to_followers', true, $activity, $user_id, $wp_object ) ) { return; } - $follower_inboxes = Followers::get_inboxes( $user_id ); - - $mentioned_inboxes = array(); - $cc = $activity->get_cc(); - if ( $cc ) { - $mentioned_inboxes = Mention::get_inboxes( $cc ); - } - - $inboxes = array_merge( $follower_inboxes, $mentioned_inboxes ); + /** + * Filter to modify the Activity before sending it to followers. + * + * @param Activity $activity The ActivityPub Activity. + * @param int $user_id The user ID. + * @param \WP_User|WP_Post|WP_Comment $wp_object The WordPress object. + */ + $inboxes = apply_filters( 'activitypub_send_to_inboxes', array(), $user_id, $activity ); $inboxes = array_unique( $inboxes ); if ( empty( $inboxes ) ) { @@ -191,8 +191,6 @@ class Activity_Dispatcher { * * @param int $id The WordPress Post ID. * @param string $type The Activity-Type. - * - * @return void */ public static function send_post( $id, $type ) { $post = get_post( $id ); @@ -201,14 +199,20 @@ class Activity_Dispatcher { return; } + /** + * Action to send an Activity for a Post. + * + * @param WP_Post $post The WordPress Post. + * @param string $type The Activity-Type. + */ do_action( 'activitypub_send_activity', $post, $type ); - do_action( - sprintf( - 'activitypub_send_%s_activity', - \strtolower( $type ) - ), - $post - ); + + /** + * Action to send a specific Activity for a Post. + * + * @param WP_Post $post The WordPress Post. + */ + do_action( sprintf( 'activitypub_send_%s_activity', \strtolower( $type ) ), $post ); } /** @@ -216,8 +220,6 @@ class Activity_Dispatcher { * * @param int $id The WordPress Comment ID. * @param string $type The Activity-Type. - * - * @return void */ public static function send_comment( $id, $type ) { $comment = get_comment( $id ); @@ -226,13 +228,101 @@ class Activity_Dispatcher { return; } + /** + * Action to send an Activity for a Comment. + * + * @param WP_Comment $comment The WordPress Comment. + * @param string $type The Activity-Type. + */ do_action( 'activitypub_send_activity', $comment, $type ); - do_action( - sprintf( - 'activitypub_send_%s_activity', - \strtolower( $type ) - ), - $comment - ); + + /** + * Action to send a specific Activity for a Comment. + * + * @param WP_Comment $comment The WordPress Comment. + */ + do_action( sprintf( 'activitypub_send_%s_activity', \strtolower( $type ) ), $comment ); + } + + /** + * Default filter to add Inboxes of Followers. + * + * @param array $inboxes The list of Inboxes. + * @param int $user_id The WordPress User-ID. + * + * @return array The filtered Inboxes + */ + public static function add_inboxes_of_follower( $inboxes, $user_id ) { + $follower_inboxes = Followers::get_inboxes( $user_id ); + + return array_merge( $inboxes, $follower_inboxes ); + } + + /** + * Default filter to add Inboxes of Mentioned Actors + * + * @param array $inboxes The list of Inboxes. + * @param int $user_id The WordPress User-ID. + * @param array $activity The ActivityPub Activity. + * + * @return array The filtered Inboxes. + */ + public static function add_inboxes_by_mentioned_actors( $inboxes, $user_id, $activity ) { + $cc = $activity->get_cc(); + if ( $cc ) { + $mentioned_inboxes = Mention::get_inboxes( $cc ); + + return array_merge( $inboxes, $mentioned_inboxes ); + } + + return $inboxes; + } + + /** + * Default filter to add Inboxes of Posts that are set as `in-reply-to` + * + * @param array $inboxes The list of Inboxes. + * @param int $user_id The WordPress User-ID. + * @param array $activity The ActivityPub Activity. + * + * @return array The filtered Inboxes + */ + public static function add_inboxes_of_replied_urls( $inboxes, $user_id, $activity ) { + $in_reply_to = $activity->get_in_reply_to(); + + if ( ! $in_reply_to ) { + return $inboxes; + } + + if ( ! is_array( $in_reply_to ) ) { + $in_reply_to = array( $in_reply_to ); + } + + foreach ( $in_reply_to as $url ) { + $object = Http::get_remote_object( $url ); + + if ( + ! $object || + \is_wp_error( $object ) || + empty( $object['attributedTo'] ) + ) { + continue; + } + + $actor = object_to_uri( $object['attributedTo'] ); + $actor = Http::get_remote_object( $actor ); + + if ( ! $actor || \is_wp_error( $actor ) ) { + continue; + } + + if ( ! empty( $actor['endpoints']['sharedInbox'] ) ) { + $inboxes[] = $actor['endpoints']['sharedInbox']; + } elseif ( ! empty( $actor['inbox'] ) ) { + $inboxes[] = $actor['inbox']; + } + } + + return $inboxes; } } diff --git a/wp-content/plugins/activitypub/includes/class-activitypub.php b/wp-content/plugins/activitypub/includes/class-activitypub.php index 9e5796e9..c85a5fb1 100644 --- a/wp-content/plugins/activitypub/includes/class-activitypub.php +++ b/wp-content/plugins/activitypub/includes/class-activitypub.php @@ -1,20 +1,18 @@ ; rel="alternate"; type="application/activity+json"' ); + } + + add_action( + 'wp_head', + function () use ( $self_link ) { + echo PHP_EOL . '' . PHP_EOL; + } + ); + } + /** * Custom redirects for ActivityPub requests. * * @return void */ public static function template_redirect() { + self::add_headers(); + $comment_id = get_query_var( 'c', null ); - // check if it seems to be a comment + // Check if it seems to be a comment. if ( ! $comment_id ) { return; } $comment = get_comment( $comment_id ); - // load a 404 page if `c` is set but not valid + // Load a 404 page if `c` is set but not valid. if ( ! $comment ) { global $wp_query; $wp_query->set_404(); return; } - // stop if it's not an ActivityPub comment + // Stop if it's not an ActivityPub comment. if ( is_activitypub_request() && ! is_local_comment( $comment ) ) { return; } @@ -164,6 +209,10 @@ class Activitypub { /** * Add the 'activitypub' query variable so WordPress won't mangle it. + * + * @param array $vars The query variables. + * + * @return array The query variables. */ public static function add_query_vars( $vars ) { $vars[] = 'activitypub'; @@ -226,9 +275,9 @@ class Activitypub { /** * Function to retrieve Avatar URL if stored in meta. * - * @param int|WP_Comment $comment + * @param int|\WP_Comment $comment The comment ID or object. * - * @return string $url + * @return string The Avatar URL. */ public static function get_avatar_url( $comment ) { if ( \is_numeric( $comment ) ) { @@ -241,8 +290,6 @@ class Activitypub { * Store permalink in meta, to send delete Activity. * * @param string $post_id The Post ID. - * - * @return void */ public static function trash_post( $post_id ) { \add_post_meta( @@ -254,22 +301,22 @@ class Activitypub { } /** - * Delete permalink from meta + * Delete permalink from meta. * - * @param string $post_id The Post ID - * - * @return void + * @param string $post_id The Post ID. */ public static function untrash_post( $post_id ) { \delete_post_meta( $post_id, 'activitypub_canonical_url' ); } /** - * Add rewrite rules + * Add rewrite rules. */ public static function add_rewrite_rules() { - // If another system needs to take precedence over the ActivityPub rewrite rules, - // they can define their own and will manually call the appropriate functions as required. + /* + * If another system needs to take precedence over the ActivityPub rewrite rules, + * they can define their own and will manually call the appropriate functions as required. + */ if ( ACTIVITYPUB_DISABLE_REWRITES ) { return; } @@ -305,7 +352,7 @@ class Activitypub { } /** - * Flush rewrite rules; + * Flush rewrite rules. */ public static function flush_rewrite_rules() { self::add_rewrite_rules(); @@ -313,37 +360,19 @@ class Activitypub { } /** - * Theme compatibility stuff - * - * @return void + * Adds metabox on wp-admin/tools.php. + */ + public static function tool_box() { + if ( \current_user_can( 'edit_posts' ) ) { + \load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/toolbox.php' ); + } + } + + /** + * Theme compatibility stuff. */ public static function theme_compat() { - $site_icon = get_theme_support( 'custom-logo' ); - - if ( ! $site_icon ) { - // custom logo support - add_theme_support( - 'custom-logo', - array( - 'height' => 80, - 'width' => 80, - ) - ); - } - - $custom_header = get_theme_support( 'custom-header' ); - - if ( ! $custom_header ) { - // This theme supports a custom header - $custom_header_args = array( - 'width' => 1250, - 'height' => 600, - 'header-text' => true, - ); - add_theme_support( 'custom-header', $custom_header_args ); - } - - // We assume that you want to use Post-Formats when enabling the setting + // We assume that you want to use Post-Formats when enabling the setting. if ( 'wordpress-post-format' === \get_option( 'activitypub_object_type', ACTIVITYPUB_DEFAULT_OBJECT_TYPE ) ) { if ( ! get_theme_support( 'post-formats' ) ) { // Add support for the Aside, Gallery Post Formats... @@ -362,11 +391,9 @@ class Activitypub { } /** - * Display plugin upgrade notice to users + * Display plugin upgrade notice to users. * - * @param array $data The plugin data - * - * @return void + * @param array $data The plugin data. */ public static function plugin_update_message( $data ) { if ( ! isset( $data['upgrade_notice'] ) ) { @@ -388,9 +415,7 @@ class Activitypub { } /** - * Register the "Followers" Taxonomy - * - * @return void + * Register the "Followers" Taxonomy. */ private static function register_post_types() { \register_post_type( @@ -460,44 +485,43 @@ class Activitypub { ) ); - \register_post_type( - 'ap_extrafield', - array( - 'labels' => array( - 'name' => _x( 'Extra fields', 'post_type plural name', 'activitypub' ), - 'singular_name' => _x( 'Extra field', 'post_type single name', 'activitypub' ), - 'add_new' => __( 'Add new', 'activitypub' ), - 'add_new_item' => __( 'Add new extra field', 'activitypub' ), - 'new_item' => __( 'New extra field', 'activitypub' ), - 'edit_item' => __( 'Edit extra field', 'activitypub' ), - 'view_item' => __( 'View extra field', 'activitypub' ), - 'all_items' => __( 'All extra fields', 'activitypub' ), - ), - 'public' => false, - 'hierarchical' => false, - 'query_var' => false, - 'has_archive' => false, - 'publicly_queryable' => false, - 'show_in_menu' => false, - 'delete_with_user' => true, - 'can_export' => true, - 'exclude_from_search' => true, - 'show_in_rest' => true, - 'map_meta_cap' => true, - 'show_ui' => true, - 'supports' => array( 'title', 'editor' ), - ) + // Both User and Blog Extra Fields types have the same args. + $args = array( + 'labels' => array( + 'name' => _x( 'Extra fields', 'post_type plural name', 'activitypub' ), + 'singular_name' => _x( 'Extra field', 'post_type single name', 'activitypub' ), + 'add_new' => __( 'Add new', 'activitypub' ), + 'add_new_item' => __( 'Add new extra field', 'activitypub' ), + 'new_item' => __( 'New extra field', 'activitypub' ), + 'edit_item' => __( 'Edit extra field', 'activitypub' ), + 'view_item' => __( 'View extra field', 'activitypub' ), + 'all_items' => __( 'All extra fields', 'activitypub' ), + ), + 'public' => false, + 'hierarchical' => false, + 'query_var' => false, + 'has_archive' => false, + 'publicly_queryable' => false, + 'show_in_menu' => false, + 'delete_with_user' => true, + 'can_export' => true, + 'exclude_from_search' => true, + 'show_in_rest' => true, + 'map_meta_cap' => true, + 'show_ui' => true, + 'supports' => array( 'title', 'editor', 'page-attributes' ), ); + \register_post_type( Extra_Fields::USER_POST_TYPE, $args ); + \register_post_type( Extra_Fields::BLOG_POST_TYPE, $args ); + \do_action( 'activitypub_after_register_post_type' ); } /** * Add the 'activitypub' capability to users who can publish posts. * - * @param int $user_id User ID. - * - * @param array $userdata The raw array of data passed to wp_insert_user(). + * @param int $user_id User ID. */ public static function user_register( $user_id ) { if ( \user_can( $user_id, 'publish_posts' ) ) { @@ -505,57 +529,4 @@ class Activitypub { $user->add_cap( 'activitypub' ); } } - - /** - * Add default extra fields to an actor. - * - * @param array $extra_fields The extra fields. - * @param int $user_id The User-ID. - * - * @return array The extra fields. - */ - public static function default_actor_extra_fields( $extra_fields, $user_id ) { - if ( $extra_fields || ! $user_id ) { - return $extra_fields; - } - - $already_migrated = \get_user_meta( $user_id, 'activitypub_default_extra_fields', true ); - - if ( $already_migrated ) { - return $extra_fields; - } - - $defaults = array( - \__( 'Blog', 'activitypub' ) => \home_url( '/' ), - \__( 'Profile', 'activitypub' ) => \get_author_posts_url( $user_id ), - \__( 'Homepage', 'activitypub' ) => \get_the_author_meta( 'user_url', $user_id ), - ); - - foreach ( $defaults as $title => $url ) { - if ( ! $url ) { - continue; - } - - $extra_field = array( - 'post_type' => 'ap_extrafield', - 'post_title' => $title, - 'post_status' => 'publish', - 'post_author' => $user_id, - 'post_content' => sprintf( - '

%s

', - \esc_attr( $url ), - $url, - \wp_parse_url( $url, \PHP_URL_HOST ) - ), - 'comment_status' => 'closed', - ); - - $extra_field_id = wp_insert_post( $extra_field ); - $extra_fields[] = get_post( $extra_field_id ); - } - - \update_user_meta( $user_id, 'activitypub_default_extra_fields', true ); - - return $extra_fields; - } } diff --git a/wp-content/plugins/activitypub/includes/class-admin.php b/wp-content/plugins/activitypub/includes/class-admin.php index de24daf3..2d1d86cd 100644 --- a/wp-content/plugins/activitypub/includes/class-admin.php +++ b/wp-content/plugins/activitypub/includes/class-admin.php @@ -1,25 +1,25 @@ id ) && 'edit-ap_extrafield' === $current_screen->id ) { + if ( ! $current_screen ) { + return; + } + if ( 'edit' === $current_screen->base && Extra_Fields::is_extra_fields_post_type( $current_screen->post_type ) ) { ?>
- +
@@ -116,7 +136,7 @@ class Admin { } /** - * Load settings page + * Load settings page. */ public static function settings_page() { // phpcs:ignore WordPress.Security.NonceVerification.Recommended @@ -131,8 +151,14 @@ class Admin { case 'settings': \load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/settings.php' ); break; + case 'blog-profile': + wp_enqueue_media(); + wp_enqueue_script( 'activitypub-header-image' ); + + \load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/blog-settings.php' ); + break; case 'followers': - \load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/blog-user-followers-list.php' ); + \load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/blog-followers-list.php' ); break; case 'welcome': default: @@ -149,7 +175,7 @@ class Admin { * Load user settings page */ public static function followers_list_page() { - // user has to be able to publish posts + // User has to be able to publish posts. if ( ! is_user_disabled( get_current_user_id() ) ) { \load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/user-followers-list.php' ); } @@ -163,8 +189,8 @@ class Admin { 'activitypub', 'activitypub_post_content_type', array( - 'type' => 'string', - 'description' => \__( 'Use title and link, summary, full or custom content', 'activitypub' ), + 'type' => 'string', + 'description' => \__( 'Use title and link, summary, full or custom content', 'activitypub' ), 'show_in_rest' => array( 'schema' => array( 'enum' => array( @@ -174,34 +200,34 @@ class Admin { ), ), ), - 'default' => 'content', + 'default' => 'content', ) ); \register_setting( 'activitypub', 'activitypub_custom_post_content', array( - 'type' => 'string', - 'description' => \__( 'Define your own custom post template', 'activitypub' ), + 'type' => 'string', + 'description' => \__( 'Define your own custom post template', 'activitypub' ), 'show_in_rest' => true, - 'default' => ACTIVITYPUB_CUSTOM_POST_CONTENT, + 'default' => ACTIVITYPUB_CUSTOM_POST_CONTENT, ) ); \register_setting( 'activitypub', 'activitypub_max_image_attachments', array( - 'type' => 'integer', + 'type' => 'integer', 'description' => \__( 'Number of images to attach to posts.', 'activitypub' ), - 'default' => ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS, + 'default' => ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS, ) ); \register_setting( 'activitypub', 'activitypub_object_type', array( - 'type' => 'string', - 'description' => \__( 'The Activity-Object-Type', 'activitypub' ), + 'type' => 'string', + 'description' => \__( 'The Activity-Object-Type', 'activitypub' ), 'show_in_rest' => array( 'schema' => array( 'enum' => array( @@ -210,16 +236,25 @@ class Admin { ), ), ), - 'default' => 'note', + 'default' => 'note', ) ); \register_setting( 'activitypub', 'activitypub_use_hashtags', array( - 'type' => 'boolean', + 'type' => 'boolean', 'description' => \__( 'Add hashtags in the content as native tags and replace the #tag with the tag-link', 'activitypub' ), - 'default' => '0', + 'default' => '0', + ) + ); + \register_setting( + 'activitypub', + 'activitypub_use_opengraph', + array( + 'type' => 'boolean', + 'description' => \__( 'Automatically add "fediverse:creator" OpenGraph tags for Authors and the Blog-User.', 'activitypub' ), + 'default' => '1', ) ); \register_setting( @@ -234,14 +269,44 @@ class Admin { ); \register_setting( 'activitypub', - 'activitypub_blog_user_identifier', + 'activitypub_enable_users', + array( + 'type' => 'boolean', + 'description' => \__( 'Every Author on this Blog (with the publish_posts capability) gets his own ActivityPub enabled Profile.', 'activitypub' ), + 'default' => '1', + ) + ); + \register_setting( + 'activitypub', + 'activitypub_enable_blog_user', + array( + 'type' => 'boolean', + 'description' => \__( 'Your Blog becomes an ActivityPub compatible Profile.', 'activitypub' ), + 'default' => '0', + ) + ); + + // Blog-User Settings. + \register_setting( + 'activitypub_blog', + 'activitypub_blog_description', + array( + 'type' => 'string', + 'description' => \esc_html__( 'The Description of the Blog-User', 'activitypub' ), + 'show_in_rest' => true, + 'default' => '', + ) + ); + \register_setting( + 'activitypub_blog', + 'activitypub_blog_identifier', array( 'type' => 'string', 'description' => \esc_html__( 'The Identifier of the Blog-User', 'activitypub' ), 'show_in_rest' => true, 'default' => Blog::get_default_username(), 'sanitize_callback' => function ( $value ) { - // hack to allow dots in the username + // Hack to allow dots in the username. $parts = explode( '.', $value ); $sanitized = array(); @@ -251,7 +316,7 @@ class Admin { $sanitized = implode( '.', $sanitized ); - // check for login or nicename. + // Check for login or nicename. $user = new WP_User_Query( array( 'search' => $sanitized, @@ -264,8 +329,8 @@ class Admin { if ( $user->results ) { add_settings_error( - 'activitypub_blog_user_identifier', - 'activitypub_blog_user_identifier', + 'activitypub_blog_identifier', + 'activitypub_blog_identifier', \esc_html__( 'You cannot use an existing author\'s name for the blog profile ID.', 'activitypub' ), 'error' ); @@ -278,35 +343,40 @@ class Admin { ) ); \register_setting( - 'activitypub', - 'activitypub_enable_users', + 'activitypub_blog', + 'activitypub_header_image', array( - 'type' => 'boolean', - 'description' => \__( 'Every Author on this Blog (with the publish_posts capability) gets his own ActivityPub enabled Profile.', 'activitypub' ), - 'default' => '1', - ) - ); - \register_setting( - 'activitypub', - 'activitypub_enable_blog_user', - array( - 'type' => 'boolean', - 'description' => \__( 'Your Blog becomes an ActivityPub compatible Profile.', 'activitypub' ), - 'default' => '0', + 'type' => 'integer', + 'description' => \__( 'The Attachment-ID of the Sites Header-Image', 'activitypub' ), + 'default' => null, ) ); } + /** + * Adds the ActivityPub settings to the Help tab. + */ public static function add_settings_help_tab() { require_once ACTIVITYPUB_PLUGIN_DIR . 'includes/help.php'; } + /** + * Adds the follower list to the Help tab. + */ public static function add_followers_list_help_tab() { - // todo + // todo. } + /** + * Add the profile. + * + * @param \WP_User $user The user object. + */ public static function add_profile( $user ) { - $description = get_user_meta( $user->ID, 'activitypub_user_description', true ); + $description = \get_user_option( 'activitypub_description', $user->ID ); + + wp_enqueue_media(); + wp_enqueue_script( 'activitypub-header-image' ); \load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/user-settings.php', @@ -317,40 +387,97 @@ class Admin { ); } - public static function save_user_description( $user_id ) { + /** + * Save the user settings. + * + * Handles the saving of the ActivityPub settings. + * + * @param int $user_id The user ID. + */ + public static function save_user_settings( $user_id ) { if ( ! isset( $_REQUEST['_apnonce'] ) ) { - return false; + return; } + $nonce = sanitize_text_field( wp_unslash( $_REQUEST['_apnonce'] ) ); if ( - ! wp_verify_nonce( $nonce, 'activitypub-user-description' ) || + ! wp_verify_nonce( $nonce, 'activitypub-user-settings' ) || ! current_user_can( 'edit_user', $user_id ) ) { - return false; + return; } - $description = ! empty( $_POST['activitypub-user-description'] ) ? sanitize_text_field( wp_unslash( $_POST['activitypub-user-description'] ) ) : false; + + $description = ! empty( $_POST['activitypub_description'] ) ? sanitize_textarea_field( wp_unslash( $_POST['activitypub_description'] ) ) : false; if ( $description ) { - update_user_meta( $user_id, 'activitypub_user_description', $description ); - } - } - - public static function enqueue_scripts( $hook_suffix ) { - if ( false !== strpos( $hook_suffix, 'activitypub' ) ) { - wp_enqueue_style( 'activitypub-admin-styles', plugins_url( 'assets/css/activitypub-admin.css', ACTIVITYPUB_PLUGIN_FILE ), array(), get_plugin_version() ); - wp_enqueue_script( 'activitypub-admin-script', plugins_url( 'assets/js/activitypub-admin.js', ACTIVITYPUB_PLUGIN_FILE ), array( 'jquery' ), get_plugin_version(), false ); + \update_user_option( $user_id, 'activitypub_description', $description ); + } else { + \delete_user_option( $user_id, 'activitypub_description' ); } - if ( 'index.php' === $hook_suffix ) { - wp_enqueue_style( 'activitypub-admin-styles', plugins_url( 'assets/css/activitypub-admin.css', ACTIVITYPUB_PLUGIN_FILE ), array(), get_plugin_version() ); + $header_image = ! empty( $_POST['activitypub_header_image'] ) ? sanitize_text_field( wp_unslash( $_POST['activitypub_header_image'] ) ) : false; + if ( $header_image && \wp_attachment_is_image( $header_image ) ) { + \update_user_option( $user_id, 'activitypub_header_image', $header_image ); + } else { + \delete_user_option( $user_id, 'activitypub_header_image' ); } } /** - * Hook into the edit_comment functionality + * Enqueue the admin scripts and styles. * - * * Disable the edit_comment capability for federated comments. + * @param string $hook_suffix The current page. + */ + public static function enqueue_scripts( $hook_suffix ) { + wp_register_script( + 'activitypub-header-image', + plugins_url( + 'assets/js/activitypub-header-image.js', + ACTIVITYPUB_PLUGIN_FILE + ), + array( 'jquery' ), + get_plugin_version(), + false + ); + + if ( false !== strpos( $hook_suffix, 'activitypub' ) ) { + wp_enqueue_style( + 'activitypub-admin-styles', + plugins_url( + 'assets/css/activitypub-admin.css', + ACTIVITYPUB_PLUGIN_FILE + ), + array(), + get_plugin_version() + ); + wp_enqueue_script( + 'activitypub-admin-script', + plugins_url( + 'assets/js/activitypub-admin.js', + ACTIVITYPUB_PLUGIN_FILE + ), + array( 'jquery' ), + get_plugin_version(), + false + ); + } + + if ( 'index.php' === $hook_suffix ) { + wp_enqueue_style( + 'activitypub-admin-styles', + plugins_url( + 'assets/css/activitypub-admin.css', + ACTIVITYPUB_PLUGIN_FILE + ), + array(), + get_plugin_version() + ); + } + } + + /** + * Hook into the edit_comment functionality. * - * @return void + * Disables the edit_comment capability for federated comments. */ public static function edit_comment() { // Disable the edit_comment capability for federated comments. @@ -372,6 +499,11 @@ class Admin { ); } + /** + * Hook into the edit_post functionality. + * + * Disables the edit_post capability for federated posts. + */ public static function edit_post() { // Disable the edit_post capability for federated posts. \add_filter( @@ -383,7 +515,7 @@ class Admin { $post = get_post( $arg[2] ); - if ( 'ap_extrafield' !== $post->post_type ) { + if ( ! Extra_Fields::is_extra_field_post_type( $post->post_type ) ) { return $allcaps; } @@ -399,9 +531,7 @@ class Admin { } /** - * Add ActivityPub specific actions/filters to the post list view - * - * @return void + * Add ActivityPub specific actions/filters to the post list view. */ public static function list_posts() { // Show only the user's extra fields. @@ -420,20 +550,23 @@ class Admin { add_filter( "views_{$screen_id}", function ( $views ) { - if ( 'ap_extrafield' === get_post_type() ) { + if ( Extra_Fields::is_extra_fields_post_type( get_current_screen()->post_type ) ) { return array(); } return $views; } ); - - // Set defaults for new extra fields. - if ( 'edit-ap_extrafield' === $screen_id ) { - Activitypub::default_actor_extra_fields( array(), get_current_user_id() ); - } } + /** + * Comment row actions. + * + * @param array $actions The existing actions. + * @param int|\WP_Comment $comment The comment object or ID. + * + * @return array The modified actions. + */ public static function comment_row_actions( $actions, $comment ) { if ( was_comment_received( $comment ) ) { unset( $actions['edit'] ); @@ -444,7 +577,7 @@ class Admin { } /** - * Add a column "activitypub" + * Add a column "activitypub". * * This column shows if the user has the capability to use ActivityPub. * @@ -458,9 +591,11 @@ class Admin { } /** - * Add "comment-type" and "protocol" as column in WP-Admin + * Add "comment-type" and "protocol" as column in WP-Admin. * - * @param array $columns the list of column names + * @param array $columns The list of column names. + * + * @return array The extended list of column names. */ public static function manage_comment_columns( $columns ) { $columns['comment_type'] = esc_attr__( 'Comment-Type', 'activitypub' ); @@ -470,13 +605,15 @@ class Admin { } /** - * Add "post_content" as column for Extra-Fields in WP-Admin + * Add "post_content" as column for Extra-Fields in WP-Admin. * - * @param array $columns Tthe list of column names. + * @param array $columns The list of column names. * @param string $post_type The post type. + * + * @return array The extended list of column names. */ public static function manage_post_columns( $columns, $post_type ) { - if ( 'ap_extrafield' === $post_type ) { + if ( Extra_Fields::is_extra_fields_post_type( $post_type ) ) { $after_key = 'title'; $index = array_search( $after_key, array_keys( $columns ), true ); $columns = array_slice( $columns, 0, $index + 1 ) + array( 'extra_field_content' => esc_attr__( 'Content', 'activitypub' ) ) + $columns; @@ -486,10 +623,10 @@ class Admin { } /** - * Add "comment-type" and "protocol" as column in WP-Admin + * Add "comment-type" and "protocol" as column in WP-Admin. * - * @param array $column The column to implement - * @param int $comment_id The comment id + * @param array $column The column to implement. + * @param int $comment_id The comment id. */ public static function manage_comments_custom_column( $column, $comment_id ) { if ( 'comment_type' === $column && ! defined( 'WEBMENTION_PLUGIN_DIR' ) ) { @@ -527,7 +664,7 @@ class Admin { } /** - * Add a column "extra_field_content" to the post list view + * Add a column "extra_field_content" to the post list view. * * @param string $column_name The column name. * @param int $post_id The post ID. @@ -535,32 +672,30 @@ class Admin { * @return void */ public static function manage_posts_custom_column( $column_name, $post_id ) { - $post = get_post( $post_id ); - if ( 'extra_field_content' === $column_name ) { $post = get_post( $post_id ); - if ( 'ap_extrafield' === $post->post_type ) { + if ( Extra_Fields::is_extra_fields_post_type( $post->post_type ) ) { echo esc_attr( wp_strip_all_tags( $post->post_content ) ); } } } /** - * Add options to the Bulk dropdown on the users page + * Add options to the Bulk dropdown on the users page. * * @param array $actions The existing bulk options. * * @return array The extended bulk options. */ public static function user_bulk_options( $actions ) { - $actions['add_activitypub_cap'] = __( 'Enable for ActivityPub', 'activitypub' ); + $actions['add_activitypub_cap'] = __( 'Enable for ActivityPub', 'activitypub' ); $actions['remove_activitypub_cap'] = __( 'Disable for ActivityPub', 'activitypub' ); return $actions; } /** - * Handle bulk activitypub requests + * Handle bulk activitypub requests. * * * `add_activitypub_cap` - Add the activitypub capability to the selected users. * * `remove_activitypub_cap` - Remove the activitypub capability from the selected users. @@ -595,7 +730,7 @@ class Admin { } /** - * Add ActivityPub infos to the dashboard glance items + * Add ActivityPub infos to the dashboard glance items. * * @param array $items The existing glance items. * @@ -606,7 +741,7 @@ class Admin { if ( ! is_user_disabled( get_current_user_id() ) ) { $follower_count = sprintf( - // translators: %s: number of followers + // translators: %s: number of followers. _n( '%s Follower', '%s Followers', @@ -625,7 +760,7 @@ class Admin { if ( ! is_user_type_disabled( 'blog' ) && current_user_can( 'manage_options' ) ) { $follower_count = sprintf( - // translators: %s: number of followers + // translators: %s: number of followers. _n( '%s Follower (Blog)', '%s Followers (Blog)', @@ -642,7 +777,7 @@ class Admin { ); } - \remove_filter( 'number_format_i18n', '\Activitypub\custom_large_numbers', 10, 3 ); + \remove_filter( 'number_format_i18n', '\Activitypub\custom_large_numbers' ); return $items; } diff --git a/wp-content/plugins/activitypub/includes/class-blocks.php b/wp-content/plugins/activitypub/includes/class-blocks.php index 660dcce0..c42d2fc6 100644 --- a/wp-content/plugins/activitypub/includes/class-blocks.php +++ b/wp-content/plugins/activitypub/includes/class-blocks.php @@ -1,36 +1,105 @@ true, + 'single' => true, + 'type' => 'string', + 'sanitize_callback' => 'sanitize_text_field', + ) + ); + } + } + + /** + * Enqueue the block editor assets. + */ + public static function enqueue_editor_assets() { + // Check for our supported post types. + $current_screen = \get_current_screen(); + $ap_post_types = \get_post_types_by_support( 'activitypub' ); + if ( ! $current_screen || ! in_array( $current_screen->post_type, $ap_post_types, true ) ) { + return; + } + $asset_data = include ACTIVITYPUB_PLUGIN_DIR . 'build/editor-plugin/plugin.asset.php'; + $plugin_url = plugins_url( 'build/editor-plugin/plugin.js', ACTIVITYPUB_PLUGIN_FILE ); + wp_enqueue_script( 'activitypub-block-editor', $plugin_url, $asset_data['dependencies'], $asset_data['version'], true ); + } + + /** + * Enqueue the reply handle script if the in_reply_to GET param is set. + */ + public static function handle_in_reply_to_get_param() { + // Only load the script if the in_reply_to GET param is set, action happens there, not here. + // phpcs:ignore WordPress.Security.NonceVerification.Recommended + if ( ! isset( $_GET['in_reply_to'] ) ) { + return; + } + + $asset_data = include ACTIVITYPUB_PLUGIN_DIR . 'build/reply-intent/plugin.asset.php'; + $plugin_url = plugins_url( 'build/reply-intent/plugin.js', ACTIVITYPUB_PLUGIN_FILE ); + wp_enqueue_script( 'activitypub-reply-intent', $plugin_url, $asset_data['dependencies'], $asset_data['version'], true ); + } + + /** + * Add data to the block editor. + */ public static function add_data() { - $context = is_admin() ? 'editor' : 'view'; + $context = is_admin() ? 'editor' : 'view'; $followers_handle = 'activitypub-followers-' . $context . '-script'; $follow_me_handle = 'activitypub-follow-me-' . $context . '-script'; - $data = array( + $data = array( 'namespace' => ACTIVITYPUB_REST_NAMESPACE, - 'enabled' => array( - 'site' => ! is_user_type_disabled( 'blog' ), + 'enabled' => array( + 'site' => ! is_user_type_disabled( 'blog' ), 'users' => ! is_user_type_disabled( 'user' ), ), ); - $js = sprintf( 'var _activityPubOptions = %s;', wp_json_encode( $data ) ); + $js = sprintf( 'var _activityPubOptions = %s;', wp_json_encode( $data ) ); \wp_add_inline_script( $followers_handle, $js, 'before' ); \wp_add_inline_script( $follow_me_handle, $js, 'before' ); } + /** + * Register the blocks. + */ public static function register_blocks() { \register_block_type_from_metadata( ACTIVITYPUB_PLUGIN_DIR . '/build/followers', @@ -44,45 +113,100 @@ class Blocks { 'render_callback' => array( self::class, 'render_follow_me_block' ), ) ); + \register_block_type_from_metadata( + ACTIVITYPUB_PLUGIN_DIR . '/build/reply', + array( + 'render_callback' => array( self::class, 'render_reply_block' ), + ) + ); } + /** + * Get the user ID from a user string. + * + * @param string $user_string The user string. Can be a user ID, 'site', or 'inherit'. + * @return int|null The user ID, or null if the 'inherit' string is not supported in this context. + */ private static function get_user_id( $user_string ) { if ( is_numeric( $user_string ) ) { return absint( $user_string ); } - // any other non-numeric falls back to 0, including the `site` string used in the UI - return 0; + + // If the user string is 'site', return the Blog User ID. + if ( 'site' === $user_string ) { + return User_Collection::BLOG_USER_ID; + } + + // The only other value should be 'inherit', which means to use the query context to determine the User. + if ( 'inherit' !== $user_string ) { + return null; + } + + // For a homepage/front page, if the Blog User is active, use it. + if ( ( is_front_page() || is_home() ) && ! is_user_type_disabled( 'blog' ) ) { + return User_Collection::BLOG_USER_ID; + } + + // If we're in a loop, use the post author. + $author_id = get_the_author_meta( 'ID' ); + if ( $author_id ) { + return $author_id; + } + + // For other pages, the queried object will clue us in. + $queried_object = get_queried_object(); + if ( ! $queried_object ) { + return null; + } + + // If we're on a user archive page, use that user's ID. + if ( is_a( $queried_object, 'WP_User' ) ) { + return $queried_object->ID; + } + + // For a single post, use the post author's ID. + if ( is_a( $queried_object, 'WP_Post' ) ) { + return get_the_author_meta( 'ID' ); + } + + // We won't properly account for some conditions, like tag archives. + return null; } /** * Filter an array by a list of keys. - * @param array $array The array to filter. + * + * @param array $data The array to filter. * @param array $keys The keys to keep. * @return array The filtered array. */ - protected static function filter_array_by_keys( $array, $keys ) { - return array_intersect_key( $array, array_flip( $keys ) ); + protected static function filter_array_by_keys( $data, $keys ) { + return array_intersect_key( $data, array_flip( $keys ) ); } /** * Render the follow me block. + * * @param array $attrs The block attributes. * @return string The HTML to render. */ public static function render_follow_me_block( $attrs ) { $user_id = self::get_user_id( $attrs['selectedUser'] ); - $user = User_Collection::get_by_id( $user_id ); - if ( ! is_wp_error( $user ) ) { - $attrs['profileData'] = self::filter_array_by_keys( - $user->to_array(), - array( 'icon', 'name', 'webfinger' ) - ); + $user = User_Collection::get_by_id( $user_id ); + if ( is_wp_error( $user ) ) { + if ( 'inherit' === $attrs['selectedUser'] ) { + // If the user is 'inherit' and we couldn't determine the user, don't render anything. + return ''; + } else { + // If the user is a specific ID and we couldn't find it, render an error message. + return ''; + } } - // add `@` prefix if it's missing - if ( '@' !== substr( $attrs['profileData']['webfinger'], 0, 1 ) ) { - $attrs['profileData']['webfinger'] = '@' . $attrs['profileData']['webfinger']; - } + $attrs['profileData'] = self::filter_array_by_keys( + $user->to_array(), + array( 'icon', 'name', 'webfinger' ) + ); $wrapper_attributes = get_block_wrapper_attributes( array( @@ -95,12 +219,28 @@ class Blocks { return '
'; } + /** + * Render the follower block. + * + * @param array $attrs The block attributes. + * + * @return string The HTML to render. + */ public static function render_follower_block( $attrs ) { $followee_user_id = self::get_user_id( $attrs['selectedUser'] ); - $per_page = absint( $attrs['per_page'] ); + if ( is_null( $followee_user_id ) ) { + return ''; + } + + $user = User_Collection::get_by_id( $followee_user_id ); + if ( is_wp_error( $user ) ) { + return ''; + } + + $per_page = absint( $attrs['per_page'] ); $follower_data = Followers::get_followers_with_count( $followee_user_id, $per_page ); - $attrs['followerData']['total'] = $follower_data['total']; + $attrs['followerData']['total'] = $follower_data['total']; $attrs['followerData']['followers'] = array_map( function ( $follower ) { return self::filter_array_by_keys( @@ -110,7 +250,7 @@ class Blocks { }, $follower_data['followers'] ); - $wrapper_attributes = get_block_wrapper_attributes( + $wrapper_attributes = get_block_wrapper_attributes( array( 'aria-label' => __( 'Fediverse Followers', 'activitypub' ), 'class' => 'activitypub-follower-block', @@ -131,9 +271,43 @@ class Blocks { return $html; } + /** + * Render the reply block. + * + * @param array $attrs The block attributes. + * + * @return string The HTML to render. + */ + public static function render_reply_block( $attrs ) { + /** + * Filter the reply block. + * + * @param string $html The HTML to render. + * @param array $attrs The block attributes. + */ + return apply_filters( + 'activitypub_reply_block', + sprintf( + '

%3$s

', + esc_url( $attrs['url'] ), + esc_attr__( 'This post is a response to the referenced content.', 'activitypub' ), + // translators: %s is the URL of the post being replied to. + sprintf( __( '↬%s', 'activitypub' ), \str_replace( array( 'https://', 'http://' ), '', $attrs['url'] ) ) + ), + $attrs + ); + } + + /** + * Render a follower. + * + * @param \Activitypub\Model\Follower $follower The follower to render. + * + * @return string The HTML to render. + */ public static function render_follower( $follower ) { $external_svg = ''; - $template = + $template = ' diff --git a/wp-content/plugins/activitypub/includes/class-cli.php b/wp-content/plugins/activitypub/includes/class-cli.php new file mode 100644 index 00000000..64b4b8ab --- /dev/null +++ b/wp-content/plugins/activitypub/includes/class-cli.php @@ -0,0 +1,201 @@ + $value ) { + WP_CLI::line( $key . ': ' . $value ); + } + } + + /** + * Remove the entire blog from the Fediverse. + * + * ## EXAMPLES + * + * $ wp activitypub self-destruct + * + * @param array|null $args The arguments. + * @param array|null $assoc_args The associative arguments. + * + * @return void + */ + public function self_destruct( $args, $assoc_args ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable + WP_CLI::warning( __( 'Self-Destructing is not implemented yet.', 'activitypub' ) ); + } + + /** + * Delete or Update a Post, Page, Custom Post Type or Attachment. + * + * ## OPTIONS + * + * + * : The action to perform. Either `delete` or `update`. + * --- + * options: + * - delete + * - update + * --- + * + * + * : The id of the Post, Page, Custom Post Type or Attachment. + * + * ## EXAMPLES + * + * $ wp activitypub post delete 1 + * + * @synopsis + * + * @param array|null $args The arguments. + */ + public function post( $args ) { + $post = get_post( $args[1] ); + + if ( ! $post ) { + WP_CLI::error( __( 'Post not found.', 'activitypub' ) ); + } + + switch ( $args[0] ) { + case 'delete': + // translators: %s is the ID of the post. + WP_CLI::confirm( sprintf( __( 'Do you really want to delete the (Custom) Post with the ID: %s', 'activitypub' ), $args[1] ) ); + Scheduler::schedule_post_activity( 'trash', 'publish', $args[1] ); + WP_CLI::success( __( '"Delete"-Activity is queued.', 'activitypub' ) ); + break; + case 'update': + Scheduler::schedule_post_activity( 'publish', 'publish', $args[1] ); + WP_CLI::success( __( '"Update"-Activity is queued.', 'activitypub' ) ); + break; + default: + WP_CLI::error( __( 'Unknown action.', 'activitypub' ) ); + } + } + + /** + * Delete or Update a Comment. + * + * ## OPTIONS + * + * + * : The action to perform. Either `delete` or `update`. + * --- + * options: + * - delete + * - update + * --- + * + * + * : The id of the Comment. + * + * ## EXAMPLES + * + * $ wp activitypub comment delete 1 + * + * @synopsis + * + * @param array|null $args The arguments. + */ + public function comment( $args ) { + $comment = get_comment( $args[1] ); + + if ( ! $comment ) { + WP_CLI::error( __( 'Comment not found.', 'activitypub' ) ); + } + + if ( was_comment_received( $comment ) ) { + WP_CLI::error( __( 'This comment was received via ActivityPub and cannot be deleted or updated.', 'activitypub' ) ); + } + + switch ( $args[0] ) { + case 'delete': + // translators: %s is the ID of the comment. + WP_CLI::confirm( sprintf( __( 'Do you really want to delete the Comment with the ID: %s', 'activitypub' ), $args[1] ) ); + Scheduler::schedule_comment_activity( 'trash', 'approved', $args[1] ); + WP_CLI::success( __( '"Delete"-Activity is queued.', 'activitypub' ) ); + break; + case 'update': + Scheduler::schedule_comment_activity( 'approved', 'approved', $args[1] ); + WP_CLI::success( __( '"Update"-Activity is queued.', 'activitypub' ) ); + break; + default: + WP_CLI::error( __( 'Unknown action.', 'activitypub' ) ); + } + } +} diff --git a/wp-content/plugins/activitypub/includes/class-comment.php b/wp-content/plugins/activitypub/includes/class-comment.php index bda7d0e5..525a3543 100644 --- a/wp-content/plugins/activitypub/includes/class-comment.php +++ b/wp-content/plugins/activitypub/includes/class-comment.php @@ -1,28 +1,35 @@ self::generate_id( $comment ), - 'commentId' => $comment->comment_ID, + 'commentId' => $comment->comment_ID, ); $div = sprintf( @@ -62,6 +69,7 @@ class Comment { /** * Create a link to reply to a federated comment. + * * This function adds a title attribute to the reply link to inform the user * that the comment was received from the fediverse and the reply will be sent * to the original author. @@ -73,7 +81,7 @@ class Comment { */ private static function create_fediverse_reply_link( $link, $args ) { $str_to_replace = sprintf( '>%s<', $args['reply_text'] ); - $replace_with = sprintf( + $replace_with = sprintf( ' title="%s">%s<', esc_attr__( 'This comment was received from the fediverse and your reply will be sent to the original author', 'activitypub' ), esc_html__( 'Reply with federation', 'activitypub' ) @@ -104,7 +112,7 @@ class Comment { } if ( is_single_user() && \user_can( $current_user, 'publish_posts' ) ) { - // On a single user site, comments by users with the `publish_posts` capability will be federated as the blog user + // On a single user site, comments by users with the `publish_posts` capability will be federated as the blog user. $current_user = Users::BLOG_USER_ID; } @@ -200,7 +208,7 @@ class Comment { * @return boolean True if the comment should be federated, false otherwise. */ public static function should_be_federated( $comment ) { - // we should not federate federated comments + // We should not federate federated comments. if ( self::was_received( $comment ) ) { return false; } @@ -208,29 +216,29 @@ class Comment { $comment = \get_comment( $comment ); $user_id = $comment->user_id; - // comments without user can't be federated + // Comments without user can't be federated. if ( ! $user_id ) { return false; } if ( is_single_user() && \user_can( $user_id, 'publish_posts' ) ) { - // On a single user site, comments by users with the `publish_posts` capability will be federated as the blog user + // On a single user site, comments by users with the `publish_posts` capability will be federated as the blog user. $user_id = Users::BLOG_USER_ID; } $is_user_disabled = is_user_disabled( $user_id ); - // user is disabled for federation + // User is disabled for federation. if ( $is_user_disabled ) { return false; } - // it is a comment to the post and can be federated + // It is a comment to the post and can be federated. if ( empty( $comment->comment_parent ) ) { return true; } - // check if parent comment is federated + // Check if parent comment is federated. $parent_comment = \get_comment( $comment->comment_parent ); return ! self::is_local( $parent_comment ); @@ -264,18 +272,18 @@ class Comment { /** * Verify if URL is a local comment, or if it is a previously received - * remote comment (For threading comments locally) + * remote comment (For threading comments locally). * * @param string $url The URL to check. * - * @return int comment_ID or null if not found + * @return string|null Comment ID or null if not found. */ public static function url_to_commentid( $url ) { if ( ! $url || ! filter_var( $url, \FILTER_VALIDATE_URL ) ) { return null; } - // check for local comment + // Check for local comment. if ( \wp_parse_url( \home_url(), \PHP_URL_HOST ) === \wp_parse_url( $url, \PHP_URL_HOST ) ) { $query = \wp_parse_url( $url, \PHP_URL_QUERY ); @@ -327,7 +335,7 @@ class Comment { * @return string[] An array of classes. */ public static function comment_class( $classes, $css_class, $comment_id ) { - // check if ActivityPub comment + // Check if ActivityPub comment. if ( 'activitypub' === get_comment_meta( $comment_id, 'protocol', true ) ) { $classes[] = 'activitypub-comment'; } @@ -335,11 +343,51 @@ class Comment { return $classes; } + /** + * Gets the public comment id via the WordPress comments meta. + * + * @param int $wp_comment_id The internal WordPress comment ID. + * @param bool $fallback Whether the code should fall back to `source_url` if `source_id` is not set. + * + * @return string|null The ActivityPub id/url of the comment. + */ + public static function get_source_id( $wp_comment_id, $fallback = true ) { + $comment_meta = \get_comment_meta( $wp_comment_id ); + + if ( ! empty( $comment_meta['source_id'][0] ) ) { + return $comment_meta['source_id'][0]; + } elseif ( ! empty( $comment_meta['source_url'][0] ) && $fallback ) { + return $comment_meta['source_url'][0]; + } + + return null; + } + + /** + * Gets the public comment url via the WordPress comments meta. + * + * @param int $wp_comment_id The internal WordPress comment ID. + * @param bool $fallback Whether the code should fall back to `source_id` if `source_url` is not set. + * + * @return string|null The ActivityPub id/url of the comment. + */ + public static function get_source_url( $wp_comment_id, $fallback = true ) { + $comment_meta = \get_comment_meta( $wp_comment_id ); + + if ( ! empty( $comment_meta['source_url'][0] ) ) { + return $comment_meta['source_url'][0]; + } elseif ( ! empty( $comment_meta['source_id'][0] ) && $fallback ) { + return $comment_meta['source_id'][0]; + } + + return null; + } + /** * Link remote comments to source url. * - * @param string $comment_link - * @param object|WP_Comment $comment + * @param string $comment_link The comment link. + * @param object|\WP_Comment $comment The comment object. * * @return string $url */ @@ -348,37 +396,30 @@ class Comment { return $comment_link; } - $comment_meta = \get_comment_meta( $comment->comment_ID ); + $public_comment_link = self::get_source_url( $comment->comment_ID ); - if ( ! empty( $comment_meta['source_url'][0] ) ) { - return $comment_meta['source_url'][0]; - } elseif ( ! empty( $comment_meta['source_id'][0] ) ) { - return $comment_meta['source_id'][0]; - } - - return $comment_link; + return $public_comment_link ?? $comment_link; } /** * Generates an ActivityPub URI for a comment * - * @param WP_Comment|int $comment A comment object or comment ID + * @param \WP_Comment|int $comment A comment object or comment ID. * * @return string ActivityPub URI for comment */ public static function generate_id( $comment ) { - $comment = \get_comment( $comment ); - $comment_meta = \get_comment_meta( $comment->comment_ID ); + $comment = \get_comment( $comment ); - // show external comment ID if it exists - if ( ! empty( $comment_meta['source_id'][0] ) ) { - return $comment_meta['source_id'][0]; - } elseif ( ! empty( $comment_meta['source_url'][0] ) ) { - return $comment_meta['source_url'][0]; + // Show external comment ID if it exists. + $public_comment_link = self::get_source_id( $comment->comment_ID ); + + if ( $public_comment_link ) { + return $public_comment_link; } - // generate URI based on comment ID + // Generate URI based on comment ID. return \add_query_arg( 'c', $comment->comment_ID, \trailingslashit( \home_url() ) ); } @@ -392,7 +433,8 @@ class Comment { private static function post_has_remote_comments( $post_id ) { $comments = \get_comments( array( - 'post_id' => $post_id, + 'post_id' => $post_id, + // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query 'meta_query' => array( 'relation' => 'AND', array( @@ -416,22 +458,22 @@ class Comment { */ public static function enqueue_scripts() { if ( ! \is_singular() || \is_user_logged_in() ) { - // only on single pages, only for logged out users + // Only on single pages, only for logged-out users. return; } if ( ! \post_type_supports( \get_post_type(), 'activitypub' ) ) { - // post type does not support ActivityPub + // Post type does not support ActivityPub. return; } if ( ! \comments_open() || ! \get_comments_number() ) { - // no comments, no need to load the script + // No comments, no need to load the script. return; } if ( ! self::post_has_remote_comments( \get_the_ID() ) ) { - // no remote comments, no need to load the script + // No remote comments, no need to load the script. return; } @@ -457,9 +499,171 @@ class Comment { \wp_enqueue_style( $handle, \plugins_url( 'build/remote-reply/style-index.css', __DIR__ ), - [ 'wp-components' ], + array( 'wp-components' ), $assets['version'] ); } } + + /** + * Return the registered custom comment types. + * + * @return array The registered custom comment types + */ + public static function get_comment_types() { + global $activitypub_comment_types; + + return $activitypub_comment_types; + } + + /** + * Is this a registered comment type. + * + * @param string $slug The name of the type. + * @return boolean True if registered. + */ + public static function is_registered_comment_type( $slug ) { + $slug = strtolower( $slug ); + $slug = sanitize_key( $slug ); + + return in_array( $slug, array_keys( self::get_comment_types() ), true ); + } + + /** + * Return the registered custom comment types names. + * + * @return array The registered custom comment type names. + */ + public static function get_comment_type_names() { + return array_values( wp_list_pluck( self::get_comment_types(), 'type' ) ); + } + + /** + * Get a comment type. + * + * @param string $type The comment type. + * + * @return array The comment type. + */ + public static function get_comment_type( $type ) { + $type = strtolower( $type ); + $type = sanitize_key( $type ); + $types = self::get_comment_types(); + + if ( in_array( $type, array_keys( $types ), true ) ) { + $type_array = $types[ $type ]; + } else { + $type_array = array(); + } + + /** + * Filter the comment type. + * + * @param array $type_array The comment type. + */ + return apply_filters( "activitypub_comment_type_{$type}", $type_array ); + } + + /** + * Get a comment type attribute. + * + * @param string $type The comment type. + * @param string $attr The attribute to get. + * + * @return mixed The value of the attribute. + */ + public static function get_comment_type_attr( $type, $attr ) { + $type_array = self::get_comment_type( $type ); + + if ( $type_array && isset( $type_array[ $attr ] ) ) { + $value = $type_array[ $attr ]; + } else { + $value = ''; + } + + /** + * Filter the comment type attribute. + * + * @param mixed $value The value of the attribute. + * @param string $type The comment type. + */ + return apply_filters( "activitypub_comment_type_{$attr}", $value, $type ); + } + + /** + * Register the comment types used by the ActivityPub plugin. + */ + public static function register_comment_types() { + register_comment_type( + 'announce', + array( + 'label' => __( 'Reposts', 'activitypub' ), + 'singular' => __( 'Repost', 'activitypub' ), + 'description' => __( 'A repost on the indieweb is a post that is purely a 100% re-publication of another (typically someone else\'s) post.', 'activitypub' ), + 'icon' => '♻️', + 'class' => 'p-repost', + 'type' => 'repost', + // translators: %1$s username, %2$s object format (post, audio, ...), %3$s URL, %4$s domain. + 'excerpt' => __( '… reposted this!', 'activitypub' ), + ) + ); + + register_comment_type( + 'like', + array( + 'label' => __( 'Likes', 'activitypub' ), + 'singular' => __( 'Like', 'activitypub' ), + 'description' => __( 'A like is a popular webaction button and in some cases post type on various silos such as Facebook and Instagram.', 'activitypub' ), + 'icon' => '👍', + 'class' => 'p-like', + 'type' => 'like', + // translators: %1$s username, %2$s object format (post, audio, ...), %3$s URL, %4$s domain. + 'excerpt' => __( '… liked this!', 'activitypub' ), + ) + ); + } + + /** + * Show avatars on Activities if set. + * + * @param array $types List of avatar enabled comment types. + * + * @return array show avatars on Activities + */ + public static function get_avatar_comment_types( $types ) { + $comment_types = self::get_comment_type_names(); + $types = array_merge( $types, $comment_types ); + + return array_unique( $types ); + } + + /** + * Excludes likes and reposts from comment queries. + * + * @author Jan Boddez + * + * @see https://github.com/janboddez/indieblocks/blob/a2d59de358031056a649ee47a1332ce9e39d4ce2/includes/functions.php#L423-L432 + * + * @param WP_Comment_Query $query Comment count. + */ + public static function comment_query( $query ) { + if ( ! $query instanceof WP_Comment_Query ) { + return; + } + + if ( is_admin() || ! is_singular() ) { + return; + } + + if ( ! empty( $query->query_vars['type__in'] ) ) { + return; + } + + if ( isset( $query->query_vars['count'] ) && true === $query->query_vars['count'] ) { + return; + } + + // Exclude likes and reposts by the Webmention plugin. + $query->query_vars['type__not_in'] = self::get_comment_type_names(); + } } diff --git a/wp-content/plugins/activitypub/includes/class-debug.php b/wp-content/plugins/activitypub/includes/class-debug.php index bdb84c68..ebca0534 100644 --- a/wp-content/plugins/activitypub/includes/class-debug.php +++ b/wp-content/plugins/activitypub/includes/class-debug.php @@ -1,37 +1,66 @@ post_content, $match ) ) { - $tags = \implode( ', ', $match[1] ); + public static function filter_activity_object( $activity ) { + /* phpcs:ignore Squiz.PHP.CommentedOutCode.Found + Removed until this is merged: https://github.com/mastodon/mastodon/pull/28629 + if ( ! empty( $activity['summary'] ) ) { + $activity['summary'] = self::the_content( $activity['summary'] ); + } + */ - \wp_add_post_tags( $post->post_parent, $tags ); + if ( ! empty( $activity['content'] ) ) { + $activity['content'] = self::the_content( $activity['content'] ); } - return $id; + return $activity; } /** - * Filter to replace the #tags in the content with links + * Filter to save #tags as real WordPress tags. * - * @param string $the_content the post-content + * @param int $post_id Post ID. + * @param \WP_Post $post Post object. + */ + public static function insert_post( $post_id, $post ) { + $tags = array(); + + if ( \preg_match_all( '/' . ACTIVITYPUB_HASHTAGS_REGEXP . '/i', $post->post_content, $match ) ) { + $tags = array_merge( $tags, $match[1] ); + } + + if ( \preg_match_all( '/' . ACTIVITYPUB_HASHTAGS_REGEXP . '/i', $post->post_excerpt, $match ) ) { + $tags = array_merge( $tags, $match[1] ); + } + + $tags = \implode( ', ', $tags ); + + \wp_add_post_tags( $post->ID, $tags ); + } + + /** + * Filter to replace the #tags in the content with links. * - * @return string the filtered post-content + * @param string $the_content The post content. + * + * @return string The filtered post content. */ public static function the_content( $the_content ) { - // small protection against execution timeouts: limit to 1 MB - if ( mb_strlen( $the_content ) > MB_IN_BYTES ) { - return $the_content; - } - $tag_stack = array(); - $protected_tags = array( - 'pre', - 'code', - 'textarea', - 'style', - 'a', - ); - $content_with_links = ''; - $in_protected_tag = false; - foreach ( wp_html_split( $the_content ) as $chunk ) { - if ( preg_match( '#^$#i', $chunk, $m ) ) { - $content_with_links .= $chunk; - continue; - } - - if ( preg_match( '#^<(/)?([a-z-]+)\b[^>]*>$#i', $chunk, $m ) ) { - $tag = strtolower( $m[2] ); - if ( '/' === $m[1] ) { - // Closing tag. - $i = array_search( $tag, $tag_stack, true ); - // We can only remove the tag from the stack if it is in the stack. - if ( false !== $i ) { - $tag_stack = array_slice( $tag_stack, 0, $i ); - } - } else { - // Opening tag, add it to the stack. - $tag_stack[] = $tag; - } - - // If we're in a protected tag, the tag_stack contains at least one protected tag string. - // The protected tag state can only change when we encounter a start or end tag. - $in_protected_tag = array_intersect( $tag_stack, $protected_tags ); - - // Never inspect tags. - $content_with_links .= $chunk; - continue; - } - - if ( $in_protected_tag ) { - // Don't inspect a chunk inside an inspected tag. - $content_with_links .= $chunk; - continue; - } - - // Only reachable when there is no protected tag in the stack. - $content_with_links .= \preg_replace_callback( '/' . ACTIVITYPUB_HASHTAGS_REGEXP . '/i', array( '\Activitypub\Hashtag', 'replace_with_links' ), $chunk ); - } - - return $content_with_links; + return enrich_content_data( $the_content, '/' . ACTIVITYPUB_HASHTAGS_REGEXP . '/i', array( self::class, 'replace_with_links' ) ); } /** - * A callback for preg_replace to build the term links + * A callback for preg_replace to build the term links. * - * @param array $result the preg_match results + * @param array $result The preg_match results. * @return string the final string */ public static function replace_with_links( $result ) { - $tag = $result[1]; + $tag = $result[1]; $tag_object = \get_term_by( 'name', $tag, 'post_tag' ); + if ( ! $tag_object ) { + $tag_object = \get_term_by( 'name', $tag, 'category' ); + } if ( $tag_object ) { $link = \get_term_link( $tag_object, 'post_tag' ); - return \sprintf( '', $link, $tag ); + return \sprintf( '', esc_url( $link ), $tag ); } return '#' . $tag; diff --git a/wp-content/plugins/activitypub/includes/class-health-check.php b/wp-content/plugins/activitypub/includes/class-health-check.php index 878ee85d..65e6a9e4 100644 --- a/wp-content/plugins/activitypub/includes/class-health-check.php +++ b/wp-content/plugins/activitypub/includes/class-health-check.php @@ -1,31 +1,37 @@ %s

', \__( 'Enhance your WordPress site’s performance and mitigate potential heavy loads caused by plugins like ActivityPub by setting up a system cron job to run WP Cron. This ensures scheduled tasks are executed consistently and reduces the reliance on website traffic for trigger events.', 'activitypub' ) ); - $result['actions'] .= sprintf( + $result['actions'] .= sprintf( '

%s %s

', - __( 'https://developer.wordpress.org/plugins/cron/hooking-wp-cron-into-the-system-task-scheduler/', 'activitypub' ), + esc_url( __( 'https://developer.wordpress.org/plugins/cron/hooking-wp-cron-into-the-system-task-scheduler/', 'activitypub' ) ), __( 'Learn how to hook the WP-Cron into the System Task Scheduler.', 'activitypub' ), /* translators: Hidden accessibility text. */ __( '(opens in a new tab)', 'activitypub' ) @@ -124,7 +130,7 @@ class Health_Check { } /** - * WebFinger tests + * WebFinger tests. * * @return array */ @@ -162,21 +168,21 @@ class Health_Check { } /** - * Check if `author_posts_url` is accessible and that request returns correct JSON + * Check if `author_posts_url` is accessible and that request returns correct JSON. * - * @return boolean|WP_Error + * @return bool|WP_Error True if the author URL is accessible, WP_Error otherwise. */ public static function is_author_url_accessible() { - $user = \wp_get_current_user(); - $author_url = \get_author_posts_url( $user->ID ); + $user = \wp_get_current_user(); + $author_url = \get_author_posts_url( $user->ID ); $reference_author_url = self::get_author_posts_url( $user->ID, $user->user_nicename ); - // check for "author" in URL + // Check for "author" in URL. if ( $author_url !== $reference_author_url ) { return new WP_Error( 'author_url_not_accessible', \sprintf( - // translators: %s: Author URL + // translators: %s: Author URL. \__( 'Your author URL %s was replaced, this is often done by plugins.', 'activitypub' @@ -186,11 +192,11 @@ class Health_Check { ); } - // try to access author URL + // Try to access author URL. $response = \wp_remote_get( $author_url, array( - 'headers' => array( 'Accept' => 'application/activity+json' ), + 'headers' => array( 'Accept' => 'application/activity+json' ), 'redirection' => 0, ) ); @@ -199,7 +205,7 @@ class Health_Check { return new WP_Error( 'author_url_not_accessible', \sprintf( - // translators: %s: Author URL + // translators: %s: Author URL. \__( 'Your author URL %s is not accessible. Please check your WordPress setup or permalink structure. If the setup seems fine, maybe check if a plugin might restrict the access.', 'activitypub' @@ -211,12 +217,12 @@ class Health_Check { $response_code = \wp_remote_retrieve_response_code( $response ); - // check for redirects + // Check for redirects. if ( \in_array( $response_code, array( 301, 302, 307, 308 ), true ) ) { return new WP_Error( 'author_url_not_accessible', \sprintf( - // translators: %s: Author URL + // translators: %s: Author URL. \__( 'Your author URL %s is redirecting to another page, this is often done by SEO plugins like "Yoast SEO".', 'activitypub' @@ -226,14 +232,14 @@ class Health_Check { ); } - // check if response is JSON + // Check if response is JSON. $body = \wp_remote_retrieve_body( $response ); if ( ! \is_string( $body ) || ! \is_array( \json_decode( $body, true ) ) ) { return new WP_Error( 'author_url_not_accessible', \sprintf( - // translators: %s: Author URL + // translators: %s: Author URL. \__( 'Your author URL %s does not return valid JSON for application/activity+json. Please check if your hosting supports alternate Accept headers.', 'activitypub' @@ -252,14 +258,15 @@ class Health_Check { * @return boolean|WP_Error */ public static function is_webfinger_endpoint_accessible() { - $user = Users::get_by_id( Users::APPLICATION_USER_ID ); + $user = Users::get_by_id( Users::APPLICATION_USER_ID ); $resource = $user->get_webfinger(); $url = Webfinger::resolve( $resource ); if ( \is_wp_error( $url ) ) { $allowed = array( 'code' => array() ); + $not_accessible = wp_kses( - // translators: %s: Author URL + // translators: %s: Author URL. \__( 'Your WebFinger endpoint %s is not accessible. Please check your WordPress setup or permalink structure.', 'activitypub' @@ -267,7 +274,7 @@ class Health_Check { $allowed ); $invalid_response = wp_kses( - // translators: %s: Author URL + // translators: %s: Author URL. \__( 'Your WebFinger endpoint %s does not return valid JSON for application/jrd+json.', 'activitypub' @@ -276,20 +283,21 @@ class Health_Check { ); $health_messages = array( - 'webfinger_url_not_accessible' => \sprintf( + 'webfinger_url_not_accessible' => \sprintf( $not_accessible, - $url->get_error_data() + $url->get_error_data()['data'] ), 'webfinger_url_invalid_response' => \sprintf( - // translators: %s: Author URL + // translators: %s: Author URL. $invalid_response, - $url->get_error_data() + $url->get_error_data()['data'] ), ); - $message = null; + $message = null; if ( isset( $health_messages[ $url->get_error_code() ] ) ) { $message = $health_messages[ $url->get_error_code() ]; } + return new WP_Error( $url->get_error_code(), $message, @@ -303,7 +311,7 @@ class Health_Check { /** * Retrieve the URL to the author page for the user with the ID provided. * - * @global WP_Rewrite $wp_rewrite WordPress rewrite component. + * @global \WP_Rewrite $wp_rewrite WordPress rewrite component. * * @param int $author_id Author ID. * @param string $author_nicename Optional. The author's nicename (slug). Default empty. @@ -312,8 +320,9 @@ class Health_Check { */ public static function get_author_posts_url( $author_id, $author_nicename = '' ) { global $wp_rewrite; + $auth_id = (int) $author_id; - $link = $wp_rewrite->get_author_permastruct(); + $link = $wp_rewrite->get_author_permastruct(); if ( empty( $link ) ) { $file = home_url( '/' ); @@ -342,12 +351,12 @@ class Health_Check { $info['activitypub'] = array( 'label' => __( 'ActivityPub', 'activitypub' ), 'fields' => array( - 'webfinger' => array( + 'webfinger' => array( 'label' => __( 'WebFinger Resource', 'activitypub' ), 'value' => Webfinger::get_user_resource( wp_get_current_user()->ID ), 'private' => true, ), - 'author_url' => array( + 'author_url' => array( 'label' => __( 'Author URL', 'activitypub' ), 'value' => get_author_posts_url( wp_get_current_user()->ID ), 'private' => true, diff --git a/wp-content/plugins/activitypub/includes/class-http.php b/wp-content/plugins/activitypub/includes/class-http.php index 2a8ce7d0..133a3469 100644 --- a/wp-content/plugins/activitypub/includes/class-http.php +++ b/wp-content/plugins/activitypub/includes/class-http.php @@ -1,11 +1,15 @@ 100, + $args = array( + 'timeout' => 100, 'limit_response_size' => 1048576, - 'redirection' => 3, - 'user-agent' => "$user_agent; ActivityPub", - 'headers' => array( - 'Accept' => 'application/activity+json', + 'redirection' => 3, + 'user-agent' => "$user_agent; ActivityPub", + 'headers' => array( + 'Accept' => 'application/activity+json', 'Content-Type' => 'application/activity+json', - 'Digest' => $digest, - 'Signature' => $signature, - 'Date' => $date, + 'Digest' => $digest, + 'Signature' => $signature, + 'Date' => $date, ), - 'body' => $body, + 'body' => $body, ); $response = \wp_safe_remote_post( $url, $args ); @@ -58,18 +62,26 @@ class Http { $response = new WP_Error( $code, __( 'Failed HTTP Request', 'activitypub' ), array( 'status' => $code ) ); } + /** + * Action to save the response of the remote POST request. + * + * @param array|WP_Error $response The response of the remote POST request. + * @param string $url The URL endpoint. + * @param string $body The Post Body. + * @param int $user_id The WordPress User-ID. + */ \do_action( 'activitypub_safe_remote_post_response', $response, $url, $body, $user_id ); return $response; } /** - * Send a GET Request with the needed HTTP Headers + * Send a GET Request with the needed HTTP Headers. * - * @param string $url The URL endpoint - * @param bool|int $cached If the result should be cached, or its duration. Default: 1hr. + * @param string $url The URL endpoint. + * @param bool|int $cached Optional. Whether the result should be cached, or its duration. Default false. * - * @return array|WP_Error The GET Response or an WP_ERROR + * @return array|WP_Error The GET Response or a WP_Error. */ public static function get( $url, $cached = false ) { \do_action( 'activitypub_pre_http_get', $url ); @@ -80,13 +92,19 @@ class Http { $response = \get_transient( $transient_key ); if ( $response ) { + /** + * Action to save the response of the remote GET request. + * + * @param array|WP_Error $response The response of the remote GET request. + * @param string $url The URL endpoint. + */ \do_action( 'activitypub_safe_remote_get_response', $response, $url ); return $response; } } - $date = \gmdate( 'D, d M Y H:i:s T' ); + $date = \gmdate( 'D, d M Y H:i:s T' ); $signature = Signature::generate_signature( Users::APPLICATION_USER_ID, 'get', $url, $date ); $wp_version = get_masked_wp_version(); @@ -99,15 +117,15 @@ class Http { $user_agent = \apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . \get_bloginfo( 'url' ) ); $args = array( - 'timeout' => apply_filters( 'activitypub_remote_get_timeout', 100 ), + 'timeout' => apply_filters( 'activitypub_remote_get_timeout', 100 ), 'limit_response_size' => 1048576, - 'redirection' => 3, - 'user-agent' => "$user_agent; ActivityPub", - 'headers' => array( - 'Accept' => 'application/activity+json', + 'redirection' => 3, + 'user-agent' => "$user_agent; ActivityPub", + 'headers' => array( + 'Accept' => 'application/activity+json', 'Content-Type' => 'application/activity+json', - 'Signature' => $signature, - 'Date' => $date, + 'Signature' => $signature, + 'Date' => $date, ), ); @@ -118,6 +136,12 @@ class Http { $response = new WP_Error( $code, __( 'Failed HTTP Request', 'activitypub' ), array( 'status' => $code ) ); } + /** + * Action to save the response of the remote GET request. + * + * @param array|WP_Error $response The response of the remote GET request. + * @param string $url The URL endpoint. + */ \do_action( 'activitypub_safe_remote_get_response', $response, $url ); if ( $cached ) { @@ -139,6 +163,11 @@ class Http { * @return bool True if the URL is a tombstone. */ public static function is_tombstone( $url ) { + /** + * Action before checking if the URL is a tombstone. + * + * @param string $url The URL to check. + */ \do_action( 'activitypub_pre_http_is_tombstone', $url ); $response = \wp_safe_remote_get( $url ); @@ -151,15 +180,22 @@ class Http { return false; } + /** + * Generate a cache key for the URL. + * + * @param string $url The URL to generate the cache key for. + * + * @return string The cache key. + */ public static function generate_cache_key( $url ) { return 'activitypub_http_' . \md5( $url ); } /** - * Requests the Data from the Object-URL or Object-Array + * Requests the Data from the Object-URL or Object-Array. * * @param array|string $url_or_object The Object or the Object URL. - * @param bool $cached If the result should be cached. + * @param bool $cached Optional. Whether the result should be cached. Default true. * * @return array|WP_Error The Object data as array or WP_Error on failure. */ @@ -204,7 +240,7 @@ class Http { $transient_key = self::generate_cache_key( $url ); - // only check the cache if needed. + // Only check the cache if needed. if ( $cached ) { $data = \get_transient( $transient_key ); diff --git a/wp-content/plugins/activitypub/includes/class-link.php b/wp-content/plugins/activitypub/includes/class-link.php new file mode 100644 index 00000000..3c53f3bb --- /dev/null +++ b/wp-content/plugins/activitypub/includes/class-link.php @@ -0,0 +1,127 @@ +%s', + esc_url( $result[0] ), + $rel, + esc_html( $invisible_prefix ), + $display_class, + esc_html( $display ), + esc_html( $invisible_suffix ) + ); + } +} diff --git a/wp-content/plugins/activitypub/includes/class-mention.php b/wp-content/plugins/activitypub/includes/class-mention.php index c2e8792d..73f1010c 100644 --- a/wp-content/plugins/activitypub/includes/class-mention.php +++ b/wp-content/plugins/activitypub/includes/class-mention.php @@ -1,96 +1,68 @@ MB_IN_BYTES ) { - return $the_content; - } - $tag_stack = array(); - $protected_tags = array( - 'pre', - 'code', - 'textarea', - 'style', - 'a', - ); - $content_with_links = ''; - $in_protected_tag = false; - foreach ( wp_html_split( $the_content ) as $chunk ) { - if ( preg_match( '#^$#i', $chunk, $m ) ) { - $content_with_links .= $chunk; - continue; - } - - if ( preg_match( '#^<(/)?([a-z-]+)\b[^>]*>$#i', $chunk, $m ) ) { - $tag = strtolower( $m[2] ); - if ( '/' === $m[1] ) { - // Closing tag. - $i = array_search( $tag, $tag_stack ); - // We can only remove the tag from the stack if it is in the stack. - if ( false !== $i ) { - $tag_stack = array_slice( $tag_stack, 0, $i ); - } - } else { - // Opening tag, add it to the stack. - $tag_stack[] = $tag; - } - - // If we're in a protected tag, the tag_stack contains at least one protected tag string. - // The protected tag state can only change when we encounter a start or end tag. - $in_protected_tag = array_intersect( $tag_stack, $protected_tags ); - - // Never inspect tags. - $content_with_links .= $chunk; - continue; - } - - if ( $in_protected_tag ) { - // Don't inspect a chunk inside an inspected tag. - $content_with_links .= $chunk; - continue; - } - - // Only reachable when there is no protected tag in the stack. - $content_with_links .= \preg_replace_callback( '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/', array( self::class, 'replace_with_links' ), $chunk ); - } - - return $content_with_links; + return enrich_content_data( $the_content, '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/', array( self::class, 'replace_with_links' ) ); } /** - * A callback for preg_replace to build the user links + * A callback for preg_replace to build the user links. * - * @param array $result the preg_match results + * @param array $result The preg_match results. * - * @return string the final string + * @return string The final string. */ public static function replace_with_links( $result ) { $metadata = get_remote_metadata_by_actor( $result[0] ); @@ -117,11 +89,11 @@ class Mention { } /** - * Get the Inboxes for the mentioned Actors + * Get the Inboxes for the mentioned Actors. * - * @param array $mentioned The list of Actors that were mentioned + * @param array $mentioned The list of Actors that were mentioned. * - * @return array The list of Inboxes + * @return array The list of Inboxes. */ public static function get_inboxes( $mentioned ) { $inboxes = array(); @@ -138,11 +110,11 @@ class Mention { } /** - * Get the inbox from the Remote-Profile of a mentioned Actor + * Get the inbox from the Remote-Profile of a mentioned Actor. * - * @param string $actor The Actor-URL + * @param string $actor The Actor URL. * - * @return string The Inbox-URL + * @return string|WP_Error The Inbox-URL or WP_Error if not found. */ public static function get_inbox_by_mentioned_actor( $actor ) { $metadata = get_remote_metadata_by_actor( $actor ); @@ -151,7 +123,7 @@ class Mention { return $metadata; } - if ( isset( $metadata['endpoints'] ) && isset( $metadata['endpoints']['sharedInbox'] ) ) { + if ( isset( $metadata['endpoints']['sharedInbox'] ) ) { return $metadata['endpoints']['sharedInbox']; } @@ -165,10 +137,10 @@ class Mention { /** * Extract the mentions from the post_content. * - * @param array $mentions The already found mentions. + * @param array $mentions The already found mentions. * @param string $post_content The post content. * - * @return mixed The discovered mentions. + * @return array The discovered mentions. */ public static function extract_mentions( $mentions, $post_content ) { \preg_match_all( '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/i', $post_content, $matches ); @@ -178,6 +150,6 @@ class Mention { $mentions[ $match ] = $link; } } - return $mentions; + return \array_unique( $mentions ); } } diff --git a/wp-content/plugins/activitypub/includes/class-migration.php b/wp-content/plugins/activitypub/includes/class-migration.php index 0e12ac11..ca4353fd 100644 --- a/wp-content/plugins/activitypub/includes/class-migration.php +++ b/wp-content/plugins/activitypub/includes/class-migration.php @@ -1,8 +1,12 @@ 'ID' ) ) as $user_id ) { $followers = get_user_meta( $user_id, 'activitypub_followers', true ); @@ -207,9 +208,7 @@ class Migration { } /** - * Clear the cache after updating to 1.3.0 - * - * @return void + * Clear the cache after updating to 1.3.0. */ private static function migrate_from_1_2_0() { $user_ids = \get_users( @@ -225,9 +224,7 @@ class Migration { } /** - * Unschedule Hooks after updating to 2.0.0 - * - * @return void + * Unschedule Hooks after updating to 2.0.0. */ private static function migrate_from_2_0_0() { wp_clear_scheduled_hook( 'activitypub_send_post_activity' ); @@ -246,42 +243,84 @@ class Migration { /** * Add the ActivityPub capability to all users that can publish posts - * Delete old meta to store followers - * - * @return void + * Delete old meta to store followers. */ private static function migrate_from_2_2_0() { - // add the ActivityPub capability to all users that can publish posts + // Add the ActivityPub capability to all users that can publish posts. self::add_activitypub_capability(); } /** - * Set the defaults needed for the plugin to work + * Rename DB fields. + */ + private static function migrate_from_2_6_0() { + wp_cache_flush(); + + self::update_usermeta_key( 'activitypub_user_description', 'activitypub_description' ); + + self::update_options_key( 'activitypub_blog_user_description', 'activitypub_blog_description' ); + self::update_options_key( 'activitypub_blog_user_identifier', 'activitypub_blog_identifier' ); + } + + /** + * Set the defaults needed for the plugin to work. * - * * Add the ActivityPub capability to all users that can publish posts - * - * @return void + * Add the ActivityPub capability to all users that can publish posts. */ public static function add_default_settings() { self::add_activitypub_capability(); } /** - * Add the ActivityPub capability to all users that can publish posts - * - * @return void + * Add the ActivityPub capability to all users that can publish posts. */ private static function add_activitypub_capability() { - // get all WP_User objects that can publish posts + // Get all WP_User objects that can publish posts. $users = \get_users( array( 'capability__in' => array( 'publish_posts' ), ) ); - // add ActivityPub capability to all users that can publish posts + // Add ActivityPub capability to all users that can publish posts. foreach ( $users as $user ) { $user->add_cap( 'activitypub' ); } } + + /** + * Rename meta keys. + * + * @param string $old_key The old comment meta key. + * @param string $new_key The new comment meta key. + */ + private static function update_usermeta_key( $old_key, $new_key ) { + global $wpdb; + + $wpdb->update( // phpcs:ignore WordPress.DB.DirectDatabaseQuery + $wpdb->usermeta, + array( 'meta_key' => $new_key ), // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key + array( 'meta_key' => $old_key ), // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key + array( '%s' ), + array( '%s' ) + ); + } + + /** + * Rename option keys. + * + * @param string $old_key The old option key. + * @param string $new_key The new option key. + */ + private static function update_options_key( $old_key, $new_key ) { + global $wpdb; + + $wpdb->update( // phpcs:ignore WordPress.DB.DirectDatabaseQuery + $wpdb->options, + array( 'option_name' => $new_key ), // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key + array( 'option_name' => $old_key ), // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key + array( '%s' ), + array( '%s' ) + ); + } } diff --git a/wp-content/plugins/activitypub/includes/class-notification.php b/wp-content/plugins/activitypub/includes/class-notification.php index 72747021..1dd65732 100644 --- a/wp-content/plugins/activitypub/includes/class-notification.php +++ b/wp-content/plugins/activitypub/includes/class-notification.php @@ -1,4 +1,9 @@ type = $type; - $this->actor = $actor; - $this->object = $object; + public function __construct( $type, $actor, $activity, $target ) { + $this->type = $type; + $this->actor = $actor; + $this->object = $activity; $this->target = $target; } @@ -53,6 +58,9 @@ class Notification { * Send the notification. */ public function send() { + $type = \strtolower( $this->type ); + do_action( 'activitypub_notification', $this ); + do_action( "activitypub_notification_{$type}", $this ); } } diff --git a/wp-content/plugins/activitypub/includes/class-scheduler.php b/wp-content/plugins/activitypub/includes/class-scheduler.php index 4faf51a7..0774f296 100644 --- a/wp-content/plugins/activitypub/includes/class-scheduler.php +++ b/wp-content/plugins/activitypub/includes/class-scheduler.php @@ -1,28 +1,26 @@ post_type ) { self::schedule_profile_update( $post->post_author ); return; } + if ( 'ap_extrafield_blog' === $post->post_type ) { + self::schedule_profile_update( 0 ); + return; + } + // Do not send activities if post is password protected. if ( \post_password_required( $post ) ) { return; @@ -142,8 +147,9 @@ class Scheduler { $type = 'Create'; } elseif ( 'publish' === $new_status || + // We want to send updates for posts that are published and then moved to draft. ( 'draft' === $new_status && - 'draft' !== $old_status ) + 'publish' === $old_status ) ) { $type = 'Update'; } elseif ( 'trash' === $new_status ) { @@ -164,19 +170,19 @@ class Scheduler { } /** - * Schedule Comment Activities + * Schedule Comment Activities. * - * transition_comment_status() + * @see transition_comment_status() * - * @param string $new_status New comment status. - * @param string $old_status Old comment status. - * @param WP_Comment $comment Comment object. + * @param string $new_status New comment status. + * @param string $old_status Old comment status. + * @param \WP_Comment $comment Comment object. */ public static function schedule_comment_activity( $new_status, $old_status, $comment ) { $comment = get_comment( $comment ); - // federate only comments that are written by a registered user. - if ( ! $comment->user_id ) { + // Federate only comments that are written by a registered user. + if ( ! $comment || ! $comment->user_id ) { return; } @@ -201,7 +207,7 @@ class Scheduler { return; } - // check if comment should be federated or not + // Check if comment should be federated or not. if ( ! should_comment_be_federated( $comment ) ) { return; } @@ -216,9 +222,7 @@ class Scheduler { } /** - * Update followers - * - * @return void + * Update followers. */ public static function update_followers() { $number = 5; @@ -227,6 +231,11 @@ class Scheduler { $number = 50; } + /** + * Filter the number of followers to update. + * + * @param int $number The number of followers to update. + */ $number = apply_filters( 'activitypub_update_followers_number', $number ); $followers = Followers::get_outdated_followers( $number ); @@ -243,9 +252,7 @@ class Scheduler { } /** - * Cleanup followers - * - * @return void + * Cleanup followers. */ public static function cleanup_followers() { $number = 5; @@ -254,6 +261,11 @@ class Scheduler { $number = 50; } + /** + * Filter the number of followers to clean up. + * + * @param int $number The number of followers to clean up. + */ $number = apply_filters( 'activitypub_update_followers_number', $number ); $followers = Followers::get_faulty_followers( $number ); @@ -282,20 +294,20 @@ class Scheduler { /** * Send a profile update when relevant user meta is updated. * - * @param int $meta_id Meta ID being updated. - * @param int $user_id User ID being updated. + * @param int $meta_id Meta ID being updated. + * @param int $user_id User ID being updated. * @param string $meta_key Meta key being updated. - * - * @return void */ public static function user_meta_update( $meta_id, $user_id, $meta_key ) { - // don't bother if the user can't publish + // Don't bother if the user can't publish. if ( ! \user_can( $user_id, 'activitypub' ) ) { return; } - // the user meta fields that affect a profile. + + // The user meta fields that affect a profile. $fields = array( - 'activitypub_user_description', + 'activitypub_description', + 'activitypub_header_image', 'description', 'user_url', 'display_name', @@ -308,12 +320,10 @@ class Scheduler { /** * Send a profile update when a user is updated. * - * @param int $user_id User ID being updated. - * - * @return void + * @param int $user_id User ID being updated. */ public static function user_update( $user_id ) { - // don't bother if the user can't publish + // Don't bother if the user can't publish. if ( ! \user_can( $user_id, 'activitypub' ) ) { return; } @@ -324,7 +334,7 @@ class Scheduler { /** * Theme mods only have a dynamic filter so we fudge it like this. * - * @param mixed $value + * @param mixed $value Optional. The value to be updated. Default null. * * @return mixed */ diff --git a/wp-content/plugins/activitypub/includes/class-shortcodes.php b/wp-content/plugins/activitypub/includes/class-shortcodes.php index b32b91dd..eb9c5135 100644 --- a/wp-content/plugins/activitypub/includes/class-shortcodes.php +++ b/wp-content/plugins/activitypub/includes/class-shortcodes.php @@ -1,11 +1,18 @@ post_type ) { - // get title of attachment with fallback to alt text. - $content = wp_get_attachment_caption( $item->ID ); - if ( empty( $content ) ) { - $content = get_post_meta( $item->ID, '_wp_attachment_image_alt', true ); - } - } elseif ( '' === $excerpt ) { - $content = \get_post_field( 'post_content', $item ); - - // An empty string will make wp_trim_excerpt do stuff we do not want. - if ( '' !== $content ) { - $excerpt = \strip_shortcodes( $content ); - - /** This filter is documented in wp-includes/post-template.php */ - $excerpt = \apply_filters( 'the_content', $excerpt ); - $excerpt = \str_replace( ']]>', ']]>', $excerpt ); - } - } - - // Strip out any remaining tags. - $excerpt = \wp_strip_all_tags( $excerpt ); - - $excerpt_more = \apply_filters( 'activitypub_excerpt_more', ' […]' ); - $excerpt_more_len = strlen( $excerpt_more ); - - // We now have a excerpt, but we need to check it's length, it may be longer than we want for two reasons: - // - // * The user has entered a manual excerpt which is longer that what we want. - // * No manual excerpt exists so we've used the content which might be longer than we want. - // - // Either way, let's trim it up if we need too. Also, don't forget to take into account the more indicator - // as part of the total length. - // - - // Setup a variable to hold the current excerpts length. - $current_excerpt_length = strlen( $excerpt ); - - // Setup a variable to keep track of our target length. - $target_excerpt_length = $excerpt_length - $excerpt_more_len; - - // Setup a variable to keep track of the current max length. - $current_excerpt_max = $target_excerpt_length; - - // This is a loop since we can't calculate word break the string after 'the_excpert' filter has run (we would break - // all kinds of html tags), so we have to cut the excerpt down a bit at a time until we hit our target length. - while ( $current_excerpt_length > $target_excerpt_length && $current_excerpt_max > 0 ) { - // Trim the excerpt based on wordwrap() positioning. - // Note: we're using
as the linebreak just in case there are any newlines existing in the excerpt from the user. - // There won't be any
left after we've run wp_strip_all_tags() in the code above, so they're - // safe to use here. It won't be included in the final excerpt as the substr() will trim it off. - $excerpt = substr( $excerpt, 0, strpos( wordwrap( $excerpt, $current_excerpt_max, '
' ), '
' ) ); - - // If something went wrong, or we're in a language that wordwrap() doesn't understand, - // just chop it off and don't worry about breaking in the middle of a word. - if ( strlen( $excerpt ) > $excerpt_length - $excerpt_more_len ) { - $excerpt = substr( $excerpt, 0, $current_excerpt_max ); - } - - // Add in the more indicator. - $excerpt = $excerpt . $excerpt_more; - - // Run it through the excerpt filter which will add some html tags back in. - $excerpt_filtered = apply_filters( 'the_excerpt', $excerpt ); - - // Now set the current excerpt length to this new filtered length. - $current_excerpt_length = strlen( $excerpt_filtered ); - - // Check to see if we're over the target length. - if ( $current_excerpt_length > $target_excerpt_length ) { - // If so, remove 20 characters from the current max and run the loop again. - $current_excerpt_max = $current_excerpt_max - 20; - } - } + $excerpt = generate_post_summary( $item, $excerpt_length ); return \apply_filters( 'the_excerpt', $excerpt ); } /** - * Generates output for the 'ap_content' Shortcode + * Generates output for the 'ap_content' Shortcode. * * @param array $atts The Shortcode attributes. * @param string $content The ActivityPub post-content. @@ -203,7 +128,7 @@ class Shortcodes { return ''; } - // prevent inception + // Prevent inception. remove_shortcode( 'ap_content' ); $atts = shortcode_atts( @@ -215,7 +140,7 @@ class Shortcodes { $content = ''; if ( 'attachment' === $item->post_type ) { - // get title of attachment with fallback to alt text. + // Get title of attachment with fallback to alt text. $content = wp_get_attachment_caption( $item->ID ); if ( empty( $content ) ) { $content = get_post_meta( $item->ID, '_wp_attachment_image_alt', true ); @@ -231,7 +156,7 @@ class Shortcodes { $content = wp_filter_content_tags( $content ); } - // replace script and style elements + // Replace script and style elements. $content = \preg_replace( '@<(script|style)[^>]*?>.*?@si', '', $content ); $content = strip_shortcodes( $content ); $content = \trim( \preg_replace( '/[\n\r\t]/', '', $content ) ); @@ -243,7 +168,7 @@ class Shortcodes { } /** - * Generates output for the 'ap_permalink' Shortcode + * Generates output for the 'ap_permalink' Shortcode. * * @param array $atts The Shortcode attributes. * @param string $content The ActivityPub post-content. @@ -277,7 +202,7 @@ class Shortcodes { } /** - * Generates output for the 'ap_shortlink' Shortcode + * Generates output for the 'ap_shortlink' Shortcode. * * @param array $atts The Shortcode attributes. * @param string $content The ActivityPub post-content. @@ -311,7 +236,7 @@ class Shortcodes { } /** - * Generates output for the 'ap_image' Shortcode + * Generates output for the 'ap_image' Shortcode. * * @param array $atts The Shortcode attributes. * @param string $content The ActivityPub post-content. @@ -354,15 +279,11 @@ class Shortcodes { } /** - * Generates output for the 'ap_hashcats' Shortcode - * - * @param array $atts The Shortcode attributes. - * @param string $content The ActivityPub post-content. - * @param string $tag The tag/name of the Shortcode. + * Generates output for the 'ap_hashcats' Shortcode. * * @return string The post categories as hashtags. */ - public static function hashcats( $atts, $content, $tag ) { + public static function hashcats() { $item = self::get_item(); if ( ! $item ) { @@ -389,15 +310,11 @@ class Shortcodes { } /** - * Generates output for the 'ap_author' Shortcode - * - * @param array $atts The Shortcode attributes. - * @param string $content The ActivityPub post-content. - * @param string $tag The tag/name of the Shortcode. + * Generates output for the 'ap_author' Shortcode. * * @return string The author name. */ - public static function author( $atts, $content, $tag ) { + public static function author() { $item = self::get_item(); if ( ! $item ) { @@ -405,7 +322,7 @@ class Shortcodes { } $author_id = \get_post_field( 'post_author', $item->ID ); - $name = \get_the_author_meta( 'display_name', $author_id ); + $name = \get_the_author_meta( 'display_name', $author_id ); if ( ! $name ) { return ''; @@ -415,15 +332,11 @@ class Shortcodes { } /** - * Generates output for the 'ap_authorurl' Shortcode - * - * @param array $atts The Shortcode attributes. - * @param string $content The ActivityPub post-content. - * @param string $tag The tag/name of the Shortcode. + * Generates output for the 'ap_authorurl' Shortcode. * * @return string The author URL. */ - public static function authorurl( $atts, $content, $tag ) { + public static function authorurl() { $item = self::get_item(); if ( ! $item ) { @@ -431,7 +344,7 @@ class Shortcodes { } $author_id = \get_post_field( 'post_author', $item->ID ); - $url = \get_the_author_meta( 'user_url', $author_id ); + $url = \get_the_author_meta( 'user_url', $author_id ); if ( ! $url ) { return ''; @@ -441,63 +354,46 @@ class Shortcodes { } /** - * Generates output for the 'ap_blogurl' Shortcode - * - * @param array $atts The Shortcode attributes. - * @param string $content The ActivityPub post-content. - * @param string $tag The tag/name of the Shortcode. + * Generates output for the 'ap_blogurl' Shortcode. * * @return string The site URL. */ - public static function blogurl( $atts, $content, $tag ) { + public static function blogurl() { return \esc_url( \get_bloginfo( 'url' ) ); } /** - * Generates output for the 'ap_blogname' Shortcode - * - * @param array $atts The Shortcode attributes. - * @param string $content The ActivityPub post-content. - * @param string $tag The tag/name of the Shortcode. + * Generates output for the 'ap_blogname' Shortcode. * * @return string */ - public static function blogname( $atts, $content, $tag ) { + public static function blogname() { return \wp_strip_all_tags( \get_bloginfo( 'name' ) ); } /** - * Generates output for the 'ap_blogdesc' Shortcode - * - * @param array $atts The Shortcode attributes. - * @param string $content The ActivityPub post-content. - * @param string $tag The tag/name of the Shortcode. + * Generates output for the 'ap_blogdesc' Shortcode. * * @return string The site description. */ - public static function blogdesc( $atts, $content, $tag ) { + public static function blogdesc() { return \wp_strip_all_tags( \get_bloginfo( 'description' ) ); } /** - * Generates output for the 'ap_date' Shortcode - * - * @param array $atts The Shortcode attributes. - * @param string $content The ActivityPub post-content. - * @param string $tag The tag/name of the Shortcode. + * Generates output for the 'ap_date' Shortcode. * * @return string The post date. */ - public static function date( $atts, $content, $tag ) { + public static function date() { $item = self::get_item(); if ( ! $item ) { return ''; } - $datetime = \get_post_datetime( $item ); + $datetime = \get_post_datetime( $item ); $dateformat = \get_option( 'date_format' ); - $timeformat = \get_option( 'time_format' ); $date = $datetime->format( $dateformat ); @@ -509,23 +405,18 @@ class Shortcodes { } /** - * Generates output for the 'ap_time' Shortcode - * - * @param array $atts The Shortcode attributes. - * @param string $content The ActivityPub post-content. - * @param string $tag The tag/name of the Shortcode. + * Generates output for the 'ap_time' Shortcode. * * @return string The post time. */ - public static function time( $atts, $content, $tag ) { + public static function time() { $item = self::get_item(); if ( ! $item ) { return ''; } - $datetime = \get_post_datetime( $item ); - $dateformat = \get_option( 'date_format' ); + $datetime = \get_post_datetime( $item ); $timeformat = \get_option( 'time_format' ); $date = $datetime->format( $timeformat ); @@ -538,22 +429,18 @@ class Shortcodes { } /** - * Generates output for the 'ap_datetime' Shortcode - * - * @param array $atts The Shortcode attributes. - * @param string $content The ActivityPub post-content. - * @param string $tag The tag/name of the Shortcode. + * Generates output for the 'ap_datetime' Shortcode. * * @return string The post date/time. */ - public static function datetime( $atts, $content, $tag ) { + public static function datetime() { $item = self::get_item(); if ( ! $item ) { return ''; } - $datetime = \get_post_datetime( $item ); + $datetime = \get_post_datetime( $item ); $dateformat = \get_option( 'date_format' ); $timeformat = \get_option( 'time_format' ); @@ -572,7 +459,7 @@ class Shortcodes { * Checks if item (WP_Post) is "public", a supported post type * and not password protected. * - * @return null|WP_Post The WordPress item. + * @return null|\WP_Post The WordPress item. */ protected static function get_item() { $post = \get_post(); diff --git a/wp-content/plugins/activitypub/includes/class-signature.php b/wp-content/plugins/activitypub/includes/class-signature.php index e7087595..b8f8af88 100644 --- a/wp-content/plugins/activitypub/includes/class-signature.php +++ b/wp-content/plugins/activitypub/includes/class-signature.php @@ -1,4 +1,10 @@ 'sha512', + 'digest_alg' => 'sha512', 'private_key_bits' => 2048, 'private_key_type' => \OPENSSL_KEYTYPE_RSA, ); - $key = \openssl_pkey_new( $config ); + $key = \openssl_pkey_new( $config ); $priv_key = null; + $detail = array(); + if ( $key ) { + \openssl_pkey_export( $key, $priv_key ); - \openssl_pkey_export( $key, $priv_key ); + $detail = \openssl_pkey_get_details( $key ); + } - $detail = \openssl_pkey_get_details( $key ); - - // check if keys are valid + // Check if keys are valid. if ( empty( $priv_key ) || ! is_string( $priv_key ) || ! isset( $detail['key'] ) || ! is_string( $detail['key'] ) @@ -115,7 +123,7 @@ class Signature { 'public_key' => $detail['key'], ); - // persist keys + // Persist keys. \add_option( $option_key, $key_pair ); return $key_pair; @@ -133,7 +141,7 @@ class Signature { if ( $user_id > 0 ) { $user = \get_userdata( $user_id ); - // sanatize username because it could include spaces and special chars + // Sanitize username because it could include spaces and special chars. $id = sanitize_title( $user->user_login ); } @@ -150,15 +158,15 @@ class Signature { protected static function check_legacy_key_pair_for( $user_id ) { switch ( $user_id ) { case 0: - $public_key = \get_option( 'activitypub_blog_user_public_key' ); + $public_key = \get_option( 'activitypub_blog_user_public_key' ); $private_key = \get_option( 'activitypub_blog_user_private_key' ); break; case -1: - $public_key = \get_option( 'activitypub_application_user_public_key' ); + $public_key = \get_option( 'activitypub_application_user_public_key' ); $private_key = \get_option( 'activitypub_application_user_private_key' ); break; default: - $public_key = \get_user_meta( $user_id, 'magic_sig_public_key', true ); + $public_key = \get_user_meta( $user_id, 'magic_sig_public_key', true ); $private_key = \get_user_meta( $user_id, 'magic_sig_private_key', true ); break; } @@ -174,13 +182,13 @@ class Signature { } /** - * Generates the Signature for a HTTP Request + * Generates the Signature for an HTTP Request. * * @param int $user_id The WordPress User ID. * @param string $http_method The HTTP method. * @param string $url The URL to send the request to. * @param string $date The date the request is sent. - * @param string $digest The digest of the request body. + * @param string $digest Optional. The digest of the request body. Default null. * * @return string The signature. */ @@ -193,12 +201,12 @@ class Signature { $host = $url_parts['host']; $path = '/'; - // add path + // Add path. if ( ! empty( $url_parts['path'] ) ) { $path = $url_parts['path']; } - // add query + // Add query. if ( ! empty( $url_parts['query'] ) ) { $path .= '?' . $url_parts['query']; } @@ -213,7 +221,7 @@ class Signature { $signature = null; \openssl_sign( $signed_string, $signature, $key, \OPENSSL_ALGO_SHA256 ); - $signature = \base64_encode( $signature ); // phpcs:ignore + $signature = \base64_encode( $signature ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode $key_id = $user->get_url() . '#main-key'; @@ -229,18 +237,18 @@ class Signature { * * @param WP_REST_Request|array $request The request object or $_SERVER array. * - * @return mixed A boolean or WP_Error. + * @return bool|WP_Error A boolean or WP_Error. */ public static function verify_http_signature( $request ) { - if ( is_object( $request ) ) { // REST Request object - // check if route starts with "index.php" + if ( is_object( $request ) ) { // REST Request object. + // Check if route starts with "index.php". if ( str_starts_with( $request->get_route(), '/index.php' ) || ! rest_get_url_prefix() ) { $route = $request->get_route(); } else { $route = '/' . rest_get_url_prefix() . '/' . ltrim( $request->get_route(), '/' ); } - // fix route for subdirectory installs + // Fix route for subdirectory installs. $path = \wp_parse_url( \get_home_url(), PHP_URL_PATH ); if ( \is_string( $path ) ) { @@ -251,11 +259,11 @@ class Signature { $route = '/' . $path . $route; } - $headers = $request->get_headers(); + $headers = $request->get_headers(); $headers['(request-target)'][0] = strtolower( $request->get_method() ) . ' ' . $route; } else { - $request = self::format_server_request( $request ); - $headers = $request['headers']; // $_SERVER array + $request = self::format_server_request( $request ); + $headers = $request['headers']; // $_SERVER array $headers['(request-target)'][0] = strtolower( $headers['request_method'][0] ) . ' ' . $headers['request_uri'][0]; } @@ -321,14 +329,14 @@ class Signature { } /** - * Get public key from key_id + * Get public key from key_id. * * @param string $key_id The URL to the public key. * * @return WP_Error|string The public key or WP_Error. */ - public static function get_remote_key( $key_id ) { // phpcs:ignore - $actor = get_remote_metadata_by_actor( strip_fragment_from_url( $key_id ) ); // phpcs:ignore + public static function get_remote_key( $key_id ) { + $actor = get_remote_metadata_by_actor( strip_fragment_from_url( $key_id ) ); if ( \is_wp_error( $actor ) ) { return new WP_Error( 'activitypub_no_remote_profile_found', @@ -337,7 +345,7 @@ class Signature { ); } if ( isset( $actor['publicKey']['publicKeyPem'] ) ) { - return \rtrim( $actor['publicKey']['publicKeyPem'] ); // phpcs:ignore + return \rtrim( $actor['publicKey']['publicKeyPem'] ); } return new WP_Error( 'activitypub_no_remote_key_found', @@ -347,9 +355,9 @@ class Signature { } /** - * Gets the signature algorithm from the signature header + * Gets the signature algorithm from the signature header. * - * @param array $signature_block + * @param array $signature_block The signature block. * * @return string The signature algorithm. */ @@ -357,7 +365,7 @@ class Signature { if ( $signature_block['algorithm'] ) { switch ( $signature_block['algorithm'] ) { case 'rsa-sha-512': - return 'sha512'; //hs2019 https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures-12 + return 'sha512'; // hs2019 https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures-12. default: return 'sha256'; } @@ -366,15 +374,15 @@ class Signature { } /** - * Parses the Signature header + * Parses the Signature header. * * @param string $signature The signature header. * - * @return array signature parts + * @return array Signature parts. */ public static function parse_signature_header( $signature ) { - $parsed_header = array(); - $matches = array(); + $parsed_header = array(); + $matches = array(); if ( \preg_match( '/keyId="(.*?)"/ism', $signature, $matches ) ) { $parsed_header['keyId'] = trim( $matches[1] ); @@ -392,7 +400,7 @@ class Signature { $parsed_header['headers'] = \explode( ' ', trim( $matches[1] ) ); } if ( \preg_match( '/signature="(.*?)"/ism', $signature, $matches ) ) { - $parsed_header['signature'] = \base64_decode( preg_replace( '/\s+/', '', trim( $matches[1] ) ) ); // phpcs:ignore + $parsed_header['signature'] = \base64_decode( preg_replace( '/\s+/', '', trim( $matches[1] ) ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_decode } if ( ( $parsed_header['signature'] ) && ( $parsed_header['algorithm'] ) && ( ! $parsed_header['headers'] ) ) { @@ -403,16 +411,17 @@ class Signature { } /** - * Gets the header data from the included pseudo headers + * Gets the header data from the included pseudo headers. * * @param array $signed_headers The signed headers. - * @param array $signature_block (pseudo-headers) - * @param array $headers (http headers) + * @param array $signature_block The signature block. + * @param array $headers The HTTP headers. * * @return string signed headers for comparison */ public static function get_signed_data( $signed_headers, $signature_block, $headers ) { $signed_data = ''; + // This also verifies time-based values by returning false if any of these are out of range. foreach ( $signed_headers as $header ) { if ( 'host' === $header ) { @@ -431,7 +440,7 @@ class Signature { } if ( '(created)' === $header ) { if ( ! empty( $signature_block['(created)'] ) && \intval( $signature_block['(created)'] ) > \time() ) { - // created in future + // Created in the future. return false; } @@ -442,7 +451,7 @@ class Signature { } if ( '(expires)' === $header ) { if ( ! empty( $signature_block['(expires)'] ) && \intval( $signature_block['(expires)'] ) < \time() ) { - // expired in past + // Expired in the past. return false; } @@ -452,16 +461,16 @@ class Signature { } } if ( 'date' === $header ) { - // allow a bit of leeway for misconfigured clocks. + // Allow a bit of leeway for misconfigured clocks. $d = new DateTime( $headers[ $header ][0] ); $d->setTimeZone( new DateTimeZone( 'UTC' ) ); $c = $d->format( 'U' ); - $dplus = time() + ( 3 * HOUR_IN_SECONDS ); + $dplus = time() + ( 3 * HOUR_IN_SECONDS ); $dminus = time() - ( 3 * HOUR_IN_SECONDS ); if ( $c > $dplus || $c < $dminus ) { - // time out of range + // Time out of range. return false; } } @@ -471,22 +480,22 @@ class Signature { } /** - * Generates the digest for a HTTP Request + * Generates the digest for an HTTP Request. * * @param string $body The body of the request. * * @return string The digest. */ public static function generate_digest( $body ) { - $digest = \base64_encode( \hash( 'sha256', $body, true ) ); // phpcs:ignore + $digest = \base64_encode( \hash( 'sha256', $body, true ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode return "SHA-256=$digest"; } /** * Formats the $_SERVER to resemble the WP_REST_REQUEST array, - * for use with verify_http_signature() + * for use with verify_http_signature(). * - * @param array $_SERVER The $_SERVER array. + * @param array $server The $_SERVER array. * * @return array $request The formatted request array. */ @@ -497,7 +506,7 @@ class Signature { if ( 'REQUEST_URI' === $req_param ) { $request['headers']['route'][] = $param_val; } else { - $header_key = str_replace( + $header_key = str_replace( 'http_', '', $req_param diff --git a/wp-content/plugins/activitypub/includes/class-webfinger.php b/wp-content/plugins/activitypub/includes/class-webfinger.php index d1357c98..f6a189af 100644 --- a/wp-content/plugins/activitypub/includes/class-webfinger.php +++ b/wp-content/plugins/activitypub/includes/class-webfinger.php @@ -1,11 +1,17 @@ @ + * Transform a URI to an acct @. * - * @param string $uri The URI (acct:, mailto:, http:, https:) + * @param string $uri The URI (acct:, mailto:, http:, https:). * - * @return string|WP_Error Error or acct URI + * @return string|WP_Error Error or acct URI. */ public static function uri_to_acct( $uri ) { $data = self::get_data( $uri ); @@ -89,7 +95,7 @@ class Webfinger { return $data; } - // check if subject is an acct URI + // Check if subject is an acct URI. if ( isset( $data['subject'] ) && \str_starts_with( $data['subject'], 'acct:' ) @@ -97,7 +103,7 @@ class Webfinger { return $data['subject']; } - // search for an acct URI in the aliases + // Search for an acct URI in the aliases. if ( isset( $data['aliases'] ) ) { foreach ( $data['aliases'] as $alias ) { if ( \str_starts_with( $alias, 'acct:' ) ) { @@ -120,10 +126,9 @@ class Webfinger { * Convert a URI string to an identifier and its host. * Automatically adds acct: if it's missing. * - * @param string $url The URI (acct:, mailto:, http:, https:) + * @param string $url The URI (acct:, mailto:, http:, https:). * - * @return WP_Error|array Error reaction or array with - * identifier and host as values + * @return WP_Error|array Error reaction or array with identifier and host as values. */ public static function get_identifier_and_host( $url ) { if ( ! $url ) { @@ -137,15 +142,15 @@ class Webfinger { ); } - // remove leading @ + // Remove leading @. $url = ltrim( $url, '@' ); if ( ! preg_match( '/^([a-zA-Z+]+):/', $url, $match ) ) { $identifier = 'acct:' . $url; - $scheme = 'acct'; + $scheme = 'acct'; } else { $identifier = $url; - $scheme = $match[1]; + $scheme = $match[1]; } $host = null; @@ -178,12 +183,11 @@ class Webfinger { } /** - * Get the WebFinger data for a given URI + * Get the WebFinger data for a given URI. * - * @param string $uri The Identifier: @ or URI + * @param string $uri The Identifier: @ or URI. * - * @return WP_Error|array Error reaction or array with - * identifier and host as values + * @return WP_Error|array Error reaction or array with identifier and host as values. */ public static function get_data( $uri ) { $identifier_and_host = self::get_identifier_and_host( $uri ); @@ -201,7 +205,11 @@ class Webfinger { return $data; } - $webfinger_url = sprintf( 'https://%s/.well-known/webfinger?resource=%s', $host, rawurlencode( $identifier ) ); + $webfinger_url = sprintf( + 'https://%s/.well-known/webfinger?resource=%s', + $host, + rawurlencode( $identifier ) + ); $response = wp_safe_remote_get( $webfinger_url, @@ -230,7 +238,9 @@ class Webfinger { } /** - * Get the Remote-Follow endpoint for a given URI + * Get the Remote-Follow endpoint for a given URI. + * + * @param string $uri The WebFinger Resource URI. * * @return string|WP_Error Error or the Remote-Follow endpoint URI. */ @@ -269,11 +279,11 @@ class Webfinger { } /** - * Generate a cache key for a given URI + * Generate a cache key for a given URI. * - * @param string $uri A WebFinger Resource URI + * @param string $uri A WebFinger Resource URI. * - * @return string The cache key + * @return string The cache key. */ public static function generate_cache_key( $uri ) { $uri = ltrim( $uri, '@' ); diff --git a/wp-content/plugins/activitypub/includes/collection/class-extra-fields.php b/wp-content/plugins/activitypub/includes/collection/class-extra-fields.php new file mode 100644 index 00000000..320ed478 --- /dev/null +++ b/wp-content/plugins/activitypub/includes/collection/class-extra-fields.php @@ -0,0 +1,283 @@ + $post_type, + 'nopaging' => true, + 'orderby' => 'menu_order', + 'order' => 'ASC', + ); + if ( ! $is_blog ) { + $args['author'] = $user_id; + } + + $query = new \WP_Query( $args ); + $fields = $query->posts ?? array(); + + return apply_filters( 'activitypub_get_actor_extra_fields', $fields, $user_id ); + } + + /** + * Get formatted content for an extra field. + * + * @param \WP_Post $post The post. + * + * @return string The formatted content. + */ + public 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)[^>]*?>.*?@si', '', $content ); + $content = \strip_shortcodes( $content ); + $content = \trim( \preg_replace( '/[\n\r\t]/', '', $content ) ); + + /** + * Filters the content of an extra field. + * + * @param string $content The content. + * @param \WP_Post $post The post. + */ + return \apply_filters( 'activitypub_extra_field_content', $content, $post ); + } + + /** + * Transforms the Extra Fields (Custom Post Types) to ActivityPub Actor-Attachments. + * + * @param \WP_Post[] $fields The extra fields. + * + * @return array ActivityPub attachments. + */ + public static function fields_to_attachments( $fields ) { + $attachments = array(); + \add_filter( + 'activitypub_link_rel', + function ( $rel ) { + $rel .= ' me'; + + return $rel; + } + ); + + foreach ( $fields as $post ) { + $content = self::get_formatted_content( $post ); + $attachments[] = array( + 'type' => 'PropertyValue', + 'name' => \get_the_title( $post ), + 'value' => \html_entity_decode( + $content, + \ENT_QUOTES, + 'UTF-8' + ), + ); + + $link_added = false; + + // Add support for FEP-fb2a, for more information see FEDERATION.md. + $link_content = \trim( \strip_tags( $content, '' ) ); + if ( + \stripos( $link_content, '', \strlen( $link_content ) - 4 ) !== false && + \class_exists( '\WP_HTML_Tag_Processor' ) + ) { + $tags = new \WP_HTML_Tag_Processor( $link_content ); + $tags->next_tag( 'A' ); + + if ( 'A' === $tags->get_tag() ) { + $attachment = array( + 'type' => 'Link', + 'name' => \get_the_title( $post ), + 'href' => \esc_url( $tags->get_attribute( 'href' ) ), + 'rel' => explode( ' ', $tags->get_attribute( 'rel' ) ), + ); + + $link_added = true; + } + } + + if ( ! $link_added ) { + $attachment = array( + 'type' => 'Note', + 'name' => \get_the_title( $post ), + 'content' => \html_entity_decode( + $content, + \ENT_QUOTES, + 'UTF-8' + ), + ); + } + + $attachments[] = $attachment; + } + + return $attachments; + } + + /** + * Check if a post type is an extra fields post type. + * + * @param string $post_type The post type. + * + * @return bool True if the post type is an extra fields post type, otherwise false. + */ + public static function is_extra_fields_post_type( $post_type ) { + return \in_array( $post_type, array( self::USER_POST_TYPE, self::BLOG_POST_TYPE ), true ); + } + + /** + * Check if a post type is the `ap_extrafield` post type. + * + * @param string $post_type The post type. + * + * @return bool True if the post type is `ap_extrafield`, otherwise false. + */ + public static function is_extra_field_post_type( $post_type ) { + return self::USER_POST_TYPE === $post_type; + } + + /** + * Check if a post type is the `ap_extrafield_blog` post type. + * + * @param string $post_type The post type. + * + * @return bool True if the post type is `ap_extrafield_blog`, otherwise false. + */ + public static function is_extra_field_blog_post_type( $post_type ) { + return self::BLOG_POST_TYPE === $post_type; + } + + /** + * Add default extra fields to an actor. + * + * @param array $extra_fields The extra fields. + * @param int $user_id The User-ID. + * + * @return array The extra fields. + */ + public static function default_actor_extra_fields( $extra_fields, $user_id ) { + // We'll only take action when there are none yet. + if ( ! empty( $extra_fields ) ) { + return $extra_fields; + } + + $is_blog = self::is_blog( $user_id ); + $already_migrated = $is_blog + ? \get_option( 'activitypub_default_extra_fields' ) + : \get_user_meta( $user_id, 'activitypub_default_extra_fields', true ); + + if ( $already_migrated ) { + return $extra_fields; + } + + \add_filter( + 'activitypub_link_rel', + function ( $rel ) { + $rel .= ' me'; + + return $rel; + } + ); + + $defaults = array( + \__( 'Blog', 'activitypub' ) => \home_url( '/' ), + ); + + if ( ! $is_blog ) { + $author_url = \get_the_author_meta( 'user_url', $user_id ); + $author_posts_url = \get_author_posts_url( $user_id ); + + $defaults[ \__( 'Profile', 'activitypub' ) ] = $author_posts_url; + if ( $author_url !== $author_posts_url ) { + $defaults[ \__( 'Homepage', 'activitypub' ) ] = $author_url; + } + } + + $post_type = $is_blog ? self::BLOG_POST_TYPE : self::USER_POST_TYPE; + $menu_order = 10; + + foreach ( $defaults as $title => $url ) { + if ( ! $url ) { + continue; + } + + $extra_field = array( + 'post_type' => $post_type, + 'post_title' => $title, + 'post_status' => 'publish', + 'post_author' => $user_id, + 'post_content' => self::make_paragraph_block( Link::the_content( $url ) ), + 'comment_status' => 'closed', + 'menu_order' => $menu_order, + ); + + $menu_order += 10; + $extra_field_id = wp_insert_post( $extra_field ); + $extra_fields[] = get_post( $extra_field_id ); + } + + $is_blog + ? \update_option( 'activitypub_default_extra_fields', true ) + : \update_user_meta( $user_id, 'activitypub_default_extra_fields', true ); + + return $extra_fields; + } + + /** + * Create a paragraph block. + * + * @param string $content The content. + * + * @return string The paragraph block. + */ + public static function make_paragraph_block( $content ) { + if ( ! site_supports_blocks() ) { + return $content; + } + return '

' . $content . '

'; + } + + /** + * Checks if the user is the blog user. + * + * @param int $user_id The user ID. + * @return bool True if the user is the blog user, otherwise false. + */ + private static function is_blog( $user_id ) { + return Users::BLOG_USER_ID === $user_id; + } +} diff --git a/wp-content/plugins/activitypub/includes/collection/class-followers.php b/wp-content/plugins/activitypub/includes/collection/class-followers.php index b51224fd..76611ff9 100644 --- a/wp-content/plugins/activitypub/includes/collection/class-followers.php +++ b/wp-content/plugins/activitypub/includes/collection/class-followers.php @@ -1,32 +1,36 @@ get_var( $wpdb->prepare( "SELECT DISTINCT p.ID FROM $wpdb->posts p INNER JOIN $wpdb->postmeta pm ON p.ID = pm.post_id WHERE p.post_type = %s AND pm.meta_key = 'activitypub_user_id' AND pm.meta_value = %d AND p.guid = %s", @@ -111,16 +115,16 @@ class Followers { } /** - * Get a Follower by Actor indepenent from the User. + * Get a Follower by Actor independent of the User. * * @param string $actor The Actor URL. * - * @return \Activitypub\Model\Follower|null The Follower object or null + * @return \Activitypub\Activity\Base_Object|WP_Error|null */ public static function get_follower_by_actor( $actor ) { global $wpdb; - // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching + // phpcs:ignore WordPress.DB.DirectDatabaseQuery $post_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE guid=%s", @@ -137,12 +141,12 @@ class Followers { } /** - * Get the Followers of a given user + * Get the Followers of a given user. * - * @param int $user_id The ID of the WordPress User. - * @param int $number Maximum number of results to return. - * @param int $page Page number. - * @param array $args The WP_Query arguments. + * @param int $user_id The ID of the WordPress User. + * @param int $number Maximum number of results to return. + * @param int $page Page number. + * @param array $args The WP_Query arguments. * @return array List of `Follower` objects. */ public static function get_followers( $user_id, $number = -1, $page = null, $args = array() ) { @@ -153,14 +157,17 @@ class Followers { /** * Get the Followers of a given user, along with a total count for pagination purposes. * - * @param int $user_id The ID of the WordPress User. - * @param int $number Maximum number of results to return. - * @param int $page Page number. - * @param array $args The WP_Query arguments. + * @param int $user_id The ID of the WordPress User. + * @param int $number Maximum number of results to return. + * @param int $page Page number. + * @param array $args The WP_Query arguments. * - * @return array - * followers List of `Follower` objects. - * total Total number of followers. + * @return array { + * Data about the followers. + * + * @type array $followers List of `Follower` objects. + * @type int $total Total number of followers. + * } */ public static function get_followers_with_count( $user_id, $number = -1, $page = null, $args = array() ) { $defaults = array( @@ -178,22 +185,21 @@ class Followers { ), ); - $args = wp_parse_args( $args, $defaults ); - $query = new WP_Query( $args ); - $total = $query->found_posts; + $args = wp_parse_args( $args, $defaults ); + $query = new WP_Query( $args ); + $total = $query->found_posts; $followers = array_map( function ( $post ) { return Follower::init_from_cpt( $post ); }, $query->get_posts() ); + return compact( 'followers', 'total' ); } /** - * Get all Followers - * - * @param array $args The WP_Query arguments. + * Get all Followers. * * @return array The Term list of Followers. */ @@ -219,7 +225,7 @@ class Followers { /** * Count the total number of followers * - * @param int $user_id The ID of the WordPress User + * @param int $user_id The ID of the WordPress User. * * @return int The number of Followers */ @@ -251,21 +257,21 @@ class Followers { } /** - * Returns all Inboxes fo a Users Followers + * Returns all Inboxes for a Users Followers. * - * @param int $user_id The ID of the WordPress User + * @param int $user_id The ID of the WordPress User. * - * @return array The list of Inboxes + * @return array The list of Inboxes. */ public static function get_inboxes( $user_id ) { $cache_key = sprintf( self::CACHE_KEY_INBOXES, $user_id ); - $inboxes = wp_cache_get( $cache_key, 'activitypub' ); + $inboxes = wp_cache_get( $cache_key, 'activitypub' ); if ( $inboxes ) { return $inboxes; } - // get all Followers of a ID of the WordPress User + // Get all Followers of a ID of the WordPress User. $posts = new WP_Query( array( 'nopaging' => true, @@ -316,13 +322,12 @@ class Followers { } /** - * Get all Followers that have not been updated for a given time + * Get all Followers that have not been updated for a given time. * - * @param enum $output The output format, supported ARRAY_N, OBJECT and ACTIVITYPUB_OBJECT. - * @param int $number Limits the result. - * @param int $older_than The time in seconds. + * @param int $number Optional. Limits the result. Default 50. + * @param int $older_than Optional. The time in seconds. Default 86400 (1 day). * - * @return mixed The Term list of Followers, the format depends on $output. + * @return array The Term list of Followers. */ public static function get_outdated_followers( $number = 50, $older_than = 86400 ) { $args = array( @@ -330,7 +335,7 @@ class Followers { 'posts_per_page' => $number, 'orderby' => 'modified', 'order' => 'ASC', - 'post_status' => 'any', // 'any' includes 'trash + 'post_status' => 'any', // 'any' includes 'trash'. 'date_query' => array( array( 'column' => 'post_modified_gmt', @@ -343,19 +348,18 @@ class Followers { $items = array(); foreach ( $posts->get_posts() as $follower ) { - $items[] = Follower::init_from_cpt( $follower ); // phpcs:ignore + $items[] = Follower::init_from_cpt( $follower ); } return $items; } /** - * Get all Followers that had errors + * Get all Followers that had errors. * - * @param enum $output The output format, supported ARRAY_N, OBJECT and ACTIVITYPUB_OBJECT - * @param integer $number The number of Followers to return. + * @param int $number Optional. The number of Followers to return. Default 20. * - * @return mixed The Term list of Followers, the format depends on $output. + * @return array The Term list of Followers. */ public static function get_faulty_followers( $number = 20 ) { $args = array( @@ -393,7 +397,7 @@ class Followers { $items = array(); foreach ( $posts->get_posts() as $follower ) { - $items[] = Follower::init_from_cpt( $follower ); // phpcs:ignore + $items[] = Follower::init_from_cpt( $follower ); } return $items; @@ -403,8 +407,7 @@ class Followers { * This function is used to store errors that occur when * sending an ActivityPub message to a Follower. * - * The error will be stored in the - * post meta. + * The error will be stored in post meta. * * @param int $post_id The ID of the WordPress Custom-Post-Type. * @param mixed $error The error message. Can be a string or a WP_Error. diff --git a/wp-content/plugins/activitypub/includes/collection/class-interactions.php b/wp-content/plugins/activitypub/includes/collection/class-interactions.php index c29cf259..36262e86 100644 --- a/wp-content/plugins/activitypub/includes/collection/class-interactions.php +++ b/wp-content/plugins/activitypub/includes/collection/class-interactions.php @@ -1,8 +1,14 @@ comment_post_ID; } - // not a reply to a post or comment + // Not a reply to a post or comment. if ( ! $comment_post_id ) { return false; } - $actor = object_to_uri( $activity['actor'] ); - $meta = get_remote_metadata_by_actor( $actor ); + $commentdata['comment_post_ID'] = $comment_post_id; + $commentdata['comment_parent'] = $parent_comment_id ? $parent_comment_id : 0; - if ( ! $meta || \is_wp_error( $meta ) ) { - return false; - } - - $url = object_to_uri( $meta['url'] ); - - $commentdata = array( - 'comment_post_ID' => $comment_post_id, - 'comment_author' => isset( $meta['name'] ) ? \esc_attr( $meta['name'] ) : \esc_attr( $meta['preferredUsername'] ), - 'comment_author_url' => \esc_url_raw( $url ), - 'comment_content' => \addslashes( $activity['object']['content'] ), - 'comment_type' => 'comment', - 'comment_author_email' => '', - 'comment_parent' => $parent_comment_id ? $parent_comment_id : 0, - 'comment_meta' => array( - 'source_id' => \esc_url_raw( $activity['object']['id'] ), - 'protocol' => 'activitypub', - ), - ); - - if ( isset( $meta['icon']['url'] ) ) { - $commentdata['comment_meta']['avatar_url'] = \esc_url_raw( $meta['icon']['url'] ); - } - - if ( isset( $activity['object']['url'] ) ) { - $commentdata['comment_meta']['source_url'] = \esc_url_raw( object_to_uri( $activity['object']['url'] ) ); - } - - // disable flood control - \remove_action( 'check_comment_flood', 'check_comment_flood_db', 10 ); - // do not require email for AP entries - \add_filter( 'pre_option_require_name_email', '__return_false' ); - // No nonce possible for this submission route - \add_filter( - 'akismet_comment_nonce', - function () { - return 'inactive'; - } - ); - \add_filter( 'wp_kses_allowed_html', array( self::class, 'allowed_comment_html' ), 10, 2 ); - - $comment = \wp_new_comment( $commentdata, true ); - - \remove_filter( 'wp_kses_allowed_html', array( self::class, 'allowed_comment_html' ), 10 ); - \remove_filter( 'pre_option_require_name_email', '__return_false' ); - // re-add flood control - \add_action( 'check_comment_flood', 'check_comment_flood_db', 10, 4 ); - - return $comment; + return self::persist( $commentdata, self::INSERT ); } /** - * Update a comment + * Update a comment. * - * @param array $activity The activity-object + * @param array $activity The activity object. * - * @return array|string|int|\WP_Error|false The commentdata or false on failure + * @return array|string|int|\WP_Error|false The comment data or false on failure. */ public static function update_comment( $activity ) { $meta = get_remote_metadata_by_actor( $activity['actor'] ); - //Determine comment_ID + // Determine comment_ID. $comment = object_id_to_comment( \esc_url_raw( $activity['object']['id'] ) ); $commentdata = \get_comment( $comment, ARRAY_A ); @@ -119,44 +75,63 @@ class Interactions { return false; } - //found a local comment id - $commentdata['comment_author'] = \esc_attr( $meta['name'] ? $meta['name'] : $meta['preferredUsername'] ); + // Found a local comment id. + $commentdata['comment_author'] = \esc_attr( $meta['name'] ? $meta['name'] : $meta['preferredUsername'] ); $commentdata['comment_content'] = \addslashes( $activity['object']['content'] ); - if ( isset( $meta['icon']['url'] ) ) { - $commentdata['comment_meta']['avatar_url'] = \esc_url_raw( $meta['icon']['url'] ); + + return self::persist( $commentdata, self::UPDATE ); + } + + /** + * Adds an incoming Like, Announce, ... as a comment to a post. + * + * @param array $activity Activity array. + * + * @return array|false Comment data or `false` on failure. + */ + public static function add_reaction( $activity ) { + $commentdata = self::activity_to_comment( $activity ); + + if ( ! $commentdata ) { + return false; } - // disable flood control - \remove_action( 'check_comment_flood', 'check_comment_flood_db', 10 ); - // do not require email for AP entries - \add_filter( 'pre_option_require_name_email', '__return_false' ); - // No nonce possible for this submission route - \add_filter( - 'akismet_comment_nonce', - function () { - return 'inactive'; - } - ); - \add_filter( 'wp_kses_allowed_html', array( self::class, 'allowed_comment_html' ), 10, 2 ); + $url = object_to_uri( $activity['object'] ); + $comment_post_id = url_to_postid( $url ); + $parent_comment_id = url_to_commentid( $url ); - $state = \wp_update_comment( $commentdata, true ); - - \remove_filter( 'wp_kses_allowed_html', array( self::class, 'allowed_comment_html' ), 10 ); - \remove_filter( 'pre_option_require_name_email', '__return_false' ); - // re-add flood control - \add_action( 'check_comment_flood', 'check_comment_flood_db', 10, 4 ); - - if ( 1 === $state ) { - return $commentdata; - } else { - return $state; // Either `false` or a `WP_Error` instance or `0` or `1`! + if ( ! $comment_post_id && $parent_comment_id ) { + $parent_comment = get_comment( $parent_comment_id ); + $comment_post_id = $parent_comment->comment_post_ID; } + + if ( ! $comment_post_id ) { + // Not a reply to a post or comment. + return false; + } + + $type = $activity['type']; + + if ( ! Comment::is_registered_comment_type( $type ) ) { + // Not a valid comment type. + return false; + } + + $comment_type = Comment::get_comment_type( $type ); + $comment_content = $comment_type['excerpt']; + + $commentdata['comment_post_ID'] = $comment_post_id; + $commentdata['comment_content'] = \esc_html( $comment_content ); + $commentdata['comment_type'] = \esc_attr( $comment_type['type'] ); + $commentdata['comment_meta']['source_id'] = \esc_url_raw( $activity['id'] ); + + return self::persist( $commentdata, self::INSERT ); } /** * Get interaction(s) for a given URL/ID. * - * @param strin $url The URL/ID to get interactions for. + * @param string $url The URL/ID to get interactions for. * * @return array The interactions as WP_Comment objects. */ @@ -198,19 +173,19 @@ class Interactions { public static function get_interactions_by_actor( $actor ) { $meta = get_remote_metadata_by_actor( $actor ); - // get URL, because $actor seems to be the ID + // Get URL, because $actor seems to be the ID. if ( $meta && ! is_wp_error( $meta ) && isset( $meta['url'] ) ) { $actor = object_to_uri( $meta['url'] ); } - $args = array( + $args = array( 'nopaging' => true, 'author_url' => $actor, // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query 'meta_query' => array( array( - 'key' => 'protocol', - 'value' => 'activitypub', + 'key' => 'protocol', + 'value' => 'activitypub', 'compare' => '=', ), ), @@ -223,7 +198,7 @@ class Interactions { * Adds line breaks to the list of allowed comment tags. * * @param array $allowed_tags Allowed HTML tags. - * @param string $context Context. + * @param string $context Optional. Context. Default empty. * * @return array Filtered tag list. */ @@ -244,4 +219,103 @@ class Interactions { return $allowed_tags; } + + /** + * Convert an Activity to a WP_Comment + * + * @param array $activity The Activity array. + * + * @return array|false The comment data or false on failure. + */ + public static function activity_to_comment( $activity ) { + $comment_content = null; + $actor = object_to_uri( $activity['actor'] ); + $actor = get_remote_metadata_by_actor( $actor ); + + // Check Actor-Meta. + if ( ! $actor || is_wp_error( $actor ) ) { + return false; + } + + // Check Actor-Name. + if ( isset( $actor['name'] ) ) { + $comment_author = $actor['name']; + } elseif ( isset( $actor['preferredUsername'] ) ) { + $comment_author = $actor['preferredUsername']; + } else { + return false; + } + + $url = object_to_uri( $actor['url'] ); + + if ( ! $url ) { + object_to_uri( $actor['id'] ); + } + + if ( isset( $activity['object']['content'] ) ) { + $comment_content = \addslashes( $activity['object']['content'] ); + } + + $commentdata = array( + 'comment_author' => \esc_attr( $comment_author ), + 'comment_author_url' => \esc_url_raw( $url ), + 'comment_content' => $comment_content, + 'comment_type' => 'comment', + 'comment_author_email' => '', + 'comment_meta' => array( + 'source_id' => \esc_url_raw( object_to_uri( $activity['object'] ) ), + 'protocol' => 'activitypub', + ), + ); + + if ( isset( $actor['icon']['url'] ) ) { + $commentdata['comment_meta']['avatar_url'] = \esc_url_raw( $actor['icon']['url'] ); + } + + if ( isset( $activity['object']['url'] ) ) { + $commentdata['comment_meta']['source_url'] = \esc_url_raw( object_to_uri( $activity['object']['url'] ) ); + } + + return $commentdata; + } + + /** + * Persist a comment. + * + * @param array $commentdata The commentdata array. + * @param string $action Optional. Either 'insert' or 'update'. Default 'insert'. + * + * @return array|string|int|\WP_Error|false The comment data or false on failure + */ + public static function persist( $commentdata, $action = self::INSERT ) { + // Disable flood control. + \remove_action( 'check_comment_flood', 'check_comment_flood_db', 10 ); + // Do not require email for AP entries. + \add_filter( 'pre_option_require_name_email', '__return_false' ); + // No nonce possible for this submission route. + \add_filter( + 'akismet_comment_nonce', + function () { + return 'inactive'; + } + ); + \add_filter( 'wp_kses_allowed_html', array( self::class, 'allowed_comment_html' ), 10, 2 ); + + if ( self::INSERT === $action ) { + $state = \wp_new_comment( $commentdata, true ); + } else { + $state = \wp_update_comment( $commentdata, true ); + } + + \remove_filter( 'wp_kses_allowed_html', array( self::class, 'allowed_comment_html' ), 10 ); + \remove_filter( 'pre_option_require_name_email', '__return_false' ); + // Restore flood control. + \add_action( 'check_comment_flood', 'check_comment_flood_db', 10, 4 ); + + if ( 1 === $state ) { + return $commentdata; + } else { + return $state; // Either WP_Comment, false, a WP_Error, 0, or 1! + } + } } diff --git a/wp-content/plugins/activitypub/includes/collection/class-replies.php b/wp-content/plugins/activitypub/includes/collection/class-replies.php new file mode 100644 index 00000000..34a5aa02 --- /dev/null +++ b/wp-content/plugins/activitypub/includes/collection/class-replies.php @@ -0,0 +1,181 @@ + 'approve', + 'orderby' => 'comment_date_gmt', + 'order' => 'ASC', + ); + + if ( $wp_object instanceof WP_Post ) { + $args['parent'] = 0; // TODO: maybe this is unnecessary. + $args['post_id'] = $wp_object->ID; + } elseif ( $wp_object instanceof WP_Comment ) { + $args['parent'] = $wp_object->comment_ID; + } else { + return new WP_Error(); + } + + return $args; + } + + /** + * Adds pagination args comments query. + * + * @param array $args Query args built by self::build_args. + * @param int $page The current pagination page. + * @param int $comments_per_page The number of comments per page. + */ + private static function add_pagination_args( $args, $page, $comments_per_page ) { + $args['number'] = $comments_per_page; + + $offset = intval( $page ) * $comments_per_page; + $args['offset'] = $offset; + + return $args; + } + + + /** + * Get the replies collections ID. + * + * @param WP_Post|WP_Comment $wp_object The post or comment to fetch replies for. + * + * @return string|WP_Error The rest URL of the replies collection or WP_Error if the object is not a post or comment. + */ + private static function get_id( $wp_object ) { + if ( $wp_object instanceof WP_Post ) { + return get_rest_url_by_path( sprintf( 'posts/%d/replies', $wp_object->ID ) ); + } elseif ( $wp_object instanceof WP_Comment ) { + return get_rest_url_by_path( sprintf( 'comments/%d/replies', $wp_object->comment_ID ) ); + } else { + return new WP_Error(); + } + } + + /** + * Get the replies collection. + * + * @param WP_Post|WP_Comment $wp_object The post or comment to fetch replies for. + * + * @return array An associative array containing the replies collection without JSON-LD context. + */ + public static function get_collection( $wp_object ) { + $id = self::get_id( $wp_object ); + + if ( ! $id ) { + return null; + } + + $replies = array( + 'id' => $id, + 'type' => 'Collection', + ); + + $replies['first'] = self::get_collection_page( $wp_object, 0, $replies['id'] ); + + return $replies; + } + + /** + * Get the ActivityPub ID's from a list of comments. + * + * It takes only federated/non-local comments into account, others also do not have an + * ActivityPub ID available. + * + * @param WP_Comment[] $comments The comments to retrieve the ActivityPub ids from. + * + * @return string[] A list of the ActivityPub ID's. + */ + private static function get_reply_ids( $comments ) { + $comment_ids = array(); + // Only add external comments from the fediverse. + // Maybe use the Comment class more and the function is_local_comment etc. + foreach ( $comments as $comment ) { + if ( is_local_comment( $comment ) ) { + continue; + } + + $public_comment_id = Comment::get_source_id( $comment->comment_ID ); + if ( $public_comment_id ) { + $comment_ids[] = $public_comment_id; + } + } + return $comment_ids; + } + + /** + * Returns a replies collection page as an associative array. + * + * @link https://www.w3.org/TR/activitystreams-vocabulary/#dfn-collectionpage + * + * @param WP_Post|WP_Comment $wp_object The post of comment the replies are for. + * @param int $page The current pagination page. + * @param string $part_of The collection id/url the returned CollectionPage belongs to. + * + * @return array A CollectionPage as an associative array. + */ + public static function get_collection_page( $wp_object, $page, $part_of = null ) { + // Build initial arguments for fetching approved comments. + $args = self::build_args( $wp_object ); + + // Retrieve the partOf if not already given. + $part_of = $part_of ?? self::get_id( $wp_object ); + + // If the collection page does not exist. + if ( is_wp_error( $args ) || is_wp_error( $part_of ) ) { + return null; + } + + // Get to total replies count. + $total_replies = \get_comments( array_merge( $args, array( 'count' => true ) ) ); + + // Modify query args to retrieve paginated results. + $comments_per_page = \get_option( 'comments_per_page' ); + + // Fetch internal and external comments for current page. + $comments = get_comments( self::add_pagination_args( $args, $page, $comments_per_page ) ); + + // Get the ActivityPub ID's of the comments, without out local-only comments. + $comment_ids = self::get_reply_ids( $comments ); + + // Build the associative CollectionPage array. + $collection_page = array( + 'id' => \add_query_arg( 'page', $page, $part_of ), + 'type' => 'CollectionPage', + 'partOf' => $part_of, + 'items' => $comment_ids, + ); + + if ( $total_replies / $comments_per_page > $page + 1 ) { + $collection_page['next'] = \add_query_arg( 'page', $page + 1, $part_of ); + } + + return $collection_page; + } +} diff --git a/wp-content/plugins/activitypub/includes/collection/class-users.php b/wp-content/plugins/activitypub/includes/collection/class-users.php index e4596b87..036d210a 100644 --- a/wp-content/plugins/activitypub/includes/collection/class-users.php +++ b/wp-content/plugins/activitypub/includes/collection/class-users.php @@ -1,4 +1,10 @@ false, - 'number' => 1, - 'hide_empty' => true, - 'fields' => 'ID', + 'count_total' => false, + 'number' => 1, + 'hide_empty' => true, + 'fields' => 'ID', // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query - 'meta_query' => array( + 'meta_query' => array( 'relation' => 'OR', array( 'key' => 'activitypub_user_identifier', @@ -110,7 +119,7 @@ class Users { $username = str_replace( array( '*', '%' ), '', $username ); - // check for login or nicename. + // Check for login or nicename. $user = new WP_User_Query( array( 'count_total' => false, @@ -136,26 +145,26 @@ class Users { /** * Get the User by resource. * - * @param string $resource The User-Resource. + * @param string $uri The User-Resource. * - * @return \Acitvitypub\Model\User The User. + * @return User|WP_Error The User or WP_Error if user not found. */ - public static function get_by_resource( $resource ) { - $resource = object_to_uri( $resource ); + public static function get_by_resource( $uri ) { + $uri = object_to_uri( $uri ); $scheme = 'acct'; - $match = array(); - // try to extract the scheme and the host - if ( preg_match( '/^([a-zA-Z^:]+):(.*)$/i', $resource, $match ) ) { - // extract the scheme + $match = array(); + // Try to extract the scheme and the host. + if ( preg_match( '/^([a-zA-Z^:]+):(.*)$/i', $uri, $match ) ) { + // Extract the scheme. $scheme = \esc_attr( $match[1] ); } switch ( $scheme ) { - // check for http(s) URIs + // Check for http(s) URIs. case 'http': case 'https': - $resource_path = \wp_parse_url( $resource, PHP_URL_PATH ); + $resource_path = \wp_parse_url( $uri, PHP_URL_PATH ); if ( $resource_path ) { $blog_path = \wp_parse_url( \home_url(), PHP_URL_PATH ); @@ -166,7 +175,7 @@ class Users { $resource_path = \trim( $resource_path, '/' ); - // check for http(s)://blog.example.com/@username + // Check for http(s)://blog.example.com/@username. if ( str_starts_with( $resource_path, '@' ) ) { $identifier = \str_replace( '@', '', $resource_path ); $identifier = \trim( $identifier, '/' ); @@ -175,17 +184,17 @@ class Users { } } - // check for http(s)://blog.example.com/author/username - $user_id = url_to_authorid( $resource ); + // Check for http(s)://blog.example.com/author/username. + $user_id = url_to_authorid( $uri ); if ( $user_id ) { return self::get_by_id( $user_id ); } - // check for http(s)://blog.example.com/ + // Check for http(s)://blog.example.com/. if ( - normalize_url( site_url() ) === normalize_url( $resource ) || - normalize_url( home_url() ) === normalize_url( $resource ) + normalize_url( site_url() ) === normalize_url( $uri ) || + normalize_url( home_url() ) === normalize_url( $uri ) ) { return self::get_by_id( self::BLOG_USER_ID ); } @@ -195,11 +204,11 @@ class Users { \__( 'User not found', 'activitypub' ), array( 'status' => 404 ) ); - // check for acct URIs + // Check for acct URIs. case 'acct': - $resource = \str_replace( 'acct:', '', $resource ); - $identifier = \substr( $resource, 0, \strrpos( $resource, '@' ) ); - $host = normalize_host( \substr( \strrchr( $resource, '@' ), 1 ) ); + $uri = \str_replace( 'acct:', '', $uri ); + $identifier = \substr( $uri, 0, \strrpos( $uri, '@' ) ); + $host = normalize_host( \substr( \strrchr( $uri, '@' ), 1 ) ); $blog_host = normalize_host( \wp_parse_url( \home_url( '/' ), \PHP_URL_HOST ) ); if ( $blog_host !== $host ) { @@ -210,7 +219,7 @@ class Users { ); } - // prepare wildcards https://github.com/mastodon/mastodon/issues/22213 + // Prepare wildcards https://github.com/mastodon/mastodon/issues/22213. if ( in_array( $identifier, array( '_', '*', '' ), true ) ) { return self::get_by_id( self::BLOG_USER_ID ); } @@ -228,9 +237,9 @@ class Users { /** * Get the User by resource. * - * @param string $resource The User-Resource. + * @param string $id The User-Resource. * - * @return \Acitvitypub\Model\User The User. + * @return User|Blog|Application|WP_Error The User or WP_Error if user not found. */ public static function get_by_various( $id ) { $user = null; @@ -238,11 +247,11 @@ class Users { if ( is_numeric( $id ) ) { $user = self::get_by_id( $id ); } elseif ( - // is URL + // Is URL. filter_var( $id, FILTER_VALIDATE_URL ) || - // is acct + // Is acct. str_starts_with( $id, 'acct:' ) || - // is email + // Is email. filter_var( $id, FILTER_VALIDATE_EMAIL ) ) { $user = self::get_by_resource( $id ); diff --git a/wp-content/plugins/activitypub/includes/compat.php b/wp-content/plugins/activitypub/includes/compat.php index 8c274c88..fa8627b7 100644 --- a/wp-content/plugins/activitypub/includes/compat.php +++ b/wp-content/plugins/activitypub/includes/compat.php @@ -1,6 +1,8 @@ $v ) { + foreach ( $input as $k => $v ) { if ( ++$next_key !== $k ) { return false; } diff --git a/wp-content/plugins/activitypub/includes/debug.php b/wp-content/plugins/activitypub/includes/debug.php index d42b2a9a..b289c80d 100644 --- a/wp-content/plugins/activitypub/includes/debug.php +++ b/wp-content/plugins/activitypub/includes/debug.php @@ -1,17 +1,22 @@ 404, 'actor' => $actor ) ); + return new WP_Error( + 'activitypub_no_valid_actor_identifier', + \__( 'The "actor" identifier is not valid', 'activitypub' ), + array( + 'status' => 404, + 'actor' => $actor, + ) + ); } } @@ -69,7 +94,14 @@ function get_remote_metadata_by_actor( $actor, $cached = true ) { } if ( ! $actor ) { - return new WP_Error( 'activitypub_no_valid_actor_identifier', \__( 'The "actor" identifier is not valid', 'activitypub' ), array( 'status' => 404, 'actor' => $actor ) ); + return new WP_Error( + 'activitypub_no_valid_actor_identifier', + \__( 'The "actor" identifier is not valid', 'activitypub' ), + array( + 'status' => 404, + 'actor' => $actor, + ) + ); } if ( is_wp_error( $actor ) ) { @@ -78,7 +110,7 @@ function get_remote_metadata_by_actor( $actor, $cached = true ) { $transient_key = 'activitypub_' . $actor; - // only check the cache if needed. + // Only check the cache if needed. if ( $cached ) { $metadata = \get_transient( $transient_key ); @@ -88,7 +120,14 @@ function get_remote_metadata_by_actor( $actor, $cached = true ) { } if ( ! \wp_http_validate_url( $actor ) ) { - $metadata = new WP_Error( 'activitypub_no_valid_actor_url', \__( 'The "actor" is no valid URL', 'activitypub' ), array( 'status' => 400, 'actor' => $actor ) ); + $metadata = new WP_Error( + 'activitypub_no_valid_actor_url', + \__( 'The "actor" is no valid URL', 'activitypub' ), + array( + 'status' => 400, + 'actor' => $actor, + ) + ); return $metadata; } @@ -102,7 +141,14 @@ function get_remote_metadata_by_actor( $actor, $cached = true ) { $metadata = \json_decode( $metadata, true ); if ( ! $metadata ) { - $metadata = new WP_Error( 'activitypub_invalid_json', \__( 'No valid JSON data', 'activitypub' ), array( 'status' => 400, 'actor' => $actor ) ); + $metadata = new WP_Error( + 'activitypub_invalid_json', + \__( 'No valid JSON data', 'activitypub' ), + array( + 'status' => 400, + 'actor' => $actor, + ) + ); return $metadata; } @@ -114,7 +160,7 @@ function get_remote_metadata_by_actor( $actor, $cached = true ) { /** * Returns the followers of a given user. * - * @param int $user_id The User-ID. + * @param int $user_id The user ID. * * @return array The followers. */ @@ -125,7 +171,7 @@ function get_followers( $user_id ) { /** * Count the number of followers for a given user. * - * @param int $user_id The User-ID. + * @param int $user_id The user ID. * * @return int The number of followers. */ @@ -145,12 +191,12 @@ function count_followers( $user_id ) { function url_to_authorid( $url ) { global $wp_rewrite; - // check if url hase the same host + // Check if url hase the same host. if ( \wp_parse_url( \home_url(), \PHP_URL_HOST ) !== \wp_parse_url( $url, \PHP_URL_HOST ) ) { return 0; } - // first, check to see if there is a 'author=N' to match against + // First, check to see if there is a 'author=N' to match against. if ( \preg_match( '/[?&]author=(\d+)/i', $url, $values ) ) { $id = \absint( $values[1] ); if ( $id ) { @@ -158,19 +204,19 @@ function url_to_authorid( $url ) { } } - // check to see if we are using rewrite rules + // Check to see if we are using rewrite rules. $rewrite = $wp_rewrite->wp_rewrite_rules(); - // not using rewrite rules, and 'author=N' method failed, so we're out of options + // Not using rewrite rules, and 'author=N' method failed, so we're out of options. if ( empty( $rewrite ) ) { return 0; } - // generate rewrite rule for the author url + // Generate rewrite rule for the author url. $author_rewrite = $wp_rewrite->get_author_permastruct(); - $author_regexp = \str_replace( '%author%', '', $author_rewrite ); + $author_regexp = \str_replace( '%author%', '', $author_rewrite ); - // match the rewrite rule with the passed url + // Match the rewrite rule with the passed url. if ( \preg_match( '/https?:\/\/(.+)' . \preg_quote( $author_regexp, '/' ) . '([^\/]+)/i', $url, $match ) ) { $user = \get_user_by( 'slug', $match[2] ); if ( $user ) { @@ -182,10 +228,9 @@ function url_to_authorid( $url ) { } /** - * Verify if url is a wp_ap_comment, - * Or if it is a previously received remote comment + * Verify that url is a wp_ap_comment or a previously received remote comment. * - * @return int comment_id + * @return int|bool Comment ID or false if not found. */ function is_comment() { $comment_id = get_query_var( 'c', null ); @@ -193,8 +238,7 @@ function is_comment() { if ( ! is_null( $comment_id ) ) { $comment = \get_comment( $comment_id ); - // Only return local origin comments - if ( $comment && $comment->user_id ) { + if ( $comment ) { return $comment_id; } } @@ -203,13 +247,13 @@ function is_comment() { } /** - * Check for Tombstone Objects + * Check for Tombstone Objects. * * @see https://www.w3.org/TR/activitypub/#delete-activity-outbox * - * @param WP_Error $wp_error A WP_Error-Response of an HTTP-Request + * @param WP_Error $wp_error A WP_Error-Response of an HTTP-Request. * - * @return boolean true if HTTP-Code is 410 or 404 + * @return boolean True if HTTP-Code is 410 or 404. */ function is_tombstone( $wp_error ) { if ( ! is_wp_error( $wp_error ) ) { @@ -226,13 +270,13 @@ function is_tombstone( $wp_error ) { /** * Get the REST URL relative to this plugin's namespace. * - * @param string $path Optional. REST route path. Otherwise this plugin's namespaced root. + * @param string $path Optional. REST route path. Default ''. * * @return string REST URL relative to this plugin's namespace. */ function get_rest_url_by_path( $path = '' ) { - // we'll handle the leading slash. - $path = ltrim( $path, '/' ); + // We'll handle the leading slash. + $path = ltrim( $path, '/' ); $namespaced_path = sprintf( '/%s/%s', ACTIVITYPUB_REST_NAMESPACE, $path ); return \get_rest_url( null, $namespaced_path ); } @@ -240,37 +284,35 @@ function get_rest_url_by_path( $path = '' ) { /** * Convert a string from camelCase to snake_case. * - * @param string $string The string to convert. + * @param string $input The string to convert. * * @return string The converted string. */ -// phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.stringFound -function camel_to_snake_case( $string ) { - return strtolower( preg_replace( '/(?query_vars['activitypub'] ) ) { return true; } @@ -363,7 +403,7 @@ function is_activitypub_request() { /** * This function checks if a user is disabled for ActivityPub. * - * @param int $user_id The User-ID. + * @param int $user_id The user ID. * * @return boolean True if the user is disabled, false otherwise. */ @@ -405,6 +445,12 @@ function is_user_disabled( $user_id ) { break; } + /** + * Allow plugins to disable users for ActivityPub. + * + * @param boolean $return True if the user is disabled, false otherwise. + * @param int $user_id The User-ID. + */ return apply_filters( 'activitypub_is_user_disabled', $return, $user_id ); } @@ -414,7 +460,7 @@ function is_user_disabled( $user_id ) { * This function is used to check if the 'blog' or 'user' * type is disabled for ActivityPub. * - * @param enum $type Can be 'blog' or 'user'. + * @param string $type User type. 'blog' or 'user'. * * @return boolean True if the user type is disabled, false otherwise. */ @@ -461,10 +507,20 @@ function is_user_type_disabled( $type ) { $return = false; break; default: - $return = new WP_Error( 'activitypub_wrong_user_type', __( 'Wrong user type', 'activitypub' ), array( 'status' => 400 ) ); + $return = new WP_Error( + 'activitypub_wrong_user_type', + __( 'Wrong user type', 'activitypub' ), + array( 'status' => 400 ) + ); break; } + /** + * Allow plugins to disable user types for ActivityPub. + * + * @param boolean $return True if the user type is disabled, false otherwise. + * @param string $type The User-Type. + */ return apply_filters( 'activitypub_is_user_type_disabled', $return, $type ); } @@ -519,20 +575,25 @@ function is_json( $data ) { } /** - * Check if a blog is public based on the `blog_public` option + * Check whther a blog is public based on the `blog_public` option. * - * @return bollean True if public, false if not + * @return bool True if public, false if not */ function is_blog_public() { + /** + * Filter whether the blog is public. + * + * @param bool $public Whether the blog is public. + */ return (bool) apply_filters( 'activitypub_is_blog_public', \get_option( 'blog_public', 1 ) ); } /** - * Sanitize a URL + * Sanitize a URL. * - * @param string $value The URL to sanitize + * @param string $value The URL to sanitize. * - * @return string|null The sanitized URL or null if invalid + * @return string|null The sanitized URL or null if invalid. */ function sanitize_url( $value ) { if ( filter_var( $value, FILTER_VALIDATE_URL ) === false ) { @@ -543,11 +604,11 @@ function sanitize_url( $value ) { } /** - * Extract recipient URLs from Activity object + * Extract recipient URLs from Activity object. * - * @param array $data + * @param array $data The Activity object as array. * - * @return array The list of user URLs + * @return array The list of user URLs. */ function extract_recipients_from_activity( $data ) { $recipient_items = array(); @@ -574,10 +635,10 @@ function extract_recipients_from_activity( $data ) { $recipients = array(); - // flatten array + // Flatten array. foreach ( $recipient_items as $recipient ) { if ( is_array( $recipient ) ) { - // check if recipient is an object + // Check if recipient is an object. if ( array_key_exists( 'id', $recipient ) ) { $recipients[] = $recipient['id']; } @@ -590,11 +651,11 @@ function extract_recipients_from_activity( $data ) { } /** - * Check if passed Activity is Public + * Check if passed Activity is Public. * - * @param array $data The Activity object as array + * @param array $data The Activity object as array. * - * @return boolean True if public, false if not + * @return boolean True if public, false if not. */ function is_activity_public( $data ) { $recipients = extract_recipients_from_activity( $data ); @@ -603,53 +664,58 @@ function is_activity_public( $data ) { } /** - * Get active users based on a given duration + * Get active users based on a given duration. * - * @param int $duration The duration to check in month(s) + * @param int $duration Optional. The duration to check in month(s). Default 1. * - * @return int The number of active users + * @return int The number of active users. */ function get_active_users( $duration = 1 ) { - $duration = intval( $duration ); + $duration = intval( $duration ); $transient_key = sprintf( 'monthly_active_users_%d', $duration ); - $count = get_transient( $transient_key ); + $count = get_transient( $transient_key ); if ( false === $count ) { global $wpdb; - $query = "SELECT COUNT( DISTINCT post_author ) FROM {$wpdb->posts} WHERE post_type = 'post' AND post_status = 'publish' AND post_date <= DATE_SUB( NOW(), INTERVAL %d MONTH )"; - $query = $wpdb->prepare( $query, $duration ); - $count = $wpdb->get_var( $query ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching + + // phpcs:ignore WordPress.DB.DirectDatabaseQuery + $count = $wpdb->get_var( + $wpdb->prepare( + "SELECT COUNT( DISTINCT post_author ) FROM {$wpdb->posts} WHERE post_type = 'post' AND post_status = 'publish' AND post_date <= DATE_SUB( NOW(), INTERVAL %d MONTH )", + $duration + ) + ); set_transient( $transient_key, $count, DAY_IN_SECONDS ); } - // if 0 authors where active + // If 0 authors where active. if ( 0 === $count ) { return 0; } - // if single user mode + // If single user mode. if ( is_single_user() ) { return 1; } - // if blog user is disabled + // If blog user is disabled. if ( is_user_disabled( Users::BLOG_USER_ID ) ) { - return $count; + return (int) $count; } - // also count blog user - return $count + 1; + // Also count blog user. + return (int) $count + 1; } /** - * Get the total number of users + * Get the total number of users. * - * @return int The total number of users + * @return int The total number of users. */ function get_total_users() { - // if single user mode + // If single user mode. if ( is_single_user() ) { return 1; } @@ -666,12 +732,12 @@ function get_total_users() { $users = 1; } - // if blog user is disabled + // If blog user is disabled. if ( is_user_disabled( Users::BLOG_USER_ID ) ) { - return $users; + return (int) $users; } - return $users + 1; + return (int) $users + 1; } /** @@ -679,60 +745,66 @@ function get_total_users() { * * @param string $id ActivityPub object ID (usually a URL) to check. * - * @return int|boolean Comment ID, or false on failure. + * @return \WP_Comment|boolean Comment, or false on failure. */ function object_id_to_comment( $id ) { return Comment::object_id_to_comment( $id ); } /** - * Verify if URL is a local comment, - * Or if it is a previously received remote comment + * Verify that URL is a local comment or a previously received remote comment. * (For threading comments locally) * * @param string $url The URL to check. * - * @return int comment_ID or null if not found + * @return string|null Comment ID or null if not found */ function url_to_commentid( $url ) { return Comment::url_to_commentid( $url ); } /** - * Get the URI of an ActivityPub object + * Get the URI of an ActivityPub object. * - * @param array $object The ActivityPub object + * @param array|string $data The ActivityPub object. * * @return string The URI of the ActivityPub object */ -function object_to_uri( $object ) { - // check if it is already simple - if ( ! $object || is_string( $object ) ) { - return $object; +function object_to_uri( $data ) { + // Check whether it is already simple. + if ( ! $data || is_string( $data ) ) { + return $data; } - // check if it is a list, then take first item - // this plugin does not support collections - if ( array_is_list( $object ) ) { - $object = $object[0]; + /* + * Check if it is a list, then take first item. + * This plugin does not support collections. + */ + if ( array_is_list( $data ) ) { + $data = $data[0]; } - // check if it is simplified now - if ( is_string( $object ) ) { - return $object; + // Check if it is simplified now. + if ( is_string( $data ) ) { + return $data; } - // return part of Object that makes most sense - switch ( $object['type'] ) { + $type = 'Object'; + if ( isset( $data['type'] ) ) { + $type = $data['type']; + } + + // Return part of Object that makes most sense. + switch ( $type ) { case 'Link': - $object = $object['href']; + $data = $data['href']; break; default: - $object = $object['id']; + $data = $data['id']; break; } - return $object; + return $data; } /** @@ -794,9 +866,8 @@ function is_local_comment( $comment ) { /** * Mark a WordPress object as federated. * - * @param WP_Comment|WP_Post|mixed $wp_object - * - * @return void + * @param \WP_Comment|\WP_Post $wp_object The WordPress object. + * @param string $state The state of the object. */ function set_wp_object_state( $wp_object, $state ) { $meta_key = 'activitypub_status'; @@ -806,6 +877,12 @@ function set_wp_object_state( $wp_object, $state ) { } elseif ( $wp_object instanceof \WP_Comment ) { \update_comment_meta( $wp_object->comment_ID, $meta_key, $state ); } else { + /** + * Allow plugins to mark WordPress objects as federated. + * + * @param \WP_Comment|\WP_Post $wp_object The WordPress object. + * @param string $state The state of the object. + */ \apply_filters( 'activitypub_mark_wp_object_as_federated', $wp_object ); } } @@ -813,7 +890,7 @@ function set_wp_object_state( $wp_object, $state ) { /** * Get the federation state of a WordPress object. * - * @param WP_Comment|WP_Post|mixed $wp_object + * @param \WP_Comment|\WP_Post $wp_object The WordPress object. * * @return string|false The state of the object or false if not found. */ @@ -825,6 +902,11 @@ function get_wp_object_state( $wp_object ) { } elseif ( $wp_object instanceof \WP_Comment ) { return \get_comment_meta( $wp_object->comment_ID, $meta_key, true ); } else { + /** + * Allow plugins to get the federation state of a WordPress object. + * + * @param \WP_Comment|\WP_Post $wp_object The WordPress object. + */ return \apply_filters( 'activitypub_get_wp_object_state', false, $wp_object ); } } @@ -834,7 +916,7 @@ function get_wp_object_state( $wp_object ) { * * Set some default descriptions for the default post types. * - * @param WP_Post_Type $post_type The post type object. + * @param \WP_Post_Type $post_type The post type object. * * @return string The description of the post type. */ @@ -857,6 +939,12 @@ function get_post_type_description( $post_type ) { } } + /** + * Allow plugins to get the description of a post type. + * + * @param string $description The description of the post type. + * @param \WP_Post_Type $post_type The post type object. + */ return apply_filters( 'activitypub_post_type_description', $description, $post_type->name, $post_type ); } @@ -866,9 +954,9 @@ function get_post_type_description( $post_type ) { * @return string The masked version. */ function get_masked_wp_version() { - // only show the major and minor version + // Only show the major and minor version. $version = get_bloginfo( 'version' ); - // strip the RC or beta part + // Strip the RC or beta part. $version = preg_replace( '/-.*$/', '', $version ); $version = explode( '.', $version ); $version = array_slice( $version, 0, 2 ); @@ -884,7 +972,7 @@ function get_masked_wp_version() { * @return array The enclosures. */ function get_enclosures( $post_id ) { - $enclosures = get_post_meta( $post_id, 'enclosure' ); + $enclosures = get_post_meta( $post_id, 'enclosure', false ); if ( ! $enclosures ) { return array(); @@ -899,8 +987,8 @@ function get_enclosures( $post_id ) { } return array( - 'url' => $attributes[0], - 'length' => isset( $attributes[1] ) ? trim( $attributes[1] ) : null, + 'url' => $attributes[0], + 'length' => isset( $attributes[1] ) ? trim( $attributes[1] ) : null, 'mediaType' => isset( $attributes[2] ) ? trim( $attributes[2] ) : null, ); }, @@ -917,15 +1005,14 @@ function get_enclosures( $post_id ) { * * @see https://developer.wordpress.org/reference/functions/get_post_ancestors/ * - * @param int|WP_Comment $comment Comment ID or comment object. + * @param int|\WP_Comment $comment Comment ID or comment object. * - * @return WP_Comment[] Array of ancestor comments or empty array if there are none. + * @return \WP_Comment[] Array of ancestor comments or empty array if there are none. */ function get_comment_ancestors( $comment ) { $comment = \get_comment( $comment ); - // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual - if ( ! $comment || empty( $comment->comment_parent ) || $comment->comment_parent == $comment->comment_ID ) { + if ( ! $comment || empty( $comment->comment_parent ) || (int) $comment->comment_parent === (int) $comment->comment_ID ) { return array(); } @@ -934,9 +1021,8 @@ function get_comment_ancestors( $comment ) { $id = (int) $comment->comment_parent; $ancestors[] = $id; - // phpcs:ignore Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition while ( $id > 0 ) { - $ancestor = \get_comment( $id ); + $ancestor = \get_comment( $id ); $parent_id = (int) $ancestor->comment_parent; // Loop detection: If the ancestor has been seen before, break. @@ -977,13 +1063,13 @@ function custom_large_numbers( $formatted, $number, $decimals ) { $thousands_sep = $wp_locale->number_format['thousands_sep']; } - if ( $number < 1000 ) { // any number less than a Thousand. + if ( $number < 1000 ) { // Any number less than a Thousand. return \number_format( $number, $decimals, $decimal_point, $thousands_sep ); - } elseif ( $number < 1000000 ) { // any number less than a million + } elseif ( $number < 1000000 ) { // Any number less than a million. return \number_format( $number / 1000, $decimals, $decimal_point, $thousands_sep ) . 'K'; - } elseif ( $number < 1000000000 ) { // any number less than a billion + } elseif ( $number < 1000000000 ) { // Any number less than a billion. return \number_format( $number / 1000000, $decimals, $decimal_point, $thousands_sep ) . 'M'; - } else { // at least a billion + } else { // At least a billion. return \number_format( $number / 1000000000, $decimals, $decimal_point, $thousands_sep ) . 'B'; } @@ -991,6 +1077,37 @@ function custom_large_numbers( $formatted, $number, $decimals ) { return $formatted; } +/** + * Registers a ActivityPub comment type. + * + * @param string $comment_type Key for comment type. + * @param array $args Optional. Array of arguments for registering a comment type. Default empty array. + * + * @return array The registered Activitypub comment type. + */ +function register_comment_type( $comment_type, $args = array() ) { + global $activitypub_comment_types; + + if ( ! is_array( $activitypub_comment_types ) ) { + $activitypub_comment_types = array(); + } + + // Sanitize comment type name. + $comment_type = sanitize_key( $comment_type ); + + $activitypub_comment_types[ $comment_type ] = $args; + + /** + * Fires after a ActivityPub comment type is registered. + * + * @param string $comment_type Comment type. + * @param array $args Arguments used to register the comment type. + */ + do_action( 'activitypub_registered_comment_type', $comment_type, $args ); + + return $args; +} + /** * Normalize a URL. * @@ -1019,27 +1136,173 @@ function normalize_host( $host ) { } /** - * Get the Extra Fields of an Actor + * Get the reply intent URI. * - * @param int $user_id The User-ID. - * - * @return array The extra fields. + * @return string The reply intent URI. */ -function get_actor_extra_fields( $user_id ) { - $extra_fields = new WP_Query( - array( - 'post_type' => 'ap_extrafield', - 'nopaging' => true, - 'status' => 'publish', - 'author' => $user_id, - ) +function get_reply_intent_uri() { + return sprintf( + 'javascript:(()=>{window.open(\'%s\'+encodeURIComponent(window.location.href));})();', + esc_url( \admin_url( 'post-new.php?in_reply_to=' ) ) ); +} - if ( $extra_fields->have_posts() ) { - $extra_fields = $extra_fields->posts; - } else { - $extra_fields = array(); +/** + * Replace content with links, mentions or hashtags by Regex callback and not affect protected tags. + * + * @param string $content The content that should be changed. + * @param string $regex The regex to use. + * @param callable $regex_callback Callback for replacement logic. + * + * @return string The content with links, mentions, hashtags, etc. + */ +function enrich_content_data( $content, $regex, $regex_callback ) { + // Small protection against execution timeouts: limit to 1 MB. + if ( mb_strlen( $content ) > MB_IN_BYTES ) { + return $content; + } + $tag_stack = array(); + $protected_tags = array( + 'pre', + 'code', + 'textarea', + 'style', + 'a', + ); + $content_with_links = ''; + $in_protected_tag = false; + foreach ( wp_html_split( $content ) as $chunk ) { + if ( preg_match( '#^$#i', $chunk, $m ) ) { + $content_with_links .= $chunk; + continue; + } + + if ( preg_match( '#^<(/)?([a-z-]+)\b[^>]*>$#i', $chunk, $m ) ) { + $tag = strtolower( $m[2] ); + if ( '/' === $m[1] ) { + // Closing tag. + $i = array_search( $tag, $tag_stack, true ); + // We can only remove the tag from the stack if it is in the stack. + if ( false !== $i ) { + $tag_stack = array_slice( $tag_stack, 0, $i ); + } + } else { + // Opening tag, add it to the stack. + $tag_stack[] = $tag; + } + + // If we're in a protected tag, the tag_stack contains at least one protected tag string. + // The protected tag state can only change when we encounter a start or end tag. + $in_protected_tag = array_intersect( $tag_stack, $protected_tags ); + + // Never inspect tags. + $content_with_links .= $chunk; + continue; + } + + if ( $in_protected_tag ) { + // Don't inspect a chunk inside an inspected tag. + $content_with_links .= $chunk; + continue; + } + + // Only reachable when there is no protected tag in the stack. + $content_with_links .= \preg_replace_callback( $regex, $regex_callback, $chunk ); } - return apply_filters( 'activitypub_get_actor_extra_fields', $extra_fields, $user_id ); + return $content_with_links; +} + +/** + * Generate a summary of a post. + * + * This function generates a summary of a post by extracting: + * + * 1. The post excerpt if it exists. + * 2. The first part of the post content if it contains the tag. + * 3. An excerpt of the post content if it is longer than the specified length. + * + * @param int|\WP_Post $post The post ID or post object. + * @param integer $length The maximum length of the summary. + * Default is 500. It will be ignored if the post excerpt + * and the content above the tag. + * + * @return string The generated post summary. + */ +function generate_post_summary( $post, $length = 500 ) { + $post = get_post( $post ); + + if ( ! $post ) { + return ''; + } + + $content = \sanitize_post_field( 'post_excerpt', $post->post_excerpt, $post->ID ); + + if ( $content ) { + /** + * Filters the post excerpt. + * + * @param string $content The post excerpt. + */ + return \apply_filters( 'the_excerpt', $content ); + } + + $content = \sanitize_post_field( 'post_content', $post->post_content, $post->ID ); + $content_parts = \get_extended( $content ); + + /** + * Filters the excerpt more value. + * + * @param string $excerpt_more The excerpt more. + */ + $excerpt_more = \apply_filters( 'activitypub_excerpt_more', '[…]' ); + $length = $length - strlen( $excerpt_more ); + + // Check for the tag. + if ( + ! empty( $content_parts['extended'] ) && + ! empty( $content_parts['main'] ) + ) { + $content = $content_parts['main'] . ' ' . $excerpt_more; + $length = null; + } + + $content = \html_entity_decode( $content ); + $content = \wp_strip_all_tags( $content ); + $content = \trim( $content ); + $content = \preg_replace( '/\R+/m', "\n\n", $content ); + $content = \preg_replace( '/[\r\t]/', '', $content ); + + if ( $length && \strlen( $content ) > $length ) { + $content = \wordwrap( $content, $length, '' ); + $content = \explode( '', $content, 2 ); + $content = $content[0] . ' ' . $excerpt_more; + } + + /* + Removed until this is merged: https://github.com/mastodon/mastodon/pull/28629 + return \apply_filters( 'the_excerpt', $content ); + */ + return $content; +} + +/** + * Get the content warning of a post. + * + * @param int|\WP_Post $post_id The post ID or post object. + * + * @return string|false The content warning or false if not found. + */ +function get_content_warning( $post_id ) { + $post = get_post( $post_id ); + if ( ! $post ) { + return false; + } + + $warning = get_post_meta( $post->ID, 'activitypub_content_warning', true ); + if ( empty( $warning ) ) { + return false; + } + + return $warning; } diff --git a/wp-content/plugins/activitypub/includes/handler/class-announce.php b/wp-content/plugins/activitypub/includes/handler/class-announce.php index 46db2a3b..377a3c6e 100644 --- a/wp-content/plugins/activitypub/includes/handler/class-announce.php +++ b/wp-content/plugins/activitypub/includes/handler/class-announce.php @@ -1,16 +1,25 @@ get_json_params(); + + if ( + 'Create' !== $json_params['type'] || + is_wp_error( $request ) + ) { + return $valid; + } + + $object = $json_params['object']; + $required = array( + 'id', + 'inReplyTo', + 'content', + ); + + if ( array_intersect( $required, array_keys( $object ) ) !== $required ) { + return false; + } + + return $valid; } } diff --git a/wp-content/plugins/activitypub/includes/handler/class-delete.php b/wp-content/plugins/activitypub/includes/handler/class-delete.php index 3cc732bf..5b514dfa 100644 --- a/wp-content/plugins/activitypub/includes/handler/class-delete.php +++ b/wp-content/plugins/activitypub/includes/handler/class-delete.php @@ -1,7 +1,12 @@ delete(); self::maybe_delete_interactions( $activity ); @@ -110,7 +129,7 @@ class Delete { * @param array $activity The delete activity. */ public static function maybe_delete_interactions( $activity ) { - // verify if Actor is deleted. + // Verify that Actor is deleted. if ( Http::is_tombstone( $activity['actor'] ) ) { \wp_schedule_single_event( \time(), @@ -123,7 +142,7 @@ class Delete { /** * Delete comments from an Actor. * - * @param array $comments The comments to delete. + * @param array $actor The actor whose comments to delete. */ public static function delete_interactions( $actor ) { $comments = Interactions::get_interactions_by_actor( $actor ); @@ -139,8 +158,6 @@ class Delete { * Delete a Reaction if URL is a Tombstone. * * @param array $activity The delete activity. - * - * @return void */ public static function maybe_delete_interaction( $activity ) { if ( is_array( $activity['object'] ) ) { diff --git a/wp-content/plugins/activitypub/includes/handler/class-follow.php b/wp-content/plugins/activitypub/includes/handler/class-follow.php index ed29dadf..fb94ba6d 100644 --- a/wp-content/plugins/activitypub/includes/handler/class-follow.php +++ b/wp-content/plugins/activitypub/includes/handler/class-follow.php @@ -1,4 +1,10 @@ get__id(); - // save follower + // Save follower. $follower = Followers::add_follower( $user_id, $activity['actor'] @@ -59,7 +63,7 @@ class Follow { $follower ); - // send notification + // Send notification. $notification = new Notification( 'follow', $activity['actor'], @@ -70,25 +74,22 @@ class Follow { } /** - * Send Accept response + * Send Accept response. * - * @param string $actor The Actor URL - * @param array $object The Activity object - * @param int $user_id The ID of the WordPress User - * @param Activitypub\Model\Follower $follower The Follower object - * - * @return void + * @param string $actor The Actor URL. + * @param array $activity_object The Activity object. + * @param int $user_id The ID of the WordPress User. + * @param \Activitypub\Model\Follower $follower The Follower object. */ - public static function send_follow_response( $actor, $object, $user_id, $follower ) { + public static function send_follow_response( $actor, $activity_object, $user_id, $follower ) { if ( \is_wp_error( $follower ) ) { - // it is not even possible to send a "Reject" because - // we can not get the Remote-Inbox + // Impossible to send a "Reject" because we can not get the Remote-Inbox. return; } - // only send minimal data - $object = array_intersect_key( - $object, + // Only send minimal data. + $activity_object = array_intersect_key( + $activity_object, array_flip( array( 'id', @@ -101,13 +102,13 @@ class Follow { $user = Users::get_by_id( $user_id ); - // get inbox + // Get inbox. $inbox = $follower->get_shared_inbox(); - // send "Accept" activity + // Send "Accept" activity. $activity = new Activity(); $activity->set_type( 'Accept' ); - $activity->set_object( $object ); + $activity->set_object( $activity_object ); $activity->set_actor( $user->get_id() ); $activity->set_to( $actor ); $activity->set_id( $user->get_id() . '#follow-' . \preg_replace( '~^https?://~', '', $actor ) . '-' . \time() ); diff --git a/wp-content/plugins/activitypub/includes/handler/class-like.php b/wp-content/plugins/activitypub/includes/handler/class-like.php new file mode 100644 index 00000000..1e951576 --- /dev/null +++ b/wp-content/plugins/activitypub/includes/handler/class-like.php @@ -0,0 +1,70 @@ +add_help_tab( array( @@ -54,17 +59,17 @@ '

' . \__( 'Fediverse', 'activitypub' ) . '

' . '

' . \__( 'The Fediverse is a new word made of two words: "federation" + "universe"', 'activitypub' ) . '

' . '

' . \__( 'It is a federated social network running on free open software on a myriad of computers across the globe. Many independent servers are interconnected and allow people to interact with one another. There\'s no one central site: you choose a server to register. This ensures some decentralization and sovereignty of data. Fediverse (also called Fedi) has no built-in advertisements, no tricky algorithms, no one big corporation dictating the rules. Instead we have small cozy communities of like-minded people. Welcome!', 'activitypub' ) . '

' . - '

' . \__( 'For more informations please visit fediverse.party', 'activitypub' ) . '

' . + '

' . \__( 'For more information please visit fediverse.party', 'activitypub' ) . '

' . '

' . \__( 'ActivityPub', 'activitypub' ) . '

' . '

' . \__( 'ActivityPub is a decentralized social networking protocol based on the ActivityStreams 2.0 data format. ActivityPub is an official W3C recommended standard published by the W3C Social Web Working Group. It provides a client to server API for creating, updating and deleting content, as well as a federated server to server API for delivering notifications and subscribing to content.', 'activitypub' ) . '

' . '

' . \__( 'WebFinger', 'activitypub' ) . '

' . '

' . \__( 'WebFinger is used to discover information about people or other entities on the Internet that are identified by a URI using standard Hypertext Transfer Protocol (HTTP) methods over a secure transport. A WebFinger resource returns a JavaScript Object Notation (JSON) object describing the entity that is queried. The JSON object is referred to as the JSON Resource Descriptor (JRD).', 'activitypub' ) . '

' . '

' . \__( 'For a person, the type of information that might be discoverable via WebFinger includes a personal profile address, identity service, telephone number, or preferred avatar. For other entities on the Internet, a WebFinger resource might return JRDs containing link relations that enable a client to discover, for example, that a printer can print in color on A4 paper, the physical location of a server, or other static information.', 'activitypub' ) . '

' . '

' . \__( 'On Mastodon [and other Plattforms], user profiles can be hosted either locally on the same website as yours, or remotely on a completely different website. The same username may be used on a different domain. Therefore, a Mastodon user\'s full mention consists of both the username and the domain, in the form @username@domain. In practical terms, @user@example.com is not the same as @user@example.org. If the domain is not included, Mastodon will try to find a local user named @username. However, in order to deliver to someone over ActivityPub, the @username@domain mention is not enough – mentions must be translated to an HTTPS URI first, so that the remote actor\'s inbox and outbox can be found. (This paragraph is copied from the Mastodon Documentation)', 'activitypub' ) . '

' . - '

' . \__( 'For more informations please visit webfinger.net', 'activitypub' ) . '

' . + '

' . \__( 'For more information please visit webfinger.net', 'activitypub' ) . '

' . '

' . \__( 'NodeInfo', 'activitypub' ) . '

' . '

' . \__( 'NodeInfo is an effort to create a standardized way of exposing metadata about a server running one of the distributed social networks. The two key goals are being able to get better insights into the user base of distributed social networking and the ability to build tools that allow users to choose the best fitting software and server for their needs.', 'activitypub' ) . '

' . - '

' . \__( 'For more informations please visit nodeinfo.diaspora.software', 'activitypub' ) . '

', + '

' . \__( 'For more information please visit nodeinfo.diaspora.software', 'activitypub' ) . '

', ) ); diff --git a/wp-content/plugins/activitypub/includes/model/class-application.php b/wp-content/plugins/activitypub/includes/model/class-application.php index 35c57d64..b7d38af2 100644 --- a/wp-content/plugins/activitypub/includes/model/class-application.php +++ b/wp-content/plugins/activitypub/includes/model/class-application.php @@ -1,4 +1,10 @@ + * @var string */ protected $webfinger; + /** + * Returns the type of the object. + * + * @return string The type of the object. + */ public function get_type() { return 'Application'; } + /** + * Returns whether the Application manually approves followers. + * + * @return true Whether the Application manually approves followers. + */ public function get_manually_approves_followers() { return true; } + /** + * Returns the ID of the Application. + * + * @return string The ID of the Application. + */ public function get_id() { return get_rest_url_by_path( 'application' ); } @@ -73,24 +97,34 @@ class Application extends Actor { return $this->get_url(); } + /** + * Get the Username. + * + * @return string The Username. + */ public function get_name() { return 'application'; } + /** + * Get the preferred username. + * + * @return string The preferred username. + */ 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 + // Try site icon first. $icon_id = get_option( 'site_icon' ); - // try custom logo second + // Try custom logo second. if ( ! $icon_id ) { $icon_id = get_theme_mod( 'custom_logo' ); } @@ -105,7 +139,7 @@ class Application extends Actor { } if ( ! $icon_url ) { - // fallback to default icon + // Fallback to default icon. $icon_url = plugins_url( '/assets/img/wp-logo.png', ACTIVITYPUB_PLUGIN_FILE ); } @@ -131,6 +165,11 @@ class Application extends Actor { return null; } + /** + * Get the first published date. + * + * @return string The published date. + */ public function get_published() { $first_post = new WP_Query( array( @@ -176,18 +215,23 @@ class Application extends Actor { return $this->get_preferred_username() . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST ); } + /** + * Returns the public key. + * + * @return array The public key. + */ public function get_public_key() { return array( - 'id' => $this->get_id() . '#main-key', - 'owner' => $this->get_id(), + 'id' => $this->get_id() . '#main-key', + 'owner' => $this->get_id(), 'publicKeyPem' => Signature::get_public_key_for( Users::APPLICATION_USER_ID ), ); } /** - * Get the User-Description. + * Get the User description. * - * @return string The User-Description. + * @return string The User description. */ public function get_summary() { return \wpautop( @@ -198,6 +242,11 @@ class Application extends Actor { ); } + /** + * Returns the canonical URL of the object. + * + * @return string|null The canonical URL of the object. + */ public function get_canonical_url() { return \home_url(); } diff --git a/wp-content/plugins/activitypub/includes/model/class-blog.php b/wp-content/plugins/activitypub/includes/model/class-blog.php index 3c52abff..3cbd6f91 100644 --- a/wp-content/plugins/activitypub/includes/model/class-blog.php +++ b/wp-content/plugins/activitypub/includes/model/class-blog.php @@ -1,17 +1,27 @@ + * @var string */ protected $webfinger; /** - * If the User is discoverable. + * Whether the User is discoverable. * * @see https://docs.joinmastodon.org/spec/activitypub/#discoverable * @@ -71,7 +81,7 @@ class Blog extends Actor { protected $discoverable; /** - * Restrict posting to mods + * Restrict posting to mods. * * @see https://join-lemmy.org/docs/contributors/05-federation.html * @@ -79,18 +89,28 @@ class Blog extends Actor { */ protected $posting_restricted_to_mods; + /** + * Whether the User manually approves followers. + * + * @return false + */ public function get_manually_approves_followers() { return false; } + /** + * Whether the User is discoverable. + * + * @return boolean + */ public function get_discoverable() { return true; } /** - * Get the User-ID. + * Get the User ID. * - * @return string The User-ID. + * @return string The User ID. */ public function get_id() { return $this->get_url(); @@ -112,9 +132,9 @@ class Blog extends Actor { } /** - * Get the User-Name. + * Get the Username. * - * @return string The User-Name. + * @return string The Username. */ public function get_name() { return \wp_strip_all_tags( @@ -127,23 +147,29 @@ class Blog extends Actor { } /** - * Get the User-Description. + * Get the User description. * - * @return string The User-Description. + * @return string The User description. */ public function get_summary() { + $summary = \get_option( 'activitypub_blog_description', null ); + + if ( ! $summary ) { + $summary = \get_bloginfo( 'description' ); + } + return \wpautop( \wp_kses( - \get_bloginfo( 'description' ), + $summary, 'default' ) ); } /** - * Get the User-Url. + * Get the User url. * - * @return string The User-Url. + * @return string The User url. */ public function get_url() { return \esc_url( \trailingslashit( get_home_url() ) . '@' . $this->get_preferred_username() ); @@ -164,12 +190,12 @@ class Blog extends Actor { * @return string The auto-generated Username. */ public static function get_default_username() { - // check if domain host has a subdomain + // Check if domain host has a subdomain. $host = \wp_parse_url( \get_home_url(), \PHP_URL_HOST ); $host = \preg_replace( '/^www\./i', '', $host ); /** - * Filter the default blog username. + * Filters the default blog username. * * @param string $host The default username. */ @@ -177,12 +203,12 @@ class Blog extends Actor { } /** - * Get the preferred User-Name. + * Get the preferred Username. * - * @return string The User-Name. + * @return string The Username. */ public function get_preferred_username() { - $username = \get_option( 'activitypub_blog_user_identifier' ); + $username = \get_option( 'activitypub_blog_identifier' ); if ( $username ) { return $username; @@ -192,15 +218,15 @@ class Blog extends Actor { } /** - * Get the User-Icon. + * Get the User icon. * - * @return array The User-Icon. + * @return array The User icon. */ public function get_icon() { - // try site icon first + // Try site_logo, falling back to site_icon, first. $icon_id = get_option( 'site_icon' ); - // try custom logo second + // Try custom logo second. if ( ! $icon_id ) { $icon_id = get_theme_mod( 'custom_logo' ); } @@ -215,7 +241,7 @@ class Blog extends Actor { } if ( ! $icon_url ) { - // fallback to default icon + // Fallback to default icon. $icon_url = plugins_url( '/assets/img/wp-logo.png', ACTIVITYPUB_PLUGIN_FILE ); } @@ -231,16 +257,32 @@ class Blog extends Actor { * @return array|null The User-Header-Image. */ public function get_image() { - if ( \has_header_image() ) { + $header_image = get_option( 'activitypub_header_image' ); + $image_url = null; + + if ( $header_image ) { + $image_url = \wp_get_attachment_url( $header_image ); + } + + if ( ! $image_url && \has_header_image() ) { + $image_url = \get_header_image(); + } + + if ( $image_url ) { return array( 'type' => 'Image', - 'url' => esc_url( \get_header_image() ), + 'url' => esc_url( $image_url ), ); } return null; } + /** + * Get the published date. + * + * @return string The published date. + */ public function get_published() { $first_post = new WP_Query( array( @@ -259,10 +301,20 @@ class Blog extends Actor { return \gmdate( 'Y-m-d\TH:i:s\Z', $time ); } + /** + * Get the canonical URL. + * + * @return string|null The canonical URL. + */ public function get_canonical_url() { return \home_url(); } + /** + * Get the Moderators endpoint. + * + * @return string|null The Moderators endpoint. + */ public function get_moderators() { if ( is_single_user() || 'Group' !== $this->get_type() ) { return null; @@ -271,6 +323,11 @@ class Blog extends Actor { return get_rest_url_by_path( 'collections/moderators' ); } + /** + * Get attributedTo value. + * + * @return string|null The attributedTo value. + */ public function get_attributed_to() { if ( is_single_user() || 'Group' !== $this->get_type() ) { return null; @@ -279,14 +336,24 @@ class Blog extends Actor { return get_rest_url_by_path( 'collections/moderators' ); } + /** + * Get the public key information. + * + * @return array The public key. + */ public function get_public_key() { return array( - 'id' => $this->get_id() . '#main-key', - 'owner' => $this->get_id(), + 'id' => $this->get_id() . '#main-key', + 'owner' => $this->get_id(), 'publicKeyPem' => Signature::get_public_key_for( $this->get__id() ), ); } + /** + * Returns whether posting is restricted to mods. + * + * @return bool|null True if posting is restricted to mods, null if not applicable. + */ public function get_posting_restricted_to_mods() { if ( 'Group' === $this->get_type() ) { return true; @@ -331,6 +398,11 @@ class Blog extends Actor { return get_rest_url_by_path( sprintf( 'actors/%d/following', $this->get__id() ) ); } + /** + * Returns endpoints. + * + * @return array|null The endpoints. + */ public function get_endpoints() { $endpoints = null; @@ -361,45 +433,101 @@ class Blog extends Actor { return get_rest_url_by_path( sprintf( 'actors/%d/collections/featured', $this->get__id() ) ); } + /** + * Returns whether the site is indexable. + * + * @return bool Whether the site is indexable. + */ public function get_indexable() { - if ( \get_option( 'blog_public', 1 ) ) { + if ( is_blog_public() ) { return true; } else { return false; } } + /** + * Update the Username. + * + * @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_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. + */ + public function get_tag() { + $hashtags = array(); + + $args = array( + 'orderby' => 'count', + 'order' => 'DESC', + 'number' => 10, + ); + + $tags = get_tags( $args ); + + foreach ( $tags as $tag ) { + $hashtags[] = array( + 'type' => 'Hashtag', + 'href' => \get_tag_link( $tag->term_id ), + 'name' => esc_hashtag( $tag->name ), + ); + } + + return $hashtags; + } + /** * Extend the User-Output with Attachments. * * @return array The extended User-Output. */ public function get_attachment() { - $array = array(); - - $array[] = array( - 'type' => 'PropertyValue', - 'name' => \__( 'Blog', 'activitypub' ), - 'value' => \html_entity_decode( - sprintf( - '%s', - \esc_attr( \home_url( '/' ) ), - \esc_url( \home_url( '/' ) ), - \wp_parse_url( \home_url( '/' ), \PHP_URL_HOST ) - ), - \ENT_QUOTES, - 'UTF-8' - ), - ); - - // Add support for FEP-fb2a, for more information see FEDERATION.md - $array[] = array( - 'type' => 'Link', - 'name' => \__( 'Blog', 'activitypub' ), - 'href' => \esc_url( \home_url( '/' ) ), - 'rel' => array( 'me' ), - ); - - return $array; + $extra_fields = Extra_Fields::get_actor_fields( $this->_id ); + return Extra_Fields::fields_to_attachments( $extra_fields ); } } diff --git a/wp-content/plugins/activitypub/includes/model/class-follower.php b/wp-content/plugins/activitypub/includes/model/class-follower.php index 4590ea49..45ef6157 100644 --- a/wp-content/plugins/activitypub/includes/model/class-follower.php +++ b/wp-content/plugins/activitypub/includes/model/class-follower.php @@ -1,13 +1,18 @@ _id, 'activitypub_errors' ); + return get_post_meta( $this->_id, 'activitypub_errors', false ); } /** * Get the Summary. * - * @return int The Summary. + * @return string The Summary. */ public function get_summary() { if ( isset( $this->summary ) ) { @@ -51,7 +56,7 @@ class Follower extends Actor { * Getter for URL attribute. * * Falls back to ID, if no URL is set. This is relevant for - * Plattforms like Lemmy, where the ID is the URL. + * Platforms like Lemmy, where the ID is the URL. * * @return string The URL. */ @@ -65,8 +70,6 @@ class Follower extends Actor { /** * Reset (delete) all errors. - * - * @return void */ public function reset_errors() { delete_post_meta( $this->_id, 'activitypub_errors' ); @@ -103,21 +106,19 @@ class Follower extends Actor { } /** - * Update the current Follower-Object. - * - * @return void + * Update the current Follower object. */ public function update() { $this->save(); } /** - * Validate the current Follower-Object. + * Validate the current Follower object. * * @return boolean True if the verification was successful. */ public function is_valid() { - // the minimum required attributes + // The minimum required attributes. $required_attributes = array( 'id', 'preferredUsername', @@ -136,9 +137,9 @@ class Follower extends Actor { } /** - * Save the current Follower-Object. + * Save the current Follower object. * - * @return int|WP_Error The Post-ID or an WP_Error. + * @return int|WP_Error The post ID or an WP_Error. */ public function save() { if ( ! $this->is_valid() ) { @@ -148,7 +149,7 @@ class Follower extends Actor { if ( ! $this->get__id() ) { global $wpdb; - // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching + // phpcs:ignore WordPress.DB.DirectDatabaseQuery $post_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE guid=%s", @@ -177,37 +178,35 @@ class Follower extends Actor { ); if ( ! empty( $post_id ) ) { - // If this is an update, prevent the "followed" date from being - // overwritten by the current date. + // If this is an update, prevent the "followed" date from being overwritten by the current date. $post = get_post( $post_id ); $args['post_date'] = $post->post_date; $args['post_date_gmt'] = $post->post_date_gmt; } - $post_id = wp_insert_post( $args ); + $post_id = wp_insert_post( $args ); $this->_id = $post_id; return $post_id; } /** - * Upsert the current Follower-Object. + * Upsert the current Follower object. * - * @return int|WP_Error The Post-ID or an WP_Error. + * @return int|WP_Error The post ID or an WP_Error. */ public function upsert() { return $this->save(); } /** - * Delete the current Follower-Object. + * Delete the current Follower object. * * Beware that this os deleting a Follower for ALL users!!! * * To delete only the User connection (unfollow) - * @see \Activitypub\Rest\Followers::remove_follower() * - * @return void + * @see \Activitypub\Rest\Followers::remove_follower() */ public function delete() { wp_delete_post( $this->_id ); @@ -215,12 +214,10 @@ class Follower extends Actor { /** * Update the post meta. - * - * @return void */ protected function get_post_meta_input() { - $meta_input = array(); - $meta_input['activitypub_inbox'] = $this->get_shared_inbox(); + $meta_input = array(); + $meta_input['activitypub_inbox'] = $this->get_shared_inbox(); $meta_input['activitypub_actor_json'] = $this->to_json(); return $meta_input; @@ -239,9 +236,9 @@ class Follower extends Actor { } return array( - 'type' => 'Image', + 'type' => 'Image', 'mediaType' => 'image/jpeg', - 'url' => ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg', + 'url' => ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg', ); } @@ -278,7 +275,7 @@ class Follower extends Actor { } /** - * Get the Icon URL (Avatar) + * Get the Icon URL (Avatar). * * @return string The URL to the Avatar. */ @@ -297,7 +294,7 @@ class Follower extends Actor { } /** - * Get the Icon URL (Avatar) + * Get the Icon URL (Avatar). * * @return string The URL to the Avatar. */ @@ -333,13 +330,12 @@ class Follower extends Actor { /** * Convert a Custom-Post-Type input to an Activitypub\Model\Follower. * - * @return string The JSON string. - * - * @return array Activitypub\Model\Follower + * @param \WP_Post $post The post object. + * @return \Activitypub\Activity\Base_Object|WP_Error */ public static function init_from_cpt( $post ) { $actor_json = get_post_meta( $post->ID, 'activitypub_actor_json', true ); - $object = self::init_from_json( $actor_json ); + $object = self::init_from_json( $actor_json ); $object->set__id( $post->ID ); $object->set_id( $post->guid ); $object->set_name( $post->post_title ); @@ -370,10 +366,10 @@ class Follower extends Actor { if ( $path ) { if ( \strpos( $name, '@' ) !== false ) { - // expected: https://example.com/@user (default URL pattern) + // Expected: https://example.com/@user (default URL pattern). $name = \preg_replace( '|^/@?|', '', $path ); } else { - // expected: https://example.com/users/user (default ID pattern) + // Expected: https://example.com/users/user (default ID pattern). $parts = \explode( '/', $path ); $name = \array_pop( $parts ); } @@ -383,7 +379,7 @@ class Follower extends Actor { \strpos( $name, 'acct' ) === 0 || \strpos( $name, '@' ) === 0 ) { - // expected: user@example.com or acct:user@example (WebFinger) + // Expected: user@example.com or acct:user@example (WebFinger). $name = \ltrim( $name, '@' ); $name = \ltrim( $name, 'acct:' ); $parts = \explode( '@', $name ); diff --git a/wp-content/plugins/activitypub/includes/model/class-post.php b/wp-content/plugins/activitypub/includes/model/class-post.php deleted file mode 100644 index a4229539..00000000 --- a/wp-content/plugins/activitypub/includes/model/class-post.php +++ /dev/null @@ -1,136 +0,0 @@ -post = $post; - $this->object = $transformer->to_object(); - } - } - - /** - * Returns the User ID. - * - * @return int the User ID. - */ - public function get_user_id() { - return apply_filters( 'activitypub_post_user_id', $this->post->post_author, $this->post ); - } - - /** - * Converts this Object into an Array. - * - * @return array the array representation of a Post. - */ - public function to_array() { - return \apply_filters( 'activitypub_post', $this->object->to_array(), $this->post ); - } - - /** - * Returns the Actor of this Object. - * - * @return string The URL of the Actor. - */ - public function get_actor() { - $user = Users::get_by_id( $this->get_user_id() ); - - return $user->get_url(); - } - - /** - * Converts this Object into a JSON String - * - * @return string - */ - public function to_json() { - return \wp_json_encode( $this->to_array(), \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT ); - } - - /** - * Returns the URL of an Activity Object - * - * @return string - */ - public function get_url() { - return $this->object->get_url(); - } - - /** - * Returns the ID of an Activity Object - * - * @return string - */ - public function get_id() { - return $this->object->get_id(); - } - - /** - * Returns a list of Image Attachments - * - * @return array - */ - public function get_attachments() { - return $this->object->get_attachment(); - } - - /** - * Returns a list of Tags, used in the Post - * - * @return array - */ - public function get_tags() { - return $this->object->get_tag(); - } - - /** - * Returns the as2 object-type for a given post - * - * @return string the object-type - */ - public function get_object_type() { - return $this->object->get_type(); - } - - /** - * Returns the content for the ActivityPub Item. - * - * @return string the content - */ - public function get_content() { - return $this->object->get_content(); - } -} diff --git a/wp-content/plugins/activitypub/includes/model/class-user.php b/wp-content/plugins/activitypub/includes/model/class-user.php index dc6cb6c0..997c5210 100644 --- a/wp-content/plugins/activitypub/includes/model/class-user.php +++ b/wp-content/plugins/activitypub/includes/model/class-user.php @@ -1,18 +1,24 @@ + * @var string */ protected $webfinger; + /** + * The type of the object. + * + * @return string The type of the object. + */ public function get_type() { return 'Person'; } + /** + * Generate a User object from a WP_User. + * + * @param int $user_id The user ID. + * + * @return WP_Error|User The User object or WP_Error if user not found. + */ public static function from_wp_user( $user_id ) { if ( is_user_disabled( $user_id ) ) { return new WP_Error( @@ -75,37 +93,37 @@ class User extends Actor { ); } - $object = new static(); + $object = new static(); $object->_id = $user_id; return $object; } /** - * Get the User-ID. + * Get the user ID. * - * @return string The User-ID. + * @return string The user ID. */ public function get_id() { return $this->get_url(); } /** - * Get the User-Name. + * Get the Username. * - * @return string The User-Name. + * @return string The Username. */ public function get_name() { return \esc_attr( \get_the_author_meta( 'display_name', $this->_id ) ); } /** - * Get the User-Description. + * Get the User description. * - * @return string The User-Description. + * @return string The User description. */ public function get_summary() { - $description = get_user_meta( $this->_id, 'activitypub_user_description', true ); + $description = get_user_option( 'activitypub_description', $this->_id ); if ( empty( $description ) ) { $description = get_user_meta( $this->_id, 'description', true ); } @@ -113,28 +131,46 @@ class User extends Actor { } /** - * Get the User-Url. + * Get the User url. * - * @return string The User-Url. + * @return string The User url. */ public function get_url() { return \esc_url( \get_author_posts_url( $this->_id ) ); } /** - * Returns the User-URL with @-Prefix for the username. + * Returns the User URL with @-Prefix for the username. * - * @return string 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() ); } + /** + * Get the preferred username. + * + * @return string The preferred username. + */ public function get_preferred_username() { return \esc_attr( \get_the_author_meta( 'login', $this->_id ) ); } + /** + * Get the User icon. + * + * @return array The User icon. + */ 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, @@ -148,26 +184,51 @@ class User extends Actor { ); } + /** + * Returns the header image. + * + * @return array|null The header image. + */ public function get_image() { - if ( \has_header_image() ) { - $image = \esc_url( \get_header_image() ); + $header_image = get_user_option( 'activitypub_header_image', $this->_id ); + $image_url = null; + + if ( ! $header_image && \has_header_image() ) { + $image_url = \get_header_image(); + } + + if ( $header_image ) { + $image_url = \wp_get_attachment_url( $header_image ); + } + + if ( $image_url ) { return array( 'type' => 'Image', - 'url' => $image, + 'url' => esc_url( $image_url ), ); } return null; } + /** + * Returns the date the user was created. + * + * @return false|string The date the user was created. + */ public function get_published() { return \gmdate( 'Y-m-d\TH:i:s\Z', \strtotime( \get_the_author_meta( 'registered', $this->_id ) ) ); } + /** + * Returns the public key. + * + * @return array The public key. + */ public function get_public_key() { return array( - 'id' => $this->get_id() . '#main-key', - 'owner' => $this->get_id(), + 'id' => $this->get_id() . '#main-key', + 'owner' => $this->get_id(), 'publicKeyPem' => Signature::get_public_key_for( $this->get__id() ), ); } @@ -217,6 +278,11 @@ class User extends Actor { return get_rest_url_by_path( sprintf( 'actors/%d/collections/featured', $this->get__id() ) ); } + /** + * Returns the endpoints. + * + * @return array|null The endpoints. + */ public function get_endpoints() { $endpoints = null; @@ -235,74 +301,8 @@ class User extends Actor { * @return array The extended User-Output. */ public function get_attachment() { - $extra_fields = get_actor_extra_fields( $this->_id ); - - $attachments = array(); - - foreach ( $extra_fields as $post ) { - $content = \get_the_content( null, false, $post ); - $content = \make_clickable( $content ); - $content = \do_blocks( $content ); - $content = \wptexturize( $content ); - $content = \wp_filter_content_tags( $content ); - // replace script and style elements - $content = \preg_replace( '@<(script|style)[^>]*?>.*?@si', '', $content ); - $content = \strip_shortcodes( $content ); - $content = \trim( \preg_replace( '/[\n\r\t]/', '', $content ) ); - - $attachments[] = array( - 'type' => 'PropertyValue', - 'name' => \get_the_title( $post ), - 'value' => \html_entity_decode( - $content, - \ENT_QUOTES, - 'UTF-8' - ), - ); - - $link_added = false; - - // Add support for FEP-fb2a, for more information see FEDERATION.md - if ( \class_exists( '\WP_HTML_Tag_Processor' ) ) { - $tags = new \WP_HTML_Tag_Processor( $content ); - $tags->next_tag(); - - if ( 'P' === $tags->get_tag() ) { - $tags->next_tag(); - } - - if ( 'A' === $tags->get_tag() ) { - $tags->set_bookmark( 'link' ); - if ( ! $tags->next_tag() ) { - $tags->seek( 'link' ); - $attachment = array( - 'type' => 'Link', - 'name' => \get_the_title( $post ), - 'href' => \esc_url( $tags->get_attribute( 'href' ) ), - 'rel' => explode( ' ', $tags->get_attribute( 'rel' ) ), - ); - - $link_added = true; - } - } - } - - if ( ! $link_added ) { - $attachment = array( - 'type' => 'Note', - 'name' => \get_the_title( $post ), - 'content' => \html_entity_decode( - $content, - \ENT_QUOTES, - 'UTF-8' - ), - ); - } - - $attachments[] = $attachment; - } - - return $attachments; + $extra_fields = Extra_Fields::get_actor_fields( $this->_id ); + return Extra_Fields::fields_to_attachments( $extra_fields ); } /** @@ -314,23 +314,93 @@ class User extends Actor { return $this->get_preferred_username() . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST ); } + /** + * Returns the canonical URL. + * + * @return string The canonical URL. + */ public function get_canonical_url() { return $this->get_url(); } + /** + * Returns the streams. + * + * @return null The streams. + */ public function get_streams() { return null; } + /** + * Returns the tag. + * + * @return array The tag. + */ public function get_tag() { return array(); } + /** + * Returns the indexable state. + * + * @return bool Whether the user is indexable. + */ public function get_indexable() { - if ( \get_option( 'blog_public', 1 ) ) { + if ( is_blog_public() ) { return true; } else { return false; } } + + /** + * Update the username. + * + * @param string $value The new value. + * @return int|WP_Error The updated user ID or WP_Error on failure. + */ + public function update_name( $value ) { + $userdata = array( + 'ID' => $this->_id, + 'display_name' => $value, + ); + return \wp_update_user( $userdata ); + } + + /** + * Update the User description. + * + * @param string $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 int $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 int $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 ); + } } diff --git a/wp-content/plugins/activitypub/includes/rest/class-actors.php b/wp-content/plugins/activitypub/includes/rest/class-actors.php index f5854a68..60f03d29 100644 --- a/wp-content/plugins/activitypub/includes/rest/class-actors.php +++ b/wp-content/plugins/activitypub/includes/rest/class-actors.php @@ -1,18 +1,22 @@ get_param( 'user_id' ); @@ -77,14 +81,17 @@ class Actors { return $user; } - // redirect to canonical URL if it is not an ActivityPub request + $link_header = sprintf( '<%1$s>; rel="alternate"; type="application/activity+json"', $user->get_id() ); + + // Redirect to canonical URL if it is not an ActivityPub request. if ( ! is_activitypub_request() ) { + header( 'Link: ' . $link_header ); header( 'Location: ' . $user->get_canonical_url(), true, 301 ); exit; } - /* - * Action triggerd prior to the ActivityPub profile being created and sent to the client + /** + * Action triggered prior to the ActivityPub profile being created and sent to the client. */ \do_action( 'activitypub_rest_users_pre' ); @@ -92,17 +99,18 @@ class Actors { $rest_response = new WP_REST_Response( $json, 200 ); $rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) ); + $rest_response->header( 'Link', $link_header ); return $rest_response; } /** - * Endpoint for remote follow UI/Block + * Endpoint for remote follow UI/Block. * * @param WP_REST_Request $request The request object. * - * @return void|string The URL to the remote follow page + * @return WP_REST_Response|\WP_Error The response object or WP_Error. */ public static function remote_follow_get( WP_REST_Request $request ) { $resource = $request->get_param( 'resource' ); @@ -123,15 +131,18 @@ class Actors { $url = str_replace( '{uri}', $resource, $template ); return new WP_REST_Response( - array( 'url' => $url, 'template' => $template ), + array( + 'url' => $url, + 'template' => $template, + ), 200 ); } /** - * The supported parameters + * The supported parameters. * - * @return array list of parameters + * @return array List of parameters, */ public static function request_parameters() { $params = array(); diff --git a/wp-content/plugins/activitypub/includes/rest/class-collection.php b/wp-content/plugins/activitypub/includes/rest/class-collection.php index 296789fb..02cc99bf 100644 --- a/wp-content/plugins/activitypub/includes/rest/class-collection.php +++ b/wp-content/plugins/activitypub/includes/rest/class-collection.php @@ -1,4 +1,10 @@ [\w\-\.]+)s/(?P[\w\-\.]+)/replies', + array( + array( + 'methods' => WP_REST_Server::READABLE, + 'callback' => array( self::class, 'replies_get' ), + 'args' => self::request_parameters_for_replies(), + 'permission_callback' => '__return_true', + ), + ) + ); + } + + /** + * The endpoint for replies collections. + * + * @param \WP_REST_Request $request The request object. + * + * @return WP_REST_Response|\WP_Error The response object or WP_Error. + */ + public static function replies_get( $request ) { + $type = $request->get_param( 'type' ); + + // Get the WordPress object of that "owns" the requested replies. + switch ( $type ) { + case 'comment': + $wp_object = \get_comment( $request->get_param( 'id' ) ); + break; + case 'post': + default: + $wp_object = \get_post( $request->get_param( 'id' ) ); + break; + } + + if ( ! isset( $wp_object ) || is_wp_error( $wp_object ) ) { + return new WP_Error( + 'activitypub_replies_collection_does_not_exist', + \sprintf( + // translators: %s: The type (post, comment, etc.) for which no replies collection exists. + \__( 'No reply collection exists for the type %s.', 'activitypub' ), + $type + ) + ); + } + + $page = intval( $request->get_param( 'page' ) ); + + // If the request parameter page is present get the CollectionPage otherwise the replies collection. + if ( isset( $page ) ) { + $response = Replies::get_collection_page( $wp_object, $page ); + } else { + $response = Replies::get_collection( $wp_object ); + } + + if ( is_wp_error( $response ) ) { + return $response; + } + + // Add ActivityPub Context. + $response = array_merge( + array( '@context' => Base_Object::JSON_LD_CONTEXT ), + $response + ); + + return new WP_REST_Response( $response, 200 ); } /** * The Featured Tags endpoint * - * @param WP_REST_Request $request The request object. + * @param \WP_REST_Request $request The request object. * - * @return WP_REST_Response The response object. + * @return WP_REST_Response|\WP_Error The response object or WP_Error. */ public static function tags_get( $request ) { $user_id = $request->get_param( 'user_id' ); @@ -126,9 +202,9 @@ class Collection { /** * Featured posts endpoint * - * @param WP_REST_Request $request The request object. + * @param \WP_REST_Request $request The request object. * - * @return WP_REST_Response The response object. + * @return WP_REST_Response|\WP_Error The response object or WP_Error. */ public static function featured_get( $request ) { $user_id = $request->get_param( 'user_id' ); @@ -184,13 +260,11 @@ class Collection { } /** - * Moderators endpoint - * - * @param WP_REST_Request $request The request object. + * Moderators endpoint. * * @return WP_REST_Response The response object. */ - public static function moderators_get( $request ) { + public static function moderators_get() { $response = array( '@context' => Actor::JSON_LD_CONTEXT, 'id' => get_rest_url_by_path( 'collections/moderators' ), @@ -211,16 +285,38 @@ class Collection { } /** - * The supported parameters + * The supported parameters. * - * @return array list of parameters + * @return array List of parameters. */ public static function request_parameters() { $params = array(); $params['user_id'] = array( 'required' => true, - 'type' => 'string', + 'type' => 'string', + ); + + return $params; + } + + /** + * The supported parameters. + * + * @return array list of parameters. + */ + public static function request_parameters_for_replies() { + $params = array(); + + $params['type'] = array( + 'required' => true, + 'type' => 'string', + 'enum' => array( 'post', 'comment' ), + ); + + $params['id'] = array( + 'required' => true, + 'type' => 'string', ); return $params; diff --git a/wp-content/plugins/activitypub/includes/rest/class-comment.php b/wp-content/plugins/activitypub/includes/rest/class-comment.php index a31b5978..095c8589 100644 --- a/wp-content/plugins/activitypub/includes/rest/class-comment.php +++ b/wp-content/plugins/activitypub/includes/rest/class-comment.php @@ -1,4 +1,10 @@ get_param( 'resource' ); @@ -75,20 +81,19 @@ class Comment { return $template; } - $comment_meta = \get_comment_meta( $comment_id ); + $resource = Comment_Utils::get_source_id( $comment_id ); - if ( ! empty( $comment_meta['source_id'][0] ) ) { - $resource = $comment_meta['source_id'][0]; - } elseif ( ! empty( $comment_meta['source_url'][0] ) ) { - $resource = $comment_meta['source_url'][0]; - } else { + if ( ! $resource ) { $resource = Comment_Utils::generate_id( $comment ); } $url = str_replace( '{uri}', $resource, $template ); return new WP_REST_Response( - array( 'url' => $url, 'template' => $template ), + array( + 'url' => $url, + 'template' => $template, + ), 200 ); } diff --git a/wp-content/plugins/activitypub/includes/rest/class-followers.php b/wp-content/plugins/activitypub/includes/rest/class-followers.php index ca882cf3..fe97548e 100644 --- a/wp-content/plugins/activitypub/includes/rest/class-followers.php +++ b/wp-content/plugins/activitypub/includes/rest/class-followers.php @@ -1,7 +1,12 @@ get_param( 'user_id' ); @@ -64,36 +69,34 @@ class Followers { $page = (int) $request->get_param( 'page' ); $context = $request->get_param( 'context' ); - /* - * Action triggerd prior to the ActivityPub profile being created and sent to the client + /** + * Action triggered prior to the ActivityPub profile being created and sent to the client */ \do_action( 'activitypub_rest_followers_pre' ); $data = Follower_Collection::get_followers_with_count( $user_id, $per_page, $page, array( 'order' => ucwords( $order ) ) ); $json = new stdClass(); + // phpcs:disable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase $json->{'@context'} = \Activitypub\get_context(); + $json->id = get_rest_url_by_path( sprintf( 'actors/%d/followers', $user->get__id() ) ); + $json->generator = 'http://wordpress.org/?v=' . get_masked_wp_version(); + $json->actor = $user->get_id(); + $json->type = 'OrderedCollectionPage'; + $json->totalItems = $data['total']; + $json->partOf = get_rest_url_by_path( sprintf( 'actors/%d/followers', $user->get__id() ) ); - $json->id = get_rest_url_by_path( sprintf( 'actors/%d/followers', $user->get__id() ) ); - $json->generator = 'http://wordpress.org/?v=' . get_masked_wp_version(); - $json->actor = $user->get_id(); - $json->type = 'OrderedCollectionPage'; + $json->first = \add_query_arg( 'page', 1, $json->partOf ); + $json->last = \add_query_arg( 'page', \ceil( $json->totalItems / $per_page ), $json->partOf ); - $json->totalItems = $data['total']; // phpcs:ignore - $json->partOf = get_rest_url_by_path( sprintf( 'actors/%d/followers', $user->get__id() ) ); // phpcs:ignore - - $json->first = \add_query_arg( 'page', 1, $json->partOf ); // phpcs:ignore - $json->last = \add_query_arg( 'page', \ceil ( $json->totalItems / $per_page ), $json->partOf ); // phpcs:ignore - - if ( $page && ( ( \ceil ( $json->totalItems / $per_page ) ) > $page ) ) { // phpcs:ignore - $json->next = \add_query_arg( 'page', $page + 1, $json->partOf ); // phpcs:ignore + if ( $page && ( ( \ceil( $json->totalItems / $per_page ) ) > $page ) ) { + $json->next = \add_query_arg( 'page', $page + 1, $json->partOf ); } - if ( $page && ( $page > 1 ) ) { // phpcs:ignore - $json->prev = \add_query_arg( 'page', $page - 1, $json->partOf ); // phpcs:ignore + if ( $page && ( $page > 1 ) ) { + $json->prev = \add_query_arg( 'page', $page - 1, $json->partOf ); } - // phpcs:ignore $json->orderedItems = array_map( function ( $item ) use ( $context ) { if ( 'full' === $context ) { @@ -103,6 +106,7 @@ class Followers { }, $data['followers'] ); + // phpcs:enable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase $rest_response = new WP_REST_Response( $json, 200 ); $rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) ); @@ -111,20 +115,20 @@ class Followers { } /** - * The supported parameters + * The supported parameters. * - * @return array list of parameters + * @return array List of parameters. */ public static function request_parameters() { $params = array(); $params['page'] = array( - 'type' => 'integer', + 'type' => 'integer', 'default' => 1, ); $params['per_page'] = array( - 'type' => 'integer', + 'type' => 'integer', 'default' => 20, ); @@ -136,13 +140,13 @@ class Followers { $params['user_id'] = array( 'required' => true, - 'type' => 'string', + 'type' => 'string', ); $params['context'] = array( - 'type' => 'string', + 'type' => 'string', 'default' => 'simple', - 'enum' => array( 'simple', 'full' ), + 'enum' => array( 'simple', 'full' ), ); return $params; diff --git a/wp-content/plugins/activitypub/includes/rest/class-following.php b/wp-content/plugins/activitypub/includes/rest/class-following.php index 4e077279..bf546e96 100644 --- a/wp-content/plugins/activitypub/includes/rest/class-following.php +++ b/wp-content/plugins/activitypub/includes/rest/class-following.php @@ -1,4 +1,10 @@ get_param( 'user_id' ); @@ -58,8 +64,8 @@ class Following { return $user; } - /* - * Action triggerd prior to the ActivityPub profile being created and sent to the client + /** + * Action triggered prior to the ActivityPub profile being created and sent to the client. */ \do_action( 'activitypub_rest_following_pre' ); @@ -67,19 +73,25 @@ class Following { $json->{'@context'} = \Activitypub\get_context(); - $json->id = get_rest_url_by_path( sprintf( 'actors/%d/following', $user->get__id() ) ); + // phpcs:disable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + $json->id = get_rest_url_by_path( sprintf( 'actors/%d/following', $user->get__id() ) ); $json->generator = 'http://wordpress.org/?v=' . get_masked_wp_version(); - $json->actor = $user->get_id(); - $json->type = 'OrderedCollectionPage'; + $json->actor = $user->get_id(); + $json->type = 'OrderedCollectionPage'; + $json->partOf = get_rest_url_by_path( sprintf( 'actors/%d/following', $user->get__id() ) ); - $json->partOf = get_rest_url_by_path( sprintf( 'actors/%d/following', $user->get__id() ) ); // phpcs:ignore + /** + * Filter the list of following urls. + * + * @param array $items The array of following urls. + * @param \Activitypub\Model\User $user The user object. + */ + $items = apply_filters( 'activitypub_rest_following', array(), $user ); - $items = apply_filters( 'activitypub_rest_following', array(), $user ); // phpcs:ignore - - $json->totalItems = is_countable( $items ) ? count( $items ) : 0; // phpcs:ignore - $json->orderedItems = $items; // phpcs:ignore - - $json->first = $json->partOf; // phpcs:ignore + $json->totalItems = is_countable( $items ) ? count( $items ) : 0; + $json->orderedItems = $items; + $json->first = $json->partOf; + // phpcs:enable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase $rest_response = new WP_REST_Response( $json, 200 ); $rest_response->header( 'Content-Type', 'application/activity+json; charset=' . get_option( 'blog_charset' ) ); @@ -88,9 +100,9 @@ class Following { } /** - * The supported parameters + * The supported parameters. * - * @return array list of parameters + * @return array List of parameters. */ public static function request_parameters() { $params = array(); @@ -101,7 +113,7 @@ class Following { $params['user_id'] = array( 'required' => true, - 'type' => 'string', + 'type' => 'string', ); return $params; @@ -111,22 +123,22 @@ class Following { * Add the Blog Authors to the following list of the Blog Actor * if Blog not in single mode. * - * @param array $array The array of following urls. - * @param User $user The user object. + * @param array $follow_list The array of following urls. + * @param \Activitypub\Model\User $user The user object. * * @return array The array of following urls. */ - public static function default_following( $array, $user ) { + public static function default_following( $follow_list, $user ) { if ( 0 !== $user->get__id() || is_single_user() ) { - return $array; + return $follow_list; } $users = User_Collection::get_collection(); foreach ( $users as $user ) { - $array[] = $user->get_url(); + $follow_list[] = $user->get_url(); } - return $array; + return $follow_list; } } diff --git a/wp-content/plugins/activitypub/includes/rest/class-inbox.php b/wp-content/plugins/activitypub/includes/rest/class-inbox.php index 161fcf19..ea550295 100644 --- a/wp-content/plugins/activitypub/includes/rest/class-inbox.php +++ b/wp-content/plugins/activitypub/includes/rest/class-inbox.php @@ -1,21 +1,25 @@ get_param( 'user_id' ); @@ -80,29 +84,33 @@ class Inbox { return $user; } - $page = $request->get_param( 'page', 0 ); - - /* - * Action triggerd prior to the ActivityPub profile being created and sent to the client + /** + * Action triggered prior to the ActivityPub profile being created and sent to the client. */ \do_action( 'activitypub_rest_inbox_pre' ); $json = new \stdClass(); + // phpcs:disable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase $json->{'@context'} = get_context(); - $json->id = get_rest_url_by_path( sprintf( 'actors/%d/inbox', $user->get__id() ) ); - $json->generator = 'http://wordpress.org/?v=' . get_masked_wp_version(); - $json->type = 'OrderedCollectionPage'; - $json->partOf = get_rest_url_by_path( sprintf( 'actors/%d/inbox', $user->get__id() ) ); // phpcs:ignore - $json->totalItems = 0; // phpcs:ignore - $json->orderedItems = array(); // phpcs:ignore - $json->first = $json->partOf; // phpcs:ignore + $json->id = get_rest_url_by_path( sprintf( 'actors/%d/inbox', $user->get__id() ) ); + $json->generator = 'http://wordpress.org/?v=' . get_masked_wp_version(); + $json->type = 'OrderedCollectionPage'; + $json->partOf = get_rest_url_by_path( sprintf( 'actors/%d/inbox', $user->get__id() ) ); + $json->totalItems = 0; + $json->orderedItems = array(); + $json->first = $json->partOf; + // phpcs:enable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase - // filter output + /** + * Filter the ActivityPub inbox array. + * + * @param array $json The ActivityPub inbox array. + */ $json = \apply_filters( 'activitypub_rest_inbox_array', $json ); - /* - * Action triggerd after the ActivityPub profile has been created and sent to the client + /** + * Action triggered after the ActivityPub profile has been created and sent to the client. */ \do_action( 'activitypub_inbox_post' ); @@ -113,11 +121,11 @@ class Inbox { } /** - * Handles user-inbox requests + * Handles user-inbox requests. * - * @param WP_REST_Request $request + * @param \WP_REST_Request $request The request object. * - * @return WP_REST_Response + * @return WP_REST_Response|\WP_Error The response object or WP_Error. */ public static function user_inbox_post( $request ) { $user_id = $request->get_param( 'user_id' ); @@ -132,7 +140,23 @@ class Inbox { $type = $request->get_param( 'type' ); $type = \strtolower( $type ); + /** + * ActivityPub inbox action. + * + * @param array $data The data array. + * @param int|null $user_id The user ID. + * @param string $type The type of the activity. + * @param Activity $activity The Activity object. + */ \do_action( 'activitypub_inbox', $data, $user->get__id(), $type, $activity ); + + /** + * ActivityPub inbox action for specific activity types. + * + * @param array $data The data array. + * @param int|null $user_id The user ID. + * @param Activity $activity The Activity object. + */ \do_action( "activitypub_inbox_{$type}", $data, $user->get__id(), $activity ); $rest_response = new WP_REST_Response( array(), 202 ); @@ -142,9 +166,9 @@ class Inbox { } /** - * The shared inbox + * The shared inbox. * - * @param WP_REST_Request $request + * @param \WP_REST_Request $request The request object. * * @return WP_REST_Response */ @@ -154,7 +178,23 @@ class Inbox { $type = $request->get_param( 'type' ); $type = \strtolower( $type ); + /** + * ActivityPub inbox action. + * + * @param array $data The data array. + * @param int|null $user_id The user ID. + * @param string $type The type of the activity. + * @param Activity $activity The Activity object. + */ \do_action( 'activitypub_inbox', $data, null, $type, $activity ); + + /** + * ActivityPub inbox action for specific activity types. + * + * @param array $data The data array. + * @param int|null $user_id The user ID. + * @param Activity $activity The Activity object. + */ \do_action( "activitypub_inbox_{$type}", $data, null, $activity ); $rest_response = new WP_REST_Response( array(), 202 ); @@ -164,9 +204,9 @@ class Inbox { } /** - * The supported parameters + * The supported parameters. * - * @return array list of parameters + * @return array List of parameters. */ public static function user_inbox_get_parameters() { $params = array(); @@ -177,100 +217,68 @@ class Inbox { $params['user_id'] = array( 'required' => true, - 'type' => 'string', + 'type' => 'string', ); return $params; } /** - * The supported parameters + * The supported parameters. * - * @return array list of parameters + * @return array List of parameters. */ public static function user_inbox_post_parameters() { $params = array(); - $params['page'] = array( - 'type' => 'integer', - ); - $params['user_id'] = array( 'required' => true, - 'type' => 'string', + 'type' => 'string', ); $params['id'] = array( - 'required' => true, + 'required' => true, 'sanitize_callback' => 'esc_url_raw', ); $params['actor'] = array( - 'required' => true, - 'sanitize_callback' => function ( $param, $request, $key ) { - return object_to_uri( $param ); - }, + 'required' => true, + 'sanitize_callback' => '\Activitypub\object_to_uri', ); $params['type'] = array( 'required' => true, - //'type' => 'enum', - //'enum' => array( 'Create' ), - //'sanitize_callback' => function ( $param, $request, $key ) { - // return \strtolower( $param ); - //}, ); $params['object'] = array( - 'required' => true, + 'required' => true, + 'validate_callback' => function ( $param, $request, $key ) { + /** + * Filter the ActivityPub object validation. + * + * @param bool $validate The validation result. + * @param array $param The object data. + * @param object $request The request object. + * @param string $key The key. + */ + return apply_filters( 'activitypub_validate_object', true, $param, $request, $key ); + }, ); return $params; } /** - * The supported parameters + * The supported parameters. * - * @return array list of parameters + * @return array List of parameters. */ public static function shared_inbox_post_parameters() { - $params = array(); - - $params['page'] = array( - 'type' => 'integer', - ); - - $params['id'] = array( - 'required' => true, - 'type' => 'string', - 'sanitize_callback' => 'esc_url_raw', - ); - - $params['actor'] = array( - 'required' => true, - //'type' => array( 'object', 'string' ), - 'sanitize_callback' => function ( $param, $request, $key ) { - return object_to_uri( $param ); - }, - ); - - $params['type'] = array( - 'required' => true, - //'type' => 'enum', - //'enum' => array( 'Create' ), - //'sanitize_callback' => function ( $param, $request, $key ) { - // return \strtolower( $param ); - //}, - ); - - $params['object'] = array( - 'required' => true, - //'type' => 'object', - ); + $params = self::user_inbox_post_parameters(); $params['to'] = array( - 'required' => false, - 'sanitize_callback' => function ( $param, $request, $key ) { + 'required' => false, + 'sanitize_callback' => function ( $param ) { if ( \is_string( $param ) ) { $param = array( $param ); } @@ -280,7 +288,7 @@ class Inbox { ); $params['cc'] = array( - 'sanitize_callback' => function ( $param, $request, $key ) { + 'sanitize_callback' => function ( $param ) { if ( \is_string( $param ) ) { $param = array( $param ); } @@ -290,7 +298,7 @@ class Inbox { ); $params['bcc'] = array( - 'sanitize_callback' => function ( $param, $request, $key ) { + 'sanitize_callback' => function ( $param ) { if ( \is_string( $param ) ) { $param = array( $param ); } @@ -303,15 +311,15 @@ class Inbox { } /** - * Get local user recipients + * Get local user recipients. * - * @param array $data + * @param array $data The data array. * - * @return array The list of local users + * @return array The list of local users. */ public static function get_recipients( $data ) { $recipients = extract_recipients_from_activity( $data ); - $users = array(); + $users = array(); foreach ( $recipients as $recipient ) { $user_id = url_to_authorid( $recipient ); diff --git a/wp-content/plugins/activitypub/includes/rest/class-interaction.php b/wp-content/plugins/activitypub/includes/rest/class-interaction.php new file mode 100644 index 00000000..8bf78267 --- /dev/null +++ b/wp-content/plugins/activitypub/includes/rest/class-interaction.php @@ -0,0 +1,118 @@ + \WP_REST_Server::READABLE, + 'callback' => array( self::class, 'get' ), + 'permission_callback' => '__return_true', + 'args' => array( + 'uri' => array( + 'type' => 'string', + 'required' => true, + 'sanitize_callback' => 'esc_url', + ), + ), + ), + ) + ); + } + + /** + * Handle GET request. + * + * @param \WP_REST_Request $request The request object. + * + * @return WP_REST_Response Redirect to the editor or die. + */ + public static function get( $request ) { + $uri = $request->get_param( 'uri' ); + $redirect_url = null; + $object = Http::get_remote_object( $uri ); + + if ( + \is_wp_error( $object ) || + ! isset( $object['type'] ) + ) { + \wp_die( + \esc_html__( + 'The URL is not supported!', + 'activitypub' + ), + 400 + ); + } + + if ( ! empty( $object['url'] ) ) { + $uri = \esc_url( $object['url'] ); + } + + switch ( $object['type'] ) { + case 'Group': + case 'Person': + case 'Service': + case 'Application': + case 'Organization': + $redirect_url = \apply_filters( 'activitypub_interactions_follow_url', $redirect_url, $uri, $object ); + break; + default: + $redirect_url = \admin_url( 'post-new.php?in_reply_to=' . $uri ); + $redirect_url = \apply_filters( 'activitypub_interactions_reply_url', $redirect_url, $uri, $object ); + } + + /** + * Filter the redirect URL. + * + * @param string $redirect_url The URL to redirect to. + * @param string $uri The URI of the object. + * @param array $object The object. + */ + $redirect_url = \apply_filters( 'activitypub_interactions_url', $redirect_url, $uri, $object ); + + // Check if hook is implemented. + if ( ! $redirect_url ) { + \wp_die( + esc_html__( + 'This Interaction type is not supported yet!', + 'activitypub' + ), + 400 + ); + } + + return new WP_REST_Response( + null, + 302, + array( + 'Location' => \esc_url( $redirect_url ), + ) + ); + } +} diff --git a/wp-content/plugins/activitypub/includes/rest/class-nodeinfo.php b/wp-content/plugins/activitypub/includes/rest/class-nodeinfo.php index 02b89b6c..3eb5fc00 100644 --- a/wp-content/plugins/activitypub/includes/rest/class-nodeinfo.php +++ b/wp-content/plugins/activitypub/includes/rest/class-nodeinfo.php @@ -1,4 +1,10 @@ 'wordpress', + 'name' => 'wordpress', 'version' => get_masked_wp_version(), ); - $posts = \wp_count_posts(); + $posts = \wp_count_posts(); $comments = \wp_count_comments(); $nodeinfo['usage'] = array( - 'users' => array( + 'users' => array( 'total' => get_total_users(), 'activeMonth' => get_active_users( '1 month ago' ), 'activeHalfyear' => get_active_users( '6 month ago' ), ), - 'localPosts' => (int) $posts->publish, + 'localPosts' => (int) $posts->publish, 'localComments' => (int) $comments->approved, ); $nodeinfo['openRegistrations'] = false; - $nodeinfo['protocols'] = array( 'activitypub' ); + $nodeinfo['protocols'] = array( 'activitypub' ); $nodeinfo['services'] = array( - 'inbound' => array(), + 'inbound' => array(), 'outbound' => array(), ); $nodeinfo['metadata'] = array( - 'nodeName' => \get_bloginfo( 'name' ), + 'nodeName' => \get_bloginfo( 'name' ), 'nodeDescription' => \get_bloginfo( 'description' ), - 'nodeIcon' => \get_site_icon_url(), + 'nodeIcon' => \get_site_icon_url(), ); return new WP_REST_Response( $nodeinfo, 200 ); } /** - * Render NodeInfo file + * Render NodeInfo file. * - * @param WP_REST_Request $request - * - * @return WP_REST_Response + * @return WP_REST_Response The JSON profile of the NodeInfo. */ - public static function nodeinfo2( $request ) { - /* - * Action triggerd prior to the ActivityPub profile being created and sent to the client + public static function nodeinfo2() { + /** + * Action triggered prior to the ActivityPub profile being created and sent to the client. */ \do_action( 'activitypub_rest_nodeinfo2_pre' ); $nodeinfo = array(); $nodeinfo['version'] = '2.0'; - $nodeinfo['server'] = array( - 'baseUrl' => \home_url( '/' ), - 'name' => \get_bloginfo( 'name' ), + $nodeinfo['server'] = array( + 'baseUrl' => \home_url( '/' ), + 'name' => \get_bloginfo( 'name' ), 'software' => 'wordpress', - 'version' => get_masked_wp_version(), + 'version' => get_masked_wp_version(), ); - $posts = \wp_count_posts(); + $posts = \wp_count_posts(); $comments = \wp_count_comments(); $nodeinfo['usage'] = array( - 'users' => array( + 'users' => array( 'total' => get_total_users(), 'activeMonth' => get_active_users( 1 ), 'activeHalfyear' => get_active_users( 6 ), ), - 'localPosts' => (int) $posts->publish, + 'localPosts' => (int) $posts->publish, 'localComments' => (int) $comments->approved, ); $nodeinfo['openRegistrations'] = false; - $nodeinfo['protocols'] = array( 'activitypub' ); + $nodeinfo['protocols'] = array( 'activitypub' ); $nodeinfo['services'] = array( - 'inbound' => array(), + 'inbound' => array(), 'outbound' => array(), ); @@ -163,21 +165,19 @@ class Nodeinfo { } /** - * Render NodeInfo discovery file - * - * @param WP_REST_Request $request + * Render NodeInfo discovery file. * * @return WP_REST_Response */ - public static function discovery( $request ) { - $discovery = array(); + public static function discovery() { + $discovery = array(); $discovery['links'] = array( array( - 'rel' => 'http://nodeinfo.diaspora.software/ns/schema/2.0', + 'rel' => 'http://nodeinfo.diaspora.software/ns/schema/2.0', 'href' => get_rest_url_by_path( 'nodeinfo' ), ), array( - 'rel' => 'https://www.w3.org/ns/activitystreams#Application', + 'rel' => 'https://www.w3.org/ns/activitystreams#Application', 'href' => get_rest_url_by_path( 'application' ), ), ); diff --git a/wp-content/plugins/activitypub/includes/rest/class-outbox.php b/wp-content/plugins/activitypub/includes/rest/class-outbox.php index e0670301..461d4286 100644 --- a/wp-content/plugins/activitypub/includes/rest/class-outbox.php +++ b/wp-content/plugins/activitypub/includes/rest/class-outbox.php @@ -1,8 +1,13 @@ get_param( 'user_id' ); @@ -64,41 +69,43 @@ class Outbox { $page = $request->get_param( 'page', 1 ); - /* - * Action triggerd prior to the ActivityPub profile being created and sent to the client + /** + * Action triggered prior to the ActivityPub profile being created and sent to the client. */ \do_action( 'activitypub_rest_outbox_pre' ); $json = new stdClass(); + // phpcs:disable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase $json->{'@context'} = get_context(); - $json->id = get_rest_url_by_path( sprintf( 'actors/%d/outbox', $user_id ) ); - $json->generator = 'http://wordpress.org/?v=' . get_masked_wp_version(); - $json->actor = $user->get_id(); - $json->type = 'OrderedCollectionPage'; - $json->partOf = get_rest_url_by_path( sprintf( 'actors/%d/outbox', $user_id ) ); // phpcs:ignore - $json->totalItems = 0; // phpcs:ignore + $json->id = get_rest_url_by_path( sprintf( 'actors/%d/outbox', $user_id ) ); + $json->generator = 'http://wordpress.org/?v=' . get_masked_wp_version(); + $json->actor = $user->get_id(); + $json->type = 'OrderedCollectionPage'; + $json->partOf = get_rest_url_by_path( sprintf( 'actors/%d/outbox', $user_id ) ); + $json->totalItems = 0; if ( $user_id > 0 ) { - $count_posts = \count_user_posts( $user_id, $post_types, true ); - $json->totalItems = \intval( $count_posts ); // phpcs:ignore + $count_posts = \count_user_posts( $user_id, $post_types, true ); + $json->totalItems = \intval( $count_posts ); } else { foreach ( $post_types as $post_type ) { - $count_posts = \wp_count_posts( $post_type ); - $json->totalItems += \intval( $count_posts->publish ); // phpcs:ignore + $count_posts = \wp_count_posts( $post_type ); + $json->totalItems += \intval( $count_posts->publish ); } } - $json->first = \add_query_arg( 'page', 1, $json->partOf ); // phpcs:ignore - $json->last = \add_query_arg( 'page', \ceil ( $json->totalItems / 10 ), $json->partOf ); // phpcs:ignore + $json->first = \add_query_arg( 'page', 1, $json->partOf ); + $json->last = \add_query_arg( 'page', \ceil( $json->totalItems / 10 ), $json->partOf ); - if ( $page && ( ( \ceil ( $json->totalItems / 10 ) ) > $page ) ) { // phpcs:ignore - $json->next = \add_query_arg( 'page', $page + 1, $json->partOf ); // phpcs:ignore + if ( $page && ( ( \ceil( $json->totalItems / 10 ) ) > $page ) ) { + $json->next = \add_query_arg( 'page', $page + 1, $json->partOf ); } - if ( $page && ( $page > 1 ) ) { // phpcs:ignore - $json->prev = \add_query_arg( 'page', $page - 1, $json->partOf ); // phpcs:ignore + if ( $page && ( $page > 1 ) ) { + $json->prev = \add_query_arg( 'page', $page - 1, $json->partOf ); } + // phpcs:enable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase if ( $page ) { $posts = \get_posts( @@ -121,15 +128,19 @@ class Outbox { $activity = new Activity(); $activity->set_type( 'Create' ); $activity->set_object( $post ); - $json->orderedItems[] = $activity->to_array( false ); // phpcs:ignore + $json->orderedItems[] = $activity->to_array( false ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase } } - // filter output + /** + * Filter the ActivityPub outbox array. + * + * @param array $json The ActivityPub outbox array. + */ $json = \apply_filters( 'activitypub_rest_outbox_array', $json ); - /* - * Action triggerd after the ActivityPub profile has been created and sent to the client + /** + * Action triggered after the ActivityPub profile has been created and sent to the client */ \do_action( 'activitypub_outbox_post' ); @@ -140,21 +151,21 @@ class Outbox { } /** - * The supported parameters + * The supported parameters. * - * @return array list of parameters + * @return array List of parameters. */ public static function request_parameters() { $params = array(); $params['page'] = array( - 'type' => 'integer', + 'type' => 'integer', 'default' => 1, ); $params['user_id'] = array( 'required' => true, - 'type' => 'string', + 'type' => 'string', ); return $params; diff --git a/wp-content/plugins/activitypub/includes/rest/class-server.php b/wp-content/plugins/activitypub/includes/rest/class-server.php index d03f6c17..aac34982 100644 --- a/wp-content/plugins/activitypub/includes/rest/class-server.php +++ b/wp-content/plugins/activitypub/includes/rest/class-server.php @@ -1,14 +1,19 @@ get_route(); - // check if it is an activitypub request and exclude webfinger and nodeinfo endpoints + // Check if it is an activitypub request and exclude webfinger and nodeinfo endpoints. if ( ! \str_starts_with( $route, '/' . ACTIVITYPUB_REST_NAMESPACE ) || \str_starts_with( $route, '/' . \trailingslashit( ACTIVITYPUB_REST_NAMESPACE ) . 'webfinger' ) || @@ -90,13 +100,13 @@ class Server { } /** - * Filter to defer signature verification + * Filter to defer signature verification. * * Skip signature verification for debugging purposes or to reduce load for * certain Activity-Types, like "Delete". * - * @param bool $defer Whether to defer signature verification. - * @param WP_REST_Request $request The request used to generate the response. + * @param bool $defer Whether to defer signature verification. + * @param \WP_REST_Request $request The request used to generate the response. * * @return bool Whether to defer signature verification. */ @@ -107,9 +117,9 @@ class Server { } if ( - // POST-Requests are always signed + // POST-Requests are always signed. 'GET' !== $request->get_method() || - // GET-Requests only require a signature in secure mode + // GET-Requests only require a signature in secure mode. ( 'GET' === $request->get_method() && ACTIVITYPUB_AUTHORIZED_FETCH ) ) { $verified_request = Signature::verify_http_signature( $request ); @@ -124,4 +134,51 @@ class Server { return $response; } + + /** + * Callback function to validate incoming ActivityPub requests + * + * @param WP_REST_Response|\WP_HTTP_Response|WP_Error|mixed $response Result to send to the client. + * Usually a WP_REST_Response or WP_Error. + * @param array $handler Route handler used for the request. + * @param \WP_REST_Request $request Request used to generate the response. + * + * @return mixed|WP_Error The response, error, or modified response. + */ + public static function validate_activitypub_requests( $response, $handler, $request ) { + if ( 'HEAD' === $request->get_method() ) { + return $response; + } + + $route = $request->get_route(); + + if ( + \is_wp_error( $response ) || + ! \str_starts_with( $route, '/' . ACTIVITYPUB_REST_NAMESPACE ) + ) { + return $response; + } + + $params = $request->get_json_params(); + + // Type is required for ActivityPub requests, so it fail later in the process. + if ( ! isset( $params['type'] ) ) { + return $response; + } + + if ( + ACTIVITYPUB_DISABLE_INCOMING_INTERACTIONS && + in_array( $params['type'], array( 'Create', 'Like', 'Announce' ), true ) + ) { + return new WP_Error( + 'activitypub_server_does_not_accept_incoming_interactions', + \__( 'This server does not accept incoming interactions.', 'activitypub' ), + // We have to use a 2XX status code here, because otherwise the response will be + // treated as an error and Mastodon might block this WordPress instance. + array( 'status' => 202 ) + ); + } + + return $response; + } } diff --git a/wp-content/plugins/activitypub/includes/rest/class-webfinger.php b/wp-content/plugins/activitypub/includes/rest/class-webfinger.php index 48224e18..868ed50d 100644 --- a/wp-content/plugins/activitypub/includes/rest/class-webfinger.php +++ b/wp-content/plugins/activitypub/includes/rest/class-webfinger.php @@ -1,12 +1,16 @@ '*', - 'Content-Type' => 'application/jrd+json; charset=' . get_option( 'blog_charset' ), + 'Content-Type' => 'application/jrd+json; charset=' . get_option( 'blog_charset' ), ) ); } /** - * The supported parameters + * The supported parameters. * * @return array list of parameters */ @@ -89,8 +89,8 @@ class Webfinger { $params['resource'] = array( 'required' => true, - 'type' => 'string', - 'pattern' => '^(acct:)|^(https?://)(.+)$', + 'type' => 'string', + 'pattern' => '^(acct:)|^(https?://)(.+)$', ); return $params; @@ -99,47 +99,17 @@ class Webfinger { /** * Get the WebFinger profile. * - * @param string $resource the WebFinger resource. + * @param string $webfinger the WebFinger resource. * - * @return array the WebFinger profile. + * @return array|\WP_Error The WebFinger profile or WP_Error if not found. */ - public static function get_profile( $resource ) { - $user = User_Collection::get_by_resource( $resource ); - - if ( \is_wp_error( $user ) ) { - return $user; - } - - $aliases = array( - $user->get_url(), - $user->get_alternate_url(), - ); - - $aliases = array_unique( $aliases ); - - $profile = array( - 'subject' => sprintf( 'acct:%s', $user->get_webfinger() ), - 'aliases' => array_values( array_unique( $aliases ) ), - 'links' => array( - array( - 'rel' => 'self', - 'type' => 'application/activity+json', - 'href' => $user->get_url(), - ), - array( - 'rel' => 'http://webfinger.net/rel/profile-page', - 'type' => 'text/html', - 'href' => $user->get_url(), - ), - ), - ); - - if ( 'Person' !== $user->get_type() ) { - $profile['links'][0]['properties'] = array( - 'https://www.w3.org/ns/activitystreams#type' => $user->get_type(), - ); - } - - return $profile; + public static function get_profile( $webfinger ) { + /** + * Filter the WebFinger data. + * + * @param array $data The WebFinger data. + * @param string $webfinger The WebFinger resource. + */ + return apply_filters( 'webfinger_data', array(), $webfinger ); } } diff --git a/wp-content/plugins/activitypub/includes/table/class-followers.php b/wp-content/plugins/activitypub/includes/table/class-followers.php index df9747bd..991f97c1 100644 --- a/wp-content/plugins/activitypub/includes/table/class-followers.php +++ b/wp-content/plugins/activitypub/includes/table/class-followers.php @@ -1,4 +1,10 @@ id === 'settings_page_activitypub' ) { $this->user_id = Users::BLOG_USER_ID; @@ -30,6 +47,11 @@ class Followers extends WP_List_Table { ); } + /** + * Get columns. + * + * @return array + */ public function get_columns() { return array( 'cb' => '', @@ -42,16 +64,22 @@ class Followers extends WP_List_Table { ); } + /** + * Returns sortable columns. + * + * @return array + */ public function get_sortable_columns() { - $sortable_columns = array( + return array( 'post_title' => array( 'post_title', true ), 'modified' => array( 'modified', false ), 'published' => array( 'published', false ), ); - - return $sortable_columns; } + /** + * Prepare items. + */ public function prepare_items() { $columns = $this->get_columns(); $hidden = array(); @@ -64,26 +92,22 @@ class Followers extends WP_List_Table { $args = array(); - // phpcs:ignore WordPress.Security.NonceVerification.Recommended + // phpcs:disable WordPress.Security.NonceVerification.Recommended if ( isset( $_GET['orderby'] ) ) { - // phpcs:ignore WordPress.Security.NonceVerification.Recommended $args['orderby'] = sanitize_text_field( wp_unslash( $_GET['orderby'] ) ); } - // phpcs:ignore WordPress.Security.NonceVerification.Recommended if ( isset( $_GET['order'] ) ) { - // phpcs:ignore WordPress.Security.NonceVerification.Recommended $args['order'] = sanitize_text_field( wp_unslash( $_GET['order'] ) ); } - // phpcs:ignore WordPress.Security.NonceVerification.Recommended if ( isset( $_GET['s'] ) && isset( $_REQUEST['_wpnonce'] ) ) { $nonce = sanitize_text_field( wp_unslash( $_REQUEST['_wpnonce'] ) ); if ( wp_verify_nonce( $nonce, 'bulk-' . $this->_args['plural'] ) ) { - // phpcs:ignore WordPress.Security.NonceVerification.Recommended $args['s'] = sanitize_text_field( wp_unslash( $_GET['s'] ) ); } } + // phpcs:enable WordPress.Security.NonceVerification.Recommended $followers_with_count = FollowerCollection::get_followers_with_count( $this->user_id, $per_page, $page_num, $args ); $followers = $followers_with_count['followers']; @@ -113,12 +137,24 @@ class Followers extends WP_List_Table { } } + /** + * Returns bulk actions. + * + * @return array + */ public function get_bulk_actions() { return array( 'delete' => __( 'Delete', 'activitypub' ), ); } + /** + * Column default. + * + * @param array $item Item. + * @param string $column_name Column name. + * @return string + */ public function column_default( $item, $column_name ) { if ( ! array_key_exists( $column_name, $item ) ) { return __( 'None', 'activitypub' ); @@ -126,6 +162,12 @@ class Followers extends WP_List_Table { return $item[ $column_name ]; } + /** + * Column avatar. + * + * @param array $item Item. + * @return string + */ public function column_avatar( $item ) { return sprintf( '', @@ -133,45 +175,63 @@ class Followers extends WP_List_Table { ); } + /** + * Column url. + * + * @param array $item Item. + * @return string + */ public function column_url( $item ) { return sprintf( '%s', - $item['url'], + esc_url( $item['url'] ), $item['url'] ); } + /** + * Column cb. + * + * @param array $item Item. + * @return string + */ public function column_cb( $item ) { return sprintf( '', esc_attr( $item['identifier'] ) ); } + /** + * Process action. + */ public function process_action() { if ( ! isset( $_REQUEST['followers'] ) || ! isset( $_REQUEST['_wpnonce'] ) ) { - return false; + return; } $nonce = sanitize_text_field( wp_unslash( $_REQUEST['_wpnonce'] ) ); if ( ! wp_verify_nonce( $nonce, 'bulk-' . $this->_args['plural'] ) ) { - return false; + return; } if ( ! current_user_can( 'edit_user', $this->user_id ) ) { - return false; + return; } - $followers = $_REQUEST['followers']; // phpcs:ignore + $followers = $_REQUEST['followers']; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput - switch ( $this->current_action() ) { - case 'delete': - if ( ! is_array( $followers ) ) { - $followers = array( $followers ); - } - foreach ( $followers as $follower ) { - FollowerCollection::remove_follower( $this->user_id, $follower ); - } - break; + if ( $this->current_action() === 'delete' ) { + if ( ! is_array( $followers ) ) { + $followers = array( $followers ); + } + foreach ( $followers as $follower ) { + FollowerCollection::remove_follower( $this->user_id, $follower ); + } } } + /** + * Returns user count. + * + * @return int + */ public function get_user_count() { return FollowerCollection::count_followers( $this->user_id ); } diff --git a/wp-content/plugins/activitypub/includes/transformer/class-attachment.php b/wp-content/plugins/activitypub/includes/transformer/class-attachment.php index 2fc46350..98aaf8bf 100644 --- a/wp-content/plugins/activitypub/includes/transformer/class-attachment.php +++ b/wp-content/plugins/activitypub/includes/transformer/class-attachment.php @@ -1,10 +1,14 @@ wp_object->ID ); $media_type = preg_replace( '/(\/[a-zA-Z]+)/i', '', $mime_type ); + $type = ''; switch ( $media_type ) { case 'audio': diff --git a/wp-content/plugins/activitypub/includes/transformer/class-base.php b/wp-content/plugins/activitypub/includes/transformer/class-base.php index 5041fa96..6d4c202a 100644 --- a/wp-content/plugins/activitypub/includes/transformer/class-base.php +++ b/wp-content/plugins/activitypub/includes/transformer/class-base.php @@ -1,15 +1,21 @@ wp_object = $wp_object; @@ -49,9 +55,9 @@ abstract class Base { /** * Transform all properties with available get(ter) functions. * - * @param Base_Object|object $object + * @param Base_Object|object $activitypub_object The ActivityPub Object. * - * @return Base_Object|object $object + * @return Base_Object|object */ protected function transform_object_properties( $activitypub_object ) { $vars = $activitypub_object->get_object_var_keys(); @@ -75,13 +81,12 @@ abstract class Base { /** * Transform the WordPress Object into an ActivityPub Object. * - * @return Activitypub\Activity\Base_Object + * @return Base_Object|object The ActivityPub Object. */ public function to_object() { $activitypub_object = new Base_Object(); - $activitypub_object = $this->transform_object_properties( $activitypub_object ); - return $activitypub_object; + return $this->transform_object_properties( $activitypub_object ); } /** @@ -89,7 +94,7 @@ abstract class Base { * * @param string $type The Activity-Type. * - * @return \Activitypub\Activity\Activity The Activity. + * @return Activity The Activity. */ public function to_activity( $type ) { $object = $this->to_object(); @@ -100,7 +105,7 @@ abstract class Base { // Pre-fill the Activity with data (for example cc and to). $activity->set_object( $object ); - // Use simple Object (only ID-URI) for Like and Announce + // Use simple Object (only ID-URI) for Like and Announce. if ( in_array( $type, array( 'Like', 'Announce' ), true ) ) { $activity->set_object( $object->get_id() ); } @@ -108,17 +113,27 @@ abstract class Base { return $activity; } + /** + * Get the ID of the WordPress Object. + */ + abstract protected function get_id(); + + /** + * Get the replies Collection. + */ + public function get_replies() { + return Replies::get_collection( $this->wp_object ); + } + /** * Returns the ID of the WordPress Object. - * - * @return int The ID of the WordPress Object */ abstract public function get_wp_user_id(); /** * Change the User-ID of the WordPress Post. * - * @return int The User-ID of the WordPress Post + * @param int $user_id The new user ID. */ abstract public function change_wp_user_id( $user_id ); } diff --git a/wp-content/plugins/activitypub/includes/transformer/class-comment.php b/wp-content/plugins/activitypub/includes/transformer/class-comment.php index 72cf11f6..7f0d3f68 100644 --- a/wp-content/plugins/activitypub/includes/transformer/class-comment.php +++ b/wp-content/plugins/activitypub/includes/transformer/class-comment.php @@ -1,21 +1,23 @@ wp_object->user_id = $user_id; } /** - * Transforms the WP_Comment object to an ActivityPub Object + * Transforms the WP_Comment object to an ActivityPub Object. * * @see \Activitypub\Activity\Base_Object * - * @return \Activitypub\Activity\Base_Object The ActivityPub Object + * @return \Activitypub\Activity\Base_Object The ActivityPub Object. */ public function to_object() { $comment = $this->wp_object; @@ -106,41 +108,49 @@ class Comment extends Base { * @return string The content. */ protected function get_content() { - // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited $comment = $this->wp_object; $content = $comment->comment_content; + /** + * Filter the content of the comment. + * + * @param string $content The content of the comment. + * @param \WP_Comment $comment The comment object. + * @param array $args The arguments. + * + * @return string The filtered content of the comment. + */ $content = \apply_filters( 'comment_text', $content, $comment, array() ); $content = \preg_replace( '/[\n\r\t]/', '', $content ); $content = \trim( $content ); - $content = \apply_filters( 'activitypub_the_content', $content, $comment ); - return $content; + /** + * Filter the content of the comment. + * + * @param string $content The content of the comment. + * @param \WP_Comment $comment The comment object. + * + * @return string The filtered content of the comment. + */ + return \apply_filters( 'activitypub_the_content', $content, $comment ); } /** * Returns the in-reply-to for the ActivityPub Item. * - * @return int The URL of the in-reply-to. + * @return false|string|null The URL of the in-reply-to. */ protected function get_in_reply_to() { - $comment = $this->wp_object; - + $comment = $this->wp_object; $parent_comment = null; - $in_reply_to = null; if ( $comment->comment_parent ) { $parent_comment = \get_comment( $comment->comment_parent ); } if ( $parent_comment ) { - $comment_meta = \get_comment_meta( $parent_comment->comment_ID ); - - if ( ! empty( $comment_meta['source_id'][0] ) ) { - $in_reply_to = $comment_meta['source_id'][0]; - } elseif ( ! empty( $comment_meta['source_url'][0] ) ) { - $in_reply_to = $comment_meta['source_url'][0]; - } elseif ( ! empty( $parent_comment->user_id ) ) { + $in_reply_to = Comment_Utils::get_source_id( $parent_comment->comment_ID ); + if ( ! $in_reply_to && ! empty( $parent_comment->user_id ) ) { $in_reply_to = Comment_Utils::generate_id( $parent_comment ); } } else { @@ -196,7 +206,7 @@ class Comment extends Base { $mentions = $this->get_mentions(); if ( $mentions ) { foreach ( $mentions as $mention => $url ) { - $tag = array( + $tag = array( 'type' => 'Mention', 'href' => \esc_url( $url ), 'name' => \esc_html( $mention ), @@ -216,6 +226,15 @@ class Comment extends Base { protected function get_mentions() { \add_filter( 'activitypub_extract_mentions', array( $this, 'extract_reply_context' ) ); + /** + * Filter the mentions in the comment. + * + * @param array $mentions The list of mentions. + * @param string $content The content of the comment. + * @param \WP_Comment $comment The comment object. + * + * @return array The filtered list of mentions. + */ return apply_filters( 'activitypub_extract_mentions', array(), $this->wp_object->comment_content, $this->wp_object ); } @@ -227,7 +246,7 @@ class Comment extends Base { protected function get_comment_ancestors() { $ancestors = get_comment_ancestors( $this->wp_object ); - // Now that we have the full tree of ancestors, only return the ones received from the fediverse + // Now that we have the full tree of ancestors, only return the ones received from the fediverse. return array_filter( $ancestors, function ( $comment_id ) { @@ -240,12 +259,12 @@ class Comment extends Base { * Collect all other Users that participated in this comment-thread * to send them a notification about the new reply. * - * @param array $mentions The already mentioned ActivityPub users + * @param array $mentions The already mentioned ActivityPub users. * * @return array The list of all Repliers. */ public function extract_reply_context( $mentions ) { - // Check if `$this->wp_object` is a WP_Comment + // Check if `$this->wp_object` is a WP_Comment. if ( 'WP_Comment' !== get_class( $this->wp_object ) ) { return $mentions; } @@ -260,7 +279,7 @@ class Comment extends Base { if ( $comment && ! empty( $comment->comment_author_url ) ) { $acct = Webfinger::uri_to_acct( $comment->comment_author_url ); if ( $acct && ! is_wp_error( $acct ) ) { - $acct = str_replace( 'acct:', '@', $acct ); + $acct = str_replace( 'acct:', '@', $acct ); $mentions[ $acct ] = $comment->comment_author_url; } } @@ -281,9 +300,9 @@ class Comment extends Base { /** * Filter the locale of the comment. * - * @param string $lang The locale of the comment. - * @param int $comment_id The comment ID. - * @param WP_Post $post The comment object. + * @param string $lang The locale of the comment. + * @param int $comment_id The comment ID. + * @param \WP_Post $post The comment object. * * @return string The filtered locale of the comment. */ diff --git a/wp-content/plugins/activitypub/includes/transformer/class-factory.php b/wp-content/plugins/activitypub/includes/transformer/class-factory.php index b21de7f9..a619423a 100644 --- a/wp-content/plugins/activitypub/includes/transformer/class-factory.php +++ b/wp-content/plugins/activitypub/includes/transformer/class-factory.php @@ -1,26 +1,31 @@ post_type ) { - return new Attachment( $object ); + if ( 'attachment' === $data->post_type ) { + return new Attachment( $data ); } - return new Post( $object ); + return new Post( $data ); case 'WP_Comment': - return new Comment( $object ); + return new Comment( $data ); default: return null; } diff --git a/wp-content/plugins/activitypub/includes/transformer/class-post.php b/wp-content/plugins/activitypub/includes/transformer/class-post.php index 82f69dcc..f18693fb 100644 --- a/wp-content/plugins/activitypub/includes/transformer/class-post.php +++ b/wp-content/plugins/activitypub/includes/transformer/class-post.php @@ -1,20 +1,26 @@ wp_object->post_author = $user_id; @@ -52,42 +67,54 @@ class Post extends Base { * @return \Activitypub\Activity\Base_Object The ActivityPub Object */ public function to_object() { - $post = $this->wp_object; + $post = $this->wp_object; $object = parent::to_object(); - $published = \strtotime( $post->post_date_gmt ); - - $object->set_published( \gmdate( 'Y-m-d\TH:i:s\Z', $published ) ); - - $updated = \strtotime( $post->post_modified_gmt ); - - if ( $updated > $published ) { - $object->set_updated( \gmdate( 'Y-m-d\TH:i:s\Z', $updated ) ); + $content_warning = get_content_warning( $post ); + if ( ! empty( $content_warning ) ) { + $object->set_sensitive( true ); + $object->set_summary( $content_warning ); + $object->set_summary_map( null ); } - $object->set_content_map( - array( - $this->get_locale() => $this->get_content(), - ) - ); - $path = sprintf( 'actors/%d/followers', intval( $post->post_author ) ); - - $object->set_to( - array( - 'https://www.w3.org/ns/activitystreams#Public', - get_rest_url_by_path( $path ), - ) - ); - return $object; } + /** + * Returns the User-Object of the Author of the Post. + * + * If `single_user` mode is enabled, the Blog-User is returned. + * + * @return \Activitypub\Activity\Actor The User-Object. + */ + protected function get_actor_object() { + if ( $this->actor_object ) { + return $this->actor_object; + } + + $blog_user = new Blog(); + $this->actor_object = $blog_user; + + if ( is_single_user() ) { + return $blog_user; + } + + $user = Users::get_by_id( $this->wp_object->post_author ); + + if ( $user && ! is_wp_error( $user ) ) { + $this->actor_object = $user; + return $user; + } + + return $blog_user; + } + /** * Returns the ID of the Post. * * @return string The Posts ID. */ - public function get_id() { + protected function get_id() { return $this->get_url(); } @@ -99,13 +126,21 @@ class Post extends Base { public function get_url() { $post = $this->wp_object; - if ( 'trash' === get_post_status( $post ) ) { - $permalink = \get_post_meta( $post->ID, 'activitypub_canonical_url', true ); - } elseif ( 'draft' === get_post_status( $post ) && get_sample_permalink( $post->ID ) ) { - $sample = get_sample_permalink( $post->ID ); - $permalink = str_replace( array( '%pagename%', '%postname%' ), $sample[1], $sample[0] ); - } else { - $permalink = \get_permalink( $post ); + switch ( \get_post_status( $post ) ) { + case 'trash': + $permalink = \get_post_meta( $post->ID, 'activitypub_canonical_url', true ); + break; + case 'draft': + // Get_sample_permalink is in wp-admin, not always loaded. + if ( ! \function_exists( '\get_sample_permalink' ) ) { + require_once ABSPATH . 'wp-admin/includes/post.php'; + } + $sample = \get_sample_permalink( $post->ID ); + $permalink = \str_replace( array( '%pagename%', '%postname%' ), $sample[1], $sample[0] ); + break; + default: + $permalink = \get_permalink( $post ); + break; } return \esc_url( $permalink ); @@ -119,19 +154,7 @@ class Post extends Base { * @return string The User-URL. */ protected function get_attributed_to() { - $blog_user = new Blog(); - - if ( is_single_user() ) { - return $blog_user->get_url(); - } - - $user = Users::get_by_id( $this->wp_object->post_author ); - - if ( $user && ! is_wp_error( $user ) ) { - return $user->get_url(); - } - - return $blog_user->get_url(); + return $this->get_actor_object()->get_url(); } /** @@ -161,7 +184,7 @@ class Post extends Base { ); $id = $this->wp_object->ID; - // list post thumbnail first if this post has one + // List post thumbnail first if this post has one. if ( \function_exists( 'has_post_thumbnail' ) && \has_post_thumbnail( $id ) ) { $media['image'][] = array( 'id' => \get_post_thumbnail_id( $id ) ); } @@ -179,155 +202,27 @@ class Post extends Base { $media = \array_intersect_key( $media, $unique_ids ); $media = \array_slice( $media, 0, $max_media ); - return \array_filter( \array_map( array( self::class, 'wp_attachment_to_activity_attachment' ), $media ) ); - } + /** + * Filter the attachment IDs for a post. + * + * @param array $media The media array grouped by type. + * @param WP_Post $this->wp_object The post object. + * + * @return array The filtered attachment IDs. + */ + $media = \apply_filters( 'activitypub_attachment_ids', $media, $this->wp_object ); - /** - * Get media attachments from blocks. They will be formatted as ActivityPub attachments, not as WP attachments. - * - * @param array $media The media array grouped by type. - * @param int $max_media The maximum number of attachments to return. - * - * @return array The attachments. - */ - protected function get_block_attachments( $media, $max_media ) { - // max media can't be negative or zero - if ( $max_media <= 0 ) { - return array(); - } + $attachments = \array_filter( \array_map( array( self::class, 'wp_attachment_to_activity_attachment' ), $media ) ); - $blocks = \parse_blocks( $this->wp_object->post_content ); - $media = self::get_media_from_blocks( $blocks, $media ); - - return $media; - } - - /** - * Get image attachments from the classic editor. - * This is imperfect as the contained images aren't necessarily the - * same as the attachments. - * - * @param int $max_images The maximum number of images to return. - * - * @return array The attachment IDs. - */ - protected function get_classic_editor_image_attachments( $max_images ) { - // max images can't be negative or zero - if ( $max_images <= 0 ) { - return array(); - } - - $images = array(); - $query = new \WP_Query( - array( - 'post_parent' => $this->wp_object->ID, - 'post_status' => 'inherit', - 'post_type' => 'attachment', - 'post_mime_type' => 'image', - 'order' => 'ASC', - 'orderby' => 'menu_order ID', - 'posts_per_page' => $max_images, - ) - ); - - foreach ( $query->get_posts() as $attachment ) { - if ( ! \in_array( $attachment->ID, $images, true ) ) { - $images[] = array( 'id' => $attachment->ID ); - } - } - - return $images; - } - - /** - * Get image embeds from the classic editor by parsing HTML. - * - * @param int $max_images The maximum number of images to return. - * - * @return array The attachments. - */ - protected function get_classic_editor_image_embeds( $max_images ) { - // if someone calls that function directly, bail - if ( ! \class_exists( '\WP_HTML_Tag_Processor' ) ) { - return array(); - } - - // max images can't be negative or zero - if ( $max_images <= 0 ) { - return array(); - } - - $images = array(); - $base = \wp_get_upload_dir()['baseurl']; - $content = \get_post_field( 'post_content', $this->wp_object ); - $tags = new \WP_HTML_Tag_Processor( $content ); - - // This linter warning is a false positive - we have to - // re-count each time here as we modify $images. - // phpcs:ignore Squiz.PHP.DisallowSizeFunctionsInLoops.Found - while ( $tags->next_tag( 'img' ) && ( \count( $images ) <= $max_images ) ) { - $src = $tags->get_attribute( 'src' ); - - // If the img source is in our uploads dir, get the - // associated ID. Note: if there's a -500x500 - // type suffix, we remove it, but we try the original - // first in case the original image is actually called - // that. Likewise, we try adding the -scaled suffix for - // the case that this is a small version of an image - // that was big enough to get scaled down on upload: - // https://make.wordpress.org/core/2019/10/09/introducing-handling-of-big-images-in-wordpress-5-3/ - if ( null !== $src && \str_starts_with( $src, $base ) ) { - $img_id = \attachment_url_to_postid( $src ); - - if ( 0 === $img_id ) { - $count = 0; - $src = preg_replace( '/-(?:\d+x\d+)(\.[a-zA-Z]+)$/', '$1', $src, 1, $count ); - if ( $count > 0 ) { - $img_id = \attachment_url_to_postid( $src ); - } - } - - if ( 0 === $img_id ) { - $src = preg_replace( '/(\.[a-zA-Z]+)$/', '-scaled$1', $src ); - $img_id = \attachment_url_to_postid( $src ); - } - - if ( 0 !== $img_id ) { - $images[] = array( - 'id' => $img_id, - 'alt' => $tags->get_attribute( 'alt' ), - ); - } - } - } - - return $images; - } - - /** - * Get post images from the classic editor. - * Note that audio/video attachments are only supported in the block editor. - * - * @param array $media The media array grouped by type. - * @param int $max_images The maximum number of images to return. - * - * @return array The attachments. - */ - protected function get_classic_editor_images( $media, $max_images ) { - // max images can't be negative or zero - if ( $max_images <= 0 ) { - return array(); - } - - if ( \count( $media['image'] ) <= $max_images ) { - if ( \class_exists( '\WP_HTML_Tag_Processor' ) ) { - $media['image'] = \array_merge( $media['image'], $this->get_classic_editor_image_embeds( $max_images ) ); - } else { - $media['image'] = \array_merge( $media['image'], $this->get_classic_editor_image_attachments( $max_images ) ); - } - } - - return $media; + /** + * Filter the attachments for a post. + * + * @param array $attachments The attachments. + * @param WP_Post $this->wp_object The post object. + * + * @return array The filtered attachments. + */ + return \apply_filters( 'activitypub_attachments', $attachments, $this->wp_object ); } /** @@ -345,11 +240,11 @@ class Post extends Base { } foreach ( $enclosures as $enclosure ) { - // check if URL is an attachment + // Check if URL is an attachment. $attachment_id = \attachment_url_to_postid( $enclosure['url'] ); if ( $attachment_id ) { - $enclosure['id'] = $attachment_id; - $enclosure['url'] = \wp_get_attachment_url( $attachment_id ); + $enclosure['id'] = $attachment_id; + $enclosure['url'] = \wp_get_attachment_url( $attachment_id ); $enclosure['mediaType'] = \get_post_mime_type( $attachment_id ); } @@ -372,17 +267,36 @@ class Post extends Base { return $media; } + /** + * Get media attachments from blocks. They will be formatted as ActivityPub attachments, not as WP attachments. + * + * @param array $media The media array grouped by type. + * @param int $max_media The maximum number of attachments to return. + * + * @return array The attachments. + */ + protected function get_block_attachments( $media, $max_media ) { + // Max media can't be negative or zero. + if ( $max_media <= 0 ) { + return array(); + } + + $blocks = \parse_blocks( $this->wp_object->post_content ); + + return self::get_media_from_blocks( $blocks, $media ); + } + /** * Recursively get media IDs from blocks. - * @param array $blocks The blocks to search for media IDs - * @param array $media The media IDs to append new IDs to - * @param int $max_media The maximum number of media to return. + * + * @param array $blocks The blocks to search for media IDs. + * @param array $media The media IDs to append new IDs to. * * @return array The image IDs. */ protected static function get_media_from_blocks( $blocks, $media ) { foreach ( $blocks as $block ) { - // recurse into inner blocks + // Recurse into inner blocks. if ( ! empty( $block['innerBlocks'] ) ) { $media = self::get_media_from_blocks( $block['innerBlocks'], $media ); } @@ -443,22 +357,160 @@ class Post extends Base { return $media; } + /** + * Get post images from the classic editor. + * Note that audio/video attachments are only supported in the block editor. + * + * @param array $media The media array grouped by type. + * @param int $max_images The maximum number of images to return. + * + * @return array The attachments. + */ + protected function get_classic_editor_images( $media, $max_images ) { + // Max images can't be negative or zero. + if ( $max_images <= 0 ) { + return array(); + } + + if ( \count( $media['image'] ) <= $max_images ) { + if ( \class_exists( '\WP_HTML_Tag_Processor' ) ) { + $media['image'] = \array_merge( $media['image'], $this->get_classic_editor_image_embeds( $max_images ) ); + } else { + $media['image'] = \array_merge( $media['image'], $this->get_classic_editor_image_attachments( $max_images ) ); + } + } + + return $media; + } + + /** + * Get image embeds from the classic editor by parsing HTML. + * + * @param int $max_images The maximum number of images to return. + * + * @return array The attachments. + */ + protected function get_classic_editor_image_embeds( $max_images ) { + // If someone calls that function directly, bail. + if ( ! \class_exists( '\WP_HTML_Tag_Processor' ) ) { + return array(); + } + + // Max images can't be negative or zero. + if ( $max_images <= 0 ) { + return array(); + } + + $images = array(); + $base = \wp_get_upload_dir()['baseurl']; + $content = \get_post_field( 'post_content', $this->wp_object ); + $tags = new \WP_HTML_Tag_Processor( $content ); + + // This linter warning is a false positive - we have to re-count each time here as we modify $images. + // phpcs:ignore Squiz.PHP.DisallowSizeFunctionsInLoops.Found + while ( $tags->next_tag( 'img' ) && ( \count( $images ) <= $max_images ) ) { + $src = $tags->get_attribute( 'src' ); + + /* + * If the img source is in our uploads dir, get the + * associated ID. Note: if there's a -500x500 + * type suffix, we remove it, but we try the original + * first in case the original image is actually called + * that. Likewise, we try adding the -scaled suffix for + * the case that this is a small version of an image + * that was big enough to get scaled down on upload: + * https://make.wordpress.org/core/2019/10/09/introducing-handling-of-big-images-in-wordpress-5-3/ + */ + if ( null !== $src && \str_starts_with( $src, $base ) ) { + $img_id = \attachment_url_to_postid( $src ); + + if ( 0 === $img_id ) { + $count = 0; + $src = preg_replace( '/-(?:\d+x\d+)(\.[a-zA-Z]+)$/', '$1', $src, 1, $count ); + if ( $count > 0 ) { + $img_id = \attachment_url_to_postid( $src ); + } + } + + if ( 0 === $img_id ) { + $src = preg_replace( '/(\.[a-zA-Z]+)$/', '-scaled$1', $src ); + $img_id = \attachment_url_to_postid( $src ); + } + + if ( 0 !== $img_id ) { + $images[] = array( + 'id' => $img_id, + 'alt' => $tags->get_attribute( 'alt' ), + ); + } + } + } + + return $images; + } + + /** + * Get image attachments from the classic editor. + * This is imperfect as the contained images aren't necessarily the + * same as the attachments. + * + * @param int $max_images The maximum number of images to return. + * + * @return array The attachment IDs. + */ + protected function get_classic_editor_image_attachments( $max_images ) { + // Max images can't be negative or zero. + if ( $max_images <= 0 ) { + return array(); + } + + $images = array(); + $query = new \WP_Query( + array( + 'post_parent' => $this->wp_object->ID, + 'post_status' => 'inherit', + 'post_type' => 'attachment', + 'post_mime_type' => 'image', + 'order' => 'ASC', + 'orderby' => 'menu_order ID', + 'posts_per_page' => $max_images, + ) + ); + + foreach ( $query->get_posts() as $attachment ) { + if ( ! \in_array( $attachment->ID, $images, true ) ) { + $images[] = array( 'id' => $attachment->ID ); + } + } + + return $images; + } + /** * Filter media IDs by object type. * - * @param array $media The media array grouped by type. - * @param string $type The object type. + * @param array $media The media array grouped by type. + * @param string $type The object type. + * @param WP_Post $wp_object The post object. * * @return array The filtered media IDs. */ protected static function filter_media_by_object_type( $media, $type, $wp_object ) { + /** + * Filter the object type for media attachments. + * + * @param string $type The object type. + * @param WP_Post $wp_object The post object. + * + * @return string The filtered object type. + */ $type = \apply_filters( 'filter_media_by_object_type', \strtolower( $type ), $wp_object ); if ( ! empty( $media[ $type ] ) ) { return $media[ $type ]; } - return array_filter( array_merge( array(), ...array_values( $media ) ) ); + return array_filter( array_merge( ...array_values( $media ) ) ); } /** @@ -477,7 +529,7 @@ class Post extends Base { $attachment = array(); $mime_type = \get_post_mime_type( $id ); $mime_type_parts = \explode( '/', $mime_type ); - // switching on image/audio/video + // Switching on image/audio/video. switch ( $mime_type_parts[0] ) { case 'image': $image_size = 'large'; @@ -524,16 +576,24 @@ class Post extends Base { 'url' => \esc_url( \wp_get_attachment_url( $id ) ), 'name' => \esc_attr( \get_the_title( $id ) ), ); - $meta = wp_get_attachment_metadata( $id ); - // height and width for videos + $meta = wp_get_attachment_metadata( $id ); + // Height and width for videos. if ( isset( $meta['width'] ) && isset( $meta['height'] ) ) { - $attachment['width'] = \esc_attr( $meta['width'] ); + $attachment['width'] = \esc_attr( $meta['width'] ); $attachment['height'] = \esc_attr( $meta['height'] ); } // @todo: add `icon` support for audio/video attachments. Maybe use post thumbnail? break; } + /** + * Filter the attachment for a post. + * + * @param array $attachment The attachment. + * @param int $id The attachment ID. + * + * @return array The filtered attachment. + */ return \apply_filters( 'activitypub_attachment', $attachment, $id ); } @@ -589,7 +649,7 @@ class Post extends Base { } // Default to Article. - $object_type = 'Note'; + $object_type = 'Article'; $post_format = 'standard'; if ( \get_theme_support( 'post-formats' ) ) { @@ -613,7 +673,7 @@ class Post extends Base { $object_type = 'Page'; break; default: - $object_type = 'Note'; + $object_type = 'Article'; break; } @@ -640,7 +700,11 @@ class Post extends Base { return $cc; } - + /** + * Returns the Audience for the Post. + * + * @return string|null The audience. + */ public function get_audience() { if ( is_single_user() ) { return null; @@ -663,7 +727,7 @@ class Post extends Base { $post_tags = \get_the_tags( $this->wp_object->ID ); if ( $post_tags ) { foreach ( $post_tags as $post_tag ) { - $tag = array( + $tag = array( 'type' => 'Hashtag', 'href' => \esc_url( \get_tag_link( $post_tag->term_id ) ), 'name' => esc_hashtag( $post_tag->name ), @@ -675,7 +739,7 @@ class Post extends Base { $mentions = $this->get_mentions(); if ( $mentions ) { foreach ( $mentions as $mention => $url ) { - $tag = array( + $tag = array( 'type' => 'Mention', 'href' => \esc_url( $url ), 'name' => \esc_html( $mention ), @@ -705,24 +769,7 @@ class Post extends Base { return \__( '(This post is being modified)', 'activitypub' ); } - $content = \get_post_field( 'post_content', $this->wp_object->ID ); - $content = \html_entity_decode( $content ); - $content = \wp_strip_all_tags( $content ); - $content = \trim( $content ); - $content = \preg_replace( '/\R+/m', "\n\n", $content ); - $content = \preg_replace( '/[\r\t]/', '', $content ); - - $excerpt_more = \apply_filters( 'activitypub_excerpt_more', '[...]' ); - $length = 500; - $length = $length - strlen( $excerpt_more ); - - if ( \strlen( $content ) > $length ) { - $content = \wordwrap( $content, $length, '' ); - $content = \explode( '', $content, 2 ); - $content = $content[0]; - } - - return $content . ' ' . $excerpt_more; + return generate_post_summary( $this->wp_object ); } /** @@ -759,6 +806,8 @@ class Post extends Base { * @return string The content. */ protected function get_content() { + add_filter( 'activitypub_reply_block', '__return_empty_string' ); + // Remove Content from drafts. if ( 'draft' === \get_post_status( $this->wp_object ) ) { return \__( '(This post is being modified)', 'activitypub' ); @@ -794,7 +843,7 @@ class Post extends Base { $content = \apply_filters( 'activitypub_the_content', $content, $post ); - // Don't need these any more, should never appear in a post. + // Don't need these anymore, should never appear in a post. Shortcodes::unregister(); return $content; @@ -819,7 +868,8 @@ class Post extends Base { $template = "[ap_content]\n\n[ap_permalink type=\"html\"]\n\n[ap_hashtags]"; break; default: - $template = \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT ); + $content = \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT ); + $template = empty( $content ) ? ACTIVITYPUB_CUSTOM_POST_CONTENT : $content; break; } @@ -838,7 +888,21 @@ class Post extends Base { * @return array The list of @-Mentions. */ protected function get_mentions() { - return apply_filters( 'activitypub_extract_mentions', array(), $this->wp_object->post_content, $this->wp_object ); + /** + * Filter the mentions in the post content. + * + * @param array $mentions The mentions. + * @param string $content The post content. + * @param WP_Post $post The post object. + * + * @return array The filtered mentions. + */ + return apply_filters( + 'activitypub_extract_mentions', + array(), + $this->wp_object->post_content . ' ' . $this->wp_object->post_excerpt, + $this->wp_object + ); } /** @@ -862,6 +926,108 @@ class Post extends Base { return apply_filters( 'activitypub_post_locale', $lang, $post_id, $this->wp_object ); } + /** + * Returns the in-reply-to URL of the post. + * + * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-inreplyto + * + * @return string|null The in-reply-to URL of the post. + */ + public function get_in_reply_to() { + $blocks = \parse_blocks( $this->wp_object->post_content ); + + foreach ( $blocks as $block ) { + if ( 'activitypub/reply' === $block['blockName'] ) { + // We only support one reply block per post for now. + return $block['attrs']['url']; + } + } + + return null; + } + + /** + * Returns the recipient of the post. + * + * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-to + * + * @return array The recipient URLs of the post. + */ + public function get_to() { + return array( + 'https://www.w3.org/ns/activitystreams#Public', + $this->get_actor_object()->get_followers(), + ); + } + + /** + * Returns the published date of the post. + * + * @return string The published date of the post. + */ + public function get_published() { + $published = \strtotime( $this->wp_object->post_date_gmt ); + + return \gmdate( 'Y-m-d\TH:i:s\Z', $published ); + } + + /** + * Returns the updated date of the post. + * + * @return string|null The updated date of the post. + */ + public function get_updated() { + $published = \strtotime( $this->wp_object->post_date_gmt ); + $updated = \strtotime( $this->wp_object->post_modified_gmt ); + + if ( $updated > $published ) { + return \gmdate( 'Y-m-d\TH:i:s\Z', $updated ); + } + + return null; + } + + /** + * Returns the content map for the post. + * + * @return array The content map for the post. + */ + public function get_content_map() { + return array( + $this->get_locale() => $this->get_content(), + ); + } + + /** + * Returns the name map for the post. + * + * @return array The name map for the post. + */ + public function get_name_map() { + if ( ! $this->get_name() ) { + return null; + } + + return array( + $this->get_locale() => $this->get_name(), + ); + } + + /** + * Returns the summary map for the post. + * + * @return array The summary map for the post. + */ + public function get_summary_map() { + if ( ! $this->get_summary() ) { + return null; + } + + return array( + $this->get_locale() => $this->get_summary(), + ); + } + /** * Transform Embed blocks to block level link. * @@ -870,8 +1036,8 @@ class Post extends Base { * @see https://www.w3.org/TR/activitypub/#security-sanitizing-content * @see https://www.w3.org/wiki/ActivityPub/Primer/HTML * - * @param string $block_content The block content (html) - * @param object $block The block object + * @param string $block_content The block content (html). + * @param object $block The block object. * * @return string A block level link */ diff --git a/wp-content/plugins/activitypub/integration/class-buddypress.php b/wp-content/plugins/activitypub/integration/class-buddypress.php index 8d71c1d2..1e86ee5f 100644 --- a/wp-content/plugins/activitypub/integration/class-buddypress.php +++ b/wp-content/plugins/activitypub/integration/class-buddypress.php @@ -1,36 +1,50 @@ url = bp_core_get_user_domain( $author_id ); //add BP member profile URL as user URL + /** + * Add BuddyPress user metadata to the author array. + * + * @param object $author The author object. + * @param int $author_id The author ID. + * + * @return object The author object. + */ + public static function add_user_metadata( $author, $author_id ) { + $author->url = bp_core_get_user_domain( $author_id ); // Add BP member profile URL as user URL. - // add BuddyPress' cover_image instead of WordPress' header_image + // Add BuddyPress' cover_image instead of WordPress' header_image. $cover_image_url = bp_attachments_get_attachment( 'url', array( 'item_id' => $author_id ) ); if ( $cover_image_url ) { - $object->image = array( + $author->image = array( 'type' => 'Image', 'url' => $cover_image_url, ); } - // change profile URL to BuddyPress' profile URL - $object->attachment['profile_url'] = array( - 'type' => 'PropertyValue', - 'name' => \__( 'Profile', 'activitypub' ), + // Change profile URL to BuddyPress' profile URL. + $author->attachment['profile_url'] = array( + 'type' => 'PropertyValue', + 'name' => \__( 'Profile', 'activitypub' ), 'value' => \html_entity_decode( sprintf( '%s', @@ -43,18 +57,18 @@ class Buddypress { ), ); - // replace blog URL on multisite + // Replace blog URL on multisite. if ( is_multisite() ) { - $user_blogs = get_blogs_of_user( $author_id ); //get sites of user to send as AP metadata + $user_blogs = get_blogs_of_user( $author_id ); // Get sites of user to send as AP metadata. if ( ! empty( $user_blogs ) ) { - unset( $object->attachment['blog_url'] ); + unset( $author->attachment['blog_url'] ); foreach ( $user_blogs as $blog ) { if ( 1 !== $blog->userblog_id ) { - $object->attachment[] = array( - 'type' => 'PropertyValue', - 'name' => $blog->blogname, + $author->attachment[] = array( + 'type' => 'PropertyValue', + 'name' => $blog->blogname, 'value' => \html_entity_decode( sprintf( '%s', @@ -71,6 +85,6 @@ class Buddypress { } } - return $object; + return $author; } } diff --git a/wp-content/plugins/activitypub/integration/class-enable-mastodon-apps.php b/wp-content/plugins/activitypub/integration/class-enable-mastodon-apps.php index 6c643b10..04c24ff7 100644 --- a/wp-content/plugins/activitypub/integration/class-enable-mastodon-apps.php +++ b/wp-content/plugins/activitypub/integration/class-enable-mastodon-apps.php @@ -1,4 +1,10 @@ update_icon( $data['avatar'] ) ) { + // Unset the avatar so it doesn't get saved again by other plugins. + // Ditto for all other fields below. + unset( $data['avatar'] ); + } + + if ( isset( $data['header'] ) && $user->update_header( $data['header'] ) ) { + unset( $data['header'] ); + } + + if ( isset( $data['display_name'] ) && $user->update_name( $data['display_name'] ) ) { + unset( $data['display_name'] ); + } + + if ( isset( $data['note'] ) && $user->update_summary( $data['note'] ) ) { + unset( $data['note'] ); + } + + if ( isset( $data['fields_attributes'] ) ) { + self::set_extra_fields( $user_id, $data['fields_attributes'] ); + unset( $data['fields_attributes'] ); + } + + return $data; + } + + /** + * Get extra fields for Mastodon API. + * + * @param int $user_id The user id to act on. + * @return array The extra fields. + */ + private static function get_extra_fields( $user_id ) { + $ret = array(); + $fields = Extra_Fields::get_actor_fields( $user_id ); + + foreach ( $fields as $field ) { + $ret[] = array( + 'name' => $field->post_title, + 'value' => Extra_Fields::get_formatted_content( $field ), + ); + } + + return $ret; + } + + /** + * Set extra fields for Mastodon API. + * + * @param int $user_id The user id to act on. + * @param array $fields The fields to set. It is assumed to be the entire set of desired fields. + */ + private static function set_extra_fields( $user_id, $fields ) { + // The Mastodon API submits a simple hash for every field. + // We can reasonably assume a similar order for our operations below. + $ids = wp_list_pluck( Extra_Fields::get_actor_fields( $user_id ), 'ID' ); + $is_blog = Users::BLOG_USER_ID === $user_id; + $post_type = $is_blog ? Extra_Fields::BLOG_POST_TYPE : Extra_Fields::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' => Extra_Fields::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 ); + } + } + } + + /** + * Add followers to Mastodon API. + * + * @param array $followers An array of followers. + * @param string $user_id The user id. * * @return array The filtered followers */ public static function api_account_followers( $followers, $user_id ) { + $user_id = self::maybe_map_user_to_blog( $user_id ); $activitypub_followers = Followers::get_followers( $user_id, 40 ); $mastodon_followers = array_map( function ( $item ) { @@ -57,92 +193,45 @@ class Enable_Mastodon_Apps { $acct = $item->get_url(); } - $account = new Account(); - $account->id = \strval( $item->get__id() ); - $account->username = $item->get_preferred_username(); - $account->acct = $acct; - $account->display_name = $item->get_name(); - $account->url = $item->get_url(); - $account->uri = $item->get_id(); - $account->avatar = $item->get_icon_url(); - $account->avatar_static = $item->get_icon_url(); - $account->created_at = new DateTime( $item->get_published() ); - $account->last_status_at = new DateTime( $item->get_published() ); - $account->note = $item->get_summary(); - $account->header = $item->get_image_url(); - $account->header_static = $item->get_image_url(); + $account = new Account(); + $account->id = \strval( $item->get__id() ); + $account->username = $item->get_preferred_username(); + $account->acct = $acct; + $account->display_name = $item->get_name(); + $account->url = $item->get_url(); + $account->avatar = $item->get_icon_url(); + $account->avatar_static = $item->get_icon_url(); + $account->created_at = new DateTime( $item->get_published() ); + $account->last_status_at = new DateTime( $item->get_published() ); + $account->note = $item->get_summary(); + $account->header = $item->get_image_url(); + $account->header_static = $item->get_image_url(); $account->followers_count = 0; $account->following_count = 0; - $account->statuses_count = 0; - $account->bot = false; - $account->locked = false; - $account->group = false; - $account->discoversable = false; - $account->indexable = false; - $account->hide_collections = false; - $account->noindex = false; - $account->fields = array(); - $account->emojis = array(); - $account->roles = array(); + $account->statuses_count = 0; + $account->bot = false; + $account->locked = false; + $account->group = false; + $account->discoverable = false; + $account->noindex = false; + $account->fields = array(); + $account->emojis = array(); return $account; }, $activitypub_followers ); - $followers = array_merge( $mastodon_followers, $followers ); - - return $followers; - } - - /** - * Add followers count to Mastodon API - * - * @param Enable_Mastodon_Apps\Entity\Account $account The account - * @param int $user_id The user id - * - * @return Enable_Mastodon_Apps\Entity\Account The filtered Account - */ - public static function api_account_add_followers( $account, $user_id ) { - if ( ! $account instanceof Account ) { - return $account; - } - - $user = Users::get_by_various( $user_id ); - - if ( ! $user || is_wp_error( $user ) ) { - return $account; - } - - $header = $user->get_image(); - if ( $header ) { - $account->header = $header['url']; - $account->header_static = $header['url']; - } - - foreach ( $user->get_attachment() as $attachment ) { - if ( 'PropertyValue' === $attachment['type'] ) { - $account->fields[] = array( - 'name' => $attachment['name'], - 'value' => $attachment['value'], - ); - } - } - - $account->acct = $user->get_preferred_username(); - $account->note = $user->get_summary(); - - $account->followers_count = Followers::count_followers( $user->get__id() ); - return $account; + return array_merge( $mastodon_followers, $followers ); } /** * Resolve external accounts for Mastodon API * - * @param Enable_Mastodon_Apps\Entity\Account $user_data The user data - * @param string $user_id The user id + * @param Account $user_data The user data. + * @param string $user_id The user id. * - * @return Enable_Mastodon_Apps\Entity\Account The filtered Account + * @return Account The filtered Account. */ public static function api_account_external( $user_data, $user_id ) { if ( $user_data || ( is_numeric( $user_id ) && $user_id ) ) { @@ -170,6 +259,78 @@ class Enable_Mastodon_Apps { return $user_data; } + /** + * Resolve internal accounts for Mastodon API + * + * @param Account $user_data The user data. + * @param string $user_id The user id. + * + * @return Account The filtered Account. + */ + public static function api_account_internal( $user_data, $user_id ) { + $user_id_to_use = self::maybe_map_user_to_blog( $user_id ); + $user = Users::get_by_id( $user_id_to_use ); + + if ( ! $user || is_wp_error( $user ) ) { + return $user_data; + } + + // Convert user to account. + $account = new Account(); + // Even if we have a blog user, maintain the provided user_id so as not to confuse clients. + $account->id = (int) $user_id; + $account->username = $user->get_preferred_username(); + $account->acct = $account->username; + $account->display_name = $user->get_name(); + $account->note = $user->get_summary(); + $account->source['note'] = wp_strip_all_tags( $account->note, true ); + $account->url = $user->get_url(); + + $icon = $user->get_icon(); + $account->avatar = $icon['url']; + $account->avatar_static = $account->avatar; + + $header = $user->get_image(); + if ( $header ) { + $account->header = $header['url']; + $account->header_static = $account->header; + } + + $account->created_at = new DateTime( $user->get_published() ); + + $post_types = \get_option( 'activitypub_support_post_types', array( 'post' ) ); + $query_args = array( + 'post_type' => $post_types, + 'posts_per_page' => 1, + ); + if ( $user_id > 0 ) { + $query_args['author'] = $user_id; + } + $posts = \get_posts( $query_args ); + $account->last_status_at = ! empty( $posts ) ? new DateTime( $posts[0]->post_date_gmt ) : $account->created_at; + + $account->fields = self::get_extra_fields( $user_id_to_use ); + // Now do it in source['fields'] with stripped tags. + $account->source['fields'] = \array_map( + function ( $field ) { + $field['value'] = \wp_strip_all_tags( $field['value'], true ); + return $field; + }, + $account->fields + ); + + $account->followers_count = Followers::count_followers( $user->get__id() ); + + return $account; + } + + /** + * Get account for actor. + * + * @param string $uri The URI. + * + * @return Account|null The account. + */ private static function get_account_for_actor( $uri ) { if ( ! is_string( $uri ) ) { return null; @@ -186,11 +347,11 @@ class Enable_Mastodon_Apps { $acct = substr( $acct, 5 ); } - $account->id = $acct; - $account->username = $acct; - $account->acct = $acct; - $account->display_name = $data['name']; - $account->url = $uri; + $account->id = $acct; + $account->username = $acct; + $account->acct = $acct; + $account->display_name = $data['name']; + $account->url = $uri; if ( ! empty( $data['summary'] ) ) { $account->note = $data['summary']; @@ -217,6 +378,14 @@ class Enable_Mastodon_Apps { return $account; } + /** + * Search by URL for Mastodon API. + * + * @param array $search_data The search data. + * @param object $request The request object. + * + * @return array The filtered search data. + */ public static function api_search_by_url( $search_data, $request ) { $p = \wp_parse_url( $request->get_param( 'q' ) ); if ( ! $p || ! isset( $p['host'] ) ) { @@ -241,6 +410,14 @@ class Enable_Mastodon_Apps { return $search_data; } + /** + * Search for Mastodon API. + * + * @param array $search_data The search data. + * @param object $request The request object. + * + * @return array The filtered search data. + */ public static function api_search( $search_data, $request ) { $user_id = \get_current_user_id(); if ( ! $user_id ) { @@ -267,20 +444,20 @@ class Enable_Mastodon_Apps { $acct = $follower->get_url(); } - $account = new Account(); - $account->id = \strval( $follower->get__id() ); - $account->username = $follower->get_preferred_username(); - $account->acct = $acct; - $account->display_name = $follower->get_name(); - $account->url = $follower->get_url(); - $account->uri = $follower->get_id(); - $account->avatar = $follower->get_icon_url(); - $account->avatar_static = $follower->get_icon_url(); - $account->created_at = new DateTime( $follower->get_published() ); + $account = new Account(); + $account->id = \strval( $follower->get__id() ); + $account->username = $follower->get_preferred_username(); + $account->acct = $acct; + $account->display_name = $follower->get_name(); + $account->url = $follower->get_url(); + $account->uri = $follower->get_id(); + $account->avatar = $follower->get_icon_url(); + $account->avatar_static = $follower->get_icon_url(); + $account->created_at = new DateTime( $follower->get_published() ); $account->last_status_at = new DateTime( $follower->get_published() ); - $account->note = $follower->get_summary(); - $account->header = $follower->get_image_url(); - $account->header_static = $follower->get_image_url(); + $account->note = $follower->get_summary(); + $account->header = $follower->get_image_url(); + $account->header_static = $follower->get_image_url(); $search_data['accounts'][] = $account; } @@ -288,6 +465,13 @@ class Enable_Mastodon_Apps { return $search_data; } + /** + * Get posts query args for Mastodon API. + * + * @param array $args The query arguments. + * + * @return array The filtered args. + */ public static function api_get_posts_query_args( $args ) { if ( isset( $args['author'] ) && is_string( $args['author'] ) ) { $uri = Webfinger_Util::resolve( $args['author'] ); @@ -300,6 +484,14 @@ class Enable_Mastodon_Apps { return $args; } + /** + * Convert an activity to a status. + * + * @param array $item The activity. + * @param Account $account The account. + * + * @return Status|null The status. + */ private static function activity_to_status( $item, $account ) { if ( isset( $item['object'] ) ) { $object = $item['object']; @@ -311,7 +503,7 @@ class Enable_Mastodon_Apps { return null; } - $status = new Status(); + $status = new Status(); $status->id = $object['id']; $status->created_at = new DateTime( $object['published'] ); $status->content = $object['content']; @@ -335,20 +527,20 @@ class Enable_Mastodon_Apps { $status->media_attachments = array_map( function ( $attachment ) { $default_attachment = array( - 'url' => null, + 'url' => null, 'mediaType' => null, - 'name' => null, - 'width' => 0, - 'height' => 0, - 'blurhash' => null, + 'name' => null, + 'width' => 0, + 'height' => 0, + 'blurhash' => null, ); $attachment = array_merge( $default_attachment, $attachment ); - $media_attachment = new Media_Attachment(); - $media_attachment->id = $attachment['url']; - $media_attachment->type = strtok( $attachment['mediaType'], '/' ); - $media_attachment->url = $attachment['url']; + $media_attachment = new Media_Attachment(); + $media_attachment->id = $attachment['url']; + $media_attachment->type = strtok( $attachment['mediaType'], '/' ); + $media_attachment->url = $attachment['url']; $media_attachment->preview_url = $attachment['url']; $media_attachment->description = $attachment['name']; if ( $attachment['blurhash'] ) { @@ -372,6 +564,14 @@ class Enable_Mastodon_Apps { return $status; } + /** + * Get posts for Mastodon API. + * + * @param array $statuses The statuses. + * @param array $args The arguments. + * + * @return array The filtered statuses. + */ public static function api_statuses_external( $statuses, $args ) { if ( ! isset( $args['activitypub'] ) ) { return $statuses; @@ -400,8 +600,8 @@ class Enable_Mastodon_Apps { $limit = 40; } $activitypub_statuses = array(); - $url = $outbox['first']; - $tries = 0; + $url = $outbox['first']; + $tries = 0; while ( $url ) { if ( ++$tries > 3 ) { break; @@ -412,7 +612,7 @@ class Enable_Mastodon_Apps { return $statuses; } - $new_statuses = array_map( + $new_statuses = array_map( function ( $item ) use ( $account, $args ) { if ( $args['exclude_replies'] ) { if ( isset( $item['object']['inReplyTo'] ) && $item['object']['inReplyTo'] ) { @@ -424,7 +624,7 @@ class Enable_Mastodon_Apps { $posts['orderedItems'] ); $activitypub_statuses = array_merge( $activitypub_statuses, array_filter( $new_statuses ) ); - $url = $posts['next']; + $url = $posts['next']; if ( count( $activitypub_statuses ) >= $limit ) { break; @@ -434,6 +634,15 @@ class Enable_Mastodon_Apps { return array_slice( $activitypub_statuses, 0, $limit ); } + /** + * Get replies for Mastodon API. + * + * @param array $context The context. + * @param int $post_id The post id. + * @param string $url The URL. + * + * @return array The filtered context. + */ public static function api_get_replies( $context, $post_id, $url ) { $meta = Http::get_remote_object( $url, true ); if ( is_wp_error( $meta ) || ! isset( $meta['replies']['first']['next'] ) ) { @@ -441,7 +650,7 @@ class Enable_Mastodon_Apps { } $replies_url = $meta['replies']['first']['next']; - $replies = Http::get_remote_object( $replies_url, true ); + $replies = Http::get_remote_object( $replies_url, true ); if ( is_wp_error( $replies ) || ! isset( $replies['items'] ) ) { return $context; } @@ -457,7 +666,7 @@ class Enable_Mastodon_Apps { } $account = self::get_account_for_actor( $status['attributedTo'] ); - $status = self::activity_to_status( $status, $account ); + $status = self::activity_to_status( $status, $account ); if ( $status ) { $context['descendants'][ $status->id ] = $status; } diff --git a/wp-content/plugins/activitypub/integration/class-jetpack.php b/wp-content/plugins/activitypub/integration/class-jetpack.php index 009811e9..002de2cb 100644 --- a/wp-content/plugins/activitypub/integration/class-jetpack.php +++ b/wp-content/plugins/activitypub/integration/class-jetpack.php @@ -1,21 +1,40 @@ = '2.0' ) { @@ -47,11 +53,11 @@ class Nodeinfo { } /** - * Extend NodeInfo2 data + * Extend NodeInfo2 data. * - * @param array $nodeinfo NodeInfo2 data + * @param array $nodeinfo NodeInfo2 data. * - * @return array The extended array + * @return array The extended array. */ public static function add_nodeinfo2_data( $nodeinfo ) { $nodeinfo['protocols'][] = 'activitypub'; @@ -66,15 +72,15 @@ class Nodeinfo { } /** - * Extend the well-known nodeinfo data + * Extend the well-known nodeinfo data. * - * @param array $data The well-known nodeinfo data + * @param array $data The well-known nodeinfo data. * - * @return array The extended array + * @return array The extended array. */ public static function add_wellknown_nodeinfo_data( $data ) { $data['links'][] = array( - 'rel' => 'https://www.w3.org/ns/activitystreams#Application', + 'rel' => 'https://www.w3.org/ns/activitystreams#Application', 'href' => get_rest_url_by_path( 'application' ), ); diff --git a/wp-content/plugins/activitypub/integration/class-opengraph.php b/wp-content/plugins/activitypub/integration/class-opengraph.php index 2d0f8c96..4eb1b1e0 100644 --- a/wp-content/plugins/activitypub/integration/class-opengraph.php +++ b/wp-content/plugins/activitypub/integration/class-opengraph.php @@ -1,4 +1,10 @@ get_webfinger(); return $metadata; } if ( \is_author() ) { - // Use the Author of the Archive-Page + // Use the Author of the Archive-Page. $user_id = \get_queried_object_id(); } elseif ( \is_singular() ) { - // Use the Author of the Post + // Use the Author of the Post. $user_id = \get_post_field( 'post_author', \get_queried_object_id() ); } elseif ( ! is_user_type_disabled( 'blog' ) ) { - // Use the Blog-User for any other page, if the Blog-User is not disabled + // Use the Blog-User for any other page, if the Blog-User is not disabled. $user_id = Users::BLOG_USER_ID; } else { - // Do not add any metadata otherwise + // Do not add any metadata otherwise. return $metadata; } @@ -78,7 +84,7 @@ class Opengraph { return $metadata; } - // add WebFinger resource + // Add WebFinger resource. $metadata['fediverse:creator'] = $user->get_webfinger(); return $metadata; diff --git a/wp-content/plugins/activitypub/integration/class-seriously-simple-podcasting.php b/wp-content/plugins/activitypub/integration/class-seriously-simple-podcasting.php new file mode 100644 index 00000000..c678f6d3 --- /dev/null +++ b/wp-content/plugins/activitypub/integration/class-seriously-simple-podcasting.php @@ -0,0 +1,68 @@ +wp_object; + $attachments = parent::get_attachment(); + + $attachment = array( + 'type' => \esc_attr( \get_post_meta( $post->ID, 'episode_type', true ) ), + 'url' => \esc_url( \get_post_meta( $post->ID, 'audio_file', true ) ), + 'name' => \esc_attr( \get_the_title( $post->ID ) ), + 'icon' => \esc_url( \get_post_meta( $post->ID, 'cover_image', true ) ), + ); + + $attachment = array_filter( $attachment ); + array_unshift( $attachments, $attachment ); + + return $attachments; + } + + /** + * Gets the object type for a podcast episode. + * + * Always returns 'Note' for the best possible compatibility with ActivityPub. + * + * @return string The object type. + */ + public function get_type() { + return 'Note'; + } + + /** + * Returns the content for the ActivityPub Item. + * + * The content will be generated based on the user settings. + * + * @return string The content. + */ + public function get_content() { + return generate_post_summary( $this->wp_object ); + } +} diff --git a/wp-content/plugins/activitypub/integration/class-stream-connector.php b/wp-content/plugins/activitypub/integration/class-stream-connector.php new file mode 100644 index 00000000..18ffb5da --- /dev/null +++ b/wp-content/plugins/activitypub/integration/class-stream-connector.php @@ -0,0 +1,82 @@ +log( + sprintf( + // translators: %s is a URL. + __( 'New Follower: %s', 'activitypub' ), + $notification->actor + ), + array( + 'notification' => \wp_json_encode( $notification, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ), + ), + null, + 'notification', + $notification->type, + $notification->target + ); + } +} diff --git a/wp-content/plugins/activitypub/integration/class-webfinger.php b/wp-content/plugins/activitypub/integration/class-webfinger.php index c9727861..7ae9607d 100644 --- a/wp-content/plugins/activitypub/integration/class-webfinger.php +++ b/wp-content/plugins/activitypub/integration/class-webfinger.php @@ -1,9 +1,16 @@ ID ); if ( ! $user || is_wp_error( $user ) ) { - return $array; + return $jrd; } - $array['subject'] = sprintf( 'acct:%s', $user->get_webfinger() ); + $jrd['subject'] = sprintf( 'acct:%s', $user->get_webfinger() ); - $array['aliases'][] = $user->get_url(); - $array['aliases'][] = $user->get_alternate_url(); + $jrd['aliases'][] = $user->get_url(); + $jrd['aliases'][] = $user->get_alternate_url(); - $array['links'][] = array( + $jrd['links'][] = array( 'rel' => 'self', 'type' => 'application/activity+json', 'href' => $user->get_url(), ); - return $array; + $jrd['links'][] = array( + 'rel' => 'http://ostatus.org/schema/1.0/subscribe', + 'template' => get_rest_url_by_path( 'interactions?uri={uri}' ), + ); + + return $jrd; } /** - * Add WebFinger discovery links + * Add WebFinger discovery links. * - * @param array $array the jrd array - * @param string $resource the WebFinger resource - * @param WP_User $user the WordPress user + * @param array $jrd The jrd array. + * @param string $uri The WebFinger resource. * - * @return array the jrd array + * @return array|\WP_Error The jrd array or WP_Error. */ - public static function add_pseudo_user_discovery( $array, $resource ) { - $user = Webfinger_Rest::get_profile( $resource ); + public static function add_pseudo_user_discovery( $jrd, $uri ) { + $user = User_Collection::get_by_resource( $uri ); - if ( ! $user || is_wp_error( $user ) ) { - return $array; + if ( \is_wp_error( $user ) ) { + return $user; } - return $user; + $aliases = array( + $user->get_url(), + $user->get_alternate_url(), + ); + + $aliases = array_unique( $aliases ); + + $profile = array( + 'subject' => sprintf( 'acct:%s', $user->get_webfinger() ), + 'aliases' => array_values( array_unique( $aliases ) ), + 'links' => array( + array( + 'rel' => 'self', + 'type' => 'application/activity+json', + 'href' => $user->get_url(), + ), + array( + 'rel' => 'http://webfinger.net/rel/profile-page', + 'type' => 'text/html', + 'href' => $user->get_url(), + ), + array( + 'rel' => 'http://ostatus.org/schema/1.0/subscribe', + 'template' => get_rest_url_by_path( 'interactions?uri={uri}' ), + ), + ), + ); + + if ( 'Person' !== $user->get_type() ) { + $profile['links'][0]['properties'] = array( + 'https://www.w3.org/ns/activitystreams#type' => $user->get_type(), + ); + } + + return $profile; } } diff --git a/wp-content/plugins/activitypub/integration/load.php b/wp-content/plugins/activitypub/integration/load.php new file mode 100644 index 00000000..860f2dc7 --- /dev/null +++ b/wp-content/plugins/activitypub/integration/load.php @@ -0,0 +1,155 @@ +ID, 'audio_file', true ) + ) { + require_once __DIR__ . '/class-seriously-simple-podcasting.php'; + return new Seriously_Simple_Podcasting( $data ); + } + return $transformer; + }, + 10, + 3 + ); + } +} +\add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_init' ); + +/** + * Register the Stream Connector for ActivityPub. + * + * @param array $classes The Stream connectors. + * + * @return array The Stream connectors with the ActivityPub connector. + */ +function register_stream_connector( $classes ) { + require plugin_dir_path( __FILE__ ) . '/class-stream-connector.php'; + + $class_name = '\Activitypub\Integration\Stream_Connector'; + + if ( ! class_exists( $class_name ) ) { + return; + } + + wp_stream_get_instance(); + $class = new $class_name(); + + if ( ! method_exists( $class, 'is_dependency_satisfied' ) ) { + return; + } + + if ( $class->is_dependency_satisfied() ) { + $classes[] = $class; + } + + return $classes; +} +add_filter( 'wp_stream_connectors', __NAMESPACE__ . '\register_stream_connector' ); + +// Excluded ActivityPub post types from the Stream. +add_filter( + 'wp_stream_posts_exclude_post_types', + function ( $post_types ) { + $post_types[] = 'ap_follower'; + $post_types[] = 'ap_extrafield'; + $post_types[] = 'ap_extrafield_blog'; + return $post_types; + } +); + +/** + * Load the BuddyPress integration. + * + * Only load code that needs BuddyPress to run once BP is loaded and initialized. + * + * @see https://buddypress.org/ + */ +add_action( + 'bp_include', + function () { + require_once __DIR__ . '/class-buddypress.php'; + Buddypress::init(); + }, + 0 +); diff --git a/wp-content/plugins/activitypub/readme.txt b/wp-content/plugins/activitypub/readme.txt index 3dcd963b..ebe777b0 100644 --- a/wp-content/plugins/activitypub/readme.txt +++ b/wp-content/plugins/activitypub/readme.txt @@ -3,7 +3,7 @@ Contributors: automattic, pfefferle, mediaformat, mattwiebe, akirk, jeherve, nur Tags: OStatus, fediverse, activitypub, activitystream Requires at least: 5.5 Tested up to: 6.6 -Stable tag: 2.6.1 +Stable tag: 3.3.3 Requires PHP: 7.0 License: MIT License URI: http://opensource.org/licenses/MIT @@ -20,7 +20,7 @@ An example: I give you my Mastodon profile name: `@pfefferle@mastodon.social`. Y Once you follow Jane's `@jane@example.com` profile, any blog post she crafts on `example.com` will land in your Home feed. Simultaneously, by following the blog-wide profile `@example.com@example.com`, you'll receive updates from all authors. -**Note**: if no one follows your author or blog instance, your posts remain unseen. The simplest method to verify the plugin's operation is by following your profile. If you possess a Mastodon profile, initiate by following your new one. +**Note**: If no one follows your author or blog instance, your posts remain unseen. The simplest method to verify the plugin's operation is by following your profile. If you possess a Mastodon profile, initiate by following your new one. The plugin works with the following tested federated platforms, but there may be more that it works with as well: @@ -48,7 +48,7 @@ So what’s the process? 1. On your blog, publish a new post. 1. From Mastodon, check to see if the new post appears in your Home feed. -Please note that it may take up to 15 minutes or so for the new post to show up in your federated feed. This is because the messages are sent to the federated platforms using a delayed cron. This avoids breaking the publishing process for those cases where users might have lots of followers. So please don’t assume that just because you didn’t see it show up right away that something is broken. Give it some time. In most cases, it will show up within a few minutes, and you’ll know everything is working as expected. +**Note**: It may take up to 15 minutes or so for the new post to show up in your federated feed. This is because the messages are sent to the federated platforms using a delayed cron. This avoids breaking the publishing process for those cases where users might have lots of followers. So please don’t assume that just because you didn’t see it show up right away that something is broken. Give it some time. In most cases, it will show up within a few minutes, and you’ll know everything is working as expected. == Frequently Asked Questions == @@ -105,6 +105,12 @@ Where 'blog' is the path to the subdirectory at which your blog resides. If you are running your blog in a subdirectory, but have a different [wp_siteurl](https://wordpress.org/documentation/article/giving-wordpress-its-own-directory/), you don't need the redirect, because the index.php will take care of that. += What if you are running your blog behind a reverse proxy with Apache? = + +If you are using a reverse proxy with Apache to run your host you may encounter that you are unable to have followers join the blog. This will occur because the proxy system rewrites the host headers to be the internal DNS name of your server, which the plugin then uses to attempt to sign the replies. The remote site attempting to follow your users is expecting the public DNS name on the replies. In these cases you will need to use the 'ProxyPreserveHost On' directive to ensure the external host name is passed to your internal host. + +If you are using SSL between the proxy and internal host you may also need to `SSLProxyCheckPeerName off` if your internal host can not answer with the correct SSL name. This may present a security issue in some environments. + = Constants = The plugin uses PHP Constants to enable, disable or change its default behaviour. Please use them with caution and only if you know what you are doing. @@ -115,6 +121,7 @@ The plugin uses PHP Constants to enable, disable or change its default behaviour * `ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS` - Change the number of attachments, that should be federated. Default: `3`. * `ACTIVITYPUB_HASHTAGS_REGEXP` - Change the default regex to detect hashtext in a text. Default: `(?:(?<=\s)|(?<=

)|(?<=
)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))`. * `ACTIVITYPUB_USERNAME_REGEXP` - Change the default regex to detect @-replies in a text. Default: `(?:([A-Za-z0-9\._-]+)@((?:[A-Za-z0-9_-]+\.)+[A-Za-z]+))`. +* `ACTIVITYPUB_URL_REGEXP` - Change the default regex to detect urls in a text. Default: `(www.|http:|https:)+[^\s]+[\w\/]`. * `ACTIVITYPUB_CUSTOM_POST_CONTENT` - Change the default template for Activities. Default: `[ap_title]\n\n[ap_content]\n\n[ap_hashtags]\n\n[ap_shortlink]`. * `ACTIVITYPUB_AUTHORIZED_FETCH` - Enable AUTHORIZED_FETCH. Default: `false`. * `ACTIVITYPUB_DISABLE_REWRITES` - Disable auto generation of `mod_rewrite` rules. Default: `false`. @@ -131,62 +138,95 @@ The followers of a user can be found in the menu under "Users" -> "Followers" or For reasons of data protection, it is not possible to see the followers of other users. +== Screenshots == + +1. The "Follow me"-Block in the Block-Editor +2. The "Followers"-Block in the Block-Editor +3. The "Federated Reply"-Block in the Block-Editor +4. A "Federated Reply" in a Post +5. A Blog-Profile on Mastodon + == Changelog == -= 2.6.1 = += 3.3.3 = -* Fixed: Extra Fields will generate wrong entries +* Fixed: Sanitization callback +* Improved: A lot of PHPCS cleanups +* Improved: Prepare multi-lang support -= 2.6.0 = += 3.3.2 = -* Added: Support for FEP-fb2a -* Added: CRUD support for Extra Fields -* Improved: Remote-Follow UI and UX -* Improved: Open Graph `fediverse:creator` implementation -* Fixed: Compatibility issues with fed.brid.gy -* Fixed: Remote-Reply endpoint -* Fixed: WebFinger Error Codes (thanks to the FediTest project) -* Fixed: Fatal Error when wp_schedule_single_event third argument is being passed as a string +* Fixed: Keep priority of Icons +* Fixed: Fatal error if remote-object is `WP_Error` +* Improved: Adopt WordPress PHP Coding Standards -= 2.5.0 = += 3.3.1 = -* Added: WebFinger cors header -* Added: WebFinger Content-Type -* Added: The Fediverse creator of a post to OpenGraph -* Improved: Try to lookup local users first for Enable Mastodon Apps -* Improved: Send also Announces for deletes -* Improved: Load time by adding `count_total=false` to `WP_User_Query` -* Fixed: Several WebFinger issues -* Fixed: Redirect issue for Application user -* Fixed: Accessibilty issues with missing screen-reader-text on User overview page +* Fixed: PHP Warnings +* Fixed: PHPCS issues -= 2.4.0 = += 3.3.0 = -* Added: A core/embed block filter to transform iframes to links -* Added: Basic support of incoming `Announce`s -* Added: Improve attachment handling -* Added: Notifications: Introduce general class and use it for new follows -* Added: Always fall back to `get_by_username` if one of the above fail -* Added: Notification support for Jetpack -* Added: EMA: Support for fetching external statuses without replies -* Added: EMA: Remote context -* Added: EMA: Allow searching for URLs -* Added: EMA: Ensuring numeric ids is now done in EMA directly -* Added: Podcast support -* Added: Follower count to "At a Glance" dashboard widget -* Improved: Use `Note` as default Object-Type, instead of `Article` -* Improved: Improve `AUTHORIZED_FETCH` -* Improved: Only send Mentions to comments in the direct hierarchy -* Improved: Improve transformer -* Improved: Improve Lemmy compatibility -* Improved: Updated JS dependencies -* Fixed: EMA: Add missing static keyword and try to lookup if the id is 0 -* Fixed: Blog-wide account when WordPress is in subdirectory -* Fixed: Funkwhale URLs -* Fixed: Prevent infinite loops in `get_comment_ancestors` -* Fixed: Better Content-Negotiation handling +* Added: Content warning support +* Added: Replies collection +* Added: Enable Mastodon Apps: support profile editing, blog user +* Added: Follow Me/Followers: add inherit mode for dynamic templating +* Fixed: Cropping Header Images for users without the 'customize' capability +* Improved: OpenSSL handling +* Improved: Added missing @ in Follow-Me block -See full Changelog on [GitHub](https://github.com/Automattic/wordpress-activitypub/blob/master/CHANGELOG.md). += 3.2.5 = + +* Fixed: Enable Mastodon Apps check +* Fixed: Fediverse replies were not threaded properly + += 3.2.4 = + +* Improved: Inbox validation + += 3.2.3 = + +* Fixed: NodeInfo endpoint +* Fixed: (Temporarily) Remove HTML from `summary`, because it seems that Mastodon has issues with it +* Improved: Accessibility for Reply-Context +* Improved: Use `Article` Object-Type as default + += 3.2.2 = + +* Fixed: Extra-Fields check + += 3.2.1 = + +* Fixed: Use `Excerpt` for Podcast Episodes + += 3.2.0 = + +* Added: Support for Seriously Simple Podcasting +* Added: Blog extra fields +* Added: Support "read more" for Activity-Summary +* Added: `Like` and `Announce` (Boost) handler +* Added: Simple Remote-Reply endpoint +* Added: "Stream" Plugin support +* Added: New Fediverse symbol +* Improved: Replace hashtags, urls and mentions in summary with links +* Improved: Hide Bookmarklet if site does not support Blocks +* Fixed: Link detection for extra fields when spaces after the link and fix when two links in the content +* Fixed: `Undo` for `Likes` and `Announces` +* Fixed: Show Avatars on `Likes` and `Announces` +* Fixed: Remove proprietary WebFinger resource +* Fixed: Wrong followers URL in "to" attribute of posts + += 3.1.0 = + +* Added: `menu_order` to `ap_extrafield` so that user can decide in with order they will be displayed +* Added: Line brakes to user biography +* Added: Blueprint +* Fixed: Changed missing `activitypub_user_description` to `activitypub_description` +* Fixed: Undefined `get_sample_permalink` +* Fixed: Only send Update for previously-published posts +* Improved: Simplified WebFinger code + +See full Changelog on [GitHub](https://github.com/Automattic/wordpress-activitypub/blob/trunk/CHANGELOG.md). == Upgrade Notice == diff --git a/wp-content/plugins/activitypub/templates/admin-header.php b/wp-content/plugins/activitypub/templates/admin-header.php index 67b91ba9..c453328d 100644 --- a/wp-content/plugins/activitypub/templates/admin-header.php +++ b/wp-content/plugins/activitypub/templates/admin-header.php @@ -1,5 +1,20 @@ '', + 'settings' => '', + 'blog-profile' => '', + 'followers' => '', + ) +); ?>

@@ -7,17 +22,21 @@
-

+

+ + + +
+ + +

+ +

+
-

+

Disallowed Comment Keys" list.', 'activitypub' ), - \esc_attr( \admin_url( 'options-discussion.php#disallowed_keys' ) ) + \esc_url( \admin_url( 'options-discussion.php#disallowed_keys' ) ) ), 'default' ); @@ -260,7 +256,7 @@

- +
diff --git a/wp-content/plugins/activitypub/templates/toolbox.php b/wp-content/plugins/activitypub/templates/toolbox.php new file mode 100644 index 00000000..adc0b80b --- /dev/null +++ b/wp-content/plugins/activitypub/templates/toolbox.php @@ -0,0 +1,74 @@ + + +
+

+

+ +

+
+

+

+

+ + + + +

+
+

+ +

+

+ +

+

+
+ +
+

+

+

+

+

+ + + + + + + + + + + + + +
+ + + +
in_reply_to
+

+
diff --git a/wp-content/plugins/activitypub/templates/user-followers-list.php b/wp-content/plugins/activitypub/templates/user-followers-list.php index 8ea35a73..1bf0ca29 100644 --- a/wp-content/plugins/activitypub/templates/user-followers-list.php +++ b/wp-content/plugins/activitypub/templates/user-followers-list.php @@ -1,4 +1,9 @@ get__id() ); \header( 'Content-Type: application/activity+json' ); echo $user->to_json(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -/* - * Action triggerd after the ActivityPub profile has been created and sent to the client +/** + * Action triggered after the ActivityPub profile has been created and sent to the client */ \do_action( 'activitypub_json_author_post', $user->get__id() ); diff --git a/wp-content/plugins/activitypub/templates/user-settings.php b/wp-content/plugins/activitypub/templates/user-settings.php index 9489acbd..fb88fbcf 100644 --- a/wp-content/plugins/activitypub/templates/user-settings.php +++ b/wp-content/plugins/activitypub/templates/user-settings.php @@ -1,8 +1,20 @@ '' ) ); + $user = \Activitypub\Collection\Users::get_by_id( \get_current_user_id() ); ?>

+

+ +

+ @@ -14,32 +26,91 @@ $user = \Activitypub\Collection\Users::get_by_id( \get_current_user_id() ); ?> get_webfinger() ); ?> or get_url() ); ?>

- +

get_webfinger() ) ); ?>

- + - + + + +
- + - +

- + -

+ +
+ +
+ + + +
+ + +

+ +

@@ -50,7 +121,7 @@ $user = \Activitypub\Collection\Users::get_by_id( \get_current_user_id() ); ?> - +

@@ -65,3 +136,5 @@ $user = \Activitypub\Collection\Users::get_by_id( \get_current_user_id() ); ?>

+ + diff --git a/wp-content/plugins/activitypub/templates/welcome.php b/wp-content/plugins/activitypub/templates/welcome.php index e5e9440e..7a27f141 100644 --- a/wp-content/plugins/activitypub/templates/welcome.php +++ b/wp-content/plugins/activitypub/templates/welcome.php @@ -1,11 +1,15 @@ '', - 'welcome' => 'active', - 'followers' => '', + 'welcome' => 'active', ) ); ?> @@ -17,7 +21,36 @@

ActivityPub, broadcasting your blog to a wider audience. Attract followers, deliver updates, and receive comments from a diverse user base on Mastodon, Friendica, Pleroma, Pixelfed, and all ActivityPub-compliant platforms.', 'activitypub' ), array( 'strong' => array() ) ); ?>

- +
+

+ +

+ %s', + esc_url( $bookmarklet_url ), // Need to escape quotes for the bookmarklet. + sprintf( $reply_from_template, \wp_parse_url( \home_url(), PHP_URL_HOST ) ) + ); + /* translators: %s is where the button HTML will be rendered. */ + $button_and_explanation_template = \__( + '%s Save this bookmarklet to reply to posts on other sites from your own blog! When visiting a post on another site, click the bookmarklet to start a reply.', + 'activitypub' + ); + + printf( $button_and_explanation_template, $button ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped + + printf( ' %s', esc_url( \admin_url( 'tools.php#activitypub' ) ), esc_html__( 'For additional information, please visit the Tools page.', 'activitypub' ) ); + ?> +

+
+ @@ -42,7 +75,7 @@

- +

@@ -92,7 +125,7 @@ 'If you have problems using this plugin, please check the Site Health page to ensure that your site is compatible and/or use the "Help" tab (in the top right of the settings pages).', 'activitypub' ), - \esc_url_raw( admin_url( 'site-health.php' ) ) + \esc_url( admin_url( 'site-health.php' ) ) ), 'default' ); @@ -116,7 +149,7 @@

-

+

@@ -128,7 +161,7 @@ @@ -141,7 +174,7 @@ @@ -154,7 +187,7 @@