Merge tag '5.6.1' into fix/nicename

* tag '5.6.1': (47 commits)
  Release 5.6.1 (Automattic#1542)
  Fix: Use specified time formatting for Outbox Activities (Automattic#1537)
  Fix: Default value for empty `movedTo` field (Automattic#1539)
  Fix: Post Interactions settings (Automattic#1540)
  Release 5.6.0 (Automattic#1534)
  lover significance (Automattic#1533)
  Scheduler: Don't federate Deletes of unfederated posts. (Automattic#1528)
  Move: use `$from` for object in `Move::externally` (Automattic#1531)
  Fix: Properly traverse the object hierarchy to get the ID (Automattic#1518)
  Mentions: Standardize around only displaying username (Automattic#1510)
  Tests: Reduce chance of time offsets (Automattic#1527)
  Import: Don't federate new attachments (Automattic#1526)
  Importer: Format import count number. (Automattic#1525)
  Move: Add a Mastodon importer (Automattic#1502)
  Move: use `$from` for object in `Move::internally` (Automattic#1516)
  Fix: Do not send self-replies (Automattic#1517)
  Fix: Delete Undone comments instead of trashing them (Automattic#1520)
  Dispatcher: Adhere to passed batch size. (Automattic#1514)
  Add interaction settings (Automattic#1395)
  Fix: Set proper default, to show Welcome screen by default (Automattic#1512)
  ...

Author: jsit

.github/workflows/changelog.yml

@@ -1,6 +1,6 @@
 name: "Changelog entry"
 on:
-  pull_request:
+  pull_request_target:
     # The specific activity types are listed here to include "labeled" and "unlabeled"
     # (which are not included by default for the "pull_request" trigger).
     # This is needed to allow skipping enforcement of the changelog in PRs with specific labels,
@@ -161,8 +161,9 @@ jobs:
           PR_MESSAGE: '${{ steps.check-pr-body.outputs.message }}'
         uses: actions/github-script@v7
         with:
+          github-token: ${{ secrets.API_TOKEN_GITHUB }}
           script: |
-            const { repo: { owner, repo }, payload : { pull_request : { number, head : { ref } } } } = context;
+            const { repo: { owner, repo }, payload : { pull_request : { number, head : { ref, repo: head_repo } } } } = context;
 
             // Get the changelog information from the previous step.
             const significance = '${{ steps.check-pr-body.outputs.significance }}';
@@ -198,8 +199,64 @@ jobs:
             const path = `.github/changelog/${ number }-from-description`;
             core.info( `Creating changelog file: ${ path }` );
 
+            // Check if PR is from a fork
+            const isFromFork = head_repo.full_name !== `${owner}/${repo}`;
+
+            if ( isFromFork ) {
+              core.info( 'PR is from a fork, so we cannot create the changelog file automatically.' );
+              // For forks, we cannot create the file automatically, so we add a helpful comment to the PR,
+              // asking the contributor to create the file manually.
+              const commentBody = `👋 Thanks for your contribution!
+
+              I see you have provided all the required changelog information in your PR description. To complete the process, you'll need to create a changelog file in your branch.
+
+              Please create a file named \`.github/changelog/${number}-from-description\` with this content:
+
+              \`\`\`
+              ${content}
+              \`\`\`
+
+              You can do this by either:
+              1. Running \`composer changelog:add\` in your local repository, or
+              2. Creating the file manually with the content above
+
+              Once you've committed and pushed the file to your PR branch, the checks will pass automatically.`;
+
+              // Check for existing comments first
+              let hasExistingComment = false;
+              for await ( const response of github.paginate.iterator( github.rest.issues.listComments, {
+                owner,
+                repo,
+                issue_number: +number,
+                per_page: 100,
+              } ) ) {
+                for ( const comment of response.data ) {
+                  if ( comment.body.includes('👋 Thanks for your contribution!') ) {
+                    hasExistingComment = true;
+                    break;
+                  }
+                }
+                if ( hasExistingComment ) {
+                  core.info( 'A comment already exists, so we will not add another one.' );
+                  break;
+                }
+              }
+
+              // Only post the comment if we haven't posted one before
+              if ( ! hasExistingComment ) {
+                core.info( 'No existing comment found, so we will add a new one.' );
+                await github.rest.issues.createComment( {
+                  owner,
+                  repo,
+                  issue_number: number,
+                  body: commentBody
+                } );
+              }
+              return;
+            }
+
             try {
-              // Create or update the file in the repository
+              // For internal PRs, create the file automatically
               await github.rest.repos.createOrUpdateFileContents( {
                 owner,
                 repo,

.github/workflows/gardening.yml

@@ -57,5 +57,7 @@ jobs:
               {"path": "includes/class-blocks.php", "label": "[Focus] Editor"},
               {"path": "integration", "label": "[Focus] Compatibility"},
               {"path": "includes/collection", "label": "[Feature] Collections"},
-              {"path": "includes/class-mailer.php", "label": "[Feature] Notifications"}
+              {"path": "includes/class-mailer.php", "label": "[Feature] Notifications"},
+              {"path": "includes/wp-admin/import", "label": "[Feature] Import"},
+              {"path": "includes/wp-admin", "label": "[Feature] WP Admin"}
             ]'

.gitignore

@@ -8,6 +8,7 @@ _site
 package-lock.json
 composer.lock
 .DS_Store
+.cursor
 .idea/
 .php_cs.cache
 .vscode/settings.json

CHANGELOG.md

@@ -5,6 +5,50 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.6.1] - 2025-04-02
+### Fixed
+- "Post Interactions" settings will now be saved to the options table. [#1540]
+- So not show `movedTo` attribute instead of setting it to `false` if empty. [#1539]
+- Use specified date format for `updated` field in Outbox-Activites. [#1537]
+
+## [5.6.0] - 2025-04-01
+### Added
+- Added a Mastodon importer to move your Mastodon posts to your WordPress site. [#1502]
+- A default Extra-Field to do a little advertising for WordPress. [#1493]
+- Move: Differentiate between `internal` and 'external' Move. [#1533]
+- Redirect user to the welcome page after ActivityPub plugin is activated. [#1511]
+- The option to show/hide the "Welcome Page". [#1504]
+- User setting to enable/disable Likes and Reblogs [#1395]
+
+### Changed
+- Logged-out remote reply button markup to look closer to logged-in version. [#1509]
+- No longer federates `Delete` activities for posts that were not federated. [#1528]
+- OrderedCollection and OrderedCollectionPage behave closer to spec now. [#1444]
+- Outbox items now contain the full activity, not just activity objects. [#1474]
+- Standardized mentions to use usernames only in comments and posts. [#1510]
+
+### Fixed
+- Changelog entries: allow automating changelog entry generation from forks as well. [#1479]
+- Comments from Fediverse actors will now be purged as expected. [#1485]
+- Importing attachments no longer creates Outbox items for them. [#1526]
+- Improved readability in Mastodon Apps plugin string. [#1477]
+- No more PHP warnings when previewing posts without attachments. [#1478]
+- Outbox batch processing adheres to passed batch size. [#1514]
+- Permanently delete reactions that were `Undo` instead of trashing them. [#1520]
+- PHP warnings when scheduling post activities for an invalid post. [#1507]
+- PHP Warning when there's no actor information in comment activities. [#1508]
+- Prevent self-replies on local comments. [#1517]
+- Properly set `to` audience of `Activity` instead of changing the `Follow` Object. [#1501]
+- Run all Site-Health checks with the required headers and a valid signature. [#1487]
+- Set `updated` field for profile updates, otherwise the `Update`-`Activity` wouldn't be handled by Mastodon. [#1495]
+- Support multiple layers of nested Outbox activities when searching for the Object ID. [#1518]
+- The Custom-Avatar getter on WP.com. [#1491]
+- Use the $from account for the object in Move activity for external Moves [#1531]
+- Use the `$from` account for the object in Move activity for internal Moves [#1516]
+- Use `add_to_outbox` instead of the changed scheduler hooks. [#1481]
+- Use `JSON_UNESCAPED_SLASHES` because Mastodon seems to have problems with encoded URLs. [#1488]
+- `Scheduler::schedule_announce_activity` to handle Activities instead of Activity-Objects. [#1500]
+
 ## [5.5.0] - 2025-03-19
 ### Added
 - Added "Enable Mastodon Apps" and "Event Bridge for ActivityPub" to the recommended plugins section. [#1450]
@@ -1075,6 +1119,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - initial
 
+[5.6.1]: https://github.com/Automattic/wordpress-activitypub/compare/5.6.0...5.6.1
+[5.6.0]: https://github.com/Automattic/wordpress-activitypub/compare/5.5.0...5.6.0
 [5.5.0]: https://github.com/Automattic/wordpress-activitypub/compare/5.4.1...5.5.0
 [5.4.1]: https://github.com/Automattic/wordpress-activitypub/compare/5.4.0...5.4.1
 [5.4.0]: https://github.com/Automattic/wordpress-activitypub/compare/5.3.2...5.4.0

activitypub.php

@@ -3,7 +3,7 @@
  * Plugin Name: ActivityPub
  * Plugin URI: https://github.com/Automattic/wordpress-activitypub
  * Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
- * Version: 5.5.0
+ * Version: 5.6.1
  * Author: Matthias Pfefferle & Automattic
  * Author URI: https://automattic.com/
  * License: MIT
@@ -19,7 +19,7 @@
 
 use WP_CLI;
 
-\define( 'ACTIVITYPUB_PLUGIN_VERSION', '5.5.0' );
+\define( 'ACTIVITYPUB_PLUGIN_VERSION', '5.6.1' );
 
 // Plugin related constants.
 \define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
@@ -102,6 +102,11 @@ function plugin_admin_init() {
 	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Welcome_Fields', 'init' ) );
 	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\Blog_Settings_Fields', 'init' ) );
 	\add_action( 'admin_init', array( __NAMESPACE__ . '\WP_Admin\User_Settings_Fields', 'init' ) );
+
+	if ( defined( 'WP_LOAD_IMPORTERS' ) && WP_LOAD_IMPORTERS ) {
+		require_once __DIR__ . '/includes/wp-admin/import/load.php';
+		\add_action( 'init', __NAMESPACE__ . '\WP_Admin\Import\load' );
+	}
 }
 \add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_admin_init' );
 
@@ -113,6 +118,19 @@ function plugin_admin_init() {
 	)
 );
 
+/**
+ * Redirect to the welcome page after plugin activation.
+ *
+ * @param string $plugin The plugin basename.
+ */
+function activation_redirect( $plugin ) {
+	if ( ACTIVITYPUB_PLUGIN_BASENAME === $plugin ) {
+		\wp_safe_redirect( \admin_url( 'options-general.php?page=activitypub' ) );
+		exit;
+	}
+}
+\add_action( 'activated_plugin', __NAMESPACE__ . '\activation_redirect' );
+
 \register_deactivation_hook(
 	__FILE__,
 	array(

assets/css/activitypub-admin.css

@@ -1,6 +1,7 @@
 .activitypub-settings {
 	max-width: 800px;
 	margin: 0 auto;
+	position: relative;
 }
 
 .settings_page_activitypub .notice {
@@ -220,3 +221,23 @@ input.blog-user-identifier {
 .like .dashboard-comment-wrap .comment-author {
 	margin-block: 0;
 }
+
+.activitypub-settings .welcome-tab-close {
+	position: absolute;
+	top: 0px;
+	right: 0px;
+	font-size: 13px;
+	padding: 0 5px 0 20px;
+	text-decoration: none;
+	z-index: 1;
+}
+
+.activitypub-settings .welcome-tab-close::before {
+	position: absolute;
+	top: 0px;
+	left: 0;
+	transition: all .1s ease-in-out;
+	font: normal 16px/20px dashicons;
+	content: '\f335';
+	font-size: 20px;
+}