...
+ validations:
+ required: true
+
+ - type: textarea
+ id: why
+ attributes:
+ label: Why
+ description: Add a description of the problem this feature solves.
+ placeholder: |
+ eg. This will solve my accessibility needs.
+ validations:
+ required: true
+
+ - type: textarea
+ id: how
+ attributes:
+ label: How
+ description: If applicable, add screenshots, mockup, animations and/or videos to help illustrate how the feature could be done.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..49ff40e88
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,22 @@
+
+
+Fixes #
+
+## Proposed changes:
+
+*
+
+### Other information:
+
+- [ ] Have you written new tests for your changes, if applicable?
+
+## Testing instructions:
+
+
+
+
+
+
+* Go to '..'
+*
+
diff --git a/.github/workflows/gardening.yml b/.github/workflows/gardening.yml
new file mode 100644
index 000000000..2055d66de
--- /dev/null
+++ b/.github/workflows/gardening.yml
@@ -0,0 +1,50 @@
+# Repo gardening. Automate some of the triage tasks in the repo.
+name: Repo Gardening
+
+on:
+ pull_request_target: # When a PR is opened, edited, updated, closed, or a label is added.
+ types: [opened, reopened, synchronize, edited, labeled, closed]
+ issues: # For auto-triage of issues.
+ types: [opened, labeled, reopened, edited, closed]
+ issue_comment: # To gather support references in issue comments.
+ types: [created]
+concurrency:
+ # For pull_request_target, cancel any concurrent jobs with the same type (e.g. "opened", "labeled") and branch.
+ # Don't cancel any for other events, accomplished by grouping on the unique run_id.
+ group: gardening-${{ github.event_name }}-${{ github.event.action }}-${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.ref || github.run_id }}
+ cancel-in-progress: true
+
+jobs:
+ repo-gardening:
+ name: 'Automated repo gardening.'
+ runs-on: ubuntu-latest
+ if: github.event_name == 'pull_request_target' || github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
+ timeout-minutes: 10
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Setup Node
+ uses: actions/setup-node@v3
+ with:
+ node-version: lts/*
+
+ - name: Wait for prior instances of the workflow to finish
+ uses: softprops/turnstyle@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: 'Automate triage (add labels, clean labels, ...).'
+ uses: automattic/action-repo-gardening@trunk
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ slack_token: ${{ secrets.SLACK_TOKEN }}
+ slack_team_channel: ${{ secrets.SLACK_TEAM_CHANNEL }}
+ slack_he_triage_channel: ${{ secrets.SLACK_HE_TRIAGE_CHANNEL }}
+ slack_quality_channel: ${{ secrets.SLACK_QUALITY_CHANNEL }}
+ tasks: 'addLabels,cleanLabels,assignIssues,flagOss,gatherSupportReferences,replyToCustomersReminder'
+ add_labels: '[
+ {"path": "src/followers", "label": "[Block] Followers"},
+ {"path": "src/follow-me", "label": "[Block] Follow Me"}
+ ]'
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 4c70a1e80..9928decba 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -15,10 +15,15 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10
strategy:
matrix:
- php-versions: ['5.6', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+ php-versions: ['5.6', '7.0', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+ include:
+ - wp-version: latest
+ - wp-version: '6.2'
+ php-versions: '5.6'
steps:
- name: Checkout
uses: actions/checkout@v2
+
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
@@ -26,10 +31,13 @@ jobs:
coverage: none
tools: composer, phpunit-polyfills
extensions: mysql
+
- name: Install Composer dependencies for PHP
uses: "ramsey/composer-install@v1"
+
- name: Setup Test Environment
- run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 latest
+ run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 ${{ matrix.wp-version }}
+
- name: Unit Testing
run: ./vendor/bin/phpunit
env:
diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index 7f81780c7..000000000
--- a/.php_cs
+++ /dev/null
@@ -1,15 +0,0 @@
-exclude('vendor')
- ->exclude('node_modules')
- ->exclude('bin')
- ->in(__DIR__)
-;
-
-return PhpCsFixer\Config::create()
- ->setRules([
- 'native_function_invocation' => ['include' => ['@all']],
- 'native_constant_invocation' => true,
- ])
- ->setFinder($finder)
-;
diff --git a/README.md b/README.md
index d1b4461bf..eef27a0bf 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
# ActivityPub #
-**Contributors:** [pfefferle](https://profiles.wordpress.org/pfefferle/), [mediaformat](https://profiles.wordpress.org/mediaformat/), [akirk](https://profiles.wordpress.org/akirk/), [automattic](https://profiles.wordpress.org/automattic/)
+**Contributors:** [automattic](https://profiles.wordpress.org/automattic/), [pfefferle](https://profiles.wordpress.org/pfefferle/), [mediaformat](https://profiles.wordpress.org/mediaformat/), [mattwiebe](https://profiles.wordpress.org/mattwiebe/), [akirk](https://profiles.wordpress.org/akirk/), [jeherve](https://profiles.wordpress.org/jeherve/), [nuriapena](https://profiles.wordpress.org/nuriapena/), [cavalierlife](https://profiles.wordpress.org/cavalierlife/)
**Tags:** OStatus, fediverse, activitypub, activitystream
**Requires at least:** 4.7
-**Tested up to:** 6.1
-**Stable tag:** 0.17.0
+**Tested up to:** 6.3
+**Stable tag:** 1.0.1
**Requires PHP:** 5.6
**License:** MIT
**License URI:** http://opensource.org/licenses/MIT
@@ -12,38 +12,39 @@ The ActivityPub protocol is a decentralized social networking protocol based upo
## Description ##
-This is BETA software, see the FAQ to see the current feature set or rather what is still planned.
+Enter the fediverse with **ActivityPub**, broadcasting your blog to a wider audience! Attract followers, deliver updates, and receive comments from a diverse user base of **ActivityPub**\-compliant platforms.
-The plugin implements the ActivityPub protocol for your blog, which means that your readers will be able to follow your blog posts on Mastodon and other federated platforms that support ActivityPub. In addition, replies to your posts on Mastodon and related platforms will automatically become comments on your blog post.
+With the ActivityPub plugin installed, your WordPress blog itself function as a federated profile, along with profiles for each author. For instance, if your website is `example.com`, then the blog-wide profile can be found at `@example.com@example.com`, and authors like Jane and Bob would have their individual profiles at `@jane@example.com` and `@bobz@example.com`, respectively.
+
+An example: I give you my Mastodon profile name: `@pfefferle@mastodon.social`. You search, see my profile, and hit follow. Now, any post I make appears in your Home feed. Similarly, with the ActivityPub plugin, you can find and follow Jane's profile at `@jane@example.com`.
+
+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.
The plugin works with the following tested federated platforms, but there may be more that it works with as well:
* [Mastodon](https://joinmastodon.org/)
-* [Pleroma](https://pleroma.social/)
-* [Friendica](https://friendi.ca/)
-* [HubZilla](https://hubzilla.org/)
+* [Pleroma](https://pleroma.social/)/[Akkoma](https://akkoma.social/)
+* [friendica](https://friendi.ca/)
+* [Hubzilla](https://hubzilla.org/)
* [Pixelfed](https://pixelfed.org/)
-* [SocialHome](https://socialhome.network/)
+* [Socialhome](https://socialhome.network/)
* [Misskey](https://join.misskey.page/)
-
-Here’s what that means and what you can expect.
-
-Once the ActivityPub plugin is installed, each author’s page on your WordPress blog will become its own federated instance. In other words, if you have two authors, Jane and Bob, on your website, `example.com`, then your authors would have their own author pages at `example.com/author/jane` and `example.com/author/bob`. Each of those author pages would now be available to Mastodon users (and all other federated platform users) as a profile that can be followed. Let’s break that down further. Let’s say you have a friend on Mastodon who tells you to follow them and they give you their profile name `@janelivesheresomeofthetime@mastodon.social`. You search for her name, see her profile, and click the follow button, right? From then on, everything Jane posts on her profile shows up in your Home feed. Okay, similarly, now that Jane has installed the ActivityPub plugin on her `example.com` site, her friends can also follow her on Mastodon by searching for `@jane@example.com` and clicking the Follow button on that profile.
-
-From now on, every blog post Jane publishes on example.com will show up on your Home feed because you follow her `@jane@example.com` profile.
-Of course, if no one follows your author instance, then no one will ever see the posts - including you! So the easiest way to even know if the plugin is working is to follow your new profile yourself. If you already have a Mastodon profile, just follow your new one from there.
+* [Firefish](https://joinfirefish.org/) (rebrand of Calckey)
Some things to note:
-1. Many single-author blogs have chosen to turn off or redirect their author profile pages, usually via an SEO plugin like Yoast or Rank Math. This is usually done to avoid duplicate content with your blog’s home page. If your author page has been deactivated in this way, then ActivityPub won’t work for you. Instead, you can turn your author profile page back on, and then use the option in your SEO plugin to noindex the author page. This will enable the page to be live and ActivityPub will now work, but the live page won’t cause any duplicate content issues with search engines.
-1. Once ActivityPub is installed, only new posts going forward will be available in the fediverse. Likewise, even if you’ve been using ActivityPub for a while, anyone who follows your site, will only see new posts you publish from that moment on. They will never see previously-published posts in their Home feed. This process is very similar to subscribing to a newsletter. If you subscribe to a newsletter, you will only receive future emails, but not the old archived ones. With ActivityPub, if someone follows your site, they will only receive new blog posts you publish from then on.
+1. The blog-wide profile is only compatible with sites with rewrite rules enabled. If your site does not have rewrite rules enabled, the author-specific profiles may still work.
+1. Many single-author blogs have chosen to turn off or redirect their author profile pages, usually via an SEO plugin like Yoast or Rank Math. This is usually done to avoid duplicate content with your blog’s home page. If your author page has been deactivated in this way, then ActivityPub author profiles won’t work for you. Instead, you can turn your author profile page back on, and then use the option in your SEO plugin to noindex the author page. This will duplicate content issues with search engines and will enable ActivityPub author profiles to work.
+1. Once ActivityPub is installed, *only new posts going forward* will be available in the fediverse. Likewise, even if you’ve been using ActivityPub for a while, anyone who follows your site, will only see new posts you publish from that moment on. They will never see previously-published posts in their Home feed. This process is very similar to subscribing to a newsletter. If you subscribe to a newsletter, you will only receive future emails, but not the old archived ones. With ActivityPub, if someone follows your site, they will only receive new blog posts you publish from then on.
So what’s the process?
1. Install the ActivityPub plugin.
1. Go to the plugin’s settings page and adjust the settings to your liking. Click the Save button when ready.
-1. Make sure your blog’s author profile page is active.
-1. Go to Mastodon or any other federated platform, search for your author’s new federated profile, and follow it. Your new profile will be in the form of @yourauthorname@yourwebsite.com, so that is what you’ll search for.
+1. Make sure your blog’s author profile page is active if you are using author profiles.
+1. Go to Mastodon or any other federated platform, and search for your profile, and follow it. Your new profile will be in the form of either `@your_username@example.com` or `@example.com@example.com`, so that is what you’ll search for.
1. On your blog, publish a new post.
1. From Mastodon, check to see if the new post appears in your Home feed.
@@ -53,34 +54,25 @@ Please note that it may take up to 15 minutes or so for the new post to show up
### tl;dr ###
-This plugin connects your WordPress blog to popular social platforms like Mastodon, making your posts more accessible to a wider audience. Once installed, your blog's author pages can be followed by users on these platforms, allowing them to receive your new posts in their feeds.
-
-Here's how it works:
-
-1. Install the plugin and adjust settings as needed.
-1. Ensure your blog's author profile page is active.
-1. On Mastodon or other supported platforms, search for and follow your author's new profile (e.g., `@yourauthorname@yourwebsite.com`).
-1. Publish a new post on your blog and check if it appears in your Mastodon feed.
-
-Please note that it may take up to 15 minutes for a new post to appear in your feed, as messages are sent on a delay to avoid overwhelming your followers. Be patient and give it some time.
+This plugin connects your WordPress blog to popular social platforms like Mastodon, making your posts more accessible to a wider audience. Once installed, your blog can be followed by users on these platforms, allowing them to receive your new posts in their feeds.
### What is the status of this plugin? ###
Implemented:
-* profile pages (JSON representation)
+* blog profile pages (JSON representation)
+* author profile pages (JSON representation)
* custom links
* functional inbox/outbox
* follow (accept follows)
* share posts
* receive comments/reactions
+* signature verification
To implement:
-* signature verification
-* better WordPress integration
-* better configuration possibilities
* threaded comments support
+* replace shortcodes with blocks for layout
### What is "ActivityPub for WordPress" ###
@@ -94,7 +86,7 @@ In order for webfinger to work, it must be mapped to the root directory of the U
Add the following to the .htaccess file in the root directory:
- RedirectMatch "^\/\.well-known(.*)$" "\/blog\/\.well-known$1"
+ RedirectMatch "^\/\.well-known/(webfinger|nodeinfo|x-nodeinfo2)(.*)$" /blog/.well-known/$1$2
Where 'blog' is the path to the subdirectory at which your blog resides.
@@ -111,7 +103,40 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
## Changelog ##
-Project maintained on GitHub at [pfefferle/wordpress-activitypub](https://github.com/pfefferle/wordpress-activitypub).
+Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
+
+### 1.0.1 ###
+
+* Update: improve image attachment detection using the block editor
+* Update: better error code handling for API responses
+* Update: use a tag stack instead of regex for protecting tags for Hashtags and @-Mentions
+* Compatibility: better signature support for subpath-installations
+* Compatibility: allow deactivating blocks registered by the plugin
+* Compatibility: avoid Fatal Errors when using ClassicPress
+* Compatibility: improve the Group-Actor to play nicely with existing implementations
+* Fixed: truncate long blog titles and handles for the "Follow me" block
+* Fixed: ensure that only a valid user can be selected for the "Follow me" block
+* Fixed: fix a typo in a hook name
+* Fixed: a problem with signatures when running WordPress in a sub-path
+
+### 1.0.0 ###
+
+* Add: blog-wide Account (catchall, like `example.com@example.com`)
+* Add: a Follow Me block (help visitors to follow your Profile)
+* Add: Signature Verification: https://docs.joinmastodon.org/spec/security/
+* Add: a Followers Block (show off your Followers)
+* Add: Simple caching
+* Add: Collection endpoints for Featured Tags and Featured Posts
+* Add: Better handling of Hashtags in mobile apps
+* Update: Complete rewrite of the Follower-System based on Custom Post Types
+* Update: Improved linter (PHPCS)
+* Compatibility: Add a new conditional, `\Activitypub\is_activitypub_request()`, to allow third-party plugins to detect ActivityPub requests
+* Compatibility: Add hooks to allow modifying images returned in ActivityPub requests
+* Compatibility: Indicate that the plugin is compatible and has been tested with the latest version of WordPress, 6.3
+* Compatibility: Avoid PHP notice on sites using PHP 8.2
+* Fixed: Load the plugin later in the WordPress code lifecycle to avoid errors in some requests
+* Fixed: Updating posts
+* Fixed: Hashtag now support CamelCase and UTF-8
### 0.17.0 ###
@@ -373,6 +398,12 @@ Project maintained on GitHub at [pfefferle/wordpress-activitypub](https://github
* initial
+## Upgrade Notice ##
+
+### 1.0.0 ###
+
+For version 1.0.0 we have completely rebuilt the followers lists. There is a migration from the old format to the new, but it may take some time until the migration is complete. No data will be lost in the process, please give the migration some time.
+
## Installation ##
Follow the normal instructions for [installing WordPress plugins](https://wordpress.org/support/article/managing-plugins/).
diff --git a/activitypub.php b/activitypub.php
index 7320f0c68..03f0743eb 100644
--- a/activitypub.php
+++ b/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: 0.17.0
+ * Version: 1.0.1
* Author: Matthias Pfefferle & Automattic
* Author URI: https://automattic.com/
* License: MIT
@@ -15,85 +15,109 @@
namespace Activitypub;
+use function Activitypub\site_supports_blocks;
+
+\defined( 'ACTIVITYPUB_REST_NAMESPACE' ) || \define( 'ACTIVITYPUB_REST_NAMESPACE', 'activitypub/1.0' );
+
/**
* Initialize plugin
*/
function init() {
\defined( 'ACTIVITYPUB_EXCERPT_LENGTH' ) || \define( 'ACTIVITYPUB_EXCERPT_LENGTH', 400 );
+ \defined( 'ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS' ) || \define( 'ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS', true );
\defined( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS' ) || \define( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS', 3 );
\defined( 'ACTIVITYPUB_HASHTAGS_REGEXP' ) || \define( 'ACTIVITYPUB_HASHTAGS_REGEXP', '(?:(?<=\s)|(?<=)|(?<=
[ap_title]
\n\n[ap_content]\n\n[ap_hashtags]
\n\n[ap_shortlink]
" );
+ \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 );
+
\define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
\define( 'ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
+ \define( 'ACTIVITYPUB_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
- require_once \dirname( __FILE__ ) . '/includes/table/followers-list.php';
- require_once \dirname( __FILE__ ) . '/includes/class-signature.php';
- require_once \dirname( __FILE__ ) . '/includes/class-webfinger.php';
- require_once \dirname( __FILE__ ) . '/includes/peer/class-followers.php';
- require_once \dirname( __FILE__ ) . '/includes/functions.php';
-
- require_once \dirname( __FILE__ ) . '/includes/model/class-activity.php';
- require_once \dirname( __FILE__ ) . '/includes/model/class-post.php';
-
- require_once \dirname( __FILE__ ) . '/includes/class-activity-dispatcher.php';
- \Activitypub\Activity_Dispatcher::init();
-
- require_once \dirname( __FILE__ ) . '/includes/class-activitypub.php';
- \Activitypub\Activitypub::init();
+ Migration::init();
+ Activitypub::init();
+ Activity_Dispatcher::init();
+ Collection\Followers::init();
// Configure the REST API route
- require_once \dirname( __FILE__ ) . '/includes/rest/class-outbox.php';
- \Activitypub\Rest\Outbox::init();
-
- require_once \dirname( __FILE__ ) . '/includes/rest/class-inbox.php';
- \Activitypub\Rest\Inbox::init();
-
- require_once \dirname( __FILE__ ) . '/includes/rest/class-followers.php';
- \Activitypub\Rest\Followers::init();
-
- require_once \dirname( __FILE__ ) . '/includes/rest/class-following.php';
- \Activitypub\Rest\Following::init();
-
- require_once \dirname( __FILE__ ) . '/includes/rest/class-webfinger.php';
- \Activitypub\Rest\Webfinger::init();
-
- // load NodeInfo endpoints only if blog is public
- if ( true === (bool) \get_option( 'blog_public', 1 ) ) {
- require_once \dirname( __FILE__ ) . '/includes/rest/class-nodeinfo.php';
- \Activitypub\Rest\NodeInfo::init();
+ Rest\Users::init();
+ Rest\Outbox::init();
+ Rest\Inbox::init();
+ Rest\Followers::init();
+ Rest\Following::init();
+ Rest\Webfinger::init();
+ Rest\Server::init();
+ Rest\Collection::init();
+
+ Admin::init();
+ Hashtag::init();
+ Shortcodes::init();
+ Mention::init();
+ Health_Check::init();
+ Scheduler::init();
+
+ if ( site_supports_blocks() ) {
+ Blocks::init();
}
+}
+\add_action( 'init', __NAMESPACE__ . '\init' );
- require_once \dirname( __FILE__ ) . '/includes/class-admin.php';
- \Activitypub\Admin::init();
-
- require_once \dirname( __FILE__ ) . '/includes/class-hashtag.php';
- \Activitypub\Hashtag::init();
-
- require_once \dirname( __FILE__ ) . '/includes/class-shortcodes.php';
- \Activitypub\Shortcodes::init();
-
- require_once \dirname( __FILE__ ) . '/includes/class-mention.php';
- \Activitypub\Mention::init();
+/**
+ * Class Autoloader
+ */
+spl_autoload_register(
+ function ( $full_class ) {
+ $base_dir = __DIR__ . '/includes/';
+ $base = 'Activitypub\\';
+
+ if ( strncmp( $full_class, $base, strlen( $base ) ) === 0 ) {
+ $maybe_uppercase = str_replace( $base, '', $full_class );
+ $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;
+ }
+
+ if ( false !== strpos( $class, '\\' ) ) {
+ $parts = explode( '\\', $class );
+ $class = array_pop( $parts );
+ $sub_dir = implode( '/', $parts );
+ $base_dir = $base_dir . $sub_dir . '/';
+ }
+
+ $filename = 'class-' . strtr( $class, '_', '-' );
+ $file = $base_dir . $filename . '.php';
+
+ 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 ) ) );
+ }
+ }
+ }
+);
- require_once \dirname( __FILE__ ) . '/includes/class-debug.php';
- \Activitypub\Debug::init();
+require_once __DIR__ . '/includes/functions.php';
- require_once \dirname( __FILE__ ) . '/includes/class-health-check.php';
- \Activitypub\Health_Check::init();
+// load NodeInfo endpoints only if blog is public
+if ( \get_option( 'blog_public', 1 ) ) {
+ Rest\NodeInfo::init();
+}
- if ( \WP_DEBUG ) {
- require_once \dirname( __FILE__ ) . '/includes/debug.php';
- }
+$debug_file = __DIR__ . '/includes/debug.php';
+if ( \WP_DEBUG && file_exists( $debug_file ) && is_readable( $debug_file ) ) {
+ require_once $debug_file;
+ Debug::init();
}
-\add_action( 'plugins_loaded', '\Activitypub\init' );
/**
* Add plugin settings link
*/
function plugin_settings_link( $actions ) {
+ $settings_link = array();
$settings_link[] = \sprintf(
'%2s ',
\menu_page_url( 'activitypub', false ),
@@ -102,40 +126,75 @@ function plugin_settings_link( $actions ) {
return \array_merge( $settings_link, $actions );
}
-\add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), '\Activitypub\plugin_settings_link' );
+\add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), __NAMESPACE__ . '\plugin_settings_link' );
+
+\register_activation_hook(
+ __FILE__,
+ array(
+ __NAMESPACE__ . '\Activitypub',
+ 'activate',
+ )
+);
+
+\register_deactivation_hook(
+ __FILE__,
+ array(
+ __NAMESPACE__ . '\Activitypub',
+ 'deactivate',
+ )
+);
+
+\register_uninstall_hook(
+ __FILE__,
+ array(
+ __NAMESPACE__ . '\Activitypub',
+ 'uninstall',
+ )
+);
/**
- * Add rewrite rules
+ * Only load code that needs BuddyPress to run once BP is loaded and initialized.
*/
-function add_rewrite_rules() {
- if ( ! \class_exists( 'Webfinger' ) ) {
- \add_rewrite_rule( '^.well-known/webfinger', 'index.php?rest_route=/activitypub/1.0/webfinger', 'top' );
- }
+add_action(
+ 'bp_include',
+ function() {
+ require_once __DIR__ . '/integration/class-buddypress.php';
+ Integration\Buddypress::init();
+ },
+ 0
+);
- if ( ! \class_exists( 'Nodeinfo' ) || ! (bool) \get_option( 'blog_public', 1 ) ) {
- \add_rewrite_rule( '^.well-known/nodeinfo', 'index.php?rest_route=/activitypub/1.0/nodeinfo/discovery', 'top' );
- \add_rewrite_rule( '^.well-known/x-nodeinfo2', 'index.php?rest_route=/activitypub/1.0/nodeinfo2', 'top' );
+/**
+ * `get_plugin_data` wrapper
+ *
+ * @return array The plugin metadata array
+ */
+function get_plugin_meta( $default_headers = array() ) {
+ if ( ! $default_headers ) {
+ $default_headers = array(
+ 'Name' => 'Plugin Name',
+ 'PluginURI' => 'Plugin URI',
+ 'Version' => 'Version',
+ 'Description' => 'Description',
+ 'Author' => 'Author',
+ 'AuthorURI' => 'Author URI',
+ 'TextDomain' => 'Text Domain',
+ 'DomainPath' => 'Domain Path',
+ 'Network' => 'Network',
+ 'RequiresWP' => 'Requires at least',
+ 'RequiresPHP' => 'Requires PHP',
+ 'UpdateURI' => 'Update URI',
+ );
}
- \add_rewrite_endpoint( 'activitypub', EP_AUTHORS | EP_PERMALINK | EP_PAGES );
+ return \get_file_data( __FILE__, $default_headers, 'plugin' );
}
-\add_action( 'init', '\Activitypub\add_rewrite_rules', 1 );
/**
- * Flush rewrite rules;
+ * Plugin Version Number used for caching.
*/
-function flush_rewrite_rules() {
- \Activitypub\add_rewrite_rules();
- \flush_rewrite_rules();
-}
-\register_activation_hook( __FILE__, '\Activitypub\flush_rewrite_rules' );
-\register_deactivation_hook( __FILE__, '\flush_rewrite_rules' );
+function get_plugin_version() {
+ $meta = get_plugin_meta( array( 'Version' => 'Version' ) );
-/**
- * Only load code that needs BuddyPress to run once BP is loaded and initialized.
- */
-function enable_buddypress_features() {
- require_once \dirname( __FILE__ ) . '/integration/class-buddypress.php';
- \Activitypub\Integration\Buddypress::init();
+ return $meta['Version'];
}
-add_action( 'bp_include', '\Activitypub\enable_buddypress_features' );
diff --git a/assets/css/activitypub-admin.css b/assets/css/activitypub-admin.css
index cd1808cd0..07aadcad8 100644
--- a/assets/css/activitypub-admin.css
+++ b/assets/css/activitypub-admin.css
@@ -1,7 +1,16 @@
+.activitypub-settings {
+ max-width: 800px;
+ margin: 0 auto;
+}
+
.settings_page_activitypub .notice {
max-width: 800px;
margin: auto;
- margin-top: 10px;
+ margin: 0px auto 30px;
+}
+
+.settings_page_activitypub .wrap {
+ padding-left: 22px;
}
.activitypub-settings-header {
@@ -25,10 +34,10 @@
.activitypub-settings-tabs-wrapper {
display: -ms-inline-grid;
- -ms-grid-columns: 1fr 1fr;
+ -ms-grid-columns: auto auto auto;
vertical-align: top;
display: inline-grid;
- grid-template-columns: 1fr 1fr;
+ grid-template-columns: auto auto auto;
}
.activitypub-settings-tab.active {
@@ -111,7 +120,8 @@ summary {
flex-grow: 1;
}
-.activitypub-settings-accordion-trigger .icon, .activitypub-settings-accordion-viewed .icon {
+.activitypub-settings-accordion-trigger .icon,
+.activitypub-settings-accordion-viewed .icon {
border: solid #50575e medium;
border-width: 0 2px 2px 0;
height: .5rem;
@@ -127,7 +137,8 @@ summary {
transform: translateY(-30%) rotate(-135deg);
}
-.activitypub-settings-accordion-trigger:active, .activitypub-settings-accordion-trigger:hover {
+.activitypub-settings-accordion-trigger:active,
+.activitypub-settings-accordion-trigger:hover {
background: #f6f7f7;
}
@@ -139,3 +150,50 @@ summary {
outline: 2px solid #2271b1;
background-color: #f6f7f7;
}
+
+.activitypub-settings
+input.blog-user-identifier {
+ text-align: right;
+}
+
+.activitypub-settings
+.header-image {
+ width: 100%;
+ height: 80px;
+ position: relative;
+ display: block;
+ margin-bottom: 40px;
+ background-image: rgb(168,165,175);
+ background-image: linear-gradient(180deg, red, yellow);
+ background-size: cover;
+}
+
+.activitypub-settings
+.logo {
+ height: 80px;
+ width: 80px;
+ position: relative;
+ top: 40px;
+ left: 40px;
+}
+
+.settings_page_activitypub .box {
+ border: 1px solid #c3c4c7;
+ background-color: #fff;
+ padding: 1em 1.5em;
+ margin-bottom: 1.5em;
+}
+
+.settings_page_activitypub .activitypub-welcome-page .box label {
+ font-weight: bold;
+}
+
+.settings_page_activitypub .activitypub-welcome-page input {
+ font-size: 20px;
+ width: 95%;
+}
+
+.settings_page_activitypub .plugin-recommendations {
+ border-bottom: none;
+ margin-bottom: 0;
+}
diff --git a/assets/img/mp.jpg b/assets/img/mp.jpg
new file mode 100644
index 000000000..05964b499
Binary files /dev/null and b/assets/img/mp.jpg differ
diff --git a/assets/img/wp-logo.png b/assets/img/wp-logo.png
new file mode 100644
index 000000000..b48f08e8e
Binary files /dev/null and b/assets/img/wp-logo.png differ
diff --git a/build/follow-me/block.json b/build/follow-me/block.json
new file mode 100644
index 000000000..8dcb824d9
--- /dev/null
+++ b/build/follow-me/block.json
@@ -0,0 +1,47 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "name": "activitypub/follow-me",
+ "apiVersion": 3,
+ "version": "1.0.0",
+ "title": "Follow me on the Fediverse",
+ "category": "widgets",
+ "description": "Display your Fediverse profile so that visitors can follow you.",
+ "textdomain": "activitypub",
+ "icon": "groups",
+ "supports": {
+ "html": false,
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true,
+ "link": true
+ }
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "width": true,
+ "color": true,
+ "style": true
+ },
+ "typography": {
+ "fontSize": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ }
+ },
+ "attributes": {
+ "selectedUser": {
+ "type": "string",
+ "default": "site"
+ }
+ },
+ "editorScript": "file:./index.js",
+ "viewScript": "file:./view.js",
+ "style": [
+ "file:./style-index.css",
+ "wp-components"
+ ]
+}
\ No newline at end of file
diff --git a/build/follow-me/index.asset.php b/build/follow-me/index.asset.php
new file mode 100644
index 000000000..28ba3737e
--- /dev/null
+++ b/build/follow-me/index.asset.php
@@ -0,0 +1 @@
+ array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '5e11f2fcd4dc9ac6d7ee');
diff --git a/build/follow-me/index.js b/build/follow-me/index.js
new file mode 100644
index 000000000..5226a1ddb
--- /dev/null
+++ b/build/follow-me/index.js
@@ -0,0 +1 @@
+(()=>{"use strict";var e,t={843:(e,t,n)=>{const r=window.wp.blocks,o=window.wp.element,l=window.wp.primitives,a=(0,o.createElement)(l.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24"},(0,o.createElement)(l.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"}));function c(){return c=Object.assign?Object.assign.bind():function(e){for(var t=1;t2&&void 0!==arguments[2]?arguments[2]:null;return n?`${e}${arguments.length>3&&void 0!==arguments[3]?arguments[3]:""} { ${t}: ${n}; }\n`:""}function g(e,t,n,r){return E(e,"background-color",t)+E(e,"color",n)+E(e,"background-color",r,":hover")+E(e,"background-color",r,":focus")}function k(e){let{selector:t,style:n,backgroundColor:r}=e;const l=function(e,t,n){const r=`${e} .components-button`,o=("string"==typeof(l=n)?h(l):l?.color?.background||null)||t?.color?.background;var l;return g(r,_(t?.elements?.link?.color?.text),o,_(t?.elements?.link?.[":hover"]?.color?.text))}(t,n,r);return(0,o.createElement)("style",null,l)}const{namespace:O}=window._activityPubOptions,x={avatar:"",resource:"@well@hello.dolly",name:(0,s.__)("Hello Dolly Fan Account","activitypub"),url:"#"};function C(e){if(!e)return x;const t={...x,...e};return t.avatar=t?.icon?.url,t}function S(e){let{profile:t,popupStyles:n,userId:r}=e;const{avatar:l,name:a,resource:c}=t;return(0,o.createElement)("div",{className:"activitypub-profile"},(0,o.createElement)("img",{className:"activitypub-profile__avatar",src:l}),(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"},c)),(0,o.createElement)(N,{profile:t,popupStyles:n,userId:r}))}function N(e){let{profile:t,popupStyles:n,userId:r}=e;const[l,a]=(0,o.useState)(!1),c=(0,s.sprintf)((0,s.__)("Follow %s","activitypub"),t?.name);return(0,o.createElement)(o.Fragment,null,(0,o.createElement)(u.Button,{className:"activitypub-profile__follow",onClick:()=>a(!0)},(0,s.__)("Follow","activitypub")),l&&(0,o.createElement)(u.Modal,{className:"activitypub-profile__confirm",onRequestClose:()=>a(!1),title:c},(0,o.createElement)(P,{profile:t,userId:r}),(0,o.createElement)("style",null,n)))}function $(e){try{return new URL(e),!0}catch(e){return!1}}function P(e){let{profile:t,userId:n}=e;const{resource:r}=t,l=(0,s.__)("Follow","activitypub"),a=(0,s.__)("Loading...","activitypub"),c=(0,s.__)("Opening...","activitypub"),i=(0,s.__)("Error","activitypub"),p=(0,s.__)("Invalid","activitypub"),[m,v]=(0,o.useState)(l),[h,_]=(0,o.useState)(f),E=(0,b.useCopyToClipboard)(r,(()=>{_(w),setTimeout((()=>_(f)),1e3)})),[g,k]=(0,o.useState)(""),x=(0,o.useCallback)((()=>{let e;if(!$(g)&&!function(e){const t=e.replace(/^@/,"").split("@");return 2===t.length&&$(`https://${t[1]}`)}(g))return v(p),e=setTimeout((()=>v(l)),2e3),()=>clearTimeout(e);const t=`/${O}/users/${n}/remote-follow?resource=${g}`;v(a),d()({path:t}).then((e=>{let{url:t}=e;v(c),setTimeout((()=>{window.open(t,"_blank"),v(l)}),200)})).catch((()=>{v(i),setTimeout((()=>v(l)),2e3)}))}),[g]);return(0,o.createElement)("div",{className:"activitypub-follow-me__dialog"},(0,o.createElement)("div",{className:"apmfd__section"},(0,o.createElement)("h4",null,(0,s.__)("My Profile","activitypub")),(0,o.createElement)("div",{className:"apfmd-description"},(0,s.__)("Copy and paste my profile into the search field of your favorite fediverse app or server.","activitypub")),(0,o.createElement)("div",{className:"apfmd__button-group"},(0,o.createElement)("input",{type:"text",value:r,readOnly:!0}),(0,o.createElement)(u.Button,{ref:E},(0,o.createElement)(y,{icon:h}),(0,s.__)("Copy","activitypub")))),(0,o.createElement)("div",{className:"apmfd__section"},(0,o.createElement)("h4",null,(0,s.__)("Your Profile","activitypub")),(0,o.createElement)("div",{className:"apfmd-description"},(0,o.createInterpolateElement)((0,s.__)("Or, if you know your own profile, we can start things that way! (eg https://example.com/yourusername or yourusername@example.com)","activitypub"),{code:(0,o.createElement)("code",null)})),(0,o.createElement)("div",{className:"apfmd__button-group"},(0,o.createElement)("input",{type:"text",value:g,onKeyDown:e=>{"Enter"===e?.code&&x()},onChange:e=>k(e.target.value)}),(0,o.createElement)(u.Button,{onClick:x},m))))}function z(e){let{selectedUser:t,style:n,backgroundColor:r,id:l,useId:a=!1}=e;const[c,i]=(0,o.useState)(C()),s="site"===t?0:t,u=function(e){return g(".apfmd__button-group .components-button",_(e?.elements?.link?.color?.text)||"#111","#fff",_(e?.elements?.link?.[":hover"]?.color?.text)||"#333")}(n),p=a?{id:l}:{};function m(e){i(C(e))}return(0,o.useEffect)((()=>{(function(e){const t={headers:{Accept:"application/activity+json"},path:`/${O}/users/${e}`};return d()(t)})(s).then(m)}),[s]),(0,o.createElement)("div",p,(0,o.createElement)(k,{selector:`#${l}`,style:n,backgroundColor:r}),(0,o.createElement)(S,{profile:c,userId:s,popupStyles:u}))}(0,r.registerBlockType)("activitypub/follow-me",{edit:function(e){let{attributes:t,setAttributes:n}=e;const r=(0,i.useBlockProps)(),l=function(){const e=m?.users?(0,p.useSelect)((e=>e("core").getUsers({who:"authors"}))):[];return(0,o.useMemo)((()=>{if(!e)return[];const t=m?.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:a}=t;return(0,o.useEffect)((()=>{l.length&&(l.find((e=>{let{value:t}=e;return t===a}))||n({selectedUser:l[0].value}))}),[a,l]),(0,o.createElement)("div",r,(0,o.createElement)(i.InspectorControls,{key:"setting"},(0,o.createElement)(u.PanelBody,{title:(0,s.__)("Followers Options","activitypub")},(0,o.createElement)(u.SelectControl,{label:(0,s.__)("Select User","activitypub"),value:t.selectedUser,options:l,onChange:e=>n({selectedUser:e})}))),(0,o.createElement)(z,c({},t,{id:r.id})))},save:()=>null,icon:a})}},n={};function r(e){var o=n[e];if(void 0!==o)return o.exports;var l=n[e]={exports:{}};return t[e](l,l.exports,r),l.exports}r.m=t,e=[],r.O=(t,n,o,l)=>{if(!n){var a=1/0;for(u=0;u=l)&&Object.keys(r.O).every((e=>r.O[e](n[i])))?n.splice(i--,1):(c=!1,l0&&e[u-1][2]>l;u--)e[u]=e[u-1];e[u]=[n,o,l]},r.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return r.d(t,{a:t}),t},r.d=(e,t)=>{for(var n in t)r.o(t,n)&&!r.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={127:0,740:0};r.O.j=t=>0===e[t];var t=(t,n)=>{var o,l,[a,c,i]=n,s=0;if(a.some((t=>0!==e[t]))){for(o in c)r.o(c,o)&&(r.m[o]=c[o]);if(i)var u=i(r)}for(t&&t(n);sr(843)));o=r.O(o)})();
\ No newline at end of file
diff --git a/build/follow-me/style-index.css b/build/follow-me/style-index.css
new file mode 100644
index 000000000..524d0e0bc
--- /dev/null
+++ b/build/follow-me/style-index.css
@@ -0,0 +1 @@
+.activitypub-follow-me-block-wrapper .activitypub-profile,.editor-styles-wrapper .activitypub-profile{align-items:self-start;display:flex;padding:1rem}.activitypub-follow-me-block-wrapper .activitypub-profile .activitypub-profile__avatar,.editor-styles-wrapper .activitypub-profile .activitypub-profile__avatar{border-radius:50%;height:75px;margin-right:1rem;width:75px}.activitypub-follow-me-block-wrapper .activitypub-profile .activitypub-profile__content,.editor-styles-wrapper .activitypub-profile .activitypub-profile__content{flex:1;min-width:0}.activitypub-follow-me-block-wrapper .activitypub-profile .activitypub-profile__handle,.activitypub-follow-me-block-wrapper .activitypub-profile .activitypub-profile__name,.editor-styles-wrapper .activitypub-profile .activitypub-profile__handle,.editor-styles-wrapper .activitypub-profile .activitypub-profile__name{line-height:1;margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.activitypub-follow-me-block-wrapper .activitypub-profile .activitypub-profile__name,.editor-styles-wrapper .activitypub-profile .activitypub-profile__name{font-size:1.25em}.activitypub-follow-me-block-wrapper .activitypub-profile .activitypub-profile__follow,.editor-styles-wrapper .activitypub-profile .activitypub-profile__follow{align-self:center;background-color:var(--wp--preset--color--black);color:var(--wp--preset--color--white);margin-left:1rem}.activitypub-follow-me__dialog{max-width:30em}.activitypub-follow-me__dialog h4{line-height:1;margin:0}.activitypub-follow-me__dialog .apmfd__section{margin-bottom:2em}.activitypub-follow-me__dialog .apfmd-description{font-size:var(--wp--preset--font-size--normal,.75rem);margin:.33em 0 1em}.activitypub-follow-me__dialog .apfmd__button-group{display:flex;justify-content:flex-end}.activitypub-follow-me__dialog .apfmd__button-group svg{height:21px;margin-right:.5em;width:21px}.activitypub-follow-me__dialog .apfmd__button-group input{flex:1;padding-left:1em;padding-right:1em}
diff --git a/build/follow-me/view.asset.php b/build/follow-me/view.asset.php
new file mode 100644
index 000000000..56862e595
--- /dev/null
+++ b/build/follow-me/view.asset.php
@@ -0,0 +1 @@
+ array('wp-api-fetch', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '06a922cf2e58c94b6431');
diff --git a/build/follow-me/view.js b/build/follow-me/view.js
new file mode 100644
index 000000000..e55d91b03
--- /dev/null
+++ b/build/follow-me/view.js
@@ -0,0 +1 @@
+(()=>{"use strict";var e,t={810:(e,t,r)=>{function n(){return n=Object.assign?Object.assign.bind():function(e){for(var t=1;t2&&void 0!==arguments[2]?arguments[2]:null;return r?`${e}${arguments.length>3&&void 0!==arguments[3]?arguments[3]:""} { ${t}: ${r}; }\n`:""}function _(e,t,r,n){return w(e,"background-color",t)+w(e,"color",r)+w(e,"background-color",n,":hover")+w(e,"background-color",n,":focus")}function h(e){let{selector:t,style:r,backgroundColor:n}=e;const l=function(e,t,r){const n=`${e} .components-button`,o=("string"==typeof(l=r)?y(l):l?.color?.background||null)||t?.color?.background;var l;return _(n,b(t?.elements?.link?.color?.text),o,b(t?.elements?.link?.[":hover"]?.color?.text))}(t,r,n);return(0,o.createElement)("style",null,l)}const{namespace:E}=window._activityPubOptions,g={avatar:"",resource:"@well@hello.dolly",name:(0,s.__)("Hello Dolly Fan Account","activitypub"),url:"#"};function k(e){if(!e)return g;const t={...g,...e};return t.avatar=t?.icon?.url,t}function O(e){let{profile:t,popupStyles:r,userId:n}=e;const{avatar:l,name:a,resource:c}=t;return(0,o.createElement)("div",{className:"activitypub-profile"},(0,o.createElement)("img",{className:"activitypub-profile__avatar",src:l}),(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"},c)),(0,o.createElement)(x,{profile:t,popupStyles:r,userId:n}))}function x(e){let{profile:t,popupStyles:r,userId:n}=e;const[l,a]=(0,o.useState)(!1),c=(0,s.sprintf)((0,s.__)("Follow %s","activitypub"),t?.name);return(0,o.createElement)(o.Fragment,null,(0,o.createElement)(u.Button,{className:"activitypub-profile__follow",onClick:()=>a(!0)},(0,s.__)("Follow","activitypub")),l&&(0,o.createElement)(u.Modal,{className:"activitypub-profile__confirm",onRequestClose:()=>a(!1),title:c},(0,o.createElement)(N,{profile:t,userId:n}),(0,o.createElement)("style",null,r)))}function C(e){try{return new URL(e),!0}catch(e){return!1}}function N(e){let{profile:t,userId:r}=e;const{resource:n}=t,l=(0,s.__)("Follow","activitypub"),a=(0,s.__)("Loading...","activitypub"),c=(0,s.__)("Opening...","activitypub"),p=(0,s.__)("Error","activitypub"),y=(0,s.__)("Invalid","activitypub"),[b,w]=(0,o.useState)(l),[_,h]=(0,o.useState)(m),g=(0,f.useCopyToClipboard)(n,(()=>{h(d),setTimeout((()=>h(m)),1e3)})),[k,O]=(0,o.useState)(""),x=(0,o.useCallback)((()=>{let e;if(!C(k)&&!function(e){const t=e.replace(/^@/,"").split("@");return 2===t.length&&C(`https://${t[1]}`)}(k))return w(y),e=setTimeout((()=>w(l)),2e3),()=>clearTimeout(e);const t=`/${E}/users/${r}/remote-follow?resource=${k}`;w(a),i()({path:t}).then((e=>{let{url:t}=e;w(c),setTimeout((()=>{window.open(t,"_blank"),w(l)}),200)})).catch((()=>{w(p),setTimeout((()=>w(l)),2e3)}))}),[k]);return(0,o.createElement)("div",{className:"activitypub-follow-me__dialog"},(0,o.createElement)("div",{className:"apmfd__section"},(0,o.createElement)("h4",null,(0,s.__)("My Profile","activitypub")),(0,o.createElement)("div",{className:"apfmd-description"},(0,s.__)("Copy and paste my profile into the search field of your favorite fediverse app or server.","activitypub")),(0,o.createElement)("div",{className:"apfmd__button-group"},(0,o.createElement)("input",{type:"text",value:n,readOnly:!0}),(0,o.createElement)(u.Button,{ref:g},(0,o.createElement)(v,{icon:_}),(0,s.__)("Copy","activitypub")))),(0,o.createElement)("div",{className:"apmfd__section"},(0,o.createElement)("h4",null,(0,s.__)("Your Profile","activitypub")),(0,o.createElement)("div",{className:"apfmd-description"},(0,o.createInterpolateElement)((0,s.__)("Or, if you know your own profile, we can start things that way! (eg https://example.com/yourusername or yourusername@example.com)","activitypub"),{code:(0,o.createElement)("code",null)})),(0,o.createElement)("div",{className:"apfmd__button-group"},(0,o.createElement)("input",{type:"text",value:k,onKeyDown:e=>{"Enter"===e?.code&&x()},onChange:e=>O(e.target.value)}),(0,o.createElement)(u.Button,{onClick:x},b))))}function S(e){let{selectedUser:t,style:r,backgroundColor:n,id:l,useId:a=!1}=e;const[c,u]=(0,o.useState)(k()),s="site"===t?0:t,p=function(e){return _(".apfmd__button-group .components-button",b(e?.elements?.link?.color?.text)||"#111","#fff",b(e?.elements?.link?.[":hover"]?.color?.text)||"#333")}(r),m=a?{id:l}:{};function d(e){u(k(e))}return(0,o.useEffect)((()=>{(function(e){const t={headers:{Accept:"application/activity+json"},path:`/${E}/users/${e}`};return i()(t)})(s).then(d)}),[s]),(0,o.createElement)("div",m,(0,o.createElement)(h,{selector:`#${l}`,style:r,backgroundColor:n}),(0,o.createElement)(O,{profile:c,userId:s,popupStyles:p}))}let $=1;a()((()=>{[].forEach.call(document.querySelectorAll(".activitypub-follow-me-block-wrapper"),(e=>{const t=JSON.parse(e.dataset.attrs);(0,o.render)((0,o.createElement)(S,n({},t,{id:"activitypub-follow-me-block-"+$++,useId:!0})),e)}))}))}},r={};function n(e){var o=r[e];if(void 0!==o)return o.exports;var l=r[e]={exports:{}};return t[e](l,l.exports,n),l.exports}n.m=t,e=[],n.O=(t,r,o,l)=>{if(!r){var a=1/0;for(s=0;s=l)&&Object.keys(n.O).every((e=>n.O[e](r[i])))?r.splice(i--,1):(c=!1,l0&&e[s-1][2]>l;s--)e[s]=e[s-1];e[s]=[r,o,l]},n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={529:0,740:0};n.O.j=t=>0===e[t];var t=(t,r)=>{var o,l,[a,c,i]=r,u=0;if(a.some((t=>0!==e[t]))){for(o in c)n.o(c,o)&&(n.m[o]=c[o]);if(i)var s=i(n)}for(t&&t(r);un(810)));o=n.O(o)})();
\ No newline at end of file
diff --git a/build/followers/block.json b/build/followers/block.json
new file mode 100644
index 000000000..c7015d334
--- /dev/null
+++ b/build/followers/block.json
@@ -0,0 +1,57 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "name": "activitypub/followers",
+ "apiVersion": 3,
+ "version": "1.0.0",
+ "title": "Fediverse Followers",
+ "category": "widgets",
+ "description": "Display your followers from the Fediverse on your website.",
+ "textdomain": "activitypub",
+ "icon": "groups",
+ "supports": {
+ "html": false
+ },
+ "attributes": {
+ "title": {
+ "type": "string",
+ "default": "Fediverse Followers"
+ },
+ "selectedUser": {
+ "type": "string",
+ "default": "site"
+ },
+ "per_page": {
+ "type": "number",
+ "default": 10
+ },
+ "order": {
+ "type": "string",
+ "default": "desc",
+ "enum": [
+ "asc",
+ "desc"
+ ]
+ }
+ },
+ "styles": [
+ {
+ "name": "default",
+ "label": "No Lines",
+ "isDefault": true
+ },
+ {
+ "name": "with-lines",
+ "label": "Lines"
+ },
+ {
+ "name": "compact",
+ "label": "Compact"
+ }
+ ],
+ "editorScript": "file:./index.js",
+ "viewScript": "file:./view.js",
+ "style": [
+ "file:./style-view.css",
+ "wp-block-query-pagination"
+ ]
+}
\ No newline at end of file
diff --git a/build/followers/index.asset.php b/build/followers/index.asset.php
new file mode 100644
index 000000000..da1854a0d
--- /dev/null
+++ b/build/followers/index.asset.php
@@ -0,0 +1 @@
+ array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => '423cdeefa42e7c7cabd1');
diff --git a/build/followers/index.js b/build/followers/index.js
new file mode 100644
index 000000000..1685162a0
--- /dev/null
+++ b/build/followers/index.js
@@ -0,0 +1,3 @@
+(()=>{var e={184:(e,t)=>{var a;!function(){"use strict";var n={}.hasOwnProperty;function l(){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 n in t)a.o(t,n)&&!a.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},a.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{"use strict";const e=window.wp.blocks,t=window.wp.element,n=window.wp.primitives,l=(0,t.createElement)(n.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24"},(0,t.createElement)(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"}));function r(){return r=Object.assign?Object.assign.bind():function(e){for(var t=1;t{e.preventDefault(),!a&&r(l)}},n)}const d={outlined:"outlined",minimal:"minimal"};function g(e){let{compact:a,nextLabel:n,page:l,pageClick:r,perPage:o,prevLabel:i,total:c,variant:s=d.outlined}=e;const p=((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,n)=>e>=1&&e<=t&&n.lastIndexOf(e)===a));for(let e=a.length-2;e>=0;e--)a[e]===a[e+1]&&a.splice(e+1,1);return a})(l,Math.ceil(c/o)),u=b()("alignwide wp-block-query-pagination is-content-justification-space-between is-layout-flex wp-block-query-pagination-is-layout-flex",`is-${s}`,{"is-compact":a});return(0,t.createElement)("nav",{className:u},i&&(0,t.createElement)(w,{key:"prev",page:l-1,pageClick:r,active:1===l,"aria-label":i,className:"wp-block-query-pagination-previous block-editor-block-list__block"},i),!a&&(0,t.createElement)("div",{className:"block-editor-block-list__block wp-block wp-block-query-pagination-numbers"},p.map((e=>(0,t.createElement)(w,{key:e,page:e,pageClick:r,active:e===l,className:"page-numbers"},e)))),n&&(0,t.createElement)(w,{key:"next",page:l+1,pageClick:r,active:l===Math.ceil(c/o),"aria-label":n,className:"wp-block-query-pagination-next block-editor-block-list__block"},n))}const{namespace:f}=window._activityPubOptions;function y(e){let{selectedUser:a,per_page:n,order:l,title:o,page:i,setPage:p,className:m="",followLinks:b=!0}=e;const w="site"===a?0:a,[d,y]=(0,s.useState)([]),[k,E]=(0,s.useState)(0),[_,x]=(0,s.useState)(0),[C,S]=function(){const[e,t]=(0,s.useState)(1);return[e,t]}(),O=i||C,N=p||S,P=(0,t.createInterpolateElement)(/* translators: arrow for previous followers link */
+(0,c.__)("← Less","activitypub"),{span:(0,t.createElement)("span",{class:"wp-block-query-pagination-previous-arrow is-arrow-arrow","aria-hidden":"true"})}),L=(0,t.createInterpolateElement)(/* translators: arrow for next followers link */
+(0,c.__)("More → ","activitypub"),{span:(0,t.createElement)("span",{class:"wp-block-query-pagination-next-arrow is-arrow-arrow","aria-hidden":"true"})});return(0,s.useEffect)((()=>{const e=function(e,t,a,n){const l=`/${f}/users/${e}/followers`,r={per_page:t,order:a,page:n,context:"full"};return(0,v.addQueryArgs)(l,r)}(w,n,l,O);u()({path:e}).then((e=>{E(Math.ceil(e.totalItems/n)),x(e.totalItems),y(e.orderedItems)})).catch((()=>{}))}),[w,n,l,O]),(0,t.createElement)("div",{className:"activitypub-follower-block "+m},(0,t.createElement)("h3",null,o),(0,t.createElement)("ul",null,d&&d.map((e=>(0,t.createElement)("li",{key:e.url},(0,t.createElement)(h,r({},e,{followLinks:b})))))),k>1&&(0,t.createElement)(g,{page:O,perPage:n,total:_,pageClick:N,nextLabel:L,prevLabel:P,compact:"is-style-compact"===m}))}function h(e){let{name:a,icon:n,url:l,preferredUsername:i,followLinks:c=!0}=e;const s=`@${i}`,p={};return c||(p.onClick=e=>e.preventDefault()),(0,t.createElement)(o.ExternalLink,r({className:"activitypub-link",href:l,title:s},p),(0,t.createElement)("img",{width:"40",height:"40",src:n.url,class:"avatar activitypub-avatar"}),(0,t.createElement)("span",{class:"activitypub-actor"},(0,t.createElement)("strong",{className:"activitypub-name"},a),(0,t.createElement)("span",{class:"sep"},"/"),(0,t.createElement)("span",{class:"activitypub-handle"},s)))}const k=window.wp.data,E=window._activityPubOptions?.enabled;(0,e.registerBlockType)("activitypub/followers",{edit:function(e){let{attributes:a,setAttributes:n}=e;const{order:l,per_page:s,selectedUser:p,title:u}=a,v=(0,i.useBlockProps)(),[m,b]=(0,t.useState)(1),w=[{label:(0,c.__)("New to old","activitypub"),value:"desc"},{label:(0,c.__)("Old to new","activitypub"),value:"asc"}],d=function(){const e=E?.users?(0,k.useSelect)((e=>e("core").getUsers({who:"authors"}))):[];return(0,t.useMemo)((()=>{if(!e)return[];const t=E?.site?[{label:(0,c.__)("Whole Site","activitypub"),value:"site"}]:[];return e.reduce(((e,t)=>(e.push({label:t.name,value:`${t.id}`}),e)),t)}),[e])}(),g=e=>t=>{b(1),n({[e]:t})};return(0,t.useEffect)((()=>{d.length&&(d.find((e=>{let{value:t}=e;return t===p}))||n({selectedUser:d[0].value}))}),[p,d]),(0,t.createElement)("div",v,(0,t.createElement)(i.InspectorControls,{key:"setting"},(0,t.createElement)(o.PanelBody,{title:(0,c.__)("Followers Options","activitypub")},(0,t.createElement)(o.TextControl,{label:(0,c.__)("Title","activitypub"),help:(0,c.__)("Title to display above the list of followers. Blank for none.","activitypub"),value:u,onChange:e=>n({title:e})}),(0,t.createElement)(o.SelectControl,{label:(0,c.__)("Select User","activitypub"),value:p,options:d,onChange:g("selectedUser")}),(0,t.createElement)(o.SelectControl,{label:(0,c.__)("Sort","activitypub"),value:l,options:w,onChange:g("order")}),(0,t.createElement)(o.RangeControl,{label:(0,c.__)("Number of Followers","activitypub"),value:s,onChange:g("per_page"),min:1,max:10}))),(0,t.createElement)(y,r({},a,{page:m,setPage:b,followLinks:!1})))},save:()=>null,icon:l})})()})();
\ No newline at end of file
diff --git a/build/followers/style-view.css b/build/followers/style-view.css
new file mode 100644
index 000000000..824879e9e
--- /dev/null
+++ b/build/followers/style-view.css
@@ -0,0 +1 @@
+.activitypub-follower-block.is-style-compact .activitypub-handle,.activitypub-follower-block.is-style-compact .sep{display:none}.activitypub-follower-block.is-style-with-lines ul li{border-bottom:.5px solid;margin-bottom:.5rem;padding-bottom:.5rem}.activitypub-follower-block.is-style-with-lines ul li:last-child{border-bottom:none}.activitypub-follower-block.is-style-with-lines .activitypub-handle,.activitypub-follower-block.is-style-with-lines .activitypub-name{text-decoration:none}.activitypub-follower-block.is-style-with-lines .activitypub-handle:hover,.activitypub-follower-block.is-style-with-lines .activitypub-name:hover{text-decoration:underline}.activitypub-follower-block ul{margin:0!important;padding:0!important}.activitypub-follower-block li{display:flex;margin-bottom:1rem}.activitypub-follower-block img{border-radius:50%;height:40px;margin-right:var(--wp--preset--spacing--20,.5rem);width:40px}.activitypub-follower-block .activitypub-link{align-items:center;color:inherit!important;display:flex;flex-flow:row nowrap;max-width:100%;text-decoration:none!important}.activitypub-follower-block .activitypub-handle,.activitypub-follower-block .activitypub-name{text-decoration:underline;text-decoration-thickness:.8px;text-underline-position:under}.activitypub-follower-block .activitypub-handle:hover,.activitypub-follower-block .activitypub-name:hover{text-decoration:none}.activitypub-follower-block .activitypub-name{font-size:var(--wp--preset--font-size--normal,16px)}.activitypub-follower-block .activitypub-actor{font-size:var(--wp--preset--font-size--small,13px);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.activitypub-follower-block .sep{padding:0 .2rem}.activitypub-follower-block .wp-block-query-pagination{margin-top:1.5rem}.activitypub-follower-block .activitypub-pager{cursor:default}.activitypub-follower-block .activitypub-pager.current{opacity:.33}.activitypub-follower-block .page-numbers{padding:0 .2rem}.activitypub-follower-block .page-numbers.current{font-weight:700;opacity:1}
diff --git a/build/followers/view.asset.php b/build/followers/view.asset.php
new file mode 100644
index 000000000..32ae6d5bf
--- /dev/null
+++ b/build/followers/view.asset.php
@@ -0,0 +1 @@
+ array('react', 'wp-api-fetch', 'wp-components', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '6384e801c2802d2fecee');
diff --git a/build/followers/view.js b/build/followers/view.js
new file mode 100644
index 000000000..29367a871
--- /dev/null
+++ b/build/followers/view.js
@@ -0,0 +1,3 @@
+(()=>{var e,t={189:(e,t,a)=>{"use strict";const r=window.wp.element;function n(){return n=Object.assign?Object.assign.bind():function(e){for(var t=1;t{e.preventDefault(),!t&&l(n)}},a)}const v={outlined:"outlined",minimal:"minimal"};function b(e){let{compact:t,nextLabel:a,page:n,pageClick:l,perPage:i,prevLabel:o,total:c,variant:s=v.outlined}=e;const p=((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})(n,Math.ceil(c/i)),b=u()("alignwide wp-block-query-pagination is-content-justification-space-between is-layout-flex wp-block-query-pagination-is-layout-flex",`is-${s}`,{"is-compact":t});return(0,r.createElement)("nav",{className:b},o&&(0,r.createElement)(m,{key:"prev",page:n-1,pageClick:l,active:1===n,"aria-label":o,className:"wp-block-query-pagination-previous block-editor-block-list__block"},o),!t&&(0,r.createElement)("div",{className:"block-editor-block-list__block wp-block wp-block-query-pagination-numbers"},p.map((e=>(0,r.createElement)(m,{key:e,page:e,pageClick:l,active:e===n,className:"page-numbers"},e)))),a&&(0,r.createElement)(m,{key:"next",page:n+1,pageClick:l,active:n===Math.ceil(c/i),"aria-label":a,className:"wp-block-query-pagination-next block-editor-block-list__block"},a))}const f=window.wp.components,{namespace:d}=window._activityPubOptions;function w(e){let{selectedUser:t,per_page:a,order:i,title:p,page:u,setPage:m,className:v="",followLinks:f=!0}=e;const w="site"===t?0:t,[y,k]=(0,l.useState)([]),[h,E]=(0,l.useState)(0),[O,x]=(0,l.useState)(0),[_,N]=function(){const[e,t]=(0,l.useState)(1);return[e,t]}(),j=u||_,S=m||N,C=(0,r.createInterpolateElement)(/* translators: arrow for previous followers link */
+(0,s.__)("← Less","activitypub"),{span:(0,r.createElement)("span",{class:"wp-block-query-pagination-previous-arrow is-arrow-arrow","aria-hidden":"true"})}),L=(0,r.createInterpolateElement)(/* translators: arrow for next followers link */
+(0,s.__)("More → ","activitypub"),{span:(0,r.createElement)("span",{class:"wp-block-query-pagination-next-arrow is-arrow-arrow","aria-hidden":"true"})});return(0,l.useEffect)((()=>{const e=function(e,t,a,r){const n=`/${d}/users/${e}/followers`,l={per_page:t,order:a,page:r,context:"full"};return(0,c.addQueryArgs)(n,l)}(w,a,i,j);o()({path:e}).then((e=>{E(Math.ceil(e.totalItems/a)),x(e.totalItems),k(e.orderedItems)})).catch((()=>{}))}),[w,a,i,j]),(0,r.createElement)("div",{className:"activitypub-follower-block "+v},(0,r.createElement)("h3",null,p),(0,r.createElement)("ul",null,y&&y.map((e=>(0,r.createElement)("li",{key:e.url},(0,r.createElement)(g,n({},e,{followLinks:f})))))),h>1&&(0,r.createElement)(b,{page:j,perPage:a,total:O,pageClick:S,nextLabel:L,prevLabel:C,compact:"is-style-compact"===v}))}function g(e){let{name:t,icon:a,url:l,preferredUsername:i,followLinks:o=!0}=e;const c=`@${i}`,s={};return o||(s.onClick=e=>e.preventDefault()),(0,r.createElement)(f.ExternalLink,n({className:"activitypub-link",href:l,title:c},s),(0,r.createElement)("img",{width:"40",height:"40",src:a.url,class:"avatar activitypub-avatar"}),(0,r.createElement)("span",{class:"activitypub-actor"},(0,r.createElement)("strong",{className:"activitypub-name"},t),(0,r.createElement)("span",{class:"sep"},"/"),(0,r.createElement)("span",{class:"activitypub-handle"},c)))}const y=window.wp.domReady;a.n(y)()((()=>{[].forEach.call(document.querySelectorAll(".activitypub-follower-block"),(e=>{const t=JSON.parse(e.dataset.attrs);(0,r.render)((0,r.createElement)(w,t),e)}))}))},184:(e,t)=>{var a;!function(){"use strict";var r={}.hasOwnProperty;function n(){for(var e=[],t=0;t{if(!a){var i=1/0;for(p=0;p=l)&&Object.keys(r.O).every((e=>r.O[e](a[c])))?a.splice(c--,1):(o=!1,l0&&e[p-1][2]>l;p--)e[p]=e[p-1];e[p]=[a,n,l]},r.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return r.d(t,{a:t}),t},r.d=(e,t)=>{for(var a in t)r.o(t,a)&&!r.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:t[a]})},r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={638:0,962:0};r.O.j=t=>0===e[t];var t=(t,a)=>{var n,l,[i,o,c]=a,s=0;if(i.some((t=>0!==e[t]))){for(n in o)r.o(o,n)&&(r.m[n]=o[n]);if(c)var p=c(r)}for(t&&t(a);sr(189)));n=r.O(n)})();
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 67bd2d3ea..054226fd6 100644
--- a/composer.json
+++ b/composer.json
@@ -11,9 +11,11 @@
"phpcompatibility/php-compatibility": "*",
"phpcompatibility/phpcompatibility-wp": "*",
"squizlabs/php_codesniffer": "3.*",
- "wp-coding-standards/wpcs": "*",
- "yoast/phpunit-polyfills": "^1.0",
- "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1"
+ "wp-coding-standards/wpcs": "dev-develop",
+ "yoast/phpunit-polyfills": "^2.0",
+ "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
+ "sirbrillig/phpcs-variable-analysis": "^2.11",
+ "phpcsstandards/phpcsextra": "^1.1.0"
},
"config": {
"allow-plugins": true
@@ -36,6 +38,12 @@
"composer install",
"bin/install-wp-tests.sh activitypub-test root activitypub-test test-db latest true",
"vendor/bin/phpunit"
+ ],
+ "lint": [
+ "vendor/bin/phpcs -n -q"
+ ],
+ "lint:fix": [
+ "vendor/bin/phpcbf"
]
}
}
diff --git a/docker-compose-test.yml b/docker-compose-test.yml
index 4c69e44c8..411f3fdd1 100644
--- a/docker-compose-test.yml
+++ b/docker-compose-test.yml
@@ -6,11 +6,19 @@ services:
environment:
MYSQL_DATABASE: activitypub-test
MYSQL_ROOT_PASSWORD: activitypub-test
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://localhost:3306"]
+ interval: 5s
+ timeout: 2s
+ retries: 5
test-php:
build:
context: .
dockerfile: Dockerfile
+ depends_on:
+ test-db:
+ condition: service_healthy
links:
- test-db
volumes:
diff --git a/includes/activity/class-activity.php b/includes/activity/class-activity.php
new file mode 100644
index 000000000..6c598662a
--- /dev/null
+++ b/includes/activity/class-activity.php
@@ -0,0 +1,223 @@
+ 'as:manuallyApprovesFollowers',
+ 'PropertyValue' => 'schema:PropertyValue',
+ 'schema' => 'http://schema.org#',
+ 'pt' => 'https://joinpeertube.org/ns#',
+ 'toot' => 'http://joinmastodon.org/ns#',
+ 'webfinger' => 'https://webfinger.net/#',
+ 'litepub' => 'http://litepub.social/ns#',
+ 'lemmy' => 'https://join-lemmy.org/ns#',
+ 'value' => 'schema:value',
+ 'Hashtag' => 'as:Hashtag',
+ 'featured' => array(
+ '@id' => 'toot:featured',
+ '@type' => '@id',
+ ),
+ 'featuredTags' => array(
+ '@id' => 'toot:featuredTags',
+ '@type' => '@id',
+ ),
+ 'alsoKnownAs' => array(
+ '@id' => 'as:alsoKnownAs',
+ '@type' => '@id',
+ ),
+ 'moderators' => array(
+ '@id' => 'lemmy:moderators',
+ '@type' => '@id',
+ ),
+ 'postingRestrictedToMods' => 'lemmy:postingRestrictedToMods',
+ 'discoverable' => 'toot:discoverable',
+ 'indexable' => 'toot:indexable',
+ 'sensitive' => 'as:sensitive',
+ 'resource' => 'webfinger:resource',
+ ),
+ );
+
+ /**
+ * The object's unique global identifier
+ *
+ * @see https://www.w3.org/TR/activitypub/#obj-id
+ *
+ * @var string
+ */
+ protected $id;
+
+ /**
+ * @var string
+ */
+ protected $type = 'Activity';
+
+ /**
+ * The context within which the object exists or an activity was
+ * performed.
+ * The notion of "context" used is intentionally vague.
+ * The intended function is to serve as a means of grouping objects
+ * and activities that share a common originating context or
+ * purpose. An example could be all activities relating to a common
+ * project or event.
+ *
+ * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-context
+ *
+ * @var string
+ * | ObjectType
+ * | Link
+ * | null
+ */
+ protected $context = self::CONTEXT;
+
+ /**
+ * Describes the direct object of the activity.
+ * For instance, in the activity "John added a movie to his
+ * wishlist", the object of the activity is the movie added.
+ *
+ * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-object-term
+ *
+ * @var string
+ * | Base_Objectr
+ * | Link
+ * | null
+ */
+ protected $object;
+
+ /**
+ * Describes one or more entities that either performed or are
+ * expected to perform the activity.
+ * Any single activity can have multiple actors.
+ * The actor MAY be specified using an indirect Link.
+ *
+ * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-actor
+ *
+ * @var string
+ * | \ActivityPhp\Type\Extended\AbstractActor
+ * | array
+ * | array
+ * | Link
+ * | array
+ * | array
+ * | array
+ * | array
+ * | array
+ * | array
+ * | array|null
+ */
+ protected $summary_map;
+
+ /**
+ * One or more "tags" that have been associated with an objects.
+ * A tag can be any kind of Object.
+ * The key difference between attachment and tag is that the former
+ * implies association by inclusion, while the latter implies
+ * associated by reference.
+ *
+ * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-tag
+ *
+ * @var string
+ * | ObjectType
+ * | Link
+ * | array
+ * | array
+ * | Link
+ * | array
+ * | array
+ * | array
+ * | array
+ * | array%s
',
+ wp_kses(
+ wpautop( $data['upgrade_notice '] ),
+ array(
+ 'p' => array(),
+ 'a' => array( 'href', 'title' ),
+ 'strong' => array(),
+ 'em' => array(),
+ )
+ )
+ );
+ }
}
diff --git a/includes/class-admin.php b/includes/class-admin.php
index e98d54791..2771d76f7 100644
--- a/includes/class-admin.php
+++ b/includes/class-admin.php
@@ -11,10 +11,14 @@ class Admin {
* Initialize the class, registering WordPress hooks
*/
public static function init() {
- \add_action( 'admin_menu', array( '\Activitypub\Admin', 'admin_menu' ) );
- \add_action( 'admin_init', array( '\Activitypub\Admin', 'register_settings' ) );
- \add_action( 'show_user_profile', array( '\Activitypub\Admin', 'add_fediverse_profile' ) );
- \add_action( 'admin_enqueue_scripts', array( '\Activitypub\Admin', 'enqueue_scripts' ) );
+ \add_action( 'admin_menu', array( self::class, 'admin_menu' ) );
+ \add_action( 'admin_init', array( self::class, 'register_settings' ) );
+ \add_action( 'personal_options_update', array( self::class, 'save_user_description' ) );
+ \add_action( 'admin_enqueue_scripts', array( self::class, 'enqueue_scripts' ) );
+
+ if ( ! is_user_disabled( get_current_user_id() ) ) {
+ \add_action( 'show_user_profile', array( self::class, 'add_profile' ) );
+ }
}
/**
@@ -26,14 +30,17 @@ public static function admin_menu() {
'ActivityPub',
'manage_options',
'activitypub',
- array( '\Activitypub\Admin', 'settings_page' )
+ array( self::class, 'settings_page' )
);
- \add_action( 'load-' . $settings_page, array( '\Activitypub\Admin', 'add_settings_help_tab' ) );
+ \add_action( 'load-' . $settings_page, array( self::class, 'add_settings_help_tab' ) );
- $followers_list_page = \add_users_page( \__( 'Followers', 'activitypub' ), \__( 'Followers (Fediverse)', 'activitypub' ), 'read', 'activitypub-followers-list', array( '\Activitypub\Admin', 'followers_list_page' ) );
+ // user has to be able to publish posts
+ if ( ! is_user_disabled( get_current_user_id() ) ) {
+ $followers_list_page = \add_users_page( \__( 'Followers', 'activitypub' ), \__( 'Followers', 'activitypub' ), 'read', 'activitypub-followers-list', array( self::class, 'followers_list_page' ) );
- \add_action( 'load-' . $followers_list_page, array( '\Activitypub\Admin', 'add_followers_list_help_tab' ) );
+ \add_action( 'load-' . $followers_list_page, array( self::class, 'add_followers_list_help_tab' ) );
+ }
}
/**
@@ -50,9 +57,10 @@ public static function settings_page() {
switch ( $tab ) {
case 'settings':
- \Activitypub\Model\Post::upgrade_post_content_template();
-
- \load_template( \dirname( __FILE__ ) . '/../templates/settings.php' );
+ \load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/settings.php' );
+ break;
+ case 'followers':
+ \load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/blog-user-followers-list.php' );
break;
case 'welcome':
default:
@@ -60,7 +68,7 @@ public static function settings_page() {
add_thickbox();
wp_enqueue_script( 'updates' );
- \load_template( \dirname( __FILE__ ) . '/../templates/welcome.php' );
+ \load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/welcome.php' );
break;
}
}
@@ -69,7 +77,10 @@ public static function settings_page() {
* Load user settings page
*/
public static function followers_list_page() {
- \load_template( \dirname( __FILE__ ) . '/../templates/followers-list.php' );
+ // 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' );
+ }
}
/**
@@ -84,7 +95,11 @@ public static function register_settings() {
'description' => \__( 'Use title and link, summary, full or custom content', 'activitypub' ),
'show_in_rest' => array(
'schema' => array(
- 'enum' => array( 'title', 'excerpt', 'content' ),
+ 'enum' => array(
+ 'title',
+ 'excerpt',
+ 'content',
+ ),
),
),
'default' => 'content',
@@ -117,7 +132,11 @@ public static function register_settings() {
'description' => \__( 'The Activity-Object-Type', 'activitypub' ),
'show_in_rest' => array(
'schema' => array(
- 'enum' => array( 'note', 'article', 'wordpress-post-format' ),
+ 'enum' => array(
+ 'note',
+ 'article',
+ 'wordpress-post-format',
+ ),
),
),
'default' => 'note',
@@ -129,7 +148,7 @@ public static function register_settings() {
array(
'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(
@@ -142,21 +161,82 @@ public static function register_settings() {
'default' => array( 'post', 'pages' ),
)
);
+ \register_setting(
+ 'activitypub',
+ 'activitypub_blog_user_identifier',
+ array(
+ 'type' => 'string',
+ 'description' => \esc_html__( 'The Identifier of the Blog-User', 'activitypub' ),
+ 'show_in_rest' => true,
+ 'default' => \Activitypub\Model\Blog_User::get_default_username(),
+ 'sanitize_callback' => function( $value ) {
+ // hack to allow dots in the username
+ $parts = explode( '.', $value );
+ $sanitized = array();
+
+ foreach ( $parts as $part ) {
+ $sanitized[] = \sanitize_title( $part );
+ }
+
+ return implode( '.', $sanitized );
+ },
+ )
+ );
+ \register_setting(
+ 'activitypub',
+ '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',
+ )
+ );
}
public static function add_settings_help_tab() {
- require_once \dirname( __FILE__ ) . '/help.php';
+ require_once ACTIVITYPUB_PLUGIN_DIR . 'includes/help.php';
}
public static function add_followers_list_help_tab() {
// todo
}
- public static function add_fediverse_profile( $user ) {
- ?>
-
';
+ }
+
+ public static function render_follower_block( $attrs ) {
+ $followee_user_id = self::get_user_id( $attrs['selectedUser'] );
+ $per_page = absint( $attrs['per_page'] );
+ $followers = Followers::get_followers( $followee_user_id, $per_page );
+ $title = $attrs['title'];
+ $wrapper_attributes = get_block_wrapper_attributes(
+ array(
+ 'aria-label' => __( 'Fediverse Followers', 'activitypub' ),
+ 'class' => 'activitypub-follower-block',
+ 'data-attrs' => wp_json_encode( $attrs ),
+ )
+ );
+
+ $html = '';
+ if ( $title ) {
+ $html .= '
' . $title . ' ';
+ }
+ $html .= '
';
+ foreach ( $followers as $follower ) {
+ $html .= '' . self::render_follower( $follower ) . ' ';
+ }
+ // We are only pagination on the JS side. Could be revisited but we gotta ship!
+ $html .= '
+
+ %s
+ /
+ @%s
+
+ %s
+ ';
+
+ $data = $follower->to_array();
+
+ return sprintf(
+ $template,
+ esc_url( $data['url'] ),
+ esc_attr( $data['name'] ),
+ esc_attr( $data['icon']['url'] ),
+ esc_html( $data['name'] ),
+ esc_html( $data['preferredUsername'] ),
+ $external_svg
+ );
+ }
+}
diff --git a/includes/class-debug.php b/includes/class-debug.php
index 767d4a9c9..36f8bda52 100644
--- a/includes/class-debug.php
+++ b/includes/class-debug.php
@@ -1,6 +1,9 @@
#is',
- $protect,
- $the_content
- );
- $the_content = preg_replace_callback(
- '#<(pre|code|textarea|style)\b[^>]*>.*?]*>#is',
- $protect,
- $the_content
- );
- $the_content = preg_replace_callback(
- '#<[^>]+>#i',
- $protect,
- $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;
+ }
- $the_content = \preg_replace_callback( '/' . ACTIVITYPUB_HASHTAGS_REGEXP . '/i', array( '\Activitypub\Hashtag', 'replace_with_links' ), $the_content );
+ // 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 );
- $the_content = str_replace( array_reverse( array_keys( $protected_tags ) ), array_reverse( array_values( $protected_tags ) ), $the_content );
+ // 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 $the_content;
+ return $content_with_links;
}
/**
@@ -85,7 +107,7 @@ public static function replace_with_links( $result ) {
if ( $tag_object ) {
$link = \get_term_link( $tag_object, 'post_tag' );
- return \sprintf( '#%s ', $link, $tag );
+ return \sprintf( '#%s ', $link, $tag );
}
return '#' . $tag;
diff --git a/includes/class-health-check.php b/includes/class-health-check.php
index 248d26060..a85b28abf 100644
--- a/includes/class-health-check.php
+++ b/includes/class-health-check.php
@@ -1,6 +1,12 @@
\__( 'Author URL test', 'activitypub' ),
- 'test' => array( '\Activitypub\Health_Check', 'test_author_url' ),
+ 'test' => array( self::class, 'test_author_url' ),
);
$tests['direct']['activitypub_test_webfinger'] = array(
'label' => __( 'WebFinger Test', 'activitypub' ),
- 'test' => array( '\Activitypub\Health_Check', 'test_webfinger' ),
+ 'test' => array( self::class, 'test_webfinger' ),
+ );
+
+ $tests['direct']['activitypub_test_system_cron'] = array(
+ 'label' => __( 'System Cron Test', 'activitypub' ),
+ 'test' => array( self::class, 'test_system_cron' ),
);
return $tests;
@@ -70,6 +81,42 @@ public static function test_author_url() {
return $result;
}
+ /**
+ * System Cron tests
+ *
+ * @return array
+ */
+ public static function test_system_cron() {
+ $result = array(
+ 'label' => \__( 'System Task Scheduler configured', 'activitypub' ),
+ 'status' => 'good',
+ 'badge' => array(
+ 'label' => \__( 'ActivityPub', 'activitypub' ),
+ 'color' => 'green',
+ ),
+ 'description' => \sprintf(
+ '%s
',
+ \esc_html__( 'You seem to use the System Task Scheduler to process WP_Cron tasks.', 'activitypub' )
+ ),
+ 'actions' => '',
+ 'test' => 'test_system_cron',
+ );
+
+ if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) {
+ return $result;
+ }
+
+ $result['status'] = 'recommended';
+ $result['label'] = \__( 'System Task Scheduler not configured', 'activitypub' );
+ $result['badge']['color'] = 'orange';
+ $result['description'] = \sprintf(
+ '%s
',
+ \__( 'It is highly recommended to use your Systems Task Scheduler instead of the default WP_Cron setup. For further informations, check the "Hooking WP-Cron Into the System Task Scheduler " guide from the Plugin Handbook.', 'activitypub' )
+ );
+
+ return $result;
+ }
+
/**
* WebFinger tests
*
@@ -111,7 +158,7 @@ public static function test_webfinger() {
/**
* Check if `author_posts_url` is accessible and that request returns correct JSON
*
- * @return boolean|\WP_Error
+ * @return boolean|WP_Error
*/
public static function is_author_url_accessible() {
$user = \wp_get_current_user();
@@ -120,12 +167,12 @@ public static function is_author_url_accessible() {
// check for "author" in URL
if ( $author_url !== $reference_author_url ) {
- return new \WP_Error(
+ return new WP_Error(
'author_url_not_accessible',
\sprintf(
// translators: %s: Author URL
\__(
- 'Your author URL %s was replaced, this is often done by plugins.
',
+ 'Your author URL %s was replaced, this is often done by plugins.',
'activitypub'
),
$author_url
@@ -143,12 +190,12 @@ public static function is_author_url_accessible() {
);
if ( \is_wp_error( $response ) ) {
- return new \WP_Error(
+ return new WP_Error(
'author_url_not_accessible',
\sprintf(
// 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.
',
+ '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'
),
$author_url
@@ -160,12 +207,12 @@ public static function is_author_url_accessible() {
// check for redirects
if ( \in_array( $response_code, array( 301, 302, 307, 308 ), true ) ) {
- return new \WP_Error(
+ return new WP_Error(
'author_url_not_accessible',
\sprintf(
// translators: %s: Author URL
\__(
- 'Your author URL %s is redirecting to another page, this is often done by SEO plugins like "Yoast SEO".
',
+ 'Your author URL %s is redirecting to another page, this is often done by SEO plugins like "Yoast SEO".',
'activitypub'
),
$author_url
@@ -177,12 +224,12 @@ public static function is_author_url_accessible() {
$body = \wp_remote_retrieve_body( $response );
if ( ! \is_string( $body ) || ! \is_array( \json_decode( $body, true ) ) ) {
- return new \WP_Error(
+ return new WP_Error(
'author_url_not_accessible',
\sprintf(
// 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.
',
+ 'Your author URL %s does not return valid JSON for application/activity+json. Please check if your hosting supports alternate Accept headers.',
'activitypub'
),
$author_url
@@ -196,29 +243,40 @@ public static function is_author_url_accessible() {
/**
* Check if WebFinger endpoint is accessible and profile request returns correct JSON
*
- * @return boolean|\WP_Error
+ * @return boolean|WP_Error
*/
public static function is_webfinger_endpoint_accessible() {
$user = \wp_get_current_user();
- $account = \Activitypub\get_webfinger_resource( $user->ID );
+ $account = get_webfinger_resource( $user->ID );
- $url = \Activitypub\Webfinger::resolve( $account );
+ $url = Webfinger::resolve( $account );
if ( \is_wp_error( $url ) ) {
+ $allowed = array( 'code' => array() );
+ $not_accessible = wp_kses(
+ // translators: %s: Author URL
+ \__(
+ 'Your WebFinger endpoint %s is not accessible. Please check your WordPress setup or permalink structure.',
+ 'activitypub'
+ ),
+ $allowed
+ );
+ $invalid_response = wp_kses(
+ // translators: %s: Author URL
+ \__(
+ 'Your WebFinger endpoint %s does not return valid JSON for application/jrd+json.',
+ 'activitypub'
+ ),
+ $allowed
+ );
+
$health_messages = array(
'webfinger_url_not_accessible' => \sprintf(
- // translators: %s: Author URL
- \__(
- 'Your WebFinger endpoint %s is not accessible. Please check your WordPress setup or permalink structure.
',
- 'activitypub'
- ),
+ $not_accessible,
$url->get_error_data()
),
'webfinger_url_invalid_response' => \sprintf(
// translators: %s: Author URL
- \__(
- 'Your WebFinger endpoint %s does not return valid JSON for application/jrd+json.
',
- 'activitypub'
- ),
+ $invalid_response,
$url->get_error_data()
),
);
@@ -226,7 +284,7 @@ public static function is_webfinger_endpoint_accessible() {
if ( isset( $health_messages[ $url->get_error_code() ] ) ) {
$message = $health_messages[ $url->get_error_code() ];
}
- return new \WP_Error(
+ return new WP_Error(
$url->get_error_code(),
$message,
$url->get_error_data()
@@ -280,7 +338,7 @@ public static function debug_information( $info ) {
'fields' => array(
'webfinger' => array(
'label' => __( 'WebFinger Resource', 'activitypub' ),
- 'value' => \Activitypub\Webfinger::get_user_resource( wp_get_current_user()->ID ),
+ 'value' => Webfinger::get_user_resource( wp_get_current_user()->ID ),
'private' => true,
),
'author_url' => array(
@@ -288,6 +346,11 @@ public static function debug_information( $info ) {
'value' => get_author_posts_url( wp_get_current_user()->ID ),
'private' => true,
),
+ 'plugin_version' => array(
+ 'label' => __( 'Plugin Version', 'activitypub' ),
+ 'value' => get_plugin_version(),
+ 'private' => true,
+ ),
),
);
diff --git a/includes/class-http.php b/includes/class-http.php
new file mode 100644
index 000000000..f9140bed5
--- /dev/null
+++ b/includes/class-http.php
@@ -0,0 +1,111 @@
+ 100,
+ 'limit_response_size' => 1048576,
+ 'redirection' => 3,
+ 'user-agent' => "$user_agent; ActivityPub",
+ 'headers' => array(
+ 'Accept' => 'application/activity+json',
+ 'Content-Type' => 'application/activity+json',
+ 'Digest' => $digest,
+ 'Signature' => $signature,
+ 'Date' => $date,
+ ),
+ 'body' => $body,
+ );
+
+ $response = \wp_safe_remote_post( $url, $args );
+ $code = \wp_remote_retrieve_response_code( $response );
+
+ if ( $code >= 400 ) {
+ $response = new WP_Error( $code, __( 'Failed HTTP Request', 'activitypub' ), array( 'status' => $code ) );
+ }
+
+ \do_action( 'activitypub_safe_remote_post_response', $response, $url, $body, $user_id );
+
+ return $response;
+ }
+
+ /**
+ * Send a GET Request with the needed HTTP Headers
+ *
+ * @param string $url The URL endpoint
+ * @param int $user_id The WordPress User-ID
+ *
+ * @return array|WP_Error The GET Response or an WP_ERROR
+ */
+ public static function get( $url ) {
+ do_action( 'activitypub_pre_http_get', $url );
+
+ $date = \gmdate( 'D, d M Y H:i:s T' );
+ $signature = Signature::generate_signature( Users::APPLICATION_USER_ID, 'get', $url, $date );
+
+ $wp_version = \get_bloginfo( 'version' );
+
+ /**
+ * Filter the HTTP headers user agent.
+ *
+ * @param string $user_agent The user agent string.
+ */
+ $user_agent = \apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . \get_bloginfo( 'url' ) );
+
+ $args = array(
+ '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',
+ 'Content-Type' => 'application/activity+json',
+ 'Signature' => $signature,
+ 'Date' => $date,
+ ),
+ );
+
+ $response = \wp_safe_remote_get( $url, $args );
+ $code = \wp_remote_retrieve_response_code( $response );
+
+ if ( $code >= 400 ) {
+ $response = new WP_Error( $code, __( 'Failed HTTP Request', 'activitypub' ), array( 'status' => $code ) );
+ }
+
+ \do_action( 'activitypub_safe_remote_get_response', $response, $url );
+
+ return $response;
+ }
+}
diff --git a/includes/class-mention.php b/includes/class-mention.php
index 7c8672a4e..4aedfb0ba 100644
--- a/includes/class-mention.php
+++ b/includes/class-mention.php
@@ -1,6 +1,8 @@
#is',
- $protect,
- $the_content
- );
- $the_content = preg_replace_callback(
- '#<(pre|code|textarea|style)\b[^>]*>.*?]*>#is',
- $protect,
- $the_content
- );
- $the_content = preg_replace_callback(
- '#]+>.*? ' . $username . ' ';
- return \sprintf( '%s ', $metadata['url'], $username );
+ return \sprintf( '@%s ', esc_url( $metadata['url'] ), esc_html( $username ) );
}
return $result[0];
}
+ /**
+ * Get the Inboxes for the mentioned Actors
+ *
+ * @param array $mentioned The list of Actors that were mentioned
+ *
+ * @return array The list of Inboxes
+ */
+ public static function get_inboxes( $mentioned ) {
+ $inboxes = array();
+
+ foreach ( $mentioned as $actor ) {
+ $inbox = self::get_inbox_by_mentioned_actor( $actor );
+
+ if ( ! is_wp_error( $inbox ) && $inbox ) {
+ $inboxes[] = $inbox;
+ }
+ }
+
+ return $inboxes;
+ }
+
+ /**
+ * Get the inbox from the Remote-Profile of a mentioned Actor
+ *
+ * @param string $actor The Actor-URL
+ *
+ * @return string The Inbox-URL
+ */
+ public static function get_inbox_by_mentioned_actor( $actor ) {
+ $metadata = get_remote_metadata_by_actor( $actor );
+
+ if ( \is_wp_error( $metadata ) ) {
+ return $metadata;
+ }
+
+ if ( isset( $metadata['endpoints'] ) && isset( $metadata['endpoints']['sharedInbox'] ) ) {
+ return $metadata['endpoints']['sharedInbox'];
+ }
+
+ if ( \array_key_exists( 'inbox', $metadata ) ) {
+ return $metadata['inbox'];
+ }
+
+ return new WP_Error( 'activitypub_no_inbox', \__( 'No "Inbox" found', 'activitypub' ), $metadata );
+ }
+
/**
* Extract the mentions from the post_content.
*
* @param array $mentions The already found mentions.
* @param string $post_content The post content.
+ *
* @return mixed The discovered mentions.
*/
public static function extract_mentions( $mentions, $post_content ) {
\preg_match_all( '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/i', $post_content, $matches );
foreach ( $matches[0] as $match ) {
- $link = \Activitypub\Webfinger::resolve( $match );
+ $link = Webfinger::resolve( $match );
if ( ! is_wp_error( $link ) ) {
$mentions[ $match ] = $link;
}
}
return $mentions;
-
}
}
diff --git a/includes/class-migration.php b/includes/class-migration.php
new file mode 100644
index 000000000..cd13f8d2c
--- /dev/null
+++ b/includes/class-migration.php
@@ -0,0 +1,179 @@
+ 'ID' ) ) as $user_id ) {
+ $followers = get_user_meta( $user_id, 'activitypub_followers', true );
+
+ if ( $followers ) {
+ foreach ( $followers as $actor ) {
+ Followers::add_follower( $user_id, $actor );
+ }
+ }
+ }
+
+ Activitypub::flush_rewrite_rules();
+ }
+
+ /**
+ * Updates the custom template to use shortcodes instead of the deprecated templates.
+ *
+ * @return void
+ */
+ private static function migrate_from_0_16() {
+ // Get the custom template.
+ $old_content = \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT );
+
+ // If the old content exists but is a blank string, we're going to need a flag to updated it even
+ // after setting it to the default contents.
+ $need_update = false;
+
+ // If the old contents is blank, use the defaults.
+ if ( '' === $old_content ) {
+ $old_content = ACTIVITYPUB_CUSTOM_POST_CONTENT;
+ $need_update = true;
+ }
+
+ // Set the new content to be the old content.
+ $content = $old_content;
+
+ // Convert old templates to shortcodes.
+ $content = \str_replace( '%title%', '[ap_title]', $content );
+ $content = \str_replace( '%excerpt%', '[ap_excerpt]', $content );
+ $content = \str_replace( '%content%', '[ap_content]', $content );
+ $content = \str_replace( '%permalink%', '[ap_permalink type="html"]', $content );
+ $content = \str_replace( '%shortlink%', '[ap_shortlink type="html"]', $content );
+ $content = \str_replace( '%hashtags%', '[ap_hashtags]', $content );
+ $content = \str_replace( '%tags%', '[ap_hashtags]', $content );
+
+ // Store the new template if required.
+ if ( $content !== $old_content || $need_update ) {
+ \update_option( 'activitypub_custom_post_content', $content );
+ }
+ }
+}
diff --git a/includes/class-scheduler.php b/includes/class-scheduler.php
new file mode 100644
index 000000000..63f927325
--- /dev/null
+++ b/includes/class-scheduler.php
@@ -0,0 +1,169 @@
+post_type, $post_types, true ) ) {
+ return;
+ }
+
+ $type = false;
+
+ if ( 'publish' === $new_status && 'publish' !== $old_status ) {
+ $type = 'Create';
+ } elseif ( 'publish' === $new_status ) {
+ $type = 'Update';
+ } elseif ( 'trash' === $new_status ) {
+ $type = 'Delete';
+ }
+
+ if ( ! $type ) {
+ return;
+ }
+
+ \wp_schedule_single_event(
+ \time(),
+ 'activitypub_send_activity',
+ array( $post, $type )
+ );
+
+ \wp_schedule_single_event(
+ \time(),
+ sprintf(
+ 'activitypub_send_%s_activity',
+ \strtolower( $type )
+ ),
+ array( $post )
+ );
+ }
+
+ /**
+ * Update followers
+ *
+ * @return void
+ */
+ public static function update_followers() {
+ $number = 5;
+
+ if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) {
+ $number = 50;
+ }
+
+ $followers = Followers::get_outdated_followers( $number );
+
+ foreach ( $followers as $follower ) {
+ $meta = get_remote_metadata_by_actor( $follower->get_url(), false );
+
+ if ( empty( $meta ) || ! is_array( $meta ) || is_wp_error( $meta ) ) {
+ Followers::add_error( $follower->get__id(), $meta );
+ } else {
+ $follower->from_array( $meta );
+ $follower->update();
+ }
+ }
+ }
+
+ /**
+ * Cleanup followers
+ *
+ * @return void
+ */
+ public static function cleanup_followers() {
+ $number = 5;
+
+ if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) {
+ $number = 50;
+ }
+
+ $followers = Followers::get_faulty_followers( $number );
+
+ foreach ( $followers as $follower ) {
+ $meta = get_remote_metadata_by_actor( $follower->get_url(), false );
+
+ if ( is_tombstone( $meta ) ) {
+ $follower->delete();
+ } elseif ( empty( $meta ) || ! is_array( $meta ) || is_wp_error( $meta ) ) {
+ if ( $follower->count_errors() >= 5 ) {
+ $follower->delete();
+ } else {
+ Followers::add_error( $follower->get__id(), $meta );
+ }
+ } else {
+ $follower->reset_errors();
+ }
+ }
+ }
+
+ /**
+ * Schedule migration if DB-Version is not up to date.
+ *
+ * @return void
+ */
+ public static function schedule_migration() {
+ if ( ! \wp_next_scheduled( 'activitypub_schedule_migration' ) && ! Migration::is_latest_version() ) {
+ \wp_schedule_single_event( \time(), 'activitypub_schedule_migration' );
+ }
+ }
+}
diff --git a/includes/class-shortcodes.php b/includes/class-shortcodes.php
index 7289808d4..43be17b08 100644
--- a/includes/class-shortcodes.php
+++ b/includes/class-shortcodes.php
@@ -1,37 +1,42 @@
ID );
if ( ! $tags ) {
return '';
@@ -41,9 +46,9 @@ public static function hashtags( $atts, $content, $tag ) {
foreach ( $tags as $tag ) {
$hash_tags[] = \sprintf(
- '#%s ',
- \get_tag_link( $tag ),
- $tag->slug
+ '%s ',
+ \esc_url( \get_tag_link( $tag ) ),
+ esc_hashtag( $tag->name )
);
}
@@ -51,38 +56,37 @@ public static function hashtags( $atts, $content, $tag ) {
}
/**
- * Generates output for the ap_title shortcode
+ * Generates output for the 'ap_title' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The post title.
*/
public static function title( $atts, $content, $tag ) {
- $post_id = get_the_ID();
+ $item = self::get_item();
- if ( ! $post_id ) {
+ if ( ! $item ) {
return '';
}
- return \get_the_title( $post_id );
-
+ return \wp_strip_all_tags( \get_the_title( $item->ID ), true );
}
/**
- * Generates output for the ap_excerpt shortcode
+ * Generates output for the 'ap_excerpt' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The post excerpt.
*/
public static function excerpt( $atts, $content, $tag ) {
- $post = get_post();
+ $item = self::get_item();
- if ( ! $post || \post_password_required( $post ) ) {
+ if ( ! $item ) {
return '';
}
@@ -98,11 +102,11 @@ public static function excerpt( $atts, $content, $tag ) {
$excerpt_length = ACTIVITYPUB_EXCERPT_LENGTH;
}
- $excerpt = \get_post_field( 'post_excerpt', $post );
+ $excerpt = \get_post_field( 'post_excerpt', $item );
if ( '' === $excerpt ) {
- $content = \get_post_field( 'post_content', $post );
+ $content = \get_post_field( 'post_content', $item );
// An empty string will make wp_trim_excerpt do stuff we do not want.
if ( '' !== $content ) {
@@ -110,7 +114,7 @@ public static function excerpt( $atts, $content, $tag ) {
/** This filter is documented in wp-includes/post-template.php */
$excerpt = \apply_filters( 'the_content', $excerpt );
- $excerpt = \str_replace( ']]>', ']]>', $excerpt );
+ $excerpt = \str_replace( ']]>', ']]>', $excerpt );
}
}
@@ -174,28 +178,31 @@ public static function excerpt( $atts, $content, $tag ) {
}
/**
- * Generates output for the ap_content shortcode
+ * Generates output for the 'ap_content' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The post content.
*/
public static function content( $atts, $content, $tag ) {
- $post = get_post();
+ $item = self::get_item();
- if ( ! $post || \post_password_required( $post ) ) {
+ if ( ! $item ) {
return '';
}
+ // prevent inception
+ remove_shortcode( 'ap_content' );
+
$atts = shortcode_atts(
array( 'apply_filters' => 'yes' ),
$atts,
$tag
);
- $content = \get_post_field( 'post_content', $post );
+ $content = \get_post_field( 'post_content', $item );
if ( 'yes' === $atts['apply_filters'] ) {
$content = \apply_filters( 'the_content', $content );
@@ -207,25 +214,27 @@ public static function content( $atts, $content, $tag ) {
// replace script and style elements
$content = \preg_replace( '@<(script|style)[^>]*?>.*?@si', '', $content );
-
+ $content = strip_shortcodes( $content );
$content = \trim( \preg_replace( '/[\n\r\t]/', '', $content ) );
+ add_shortcode( 'ap_content', array( 'Activitypub\Shortcodes', 'content' ) );
+
return $content;
}
/**
- * Generates output for the ap_permalink shortcode
+ * Generates output for the 'ap_permalink' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The post permalink.
*/
public static function permalink( $atts, $content, $tag ) {
- $post = get_post();
+ $item = self::get_item();
- if ( ! $post ) {
+ if ( ! $item ) {
return '';
}
@@ -238,25 +247,28 @@ public static function permalink( $atts, $content, $tag ) {
);
if ( 'url' === $atts['type'] ) {
- return \esc_url( \get_permalink( $post->ID ) );
+ return \esc_url( \get_permalink( $item->ID ) );
}
- return \sprintf( '%1$s ', \esc_url( \get_permalink( $post->ID ) ) );
+ return \sprintf(
+ '%1$s ',
+ \esc_url( \get_permalink( $item->ID ) )
+ );
}
/**
- * Generates output for the ap_shortlink shortcode
+ * Generates output for the 'ap_shortlink' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The post shortlink.
*/
public static function shortlink( $atts, $content, $tag ) {
- $post = get_post();
+ $item = self::get_item();
- if ( ! $post ) {
+ if ( ! $item ) {
return '';
}
@@ -269,25 +281,28 @@ public static function shortlink( $atts, $content, $tag ) {
);
if ( 'url' === $atts['type'] ) {
- return \esc_url( \wp_get_shortlink( $post->ID ) );
+ return \esc_url( \wp_get_shortlink( $item->ID ) );
}
- return \sprintf( '%1$s ', \esc_url( \wp_get_shortlink( $post->ID ) ) );
+ return \sprintf(
+ '%1$s ',
+ \esc_url( \wp_get_shortlink( $item->ID ) )
+ );
}
/**
- * Generates output for the ap_image shortcode
+ * Generates output for the 'ap_image' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
* @return string
*/
public static function image( $atts, $content, $tag ) {
- $post_id = get_the_ID();
+ $item = self::get_item();
- if ( ! $post_id ) {
+ if ( ! $item ) {
return '';
}
@@ -309,7 +324,7 @@ public static function image( $atts, $content, $tag ) {
$size = $atts['type'];
}
- $image = \get_the_post_thumbnail_url( $post_id, $size );
+ $image = \get_the_post_thumbnail_url( $item->ID, $size );
if ( ! $image ) {
return '';
@@ -319,22 +334,22 @@ public static function image( $atts, $content, $tag ) {
}
/**
- * Generates output for the ap_hashcats shortcode
+ * Generates output for the 'ap_hashcats' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The post categories as hashtags.
*/
public static function hashcats( $atts, $content, $tag ) {
- $post_id = get_the_ID();
+ $item = self::get_item();
- if ( ! $post_id ) {
+ if ( ! $item ) {
return '';
}
- $categories = \get_the_category( $post_id );
+ $categories = \get_the_category( $item->ID );
if ( ! $categories ) {
return '';
@@ -343,54 +358,58 @@ public static function hashcats( $atts, $content, $tag ) {
$hash_tags = array();
foreach ( $categories as $category ) {
- $hash_tags[] = \sprintf( '#%s ', \get_category_link( $category ), $category->slug );
+ $hash_tags[] = \sprintf(
+ '%s ',
+ \esc_url( \get_category_link( $category ) ),
+ esc_hashtag( $category->name )
+ );
}
return \implode( ' ', $hash_tags );
}
/**
- * Generates output for the ap_author shortcode
+ * Generates output for the 'ap_author' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The author name.
*/
public static function author( $atts, $content, $tag ) {
- $post = get_post();
+ $item = self::get_item();
- if ( ! $post ) {
+ if ( ! $item ) {
return '';
}
- $name = \get_the_author_meta( 'display_name', $post->post_author );
+ $name = \get_the_author_meta( 'display_name', $item->post_author );
if ( ! $name ) {
return '';
}
- return $name;
+ return wp_strip_all_tags( $name );
}
/**
- * Generates output for the ap_authorurl shortcode
+ * Generates output for the 'ap_authorurl' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The author URL.
*/
public static function authorurl( $atts, $content, $tag ) {
- $post = get_post();
+ $item = self::get_item();
- if ( ! $post ) {
+ if ( ! $item ) {
return '';
}
- $url = \get_the_author_meta( 'user_url', $post->post_author );
+ $url = \get_the_author_meta( 'user_url', $item->post_author );
if ( ! $url ) {
return '';
@@ -400,61 +419,61 @@ public static function authorurl( $atts, $content, $tag ) {
}
/**
- * Generates output for the ap_blogurl shortcode
+ * Generates output for the 'ap_blogurl' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The site URL.
*/
public static function blogurl( $atts, $content, $tag ) {
return \esc_url( \get_bloginfo( 'url' ) );
}
/**
- * Generates output for the ap_blogname shortcode
+ * Generates output for the 'ap_blogname' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
* @return string
*/
public static function blogname( $atts, $content, $tag ) {
- return \get_bloginfo( 'name' );
+ return \wp_strip_all_tags( \get_bloginfo( 'name' ) );
}
/**
- * Generates output for the ap_blogdesc shortcode
+ * Generates output for the 'ap_blogdesc' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The site description.
*/
public static function blogdesc( $atts, $content, $tag ) {
- return \get_bloginfo( 'description' );
+ return \wp_strip_all_tags( \get_bloginfo( 'description' ) );
}
/**
- * Generates output for the ap_date shortcode
+ * Generates output for the 'ap_date' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The post date.
*/
public static function date( $atts, $content, $tag ) {
- $post = get_post();
+ $item = self::get_item();
- if ( ! $post ) {
+ if ( ! $item ) {
return '';
}
- $datetime = \get_post_datetime( $post );
+ $datetime = \get_post_datetime( $item );
$dateformat = \get_option( 'date_format' );
$timeformat = \get_option( 'time_format' );
@@ -468,22 +487,22 @@ public static function date( $atts, $content, $tag ) {
}
/**
- * Generates output for the ap_time shortcode
+ * Generates output for the 'ap_time' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The post time.
*/
public static function time( $atts, $content, $tag ) {
- $post = get_post();
+ $item = self::get_item();
- if ( ! $post ) {
+ if ( ! $item ) {
return '';
}
- $datetime = \get_post_datetime( $post );
+ $datetime = \get_post_datetime( $item );
$dateformat = \get_option( 'date_format' );
$timeformat = \get_option( 'time_format' );
@@ -497,22 +516,22 @@ public static function time( $atts, $content, $tag ) {
}
/**
- * Generates output for the ap_datetime shortcode
+ * Generates output for the 'ap_datetime' Shortcode
*
- * @param array $atts shortcode attributes
- * @param string $content shortcode content
- * @param string $tag shortcode tag name
+ * @param array $atts The Shortcode attributes.
+ * @param string $content The ActivityPub post-content.
+ * @param string $tag The tag/name of the Shortcode.
*
- * @return string
+ * @return string The post date/time.
*/
public static function datetime( $atts, $content, $tag ) {
- $post = get_post();
+ $item = self::get_item();
- if ( ! $post ) {
+ if ( ! $item ) {
return '';
}
- $datetime = \get_post_datetime( $post );
+ $datetime = \get_post_datetime( $item );
$dateformat = \get_option( 'date_format' );
$timeformat = \get_option( 'time_format' );
@@ -524,4 +543,34 @@ public static function datetime( $atts, $content, $tag ) {
return $date;
}
+
+ /**
+ * Get a WordPress item to federate.
+ *
+ * Checks if item (WP_Post) is "public", a supported post type
+ * and not password protected.
+ *
+ * @return null|WP_Post The WordPress item.
+ */
+ protected static function get_item() {
+ $post = \get_post();
+
+ if ( ! $post ) {
+ return null;
+ }
+
+ if ( 'publish' !== \get_post_status( $post ) ) {
+ return null;
+ }
+
+ if ( \post_password_required( $post ) ) {
+ return null;
+ }
+
+ if ( ! \in_array( \get_post_type( $post ), \get_post_types_by_support( 'activitypub' ), true ) ) {
+ return null;
+ }
+
+ return $post;
+ }
}
diff --git a/includes/class-signature.php b/includes/class-signature.php
index f78b87dc1..1789dd676 100644
--- a/includes/class-signature.php
+++ b/includes/class-signature.php
@@ -1,55 +1,90 @@
'sha512',
'private_key_bits' => 2048,
@@ -61,17 +96,96 @@ public static function generate_key_pair( $user_id ) {
\openssl_pkey_export( $key, $priv_key );
- // private key
- \update_user_meta( $user_id, 'magic_sig_private_key', $priv_key );
-
$detail = \openssl_pkey_get_details( $key );
- // public key
- \update_user_meta( $user_id, 'magic_sig_public_key', $detail['key'] );
+ // check if keys are valid
+ if (
+ empty( $priv_key ) || ! is_string( $priv_key ) ||
+ ! isset( $detail['key'] ) || ! is_string( $detail['key'] )
+ ) {
+ return array(
+ 'private_key' => null,
+ 'public_key' => null,
+ );
+ }
+
+ $key_pair = array(
+ 'private_key' => $priv_key,
+ 'public_key' => $detail['key'],
+ );
+
+ // persist keys
+ \add_option( $option_key, $key_pair );
+
+ return $key_pair;
+ }
+
+ /**
+ * Return the option key for a given user.
+ *
+ * @param int $user_id The WordPress User ID.
+ *
+ * @return string The option key.
+ */
+ protected static function get_signature_options_key_for( $user_id ) {
+ $id = $user_id;
+
+ if ( $user_id > 0 ) {
+ $user = \get_userdata( $user_id );
+ // sanatize username because it could include spaces and special chars
+ $id = sanitize_title( $user->user_login );
+ }
+
+ return 'activitypub_keypair_for_' . $id;
}
+ /**
+ * Check if there is a legacy key pair
+ *
+ * @param int $user_id The WordPress User ID.
+ *
+ * @return array|bool The key pair or false.
+ */
+ protected static function check_legacy_key_pair_for( $user_id ) {
+ switch ( $user_id ) {
+ case 0:
+ $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' );
+ $private_key = \get_option( 'activitypub_application_user_private_key' );
+ break;
+ default:
+ $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;
+ }
+
+ if ( ! empty( $public_key ) && is_string( $public_key ) && ! empty( $private_key ) && is_string( $private_key ) ) {
+ return array(
+ 'private_key' => $private_key,
+ 'public_key' => $public_key,
+ );
+ }
+
+ return false;
+ }
+
+ /**
+ * Generates the Signature for a 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.
+ *
+ * @return string The signature.
+ */
public static function generate_signature( $user_id, $http_method, $url, $date, $digest = null ) {
- $key = self::get_private_key( $user_id );
+ $user = Users::get_by_id( $user_id );
+ $key = self::get_private_key_for( $user->get__id() );
$url_parts = \wp_parse_url( $url );
@@ -88,8 +202,10 @@ public static function generate_signature( $user_id, $http_method, $url, $date,
$path .= '?' . $url_parts['query'];
}
+ $http_method = \strtolower( $http_method );
+
if ( ! empty( $digest ) ) {
- $signed_string = "(request-target): $http_method $path\nhost: $host\ndate: $date\ndigest: SHA-256=$digest";
+ $signed_string = "(request-target): $http_method $path\nhost: $host\ndate: $date\ndigest: $digest";
} else {
$signed_string = "(request-target): $http_method $path\nhost: $host\ndate: $date";
}
@@ -98,7 +214,7 @@ public static function generate_signature( $user_id, $http_method, $url, $date,
\openssl_sign( $signed_string, $signature, $key, \OPENSSL_ALGO_SHA256 );
$signature = \base64_encode( $signature ); // phpcs:ignore
- $key_id = \get_author_posts_url( $user_id ) . '#main-key';
+ $key_id = $user->get_url() . '#main-key';
if ( ! empty( $digest ) ) {
return \sprintf( 'keyId="%s",algorithm="rsa-sha256",headers="(request-target) host date digest",signature="%s"', $key_id, $signature );
@@ -107,12 +223,268 @@ public static function generate_signature( $user_id, $http_method, $url, $date,
}
}
- public static function verify_signature( $headers, $signature ) {
+ /**
+ * Verifies the http signatures
+ *
+ * @param WP_REQUEST|array $request The request object or $_SERVER array.
+ *
+ * @return mixed 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 ( 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
+ $path = \wp_parse_url( \get_home_url(), PHP_URL_PATH );
+
+ if ( \is_string( $path ) ) {
+ $path = trim( $path, '/' );
+ }
+
+ if ( $path ) {
+ $route = '/' . $path . $route;
+ }
+
+ $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
+ $headers['(request-target)'][0] = strtolower( $headers['request_method'][0] ) . ' ' . $headers['request_uri'][0];
+ }
+
+ if ( ! isset( $headers['signature'] ) ) {
+ return new WP_Error( 'activitypub_signature', __( 'Request not signed', 'activitypub' ), array( 'status' => 403 ) );
+ }
+
+ if ( array_key_exists( 'signature', $headers ) ) {
+ $signature_block = self::parse_signature_header( $headers['signature'][0] );
+ } elseif ( array_key_exists( 'authorization', $headers ) ) {
+ $signature_block = self::parse_signature_header( $headers['authorization'][0] );
+ }
+
+ if ( ! isset( $signature_block ) || ! $signature_block ) {
+ return new WP_Error( 'activitypub_signature', __( 'Incompatible request signature. keyId and signature are required', 'activitypub' ), array( 'status' => 403 ) );
+ }
+
+ $signed_headers = $signature_block['headers'];
+ if ( ! $signed_headers ) {
+ $signed_headers = array( 'date' );
+ }
+
+ $signed_data = self::get_signed_data( $signed_headers, $signature_block, $headers );
+ if ( ! $signed_data ) {
+ return new WP_Error( 'activitypub_signature', __( 'Signed request date outside acceptable time window', 'activitypub' ), array( 'status' => 403 ) );
+ }
+
+ $algorithm = self::get_signature_algorithm( $signature_block );
+ if ( ! $algorithm ) {
+ return new WP_Error( 'activitypub_signature', __( 'Unsupported signature algorithm (only rsa-sha256 and hs2019 are supported)', 'activitypub' ), array( 'status' => 403 ) );
+ }
+
+ if ( \in_array( 'digest', $signed_headers, true ) && isset( $body ) ) {
+ if ( is_array( $headers['digest'] ) ) {
+ $headers['digest'] = $headers['digest'][0];
+ }
+ $digest = explode( '=', $headers['digest'], 2 );
+ if ( 'SHA-256' === $digest[0] ) {
+ $hashalg = 'sha256';
+ }
+ if ( 'SHA-512' === $digest[0] ) {
+ $hashalg = 'sha512';
+ }
+
+ if ( \base64_encode( \hash( $hashalg, $body, true ) ) !== $digest[1] ) { // phpcs:ignore
+ return new WP_Error( 'activitypub_signature', __( 'Invalid Digest header', 'activitypub' ), array( 'status' => 403 ) );
+ }
+ }
+
+ $public_key = self::get_remote_key( $signature_block['keyId'] );
+
+ if ( \is_wp_error( $public_key ) ) {
+ return $public_key;
+ }
+
+ $verified = \openssl_verify( $signed_data, $signature_block['signature'], $public_key, $algorithm ) > 0;
+
+ if ( ! $verified ) {
+ return new WP_Error( 'activitypub_signature', __( 'Invalid signature', 'activitypub' ), array( 'status' => 403 ) );
+ }
+ return $verified;
+ }
+
+ /**
+ * Get public key from key_id
+ *
+ * @param string $key_id The URL to the public key.
+ *
+ * @return WP_Error|string The public key.
+ */
+ public static function get_remote_key( $key_id ) { // phpcs:ignore
+ $actor = get_remote_metadata_by_actor( strip_fragment_from_url( $key_id ) ); // phpcs:ignore
+ if ( \is_wp_error( $actor ) ) {
+ return $actor;
+ }
+ if ( isset( $actor['publicKey']['publicKeyPem'] ) ) {
+ return \rtrim( $actor['publicKey']['publicKeyPem'] ); // phpcs:ignore
+ }
+ return new WP_Error( 'activitypub_no_remote_key_found', __( 'No Public-Key found', 'activitypub' ), array( 'status' => 403 ) );
+ }
+
+ /**
+ * Gets the signature algorithm from the signature header
+ *
+ * @param array $signature_block
+ *
+ * @return string The signature algorithm.
+ */
+ public static function get_signature_algorithm( $signature_block ) {
+ 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
+ default:
+ return 'sha256';
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Parses the Signature header
+ *
+ * @param string $signature The signature header.
+ *
+ * @return array signature parts
+ */
+ public static function parse_signature_header( $signature ) {
+ $parsed_header = array();
+ $matches = array();
+
+ if ( \preg_match( '/keyId="(.*?)"/ism', $signature, $matches ) ) {
+ $parsed_header['keyId'] = trim( $matches[1] );
+ }
+ if ( \preg_match( '/created=([0-9]*)/ism', $signature, $matches ) ) {
+ $parsed_header['(created)'] = trim( $matches[1] );
+ }
+ if ( \preg_match( '/expires=([0-9]*)/ism', $signature, $matches ) ) {
+ $parsed_header['(expires)'] = trim( $matches[1] );
+ }
+ if ( \preg_match( '/algorithm="(.*?)"/ism', $signature, $matches ) ) {
+ $parsed_header['algorithm'] = trim( $matches[1] );
+ }
+ if ( \preg_match( '/headers="(.*?)"/ism', $signature, $matches ) ) {
+ $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
+ }
+
+ if ( ( $parsed_header['signature'] ) && ( $parsed_header['algorithm'] ) && ( ! $parsed_header['headers'] ) ) {
+ $parsed_header['headers'] = array( 'date' );
+ }
+
+ return $parsed_header;
+ }
+
+ /**
+ * 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)
+ *
+ * @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 ) {
+ if ( isset( $headers['x_original_host'] ) ) {
+ $signed_data .= $header . ': ' . $headers['x_original_host'][0] . "\n";
+ continue;
+ }
+ }
+ if ( '(request-target)' === $header ) {
+ $signed_data .= $header . ': ' . $headers[ $header ][0] . "\n";
+ continue;
+ }
+ if ( str_contains( $header, '-' ) ) {
+ $signed_data .= $header . ': ' . $headers[ str_replace( '-', '_', $header ) ][0] . "\n";
+ continue;
+ }
+ if ( '(created)' === $header ) {
+ if ( ! empty( $signature_block['(created)'] ) && \intval( $signature_block['(created)'] ) > \time() ) {
+ // created in future
+ return false;
+ }
+ }
+ if ( '(expires)' === $header ) {
+ if ( ! empty( $signature_block['(expires)'] ) && \intval( $signature_block['(expires)'] ) < \time() ) {
+ // expired in past
+ return false;
+ }
+ }
+ if ( 'date' === $header ) {
+ // 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 );
+ $dminus = time() - ( 3 * HOUR_IN_SECONDS );
+ if ( $c > $dplus || $c < $dminus ) {
+ // time out of range
+ return false;
+ }
+ }
+ $signed_data .= $header . ': ' . $headers[ $header ][0] . "\n";
+ }
+ return \rtrim( $signed_data, "\n" );
}
+ /**
+ * Generates the digest for a 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
- return "$digest";
+ return "SHA-256=$digest";
+ }
+
+ /**
+ * Formats the $_SERVER to resemble the WP_REST_REQUEST array,
+ * for use with verify_http_signature()
+ *
+ * @param array $_SERVER The $_SERVER array.
+ *
+ * @return array $request The formatted request array.
+ */
+ public static function format_server_request( $server ) {
+ $request = array();
+ foreach ( $server as $param_key => $param_val ) {
+ $req_param = strtolower( $param_key );
+ if ( 'REQUEST_URI' === $req_param ) {
+ $request['headers']['route'][] = $param_val;
+ } else {
+ $header_key = str_replace(
+ 'http_',
+ '',
+ $req_param
+ );
+ $request['headers'][ $header_key ][] = \wp_unslash( $param_val );
+ }
+ }
+ return $request;
}
}
diff --git a/includes/class-webfinger.php b/includes/class-webfinger.php
index c7d2cba62..b6b0a64e9 100644
--- a/includes/class-webfinger.php
+++ b/includes/class-webfinger.php
@@ -1,6 +1,9 @@
user_login . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST );
+ return $user->get_resource();
}
- public static function resolve( $account ) {
- if ( ! preg_match( '/^@?' . ACTIVITYPUB_USERNAME_REGEXP . '$/i', $account, $m ) ) {
+ /**
+ * Resolve a WebFinger resource
+ *
+ * @param string $resource The WebFinger resource
+ *
+ * @return string|WP_Error The URL or WP_Error
+ */
+ public static function resolve( $resource ) {
+ if ( ! preg_match( '/^@?' . ACTIVITYPUB_USERNAME_REGEXP . '$/i', $resource, $m ) ) {
return null;
}
- $transient_key = 'activitypub_resolve_' . ltrim( $account, '@' );
+ $transient_key = 'activitypub_resolve_' . ltrim( $resource, '@' );
$link = \get_transient( $transient_key );
if ( $link ) {
return $link;
}
- $url = \add_query_arg( 'resource', 'acct:' . ltrim( $account, '@' ), 'https://' . $m[2] . '/.well-known/webfinger' );
+ $url = \add_query_arg( 'resource', 'acct:' . ltrim( $resource, '@' ), 'https://' . $m[2] . '/.well-known/webfinger' );
if ( ! \wp_http_validate_url( $url ) ) {
- $response = new \WP_Error( 'invalid_webfinger_url', null, $url );
+ $response = new WP_Error( 'invalid_webfinger_url', null, $url );
\set_transient( $transient_key, $response, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $response;
}
@@ -52,14 +62,14 @@ public static function resolve( $account ) {
$response = \wp_remote_get(
$url,
array(
- 'headers' => array( 'Accept' => 'application/activity+json' ),
- 'redirection' => 0,
+ 'headers' => array( 'Accept' => 'application/jrd+json' ),
+ 'redirection' => 2,
'timeout' => 2,
)
);
if ( \is_wp_error( $response ) ) {
- $link = new \WP_Error( 'webfinger_url_not_accessible', null, $url );
+ $link = new WP_Error( 'webfinger_url_not_accessible', null, $url );
\set_transient( $transient_key, $link, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $link;
}
@@ -68,7 +78,7 @@ public static function resolve( $account ) {
$body = \json_decode( $body, true );
if ( empty( $body['links'] ) ) {
- $link = new \WP_Error( 'webfinger_url_invalid_response', null, $url );
+ $link = new WP_Error( 'webfinger_url_invalid_response', null, $url );
\set_transient( $transient_key, $link, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $link;
}
@@ -80,8 +90,114 @@ public static function resolve( $account ) {
}
}
- $link = new \WP_Error( 'webfinger_url_no_activity_pub', null, $body );
+ $link = new WP_Error( 'webfinger_url_no_activitypub', null, $body );
\set_transient( $transient_key, $link, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $link;
}
+
+ /**
+ * 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:)
+ *
+ * @return WP_Error|array Error reaction or array with
+ * identifier and host as values
+ */
+ public static function get_identifier_and_host( $url ) {
+ // remove leading @
+ $url = ltrim( $url, '@' );
+
+ if ( ! preg_match( '/^([a-zA-Z+]+):/', $url, $match ) ) {
+ $identifier = 'acct:' . $url;
+ $scheme = 'acct';
+ } else {
+ $identifier = $url;
+ $scheme = $match[1];
+ }
+
+ $host = null;
+
+ switch ( $scheme ) {
+ case 'acct':
+ case 'mailto':
+ case 'xmpp':
+ if ( strpos( $identifier, '@' ) !== false ) {
+ $host = substr( $identifier, strpos( $identifier, '@' ) + 1 );
+ }
+ break;
+ default:
+ $host = wp_parse_url( $identifier, PHP_URL_HOST );
+ break;
+ }
+
+ if ( empty( $host ) ) {
+ return new WP_Error( 'invalid_identifier', __( 'Invalid Identifier', 'activitypub' ) );
+ }
+
+ return array( $identifier, $host );
+ }
+
+ /**
+ * Get the WebFinger data for a given URI
+ *
+ * @param string $identifier The Identifier: @
+ * @param string $host The Host: @
+ *
+ * @return WP_Error|array Error reaction or array with
+ * identifier and host as values
+ */
+ public static function get_data( $identifier, $host ) {
+ $webfinger_url = 'https://' . $host . '/.well-known/webfinger?resource=' . rawurlencode( $identifier );
+
+ $response = wp_safe_remote_get(
+ $webfinger_url,
+ array(
+ 'headers' => array( 'Accept' => 'application/jrd+json' ),
+ 'redirection' => 0,
+ 'timeout' => 2,
+ )
+ );
+
+ if ( is_wp_error( $response ) ) {
+ return new WP_Error( 'webfinger_url_not_accessible', null, $webfinger_url );
+ }
+
+ $body = wp_remote_retrieve_body( $response );
+
+ return json_decode( $body, true );
+ }
+
+ /**
+ * Undocumented function
+ *
+ * @return void
+ */
+ public static function get_remote_follow_endpoint( $uri ) {
+ $identifier_and_host = self::get_identifier_and_host( $uri );
+
+ if ( is_wp_error( $identifier_and_host ) ) {
+ return $identifier_and_host;
+ }
+
+ list( $identifier, $host ) = $identifier_and_host;
+
+ $data = self::get_data( $identifier, $host );
+
+ if ( is_wp_error( $data ) ) {
+ return $data;
+ }
+
+ if ( empty( $data['links'] ) ) {
+ return new WP_Error( 'webfinger_url_invalid_response', null, $data );
+ }
+
+ foreach ( $data['links'] as $link ) {
+ if ( 'http://ostatus.org/schema/1.0/subscribe' === $link['rel'] ) {
+ return $link['template'];
+ }
+ }
+
+ return new WP_Error( 'webfinger_remote_follow_endpoint_invalid', $data, array( 'status' => 417 ) );
+ }
}
diff --git a/includes/collection/class-followers.php b/includes/collection/class-followers.php
new file mode 100644
index 000000000..a9fe29818
--- /dev/null
+++ b/includes/collection/class-followers.php
@@ -0,0 +1,591 @@
+ array(
+ 'name' => _x( 'Followers', 'post_type plural name', 'activitypub' ),
+ 'singular_name' => _x( 'Follower', 'post_type single name', 'activitypub' ),
+ ),
+ 'public' => false,
+ 'hierarchical' => false,
+ 'rewrite' => false,
+ 'query_var' => false,
+ 'delete_with_user' => false,
+ 'can_export' => true,
+ 'supports' => array(),
+ )
+ );
+
+ register_post_meta(
+ self::POST_TYPE,
+ 'activitypub_inbox',
+ array(
+ 'type' => 'string',
+ 'single' => true,
+ 'sanitize_callback' => array( self::class, 'sanitize_url' ),
+ )
+ );
+
+ register_post_meta(
+ self::POST_TYPE,
+ 'activitypub_errors',
+ array(
+ 'type' => 'string',
+ 'single' => false,
+ 'sanitize_callback' => function( $value ) {
+ if ( ! is_string( $value ) ) {
+ throw new Exception( 'Error message is no valid string' );
+ }
+
+ return esc_sql( $value );
+ },
+ )
+ );
+
+ register_post_meta(
+ self::POST_TYPE,
+ 'activitypub_user_id',
+ array(
+ 'type' => 'string',
+ 'single' => false,
+ 'sanitize_callback' => function( $value ) {
+ return esc_sql( $value );
+ },
+ )
+ );
+
+ register_post_meta(
+ self::POST_TYPE,
+ 'activitypub_actor_json',
+ array(
+ 'type' => 'string',
+ 'single' => true,
+ 'sanitize_callback' => function( $value ) {
+ return sanitize_text_field( $value );
+ },
+ )
+ );
+
+ do_action( 'activitypub_after_register_post_type' );
+ }
+
+ public static function sanitize_url( $value ) {
+ if ( filter_var( $value, FILTER_VALIDATE_URL ) === false ) {
+ return null;
+ }
+
+ return esc_url_raw( $value );
+ }
+
+ /**
+ * Handle the "Follow" Request
+ *
+ * @param array $object The JSON "Follow" Activity
+ * @param int $user_id The ID of the ID of the WordPress User
+ *
+ * @return void
+ */
+ public static function handle_follow_request( $object, $user_id ) {
+ // save follower
+ $follower = self::add_follower( $user_id, $object['actor'] );
+
+ do_action( 'activitypub_followers_post_follow', $object['actor'], $object, $user_id, $follower );
+ }
+
+ /**
+ * Handle "Unfollow" requests
+ *
+ * @param array $object The JSON "Undo" Activity
+ * @param int $user_id The ID of the ID of the WordPress User
+ */
+ public static function handle_undo_request( $object, $user_id ) {
+ if (
+ isset( $object['object'] ) &&
+ isset( $object['object']['type'] ) &&
+ 'Follow' === $object['object']['type']
+ ) {
+ self::remove_follower( $user_id, $object['actor'] );
+ }
+ }
+
+ /**
+ * Add new Follower
+ *
+ * @param int $user_id The ID of the WordPress User
+ * @param string $actor The Actor URL
+ *
+ * @return array|WP_Error The Follower (WP_Post array) or an WP_Error
+ */
+ public static function add_follower( $user_id, $actor ) {
+ $meta = get_remote_metadata_by_actor( $actor );
+
+ if ( is_tombstone( $meta ) ) {
+ return $meta;
+ }
+
+ if ( empty( $meta ) || ! is_array( $meta ) || is_wp_error( $meta ) ) {
+ return new WP_Error( 'activitypub_invalid_follower', __( 'Invalid Follower', 'activitypub' ), array( 'status' => 400 ) );
+ }
+
+ $error = null;
+
+ $follower = new Follower();
+ $follower->from_array( $meta );
+
+ $id = $follower->upsert();
+
+ if ( is_wp_error( $id ) ) {
+ return $id;
+ }
+
+ $meta = get_post_meta( $id, 'activitypub_user_id' );
+
+ if ( $error ) {
+ self::add_error( $id, $error );
+ }
+
+ // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
+ if ( is_array( $meta ) && ! in_array( $user_id, $meta ) ) {
+ add_post_meta( $id, 'activitypub_user_id', $user_id );
+ wp_cache_delete( sprintf( self::CACHE_KEY_INBOXES, $user_id ), 'activitypub' );
+ }
+
+ return $follower;
+ }
+
+ /**
+ * Remove a Follower
+ *
+ * @param int $user_id The ID of the WordPress User
+ * @param string $actor The Actor URL
+ *
+ * @return bool|WP_Error True on success, false or WP_Error on failure.
+ */
+ public static function remove_follower( $user_id, $actor ) {
+ wp_cache_delete( sprintf( self::CACHE_KEY_INBOXES, $user_id ), 'activitypub' );
+
+ $follower = self::get_follower( $user_id, $actor );
+
+ if ( ! $follower ) {
+ return false;
+ }
+
+ return delete_post_meta( $follower->get__id(), 'activitypub_user_id', $user_id );
+ }
+
+ /**
+ * Get a Follower
+ *
+ * @param int $user_id The ID of the WordPress User
+ * @param string $actor The Actor URL
+ *
+ * @return \Activitypub\Model\Follower The Follower object
+ */
+ public static function get_follower( $user_id, $actor ) {
+ global $wpdb;
+
+ $post_id = $wpdb->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",
+ array(
+ esc_sql( self::POST_TYPE ),
+ esc_sql( $user_id ),
+ esc_sql( $actor ),
+ )
+ )
+ );
+
+ if ( $post_id ) {
+ $post = get_post( $post_id );
+ return Follower::init_from_cpt( $post );
+ }
+
+ return null;
+ }
+
+ /**
+ * 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
+ */
+ public static function send_follow_response( $actor, $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
+ return;
+ }
+
+ // only send minimal data
+ $object = array_intersect_key(
+ $object,
+ array_flip(
+ array(
+ 'id',
+ 'type',
+ 'actor',
+ 'object',
+ )
+ )
+ );
+
+ $user = Users::get_by_id( $user_id );
+
+ // get inbox
+ $inbox = $follower->get_shared_inbox();
+
+ // send "Accept" activity
+ $activity = new Activity();
+ $activity->set_type( 'Accept' );
+ $activity->set_object( $object );
+ $activity->set_actor( $user->get_id() );
+ $activity->set_to( $actor );
+ $activity->set_id( $user->get_id() . '#follow-' . \preg_replace( '~^https?://~', '', $actor ) . '-' . \time() );
+
+ $activity = $activity->to_json();
+
+ Http::post( $inbox, $activity, $user_id );
+ }
+
+ /**
+ * 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.
+ * @return array List of `Follower` objects.
+ */
+ public static function get_followers( $user_id, $number = -1, $page = null, $args = array() ) {
+ $data = self::get_followers_with_count( $user_id, $number, $page, $args );
+ return $data['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.
+ *
+ * @return array
+ * followers List of `Follower` objects.
+ * total Total number of followers.
+ */
+ public static function get_followers_with_count( $user_id, $number = -1, $page = null, $args = array() ) {
+ $defaults = array(
+ 'post_type' => self::POST_TYPE,
+ 'posts_per_page' => $number,
+ 'paged' => $page,
+ 'orderby' => 'ID',
+ 'order' => 'DESC',
+ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+ 'meta_query' => array(
+ array(
+ 'key' => 'activitypub_user_id',
+ 'value' => $user_id,
+ ),
+ ),
+ );
+
+ $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.
+ *
+ * @return array The Term list of Followers.
+ */
+ public static function get_all_followers() {
+ $args = array(
+ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+ 'meta_query' => array(
+ 'relation' => 'AND',
+ array(
+ 'key' => 'activitypub_inbox',
+ 'compare' => 'EXISTS',
+ ),
+ array(
+ 'key' => 'activitypub_actor_json',
+ 'compare' => 'EXISTS',
+ ),
+ ),
+ );
+ return self::get_followers( null, null, null, $args );
+ }
+
+ /**
+ * Count the total number of followers
+ *
+ * @param int $user_id The ID of the WordPress User
+ *
+ * @return int The number of Followers
+ */
+ public static function count_followers( $user_id ) {
+ $query = new WP_Query(
+ array(
+ 'post_type' => self::POST_TYPE,
+ 'fields' => 'ids',
+ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+ 'meta_query' => array(
+ 'relation' => 'AND',
+ array(
+ 'key' => 'activitypub_user_id',
+ 'value' => $user_id,
+ ),
+ array(
+ 'key' => 'activitypub_inbox',
+ 'compare' => 'EXISTS',
+ ),
+ array(
+ 'key' => 'activitypub_actor_json',
+ 'compare' => 'EXISTS',
+ ),
+ ),
+ )
+ );
+
+ return $query->found_posts;
+ }
+
+ /**
+ * Returns all Inboxes fo a Users Followers
+ *
+ * @param int $user_id The ID of the WordPress User
+ *
+ * @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' );
+
+ if ( $inboxes ) {
+ return $inboxes;
+ }
+
+ // get all Followers of a ID of the WordPress User
+ $posts = new WP_Query(
+ array(
+ 'post_type' => self::POST_TYPE,
+ 'fields' => 'ids',
+ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+ 'meta_query' => array(
+ 'relation' => 'AND',
+ array(
+ 'key' => 'activitypub_inbox',
+ 'compare' => 'EXISTS',
+ ),
+ array(
+ 'key' => 'activitypub_user_id',
+ 'value' => $user_id,
+ ),
+ array(
+ 'key' => 'activitypub_inbox',
+ 'value' => '',
+ 'compare' => '!=',
+ ),
+ ),
+ )
+ );
+
+ $posts = $posts->get_posts();
+
+ if ( ! $posts ) {
+ return array();
+ }
+
+ global $wpdb;
+ // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
+ $results = $wpdb->get_col(
+ $wpdb->prepare(
+ "SELECT DISTINCT meta_value FROM {$wpdb->postmeta}
+ WHERE post_id IN (" . implode( ', ', array_fill( 0, count( $posts ), '%d' ) ) . ")
+ AND meta_key = 'activitypub_inbox'
+ AND meta_value IS NOT NULL",
+ $posts
+ )
+ );
+
+ $inboxes = array_filter( $results );
+ wp_cache_set( $cache_key, $inboxes, 'activitypub' );
+
+ return $inboxes;
+ }
+
+ /**
+ * 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.
+ *
+ * @return mixed The Term list of Followers, the format depends on $output.
+ */
+ public static function get_outdated_followers( $number = 50, $older_than = 86400 ) {
+ $args = array(
+ 'post_type' => self::POST_TYPE,
+ 'posts_per_page' => $number,
+ 'orderby' => 'modified',
+ 'order' => 'ASC',
+ 'post_status' => 'any', // 'any' includes 'trash
+ 'date_query' => array(
+ array(
+ 'column' => 'post_modified_gmt',
+ 'before' => gmdate( 'Y-m-d', \time() - $older_than ),
+ ),
+ ),
+ );
+
+ $posts = new WP_Query( $args );
+ $items = array();
+
+ foreach ( $posts->get_posts() as $follower ) {
+ $items[] = Follower::init_from_cpt( $follower ); // phpcs:ignore
+ }
+
+ return $items;
+ }
+
+ /**
+ * 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.
+ *
+ * @return mixed The Term list of Followers, the format depends on $output.
+ */
+ public static function get_faulty_followers( $number = 20 ) {
+ $args = array(
+ 'post_type' => self::POST_TYPE,
+ 'posts_per_page' => $number,
+ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+ 'meta_query' => array(
+ 'relation' => 'OR',
+ array(
+ 'key' => 'activitypub_errors',
+ 'compare' => 'EXISTS',
+ ),
+ array(
+ 'key' => 'activitypub_inbox',
+ 'compare' => 'NOT EXISTS',
+ ),
+ array(
+ 'key' => 'activitypub_actor_json',
+ 'compare' => 'NOT EXISTS',
+ ),
+ array(
+ 'key' => 'activitypub_inbox',
+ 'value' => '',
+ 'compare' => '=',
+ ),
+ array(
+ 'key' => 'activitypub_actor_json',
+ 'value' => '',
+ 'compare' => '=',
+ ),
+ ),
+ );
+
+ $posts = new WP_Query( $args );
+ $items = array();
+
+ foreach ( $posts->get_posts() as $follower ) {
+ $items[] = Follower::init_from_cpt( $follower ); // phpcs:ignore
+ }
+
+ return $items;
+ }
+
+ /**
+ * 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.
+ *
+ * @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.
+ *
+ * @return int|false The meta ID on success, false on failure.
+ */
+ public static function add_error( $post_id, $error ) {
+ if ( is_string( $error ) ) {
+ $error_message = $error;
+ } elseif ( is_wp_error( $error ) ) {
+ $error_message = $error->get_error_message();
+ } else {
+ $error_message = __(
+ 'Unknown Error or misconfigured Error-Message',
+ 'activitypub'
+ );
+ }
+
+ return add_post_meta(
+ $post_id,
+ 'activitypub_errors',
+ $error_message
+ );
+ }
+}
diff --git a/includes/collection/class-users.php b/includes/collection/class-users.php
new file mode 100644
index 000000000..f6e35a64d
--- /dev/null
+++ b/includes/collection/class-users.php
@@ -0,0 +1,209 @@
+ 404 )
+ );
+ }
+
+ if ( self::BLOG_USER_ID === $user_id ) {
+ return Blog_User::from_wp_user( $user_id );
+ } elseif ( self::APPLICATION_USER_ID === $user_id ) {
+ return Application_User::from_wp_user( $user_id );
+ } elseif ( $user_id > 0 ) {
+ return User::from_wp_user( $user_id );
+ }
+
+ return new WP_Error(
+ 'activitypub_user_not_found',
+ \__( 'User not found', 'activitypub' ),
+ array( 'status' => 404 )
+ );
+ }
+
+ /**
+ * Get the User by username.
+ *
+ * @param string $username The User-Name.
+ *
+ * @return \Acitvitypub\Model\User The User.
+ */
+ public static function get_by_username( $username ) {
+ // check for blog user.
+ if ( Blog_User::get_default_username() === $username ) {
+ return self::get_by_id( self::BLOG_USER_ID );
+ }
+
+ if ( get_option( 'activitypub_blog_user_identifier' ) === $username ) {
+ return self::get_by_id( self::BLOG_USER_ID );
+ }
+
+ // check for application user.
+ if ( 'application' === $username ) {
+ return self::get_by_id( self::APPLICATION_USER_ID );
+ }
+
+ // check for 'activitypub_username' meta
+ $user = new WP_User_Query(
+ array(
+ 'number' => 1,
+ 'hide_empty' => true,
+ 'fields' => 'ID',
+ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+ 'meta_query' => array(
+ 'relation' => 'OR',
+ array(
+ 'key' => 'activitypub_user_identifier',
+ 'value' => $username,
+ 'compare' => 'LIKE',
+ ),
+ ),
+ )
+ );
+
+ if ( $user->results ) {
+ return self::get_by_id( $user->results[0] );
+ }
+
+ // check for login or nicename.
+ $user = new WP_User_Query(
+ array(
+ 'search' => $username,
+ 'search_columns' => array( 'user_login', 'user_nicename' ),
+ 'number' => 1,
+ 'hide_empty' => true,
+ 'fields' => 'ID',
+ )
+ );
+
+ if ( $user->results ) {
+ return self::get_by_id( $user->results[0] );
+ }
+
+ return new WP_Error(
+ 'activitypub_user_not_found',
+ \__( 'User not found', 'activitypub' ),
+ array( 'status' => 404 )
+ );
+ }
+
+ /**
+ * Get the User by resource.
+ *
+ * @param string $resource The User-Resource.
+ *
+ * @return \Acitvitypub\Model\User The User.
+ */
+ public static function get_by_resource( $resource ) {
+ if ( \strpos( $resource, '@' ) === false ) {
+ return new WP_Error(
+ 'activitypub_unsupported_resource',
+ \__( 'Resource is invalid', 'activitypub' ),
+ array( 'status' => 400 )
+ );
+ }
+
+ $resource = \str_replace( 'acct:', '', $resource );
+
+ $resource_identifier = \substr( $resource, 0, \strrpos( $resource, '@' ) );
+ $resource_host = self::normalize_host( \substr( \strrchr( $resource, '@' ), 1 ) );
+ $blog_host = self::normalize_host( \wp_parse_url( \home_url( '/' ), \PHP_URL_HOST ) );
+
+ if ( $blog_host !== $resource_host ) {
+ return new WP_Error(
+ 'activitypub_wrong_host',
+ \__( 'Resource host does not match blog host', 'activitypub' ),
+ array( 'status' => 404 )
+ );
+ }
+
+ return self::get_by_username( $resource_identifier );
+ }
+
+ /**
+ * Get the User by resource.
+ *
+ * @param string $resource The User-Resource.
+ *
+ * @return \Acitvitypub\Model\User The User.
+ */
+ public static function get_by_various( $id ) {
+ if ( is_numeric( $id ) ) {
+ return self::get_by_id( $id );
+ } elseif ( filter_var( $id, FILTER_VALIDATE_URL ) ) {
+ return self::get_by_resource( $id );
+ } else {
+ return self::get_by_username( $id );
+ }
+ }
+
+ /**
+ * Normalize the host.
+ *
+ * @param string $host The host.
+ *
+ * @return string The normalized host.
+ */
+ public static function normalize_host( $host ) {
+ return \str_replace( 'www.', '', $host );
+ }
+
+ /**
+ * Get the User collection.
+ *
+ * @return array The User collection.
+ */
+ public static function get_collection() {
+ $users = \get_users(
+ array(
+ 'capability__in' => array( 'publish_posts' ),
+ )
+ );
+
+ $return = array();
+
+ foreach ( $users as $user ) {
+ $return[] = User::from_wp_user( $user->ID );
+ }
+
+ return $return;
+ }
+}
diff --git a/includes/debug.php b/includes/debug.php
index a5683f4e4..d42b2a9a1 100644
--- a/includes/debug.php
+++ b/includes/debug.php
@@ -6,7 +6,8 @@
*
* @param array $r Array of HTTP request args.
* @param string $url The request URL.
- * @return array $args Array or string of HTTP request arguments.
+ *
+ * @return array Array or string of HTTP request arguments.
*/
function allow_localhost( $r, $url ) {
$r['reject_unsafe_urls'] = false;
diff --git a/includes/functions.php b/includes/functions.php
index 012709ea7..10694cad1 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1,111 +1,50 @@
'as:manuallyApprovesFollowers',
- 'PropertyValue' => 'schema:PropertyValue',
- 'schema' => 'http://schema.org#',
- 'pt' => 'https://joinpeertube.org/ns#',
- 'toot' => 'http://joinmastodon.org/ns#',
- 'value' => 'schema:value',
- 'Hashtag' => 'as:Hashtag',
- 'featured' => array(
- '@id' => 'toot:featured',
- '@type' => '@id',
- ),
- 'featuredTags' => array(
- '@id' => 'toot:featuredTags',
- '@type' => '@id',
- ),
- ),
- );
+ $context = Activity::CONTEXT;
return \apply_filters( 'activitypub_json_context', $context );
}
function safe_remote_post( $url, $body, $user_id ) {
- $date = \gmdate( 'D, d M Y H:i:s T' );
- $digest = \Activitypub\Signature::generate_digest( $body );
- $signature = \Activitypub\Signature::generate_signature( $user_id, 'post', $url, $date, $digest );
-
- $wp_version = \get_bloginfo( 'version' );
- $user_agent = \apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . \get_bloginfo( 'url' ) );
- $args = array(
- 'timeout' => 100,
- 'limit_response_size' => 1048576,
- 'redirection' => 3,
- 'user-agent' => "$user_agent; ActivityPub",
- 'headers' => array(
- 'Accept' => 'application/activity+json',
- 'Content-Type' => 'application/activity+json',
- 'Digest' => "SHA-256=$digest",
- 'Signature' => $signature,
- 'Date' => $date,
- ),
- 'body' => $body,
- );
-
- $response = \wp_safe_remote_post( $url, $args );
-
- \do_action( 'activitypub_safe_remote_post_response', $response, $url, $body, $user_id );
-
- return $response;
+ return Http::post( $url, $body, $user_id );
}
-function safe_remote_get( $url, $user_id ) {
- $date = \gmdate( 'D, d M Y H:i:s T' );
- $signature = \Activitypub\Signature::generate_signature( $user_id, 'get', $url, $date );
-
- $wp_version = \get_bloginfo( 'version' );
- $user_agent = \apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . \get_bloginfo( 'url' ) );
- $args = array(
- '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',
- 'Content-Type' => 'application/activity+json',
- 'Signature' => $signature,
- 'Date' => $date,
- ),
- );
-
- $response = \wp_safe_remote_get( $url, $args );
-
- \do_action( 'activitypub_safe_remote_get_response', $response, $url, $user_id );
-
- return $response;
+function safe_remote_get( $url ) {
+ return Http::get( $url );
}
/**
* Returns a users WebFinger "resource"
*
- * @param int $user_id
+ * @param int $user_id The User-ID.
*
- * @return string The user-resource
+ * @return string The User-Resource.
*/
function get_webfinger_resource( $user_id ) {
- return \Activitypub\Webfinger::get_user_resource( $user_id );
+ return Webfinger::get_user_resource( $user_id );
}
/**
- * [get_metadata_by_actor description]
+ * Requests the Meta-Data from the Actors profile
*
- * @param string $actor
+ * @param string $actor The Actor URL.
+ * @param bool $cached If the result should be cached.
*
- * @return array
+ * @return array The Actor profile as array
*/
-function get_remote_metadata_by_actor( $actor ) {
+function get_remote_metadata_by_actor( $actor, $cached = true ) {
$pre = apply_filters( 'pre_get_remote_metadata_by_actor', false, $actor );
if ( $pre ) {
return $pre;
@@ -115,7 +54,7 @@ function get_remote_metadata_by_actor( $actor ) {
}
if ( ! $actor ) {
- return null;
+ 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 ) ) {
@@ -123,33 +62,27 @@ function get_remote_metadata_by_actor( $actor ) {
}
$transient_key = 'activitypub_' . $actor;
- $metadata = \get_transient( $transient_key );
- if ( $metadata ) {
- return $metadata;
+ // only check the cache if needed.
+ if ( $cached ) {
+ $metadata = \get_transient( $transient_key );
+
+ if ( $metadata ) {
+ return $metadata;
+ }
}
if ( ! \wp_http_validate_url( $actor ) ) {
- $metadata = new \WP_Error( 'activitypub_no_valid_actor_url', \__( 'The "actor" is no valid URL', 'activitypub' ), $actor );
+ $metadata = new WP_Error( 'activitypub_no_valid_actor_url', \__( 'The "actor" is no valid URL', 'activitypub' ), array( 'status' => 400, 'actor' => $actor ) );
\set_transient( $transient_key, $metadata, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $metadata;
}
- $user = \get_users(
- array(
- 'number' => 1,
- 'capability__in' => array( 'publish_posts' ),
- 'fields' => 'ID',
- )
- );
-
- // we just need any user to generate a request signature
- $user_id = \reset( $user );
$short_timeout = function() {
return 3;
};
add_filter( 'activitypub_remote_get_timeout', $short_timeout );
- $response = \Activitypub\safe_remote_get( $actor, $user_id );
+ $response = Http::get( $actor );
remove_filter( 'activitypub_remote_get_timeout', $short_timeout );
if ( \is_wp_error( $response ) ) {
\set_transient( $transient_key, $response, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
@@ -159,118 +92,37 @@ function get_remote_metadata_by_actor( $actor ) {
$metadata = \wp_remote_retrieve_body( $response );
$metadata = \json_decode( $metadata, true );
+ \set_transient( $transient_key, $metadata, WEEK_IN_SECONDS );
+
if ( ! $metadata ) {
- $metadata = new \WP_Error( 'activitypub_invalid_json', \__( 'No valid JSON data', 'activitypub' ), $actor );
+ $metadata = new WP_Error( 'activitypub_invalid_json', \__( 'No valid JSON data', 'activitypub' ), array( 'status' => 400, 'actor' => $actor ) );
\set_transient( $transient_key, $metadata, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $metadata;
}
- \set_transient( $transient_key, $metadata, WEEK_IN_SECONDS );
-
return $metadata;
}
/**
- * [get_inbox_by_actor description]
- * @param [type] $actor [description]
- * @return [type] [description]
+ * Returns the followers of a given user.
+ *
+ * @param int $user_id The User-ID.
+ *
+ * @return array The followers.
*/
-function get_inbox_by_actor( $actor ) {
- $metadata = \Activitypub\get_remote_metadata_by_actor( $actor );
-
- if ( \is_wp_error( $metadata ) ) {
- return $metadata;
- }
-
- if ( isset( $metadata['endpoints'] ) && isset( $metadata['endpoints']['sharedInbox'] ) ) {
- return $metadata['endpoints']['sharedInbox'];
- }
-
- if ( \array_key_exists( 'inbox', $metadata ) ) {
- return $metadata['inbox'];
- }
-
- return new \WP_Error( 'activitypub_no_inbox', \__( 'No "Inbox" found', 'activitypub' ), $metadata );
+function get_followers( $user_id ) {
+ return Followers::get_followers( $user_id );
}
/**
- * [get_inbox_by_actor description]
- * @param [type] $actor [description]
- * @return [type] [description]
+ * Count the number of followers for a given user.
+ *
+ * @param int $user_id The User-ID.
+ *
+ * @return int The number of followers.
*/
-function get_publickey_by_actor( $actor, $key_id ) {
- $metadata = \Activitypub\get_remote_metadata_by_actor( $actor );
-
- if ( \is_wp_error( $metadata ) ) {
- return $metadata;
- }
-
- if (
- isset( $metadata['publicKey'] ) &&
- isset( $metadata['publicKey']['id'] ) &&
- isset( $metadata['publicKey']['owner'] ) &&
- isset( $metadata['publicKey']['publicKeyPem'] ) &&
- $key_id === $metadata['publicKey']['id'] &&
- $actor === $metadata['publicKey']['owner']
- ) {
- return $metadata['publicKey']['publicKeyPem'];
- }
-
- return new \WP_Error( 'activitypub_no_public_key', \__( 'No "Public-Key" found', 'activitypub' ), $metadata );
-}
-
-function get_follower_inboxes( $user_id ) {
- $followers = \Activitypub\Peer\Followers::get_followers( $user_id );
- $inboxes = array();
-
- foreach ( $followers as $follower ) {
- $inbox = \Activitypub\get_inbox_by_actor( $follower );
- if ( ! $inbox || \is_wp_error( $inbox ) ) {
- continue;
- }
- // init array if empty
- if ( ! isset( $inboxes[ $inbox ] ) ) {
- $inboxes[ $inbox ] = array();
- }
- $inboxes[ $inbox ][] = $follower;
- }
-
- return $inboxes;
-}
-
-function get_identifier_settings( $user_id ) {
- ?>
-
- get_error_code(), array( 404, 410 ), true ) ) {
+ return true;
+ }
+
+ return false;
+}
+
+/**
+ * Get the REST URL relative to this plugin's namespace.
+ *
+ * @param string $path Optional. REST route path. Otherwise this plugin's namespaced root.
+ *
+ * @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, '/' );
+ $namespaced_path = sprintf( '/%s/%s', ACTIVITYPUB_REST_NAMESPACE, $path );
+ return \get_rest_url( null, $namespaced_path );
+}
+
+/**
+ * Convert a string from camelCase to snake_case.
+ *
+ * @param string $string 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;
+ }
+
+ /*
+ * The other (more common) option to make an ActivityPub request
+ * is to send an Accept header.
+ */
+ if ( isset( $_SERVER['HTTP_ACCEPT'] ) ) {
+ $accept = sanitize_text_field( wp_unslash( $_SERVER['HTTP_ACCEPT'] ) );
+
+ /*
+ * $accept can be a single value, or a comma separated list of values.
+ * We want to support both scenarios,
+ * and return true when the header includes at least one of the following:
+ * - application/activity+json
+ * - application/ld+json
+ * - application/json
+ */
+ if ( preg_match( '/(application\/(ld\+json|activity\+json|json))/i', $accept ) ) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+/**
+ * This function checks if a user is disabled for ActivityPub.
+ *
+ * @param int $user_id The User-ID.
+ *
+ * @return boolean True if the user is disabled, false otherwise.
+ */
+function is_user_disabled( $user_id ) {
+ $return = false;
+
+ switch ( $user_id ) {
+ // if the user is the application user, it's always enabled.
+ case \Activitypub\Collection\Users::APPLICATION_USER_ID:
+ $return = false;
+ break;
+ // if the user is the blog user, it's only enabled in single-user mode.
+ case \Activitypub\Collection\Users::BLOG_USER_ID:
+ if ( is_user_type_disabled( 'blog' ) ) {
+ $return = true;
+ break;
+ }
+
+ $return = false;
+ break;
+ // if the user is any other user, it's enabled if it can publish posts.
+ default:
+ if ( ! \get_user_by( 'id', $user_id ) ) {
+ $return = true;
+ break;
+ }
+
+ if ( is_user_type_disabled( 'user' ) ) {
+ $return = true;
+ break;
+ }
+
+ if ( ! \user_can( $user_id, 'publish_posts' ) ) {
+ $return = true;
+ break;
+ }
+
+ $return = false;
+ break;
+ }
+
+ return apply_filters( 'activitypub_is_user_disabled', $return, $user_id );
+}
+
+/**
+ * Checks if a User-Type is disabled for ActivityPub.
+ *
+ * This function is used to check if the 'blog' or 'user'
+ * type is disabled for ActivityPub.
+ *
+ * @param enum $type Can be 'blog' or 'user'.
+ *
+ * @return boolean True if the user type is disabled, false otherwise.
+ */
+function is_user_type_disabled( $type ) {
+ switch ( $type ) {
+ case 'blog':
+ if ( \defined( 'ACTIVITYPUB_SINGLE_USER_MODE' ) ) {
+ if ( ACTIVITYPUB_SINGLE_USER_MODE ) {
+ $return = false;
+ break;
+ }
+ }
+
+ if ( \defined( 'ACTIVITYPUB_DISABLE_BLOG_USER' ) ) {
+ $return = ACTIVITYPUB_DISABLE_BLOG_USER;
+ break;
+ }
+
+ if ( '1' !== \get_option( 'activitypub_enable_blog_user', '0' ) ) {
+ $return = true;
+ break;
+ }
+
+ $return = false;
+ break;
+ case 'user':
+ if ( \defined( 'ACTIVITYPUB_SINGLE_USER_MODE' ) ) {
+ if ( ACTIVITYPUB_SINGLE_USER_MODE ) {
+ $return = true;
+ break;
+ }
+ }
+
+ if ( \defined( 'ACTIVITYPUB_DISABLE_USER' ) ) {
+ $return = ACTIVITYPUB_DISABLE_USER;
+ break;
+ }
+
+ if ( '1' !== \get_option( 'activitypub_enable_users', '1' ) ) {
+ $return = true;
+ break;
+ }
+
+ $return = false;
+ break;
+ default:
+ $return = new WP_Error( 'activitypub_wrong_user_type', __( 'Wrong user type', 'activitypub' ), array( 'status' => 400 ) );
+ break;
+ }
+
+ return apply_filters( 'activitypub_is_user_type_disabled', $return, $type );
+}
+
+/**
+ * Check if the blog is in single-user mode.
+ *
+ * @return boolean True if the blog is in single-user mode, false otherwise.
+ */
+function is_single_user() {
+ if (
+ false === is_user_type_disabled( 'blog' ) &&
+ true === is_user_type_disabled( 'user' )
+ ) {
+ return true;
+ }
+
+ return false;
+}
+
+if ( ! function_exists( 'get_self_link' ) ) {
+ /**
+ * Returns the link for the currently displayed feed.
+ *
+ * @return string Correct link for the atom:self element.
+ */
+ function get_self_link() {
+ $host = wp_parse_url( home_url() );
+ $path = isset( $_SERVER['REQUEST_URI'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : '';
+ return esc_url( apply_filters( 'self_link', set_url_scheme( 'http://' . $host['host'] . $path ) ) );
+ }
+}
+
+/**
+ * Check if a site supports the block editor.
+ *
+ * @return boolean True if the site supports the block editor, false otherwise.
+ */
+function site_supports_blocks() {
+ if ( ! \function_exists( 'register_block_type_from_metadata' ) ) {
+ return false;
+ }
+
+ /**
+ * Allow plugins to disable block editor support,
+ * thus disabling blocks registered by the ActivityPub plugin.
+ *
+ * @param boolean $supports_blocks True if the site supports the block editor, false otherwise.
+ */
+ return apply_filters( 'activitypub_site_supports_blocks', true );
+}
+
+/**
+ * Check if data is valid JSON.
+ *
+ * @param string $data The data to check.
+ *
+ * @return boolean True if the data is JSON, false otherwise.
+ */
+function is_json( $data ) {
+ return \is_array( \json_decode( $data, true ) ) ? true : false;
+}
diff --git a/includes/help.php b/includes/help.php
index 58339fb0a..3f0c7b9df 100644
--- a/includes/help.php
+++ b/includes/help.php
@@ -8,37 +8,37 @@
'' . __( 'The following Template Tags are available:', 'activitypub' ) . '
' .
'' .
'[ap_title]' . \wp_kses( __( 'The post\'s title.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The post\'s title.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_content apply_filters="yes"]' . \wp_kses( __( 'The post\'s content. With apply_filters you can decide if filters should be applied or not (default is yes). The values can be yes or no. apply_filters attribute is optional.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The post\'s content. With apply_filters you can decide if filters (apply_filters( \'the_content\', $content )) should be applied or not (default is yes). The values can be yes or no. apply_filters attribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_excerpt lenght="400"]' . \wp_kses( __( 'The post\'s excerpt (default 400 chars). length attribute is optional.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The post\'s excerpt (default 400 chars). length attribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_permalink type="url"]' . \wp_kses( __( 'The post\'s permalink. type can be either: url or html (an <a /> tag). type attribute is optional.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The post\'s permalink. type can be either: url or html (an <a /> tag). type attribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_shortlink type="url"]' . \wp_kses( __( 'The post\'s shortlink. type can be either url or html (an <a /> tag). I can recommend Hum , to prettify the Shortlinks. type attribute is optional.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The post\'s shortlink. type can be either url or html (an <a /> tag). I can recommend Hum , to prettify the Shortlinks. type attribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_hashtags]' . \wp_kses( __( 'The post\'s tags as hashtags.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The post\'s tags as hashtags.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_hashcats]' . \wp_kses( __( 'The post\'s categories as hashtags.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The post\'s categories as hashtags.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_image type=full]' . \wp_kses( __( 'The URL for the post\'s featured image, defaults to full size. The type attribute can be any of the following: thumbnail, medium, large, full. type attribute is optional.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The URL for the post\'s featured image, defaults to full size. The type attribute can be any of the following: thumbnail, medium, large, full. type attribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_author]' . \wp_kses( __( 'The author\'s name.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The author\'s name.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_authorurl]' . \wp_kses( __( 'The URL to the author\'s profile page.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The URL to the author\'s profile page.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_date]' . \wp_kses( __( 'The post\'s date.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The post\'s date.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_time]' . \wp_kses( __( 'The post\'s time.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The post\'s time.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_datetime]' . \wp_kses( __( 'The post\'s date/time formated as "date @ time".', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The post\'s date/time formated as "date @ time".', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_blogurl]' . \wp_kses( __( 'The URL to the site.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The URL to the site.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_blogname]' . \wp_kses( __( 'The name of the site.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The name of the site.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
'[ap_blogdesc]' . \wp_kses( __( 'The description of the site.', 'activitypub' ), 'default' ) . ' ' .
+ '' . \wp_kses( __( 'The description of the site.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
' ' .
'' . __( 'You may also use any Shortcode normally available to you on your site, however be aware that Shortcodes may significantly increase the size of your content depending on what they do.', 'activitypub' ) . '
' .
'' . __( 'Note: the old Template Tags are now deprecated and automatically converted to the new ones.', 'activitypub' ) . '
' .
@@ -48,8 +48,8 @@
\get_current_screen()->add_help_tab(
array(
- 'id' => 'glossar',
- 'title' => \__( 'Glossar', 'activitypub' ),
+ 'id' => 'glossary',
+ 'title' => \__( 'Glossary', 'activitypub' ),
'content' =>
'
' . \__( 'Fediverse', 'activitypub' ) . '
' .
'' . \__( 'The Fediverse is a new word made of two words: "federation" + "universe"', 'activitypub' ) . '
' .
@@ -71,7 +71,5 @@
\get_current_screen()->set_help_sidebar(
'' . \__( 'For more information:', 'activitypub' ) . '
' .
'' . \__( 'Get support ', 'activitypub' ) . '
' .
- '' . \__( 'Report an issue ', 'activitypub' ) . '
' .
- '' . \__( 'Donate ', 'activitypub' ) . '
'
+ '' . \__( 'Report an issue ', 'activitypub' ) . '
'
);
diff --git a/includes/model/class-activity.php b/includes/model/class-activity.php
deleted file mode 100644
index f865d6dd4..000000000
--- a/includes/model/class-activity.php
+++ /dev/null
@@ -1,126 +0,0 @@
-context = null;
- } elseif ( 'full' === $context ) {
- $this->context = \Activitypub\get_context();
- }
-
- $this->type = \ucfirst( $type );
- $this->published = \gmdate( 'Y-m-d\TH:i:s\Z', \strtotime( 'now' ) );
- }
-
- public function __call( $method, $params ) {
- $var = \strtolower( \substr( $method, 4 ) );
-
- if ( \strncasecmp( $method, 'get', 3 ) === 0 ) {
- return $this->$var;
- }
-
- if ( \strncasecmp( $method, 'set', 3 ) === 0 ) {
- $this->$var = $params[0];
- }
- }
-
- public function from_post( Post $post ) {
- $this->object = $post->to_array();
-
- if ( isset( $object['published'] ) ) {
- $this->published = $object['published'];
- }
- $this->cc = array( \get_rest_url( null, '/activitypub/1.0/users/' . intval( $post->get_post_author() ) . '/followers' ) );
-
- if ( isset( $this->object['attributedTo'] ) ) {
- $this->actor = $this->object['attributedTo'];
- }
-
- foreach ( $post->get_tags() as $tag ) {
- if ( 'Mention' === $tag['type'] ) {
- $this->cc[] = $tag['href'];
- }
- }
-
- $type = \strtolower( $this->type );
-
- if ( isset( $this->object['id'] ) ) {
- $this->id = add_query_arg( 'activity', $type, $this->object['id'] );
- }
- }
-
- public function from_comment( $object ) {
-
- }
-
- public function to_comment() {
-
- }
-
- public function from_remote_array( $array ) {
-
- }
-
- public function to_array() {
- $array = array_filter( \get_object_vars( $this ) );
-
- if ( $this->context ) {
- $array = array( '@context' => $this->context ) + $array;
- }
-
- unset( $array['context'] );
-
- return $array;
- }
-
- /**
- * Convert to JSON
- *
- * @return void
- */
- public function to_json() {
- return \wp_json_encode( $this->to_array(), \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT );
- }
-
- public function to_simple_array() {
- $activity = array(
- '@context' => $this->context,
- 'type' => $this->type,
- 'actor' => $this->actor,
- 'object' => $this->object,
- 'to' => $this->to,
- 'cc' => $this->cc,
- );
-
- if ( $this->id ) {
- $activity['id'] = $this->id;
- }
-
- return $activity;
- }
-
- public function to_simple_json() {
- return \wp_json_encode( $this->to_simple_array(), \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT );
- }
-}
diff --git a/includes/model/class-application-user.php b/includes/model/class-application-user.php
new file mode 100644
index 000000000..1cfcec0ef
--- /dev/null
+++ b/includes/model/class-application-user.php
@@ -0,0 +1,72 @@
+ 404 )
+ );
+ }
+
+ $object = new static();
+ $object->_id = $user_id;
+
+ return $object;
+ }
+
+ /**
+ * Get the type of the object.
+ *
+ * If the Blog is in "single user" mode, return "Person" insted of "Group".
+ *
+ * @return string The type of the object.
+ */
+ public function get_type() {
+ if ( is_single_user() ) {
+ return 'Person';
+ } else {
+ return 'Group';
+ }
+ }
+
+ /**
+ * Get the User-Name.
+ *
+ * @return string The User-Name.
+ */
+ public function get_name() {
+ return \esc_html( \get_bloginfo( 'name' ) );
+ }
+
+ /**
+ * Get the User-Description.
+ *
+ * @return string The User-Description.
+ */
+ public function get_summary() {
+ return \wpautop(
+ \wp_kses(
+ \get_bloginfo( 'description' ),
+ 'default'
+ )
+ );
+ }
+
+ /**
+ * Get the User-Url.
+ *
+ * @return string The User-Url.
+ */
+ public function get_url() {
+ return \esc_url( \trailingslashit( get_home_url() ) . '@' . $this->get_preferred_username() );
+ }
+
+ /**
+ * Returns the User-URL with @-Prefix for the username.
+ *
+ * @return string The User-URL with @-Prefix for the username.
+ */
+ public function get_at_url() {
+ return \esc_url( \trailingslashit( get_home_url() ) . '@' . $this->get_preferred_username() );
+ }
+
+ /**
+ * Generate a default Username.
+ *
+ * @return string The auto-generated Username.
+ */
+ public static function get_default_username() {
+ // 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.
+ *
+ * @param string $host The default username.
+ */
+ return apply_filters( 'activitypub_default_blog_username', $host );
+ }
+
+ /**
+ * Get the preferred User-Name.
+ *
+ * @return string The User-Name.
+ */
+ public function get_preferred_username() {
+ $username = \get_option( 'activitypub_blog_user_identifier' );
+
+ if ( $username ) {
+ return $username;
+ }
+
+ return self::get_default_username();
+ }
+
+ /**
+ * Get the User-Icon.
+ *
+ * @return array The User-Icon.
+ */
+ public function get_icon() {
+ // try site icon first
+ $icon_id = get_option( 'site_icon' );
+
+ // try custom logo second
+ if ( ! $icon_id ) {
+ $icon_id = get_theme_mod( 'custom_logo' );
+ }
+
+ $icon_url = false;
+
+ if ( $icon_id ) {
+ $icon = wp_get_attachment_image_src( $icon_id, 'full' );
+ if ( $icon ) {
+ $icon_url = $icon[0];
+ }
+ }
+
+ if ( ! $icon_url ) {
+ // fallback to default icon
+ $icon_url = plugins_url( '/assets/img/wp-logo.png', ACTIVITYPUB_PLUGIN_FILE );
+ }
+
+ return array(
+ 'type' => 'Image',
+ 'url' => esc_url( $icon_url ),
+ );
+ }
+
+ /**
+ * Get the User-Header-Image.
+ *
+ * @return array|null The User-Header-Image.
+ */
+ public function get_header_image() {
+ if ( \has_header_image() ) {
+ return array(
+ 'type' => 'Image',
+ 'url' => esc_url( \get_header_image() ),
+ );
+ }
+
+ return null;
+ }
+
+ public function get_published() {
+ $first_post = new WP_Query(
+ array(
+ 'orderby' => 'date',
+ 'order' => 'ASC',
+ 'number' => 1,
+ )
+ );
+
+ if ( ! empty( $first_post->posts[0] ) ) {
+ $time = \strtotime( $first_post->posts[0]->post_date_gmt );
+ } else {
+ $time = \time();
+ }
+
+ return \gmdate( 'Y-m-d\TH:i:s\Z', $time );
+ }
+
+ public function get_attachment() {
+ return null;
+ }
+
+ public function get_canonical_url() {
+ return \home_url();
+ }
+
+ public function get_moderators() {
+ if ( is_single_user() || 'Group' !== $this->get_type() ) {
+ return null;
+ }
+
+ return get_rest_url_by_path( 'collections/moderators' );
+ }
+
+ public function get_attributed_to() {
+ if ( is_single_user() || 'Group' !== $this->get_type() ) {
+ return null;
+ }
+
+ return get_rest_url_by_path( 'collections/moderators' );
+ }
+
+ public function get_posting_restricted_to_mods() {
+ if ( 'Group' === $this->get_type() ) {
+ return true;
+ }
+
+ return null;
+ }
+}
diff --git a/includes/model/class-follower.php b/includes/model/class-follower.php
new file mode 100644
index 000000000..7cf6dd464
--- /dev/null
+++ b/includes/model/class-follower.php
@@ -0,0 +1,366 @@
+_id, 'activitypub_errors' );
+ }
+
+ /**
+ * Get the Summary.
+ *
+ * @return int The Summary.
+ */
+ public function get_summary() {
+ if ( isset( $this->summary ) ) {
+ return $this->summary;
+ }
+
+ return '';
+ }
+
+ /**
+ * 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.
+ *
+ * @return string The URL.
+ */
+ public function get_url() {
+ if ( $this->url ) {
+ return $this->url;
+ }
+
+ return $this->id;
+ }
+
+ /**
+ * Reset (delete) all errors.
+ *
+ * @return void
+ */
+ public function reset_errors() {
+ delete_post_meta( $this->_id, 'activitypub_errors' );
+ }
+
+ /**
+ * Count the errors.
+ *
+ * @return int The number of errors.
+ */
+ public function count_errors() {
+ $errors = $this->get_errors();
+
+ if ( is_array( $errors ) && ! empty( $errors ) ) {
+ return count( $errors );
+ }
+
+ return 0;
+ }
+
+ /**
+ * Return the latest error message.
+ *
+ * @return string The error message.
+ */
+ public function get_latest_error_message() {
+ $errors = $this->get_errors();
+
+ if ( is_array( $errors ) && ! empty( $errors ) ) {
+ return reset( $errors );
+ }
+
+ return '';
+ }
+
+ /**
+ * Update the current Follower-Object.
+ *
+ * @return void
+ */
+ public function update() {
+ $this->save();
+ }
+
+ /**
+ * Validate the current Follower-Object.
+ *
+ * @return boolean True if the verification was successful.
+ */
+ public function is_valid() {
+ // the minimum required attributes
+ $required_attributes = array(
+ 'id',
+ 'preferredUsername',
+ 'inbox',
+ 'publicKey',
+ 'publicKeyPem',
+ );
+
+ foreach ( $required_attributes as $attribute ) {
+ if ( ! $this->get( $attribute ) ) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Save the current Follower-Object.
+ *
+ * @return int|WP_Error The Post-ID or an WP_Error.
+ */
+ public function save() {
+ if ( ! $this->is_valid() ) {
+ return new WP_Error( 'activitypub_invalid_follower', __( 'Invalid Follower', 'activitypub' ), array( 'status' => 400 ) );
+ }
+
+ if ( ! $this->get__id() ) {
+ global $wpdb;
+
+ // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching
+ $post_id = $wpdb->get_var(
+ $wpdb->prepare(
+ "SELECT ID FROM $wpdb->posts WHERE guid=%s",
+ esc_sql( $this->get_id() )
+ )
+ );
+
+ if ( $post_id ) {
+ $post = get_post( $post_id );
+ $this->set__id( $post->ID );
+ }
+ }
+
+ $args = array(
+ 'ID' => $this->get__id(),
+ 'guid' => esc_url_raw( $this->get_id() ),
+ 'post_title' => wp_strip_all_tags( sanitize_text_field( $this->get_name() ) ),
+ 'post_author' => 0,
+ 'post_type' => Followers::POST_TYPE,
+ 'post_name' => esc_url_raw( $this->get_id() ),
+ 'post_excerpt' => sanitize_text_field( wp_kses( $this->get_summary(), 'user_description' ) ),
+ 'post_status' => 'publish',
+ 'meta_input' => $this->get_post_meta_input(),
+ );
+
+ $post_id = wp_insert_post( $args );
+ $this->_id = $post_id;
+
+ return $post_id;
+ }
+
+ /**
+ * Upsert the current Follower-Object.
+ *
+ * @return int|WP_Error The Post-ID or an WP_Error.
+ */
+ public function upsert() {
+ return $this->save();
+ }
+
+ /**
+ * 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
+ */
+ public function delete() {
+ wp_delete_post( $this->_id );
+ }
+
+ /**
+ * 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['activitypub_actor_json'] = $this->to_json();
+
+ return $meta_input;
+ }
+
+ /**
+ * Get the icon.
+ *
+ * Sets a fallback to better handle API and HTML outputs.
+ *
+ * @return array The icon.
+ */
+ public function get_icon() {
+ if ( isset( $this->icon['url'] ) ) {
+ return $this->icon;
+ }
+
+ return array(
+ 'type' => 'Image',
+ 'mediaType' => 'image/jpeg',
+ 'url' => ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg',
+ );
+ }
+
+ /**
+ * Get Name.
+ *
+ * Tries to extract a name from the URL or ID if not set.
+ *
+ * @return string The name.
+ */
+ public function get_name() {
+ if ( $this->name ) {
+ return $this->name;
+ } elseif ( $this->preferred_username ) {
+ return $this->preferred_username;
+ }
+
+ return $this->extract_name_from_uri();
+ }
+
+ /**
+ * The preferred Username.
+ *
+ * Tries to extract a name from the URL or ID if not set.
+ *
+ * @return string The preferred Username.
+ */
+ public function get_preferred_username() {
+ if ( $this->preferred_username ) {
+ return $this->preferred_username;
+ }
+
+ return $this->extract_name_from_uri();
+ }
+
+ /**
+ * Get the Icon URL (Avatar)
+ *
+ * @return string The URL to the Avatar.
+ */
+ public function get_icon_url() {
+ $icon = $this->get_icon();
+
+ if ( ! $icon ) {
+ return '';
+ }
+
+ if ( is_array( $icon ) ) {
+ return $icon['url'];
+ }
+
+ return $icon;
+ }
+
+ /**
+ * Get the shared inbox, with a fallback to the inbox.
+ *
+ * @return string|null The URL to the shared inbox, the inbox or null.
+ */
+ public function get_shared_inbox() {
+ if ( ! empty( $this->get_endpoints()['sharedInbox'] ) ) {
+ return $this->get_endpoints()['sharedInbox'];
+ } elseif ( ! empty( $this->get_inbox() ) ) {
+ return $this->get_inbox();
+ }
+
+ return null;
+ }
+
+ /**
+ * Convert a Custom-Post-Type input to an Activitypub\Model\Follower.
+ *
+ * @return string The JSON string.
+ *
+ * @return array Activitypub\Model\Follower
+ */
+ 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->set__id( $post->ID );
+ $object->set_id( $post->guid );
+ $object->set_name( $post->post_title );
+ $object->set_summary( $post->post_excerpt );
+ $object->set_published( gmdate( 'Y-m-d H:i:s', strtotime( $post->post_published ) ) );
+ $object->set_updated( gmdate( 'Y-m-d H:i:s', strtotime( $post->post_modified ) ) );
+
+ return $object;
+ }
+
+ /**
+ * Infer a shortname from the Actor ID or URL. Used only for fallbacks,
+ * we will try to use what's supplied.
+ *
+ * @return string Hopefully the name of the Follower.
+ */
+ protected function extract_name_from_uri() {
+ // prefer the URL, but fall back to the ID.
+ if ( $this->url ) {
+ $name = $this->url;
+ } else {
+ $name = $this->id;
+ }
+
+ if ( \filter_var( $name, FILTER_VALIDATE_URL ) ) {
+ $name = \rtrim( $name, '/' );
+ $path = \wp_parse_url( $name, PHP_URL_PATH );
+
+ if ( $path ) {
+ if ( \strpos( $name, '@' ) !== false ) {
+ // expected: https://example.com/@user (default URL pattern)
+ $name = \preg_replace( '|^/@?|', '', $path );
+ } else {
+ // expected: https://example.com/users/user (default ID pattern)
+ $parts = \explode( '/', $path );
+ $name = \array_pop( $parts );
+ }
+ }
+ } elseif (
+ \is_email( $name ) ||
+ \strpos( $name, 'acct' ) === 0 ||
+ \strpos( $name, '@' ) === 0
+ ) {
+ // expected: user@example.com or acct:user@example (WebFinger)
+ $name = \ltrim( $name, '@' );
+ $name = \ltrim( $name, 'acct:' );
+ $parts = \explode( '@', $name );
+ $name = $parts[0];
+ }
+
+ return $name;
+ }
+}
diff --git a/includes/model/class-post.php b/includes/model/class-post.php
index d83384eee..d967ad9a7 100644
--- a/includes/model/class-post.php
+++ b/includes/model/class-post.php
@@ -1,6 +1,8 @@
post = $post;
+ $this->object = Post_Transformer::transform( $post )->to_object();
+ }
/**
- * The Allowed Tags, used in the content.
+ * Returns the User ID.
*
- * @var array
+ * @return int the User ID.
*/
- private $allowed_tags = array(
- 'a' => array(
- 'href' => array(),
- 'title' => array(),
- 'class' => array(),
- 'rel' => array(),
- ),
- 'br' => array(),
- 'p' => array(
- 'class' => array(),
- ),
- 'span' => array(
- 'class' => array(),
- ),
- 'div' => array(
- 'class' => array(),
- ),
- 'ul' => array(),
- 'ol' => array(),
- 'li' => array(),
- 'strong' => array(
- 'class' => array(),
- ),
- 'b' => array(
- 'class' => array(),
- ),
- 'i' => array(
- 'class' => array(),
- ),
- 'em' => array(
- 'class' => array(),
- ),
- 'blockquote' => array(),
- 'cite' => array(),
- );
+ public function get_user_id() {
+ return apply_filters( 'activitypub_post_user_id', $this->post->post_author, $this->post );
+ }
/**
- * Constructor
+ * Converts this Object into an Array.
*
- * @param WP_Post $post
+ * @return array the array representation of a Post.
*/
- public function __construct( $post ) {
- $this->post = \get_post( $post );
+ public function to_array() {
+ return \apply_filters( 'activitypub_post', $this->object->to_array(), $this->post );
}
/**
- * Magic function to implement getter and setter
- *
- * @param string $method
- * @param string $params
+ * Returns the Actor of this Object.
*
- * @return void
+ * @return string The URL of the Actor.
*/
- public function __call( $method, $params ) {
- $var = \strtolower( \substr( $method, 4 ) );
+ public function get_actor() {
+ $user = User_Factory::get_by_id( $this->get_user_id() );
- if ( \strncasecmp( $method, 'get', 3 ) === 0 ) {
- if ( empty( $this->$var ) && ! empty( $this->post->$var ) ) {
- return $this->post->$var;
- }
- return $this->$var;
- }
-
- if ( \strncasecmp( $method, 'set', 3 ) === 0 ) {
- $this->$var = $params[0];
- }
+ return $user->get_url();
}
/**
- * Converts this Object into an Array.
+ * Converts this Object into a JSON String
*
- * @return array
+ * @return string
*/
- public function to_array() {
- $post = $this->post;
-
- $array = array(
- 'id' => $this->get_id(),
- 'type' => $this->get_object_type(),
- 'published' => \gmdate( 'Y-m-d\TH:i:s\Z', \strtotime( $post->post_date_gmt ) ),
- 'attributedTo' => \get_author_posts_url( $post->post_author ),
- 'summary' => $this->get_summary(),
- 'inReplyTo' => null,
- 'content' => $this->get_content(),
- 'contentMap' => array(
- \strstr( \get_locale(), '_', true ) => $this->get_content(),
- ),
- 'to' => array( 'https://www.w3.org/ns/activitystreams#Public' ),
- 'cc' => array( 'https://www.w3.org/ns/activitystreams#Public' ),
- 'attachment' => $this->get_attachments(),
- 'tag' => $this->get_tags(),
- );
-
- return \apply_filters( 'activitypub_post', $array, $this->post );
+ public function to_json() {
+ return \wp_json_encode( $this->to_array(), \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT );
}
/**
- * Converts this Object into a JSON String
+ * Returns the URL of an Activity Object
*
* @return string
*/
- public function to_json() {
- return \wp_json_encode( $this->to_array(), \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT );
+ public function get_url() {
+ return $this->object->get_url();
}
/**
@@ -179,21 +90,7 @@ public function to_json() {
* @return string
*/
public function get_id() {
- if ( $this->id ) {
- return $this->id;
- }
-
- $post = $this->post;
-
- if ( 'trash' === get_post_status( $post ) ) {
- $permalink = \get_post_meta( $post->ID, 'activitypub_canonical_url', true );
- } else {
- $permalink = \get_permalink( $post );
- }
-
- $this->id = $permalink;
-
- return $permalink;
+ return $this->object->get_id();
}
/**
@@ -202,73 +99,7 @@ public function get_id() {
* @return array
*/
public function get_attachments() {
- if ( $this->attachments ) {
- return $this->attachments;
- }
-
- $max_images = intval( \apply_filters( 'activitypub_max_image_attachments', \get_option( 'activitypub_max_image_attachments', ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS ) ) );
-
- $images = array();
-
- // max images can't be negative or zero
- if ( $max_images <= 0 ) {
- return $images;
- }
-
- $id = $this->post->ID;
-
- $image_ids = array();
-
- // list post thumbnail first if this post has one
- if ( \function_exists( 'has_post_thumbnail' ) && \has_post_thumbnail( $id ) ) {
- $image_ids[] = \get_post_thumbnail_id( $id );
- $max_images--;
- }
-
- if ( $max_images > 0 ) {
- // then list any image attachments
- $query = new \WP_Query(
- array(
- 'post_parent' => $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, $image_ids, true ) ) {
- $image_ids[] = $attachment->ID;
- }
- }
- }
-
- $image_ids = \array_unique( $image_ids );
-
- // get URLs for each image
- foreach ( $image_ids as $id ) {
- $alt = \get_post_meta( $id, '_wp_attachment_image_alt', true );
- $thumbnail = \wp_get_attachment_image_src( $id, 'full' );
- $mimetype = \get_post_mime_type( $id );
-
- if ( $thumbnail ) {
- $image = array(
- 'type' => 'Image',
- 'url' => $thumbnail[0],
- 'mediaType' => $mimetype,
- );
- if ( $alt ) {
- $image['name'] = $alt;
- }
- $images[] = $image;
- }
- }
-
- $this->attachments = $images;
-
- return $images;
+ return $this->object->get_attachment();
}
/**
@@ -277,39 +108,7 @@ public function get_attachments() {
* @return array
*/
public function get_tags() {
- if ( $this->tags ) {
- return $this->tags;
- }
-
- $tags = array();
-
- $post_tags = \get_the_tags( $this->post->ID );
- if ( $post_tags ) {
- foreach ( $post_tags as $post_tag ) {
- $tag = array(
- 'type' => 'Hashtag',
- 'href' => \get_tag_link( $post_tag->term_id ),
- 'name' => '#' . $post_tag->slug,
- );
- $tags[] = $tag;
- }
- }
-
- $mentions = apply_filters( 'activitypub_extract_mentions', array(), $this->post->post_content, $this );
- if ( $mentions ) {
- foreach ( $mentions as $mention => $url ) {
- $tag = array(
- 'type' => 'Mention',
- 'href' => $url,
- 'name' => $mention,
- );
- $tags[] = $tag;
- }
- }
-
- $this->tags = $tags;
-
- return $tags;
+ return $this->object->get_tag();
}
/**
@@ -318,66 +117,7 @@ public function get_tags() {
* @return string the object-type
*/
public function get_object_type() {
- if ( $this->object_type ) {
- return $this->object_type;
- }
-
- if ( 'wordpress-post-format' !== \get_option( 'activitypub_object_type', 'note' ) ) {
- return \ucfirst( \get_option( 'activitypub_object_type', 'note' ) );
- }
-
- $post_type = \get_post_type( $this->post );
- switch ( $post_type ) {
- case 'post':
- $post_format = \get_post_format( $this->post );
- switch ( $post_format ) {
- case 'aside':
- case 'status':
- case 'quote':
- case 'note':
- $object_type = 'Note';
- break;
- case 'gallery':
- case 'image':
- $object_type = 'Image';
- break;
- case 'video':
- $object_type = 'Video';
- break;
- case 'audio':
- $object_type = 'Audio';
- break;
- default:
- $object_type = 'Article';
- break;
- }
- break;
- case 'page':
- $object_type = 'Page';
- break;
- case 'attachment':
- $mime_type = \get_post_mime_type();
- $media_type = \preg_replace( '/(\/[a-zA-Z]+)/i', '', $mime_type );
- switch ( $media_type ) {
- case 'audio':
- $object_type = 'Audio';
- break;
- case 'video':
- $object_type = 'Video';
- break;
- case 'image':
- $object_type = 'Image';
- break;
- }
- break;
- default:
- $object_type = 'Article';
- break;
- }
-
- $this->object_type = $object_type;
-
- return $object_type;
+ return $this->object->get_type();
}
/**
@@ -386,92 +126,6 @@ public function get_object_type() {
* @return string the content
*/
public function get_content() {
- global $post;
-
- if ( $this->content ) {
- return $this->content;
- }
-
- // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
- $post = $this->post;
- $content = $this->get_post_content_template();
-
- // Fill in the shortcodes.
- setup_postdata( $post );
- $content = do_shortcode( $content );
- wp_reset_postdata();
-
- $content = \wpautop( \wp_kses( $content, $this->allowed_tags ) );
- $content = \trim( \preg_replace( '/[\n\r\t]/', '', $content ) );
-
- $content = \apply_filters( 'activitypub_the_content', $content, $post );
- $content = \html_entity_decode( $content, \ENT_QUOTES, 'UTF-8' );
-
- $this->content = $content;
-
- return $content;
- }
-
- /**
- * Gets the template to use to generate the content of the activitypub item.
- *
- * @return string the template
- */
- public function get_post_content_template() {
- if ( 'excerpt' === \get_option( 'activitypub_post_content_type', 'content' ) ) {
- return "[ap_excerpt]\n\n[ap_permalink type=\"html\"]";
- }
-
- if ( 'title' === \get_option( 'activitypub_post_content_type', 'content' ) ) {
- return "[ap_title]\n\n[ap_permalink type=\"html\"]";
- }
-
- if ( 'content' === \get_option( 'activitypub_post_content_type', 'content' ) ) {
- return "[ap_content]\n\n[ap_hashtags]\n\n[ap_permalink type=\"html\"]";
- }
-
- // Upgrade from old template codes to shortcodes.
- $content = self::upgrade_post_content_template();
-
- return $content;
- }
-
- /**
- * Updates the custom template to use shortcodes instead of the deprecated templates.
- *
- * @return string the updated template content
- */
- public static function upgrade_post_content_template() {
- // Get the custom template.
- $old_content = \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT );
-
- // If the old content exists but is a blank string, we're going to need a flag to updated it even
- // after setting it to the default contents.
- $need_update = false;
-
- // If the old contents is blank, use the defaults.
- if ( '' === $old_content ) {
- $old_content = ACTIVITYPUB_CUSTOM_POST_CONTENT;
- $need_update = true;
- }
-
- // Set the new content to be the old content.
- $content = $old_content;
-
- // Convert old templates to shortcodes.
- $content = \str_replace( '%title%', '[ap_title]', $content );
- $content = \str_replace( '%excerpt%', '[ap_excerpt]', $content );
- $content = \str_replace( '%content%', '[ap_content]', $content );
- $content = \str_replace( '%permalink%', '[ap_permalink type="html"]', $content );
- $content = \str_replace( '%shortlink%', '[ap_shortlink type="html"]', $content );
- $content = \str_replace( '%hashtags%', '[ap_hashtags]', $content );
- $content = \str_replace( '%tags%', '[ap_hashtags]', $content );
-
- // Store the new template if required.
- if ( $content !== $old_content || $need_update ) {
- \update_option( 'activitypub_custom_post_content', $content );
- }
-
- return $content;
+ return $this->object->get_content();
}
}
diff --git a/includes/model/class-user.php b/includes/model/class-user.php
new file mode 100644
index 000000000..d07534bb2
--- /dev/null
+++ b/includes/model/class-user.php
@@ -0,0 +1,314 @@
+
+ */
+ protected $resource;
+
+ /**
+ * Restrict posting to mods
+ *
+ * @see https://join-lemmy.org/docs/contributors/05-federation.html
+ *
+ * @var boolean
+ */
+ protected $posting_restricted_to_mods = null;
+
+ public static function from_wp_user( $user_id ) {
+ if ( is_user_disabled( $user_id ) ) {
+ return new WP_Error(
+ 'activitypub_user_not_found',
+ \__( 'User not found', 'activitypub' ),
+ array( 'status' => 404 )
+ );
+ }
+
+ $object = new static();
+ $object->_id = $user_id;
+
+ return $object;
+ }
+
+ /**
+ * Get the User-ID.
+ *
+ * @return string The User-ID.
+ */
+ public function get_id() {
+ return $this->get_url();
+ }
+
+ /**
+ * Get the User-Name.
+ *
+ * @return string The User-Name.
+ */
+ public function get_name() {
+ return \esc_attr( \get_the_author_meta( 'display_name', $this->_id ) );
+ }
+
+ /**
+ * Get the User-Description.
+ *
+ * @return string The User-Description.
+ */
+ public function get_summary() {
+ $description = get_user_meta( $this->_id, 'activitypub_user_description', true );
+ if ( empty( $description ) ) {
+ $description = get_user_meta( $this->_id, 'description', true );
+ }
+ return \wpautop( \wp_kses( $description, 'default' ) );
+ }
+
+ /**
+ * Get 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.
+ *
+ * @return string The User-URL with @-Prefix for the username.
+ */
+ public function get_at_url() {
+ return \esc_url( \trailingslashit( get_home_url() ) . '@' . $this->get_username() );
+ }
+
+ public function get_preferred_username() {
+ return \esc_attr( \get_the_author_meta( 'login', $this->_id ) );
+ }
+
+ public function get_icon() {
+ $icon = \esc_url(
+ \get_avatar_url(
+ $this->_id,
+ array( 'size' => 120 )
+ )
+ );
+
+ return array(
+ 'type' => 'Image',
+ 'url' => $icon,
+ );
+ }
+
+ public function get_image() {
+ if ( \has_header_image() ) {
+ $image = \esc_url( \get_header_image() );
+ return array(
+ 'type' => 'Image',
+ 'url' => $image,
+ );
+ }
+
+ return null;
+ }
+
+ public function get_published() {
+ return \gmdate( 'Y-m-d\TH:i:s\Z', \strtotime( \get_the_author_meta( 'registered', $this->_id ) ) );
+ }
+
+ public function get_public_key() {
+ return array(
+ 'id' => $this->get_id() . '#main-key',
+ 'owner' => $this->get_id(),
+ 'publicKeyPem' => Signature::get_public_key_for( $this->get__id() ),
+ );
+ }
+
+ /**
+ * Returns the Inbox-API-Endpoint.
+ *
+ * @return string The Inbox-Endpoint.
+ */
+ public function get_inbox() {
+ return get_rest_url_by_path( sprintf( 'users/%d/inbox', $this->get__id() ) );
+ }
+
+ /**
+ * Returns the Outbox-API-Endpoint.
+ *
+ * @return string The Outbox-Endpoint.
+ */
+ public function get_outbox() {
+ return get_rest_url_by_path( sprintf( 'users/%d/outbox', $this->get__id() ) );
+ }
+
+ /**
+ * Returns the Followers-API-Endpoint.
+ *
+ * @return string The Followers-Endpoint.
+ */
+ public function get_followers() {
+ return get_rest_url_by_path( sprintf( 'users/%d/followers', $this->get__id() ) );
+ }
+
+ /**
+ * Returns the Following-API-Endpoint.
+ *
+ * @return string The Following-Endpoint.
+ */
+ public function get_following() {
+ return get_rest_url_by_path( sprintf( 'users/%d/following', $this->get__id() ) );
+ }
+
+ /**
+ * Returns the Featured-API-Endpoint.
+ *
+ * @return string The Featured-Endpoint.
+ */
+ public function get_featured() {
+ return get_rest_url_by_path( sprintf( 'users/%d/collections/featured', $this->get__id() ) );
+ }
+
+ /**
+ * Returns the Featured-Tags-API-Endpoint.
+ *
+ * @return string The Featured-Tags-Endpoint.
+ */
+ public function get_featured_tags() {
+ return get_rest_url_by_path( sprintf( 'users/%d/collections/tags', $this->get__id() ) );
+ }
+
+ /**
+ * 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(
+ '' . \wp_parse_url( \home_url( '/' ), \PHP_URL_HOST ) . ' ',
+ \ENT_QUOTES,
+ 'UTF-8'
+ ),
+ );
+
+ $array[] = array(
+ 'type' => 'PropertyValue',
+ 'name' => \__( 'Profile', 'activitypub' ),
+ 'value' => \html_entity_decode(
+ '' . \wp_parse_url( \get_author_posts_url( $this->get__id() ), \PHP_URL_HOST ) . ' ',
+ \ENT_QUOTES,
+ 'UTF-8'
+ ),
+ );
+
+ if ( \get_the_author_meta( 'user_url', $this->get__id() ) ) {
+ $array[] = array(
+ 'type' => 'PropertyValue',
+ 'name' => \__( 'Website', 'activitypub' ),
+ 'value' => \html_entity_decode(
+ '' . \wp_parse_url( \get_the_author_meta( 'user_url', $this->get__id() ), \PHP_URL_HOST ) . ' ',
+ \ENT_QUOTES,
+ 'UTF-8'
+ ),
+ );
+ }
+
+ return $array;
+ }
+
+ /**
+ * Returns a user@domain type of identifier for the user.
+ *
+ * @return string The Webfinger-Identifier.
+ */
+ public function get_resource() {
+ return $this->get_preferred_username() . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST );
+ }
+
+ public function get_canonical_url() {
+ return $this->get_url();
+ }
+
+ public function get_streams() {
+ return null;
+ }
+
+ public function get_indexable() {
+ if ( \get_option( 'blog_public', 1 ) ) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+}
diff --git a/includes/peer/class-followers.php b/includes/peer/class-followers.php
index abc18e32e..e0e6ddba3 100644
--- a/includes/peer/class-followers.php
+++ b/includes/peer/class-followers.php
@@ -9,76 +9,26 @@
class Followers {
public static function get_followers( $author_id ) {
- $followers = \get_user_option( 'activitypub_followers', $author_id );
+ _deprecated_function( __METHOD__, '1.0.0', '\Activitypub\Collection\Followers::get_followers' );
- if ( ! $followers ) {
- return array();
- }
-
- foreach ( $followers as $key => $follower ) {
- if (
- \is_array( $follower ) &&
- isset( $follower['type'] ) &&
- 'Person' === $follower['type'] &&
- isset( $follower['id'] ) &&
- false !== \filter_var( $follower['id'], \FILTER_VALIDATE_URL )
- ) {
- $followers[ $key ] = $follower['id'];
- }
- }
-
- return $followers;
+ return \Activitypub\Collection\Followers::get_followers( $author_id );
}
public static function count_followers( $author_id ) {
- $followers = self::get_followers( $author_id );
+ _deprecated_function( __METHOD__, '1.0.0', '\Activitypub\Collection\Followers::count_followers' );
- return \count( $followers );
+ return \Activitypub\Collection\Followers::count_followers( $author_id );
}
public static function add_follower( $actor, $author_id ) {
- $followers = \get_user_option( 'activitypub_followers', $author_id );
-
- if ( ! \is_string( $actor ) ) {
- if (
- \is_array( $actor ) &&
- isset( $actor['type'] ) &&
- 'Person' === $actor['type'] &&
- isset( $actor['id'] ) &&
- false !== \filter_var( $actor['id'], \FILTER_VALIDATE_URL )
- ) {
- $actor = $actor['id'];
- }
-
- return new \WP_Error(
- 'invalid_actor_object',
- \__( 'Unknown Actor schema', 'activitypub' ),
- array(
- 'status' => 404,
- )
- );
- }
+ _deprecated_function( __METHOD__, '1.0.0', '\Activitypub\Collection\Followers::add_follower' );
- if ( ! \is_array( $followers ) ) {
- $followers = array( $actor );
- } else {
- $followers[] = $actor;
- }
-
- $followers = \array_unique( $followers );
-
- \update_user_meta( $author_id, 'activitypub_followers', $followers );
+ return \Activitypub\Collection\Followers::add_follower( $author_id, $actor );
}
public static function remove_follower( $actor, $author_id ) {
- $followers = \get_user_option( 'activitypub_followers', $author_id );
-
- foreach ( $followers as $key => $value ) {
- if ( $value === $actor ) {
- unset( $followers[ $key ] );
- }
- }
+ _deprecated_function( __METHOD__, '1.0.0', '\Activitypub\Collection\Followers::remove_follower' );
- \update_user_meta( $author_id, 'activitypub_followers', $followers );
+ return \Activitypub\Collection\Followers::remove_follower( $author_id, $actor );
}
}
diff --git a/includes/peer/class-users.php b/includes/peer/class-users.php
deleted file mode 100644
index fd9c7b838..000000000
--- a/includes/peer/class-users.php
+++ /dev/null
@@ -1,67 +0,0 @@
-wp_rewrite_rules();
-
- // 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
- $author_rewrite = $wp_rewrite->get_author_permastruct();
- $author_regexp = \str_replace( '%author%', '', $author_rewrite );
-
- // 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 ) {
- return $user->ID;
- }
- }
-
- return 0;
- }
-}
diff --git a/includes/rest/class-collection.php b/includes/rest/class-collection.php
new file mode 100644
index 000000000..9e50835b6
--- /dev/null
+++ b/includes/rest/class-collection.php
@@ -0,0 +1,213 @@
+[\w\-\.]+)/collections/tags',
+ array(
+ array(
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( self::class, 'tags_get' ),
+ 'args' => self::request_parameters(),
+ 'permission_callback' => '__return_true',
+ ),
+ )
+ );
+
+ \register_rest_route(
+ ACTIVITYPUB_REST_NAMESPACE,
+ '/users/(?P[\w\-\.]+)/collections/featured',
+ array(
+ array(
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( self::class, 'featured_get' ),
+ 'args' => self::request_parameters(),
+ 'permission_callback' => '__return_true',
+ ),
+ )
+ );
+
+ \register_rest_route(
+ ACTIVITYPUB_REST_NAMESPACE,
+ '/collections/moderators',
+ array(
+ array(
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( self::class, 'moderators_get' ),
+ 'permission_callback' => '__return_true',
+ ),
+ )
+ );
+ }
+
+ /**
+ * The Featured Tags endpoint
+ *
+ * @param WP_REST_Request $request The request object.
+ *
+ * @return WP_REST_Response The response object.
+ */
+ public static function tags_get( $request ) {
+ $user_id = $request->get_param( 'user_id' );
+ $user = User_Collection::get_by_various( $user_id );
+
+ if ( is_wp_error( $user ) ) {
+ return $user;
+ }
+
+ $number = 4;
+
+ $tags = \get_terms(
+ array(
+ 'taxonomy' => 'post_tag',
+ 'orderby' => 'count',
+ 'order' => 'DESC',
+ 'number' => $number,
+ )
+ );
+
+ if ( is_wp_error( $tags ) ) {
+ $tags = array();
+ }
+
+ $response = array(
+ '@context' => Activity::CONTEXT,
+ 'id' => get_rest_url_by_path( sprintf( 'users/%d/collections/tags', $user->get__id() ) ),
+ 'type' => 'Collection',
+ 'totalItems' => count( $tags ),
+ 'items' => array(),
+ );
+
+ foreach ( $tags as $tag ) {
+ $response['items'][] = array(
+ 'type' => 'Hashtag',
+ 'href' => \esc_url( \get_tag_link( $tag ) ),
+ 'name' => esc_hashtag( $tag->name ),
+ );
+ }
+
+ return new WP_REST_Response( $response, 200 );
+ }
+
+ /**
+ * Featured posts endpoint
+ *
+ * @param WP_REST_Request $request The request object.
+ *
+ * @return WP_REST_Response The response object.
+ */
+ public static function featured_get( $request ) {
+ $user_id = $request->get_param( 'user_id' );
+ $user = User_Collection::get_by_various( $user_id );
+
+ if ( is_wp_error( $user ) ) {
+ return $user;
+ }
+
+ $sticky_posts = \get_option( 'sticky_posts' );
+
+ if ( ! is_single_user() && User_Collection::BLOG_USER_ID === $user->get__id() ) {
+ $posts = array();
+ } elseif ( $sticky_posts ) {
+ $args = array(
+ 'post__in' => $sticky_posts,
+ 'ignore_sticky_posts' => 1,
+ 'orderby' => 'date',
+ 'order' => 'DESC',
+ );
+
+ if ( $user->get__id() > 0 ) {
+ $args['author'] = $user->get__id();
+ }
+
+ $posts = \get_posts( $args );
+ } else {
+ $posts = array();
+ }
+
+ $response = array(
+ '@context' => Activity::CONTEXT,
+ 'id' => get_rest_url_by_path( sprintf( 'users/%d/collections/featured', $user_id ) ),
+ 'type' => 'OrderedCollection',
+ 'totalItems' => count( $posts ),
+ 'orderedItems' => array(),
+ );
+
+ foreach ( $posts as $post ) {
+ $response['orderedItems'][] = Post::transform( $post )->to_object()->to_array();
+ }
+
+ return new WP_REST_Response( $response, 200 );
+ }
+
+ /**
+ * Moderators endpoint
+ *
+ * @param WP_REST_Request $request The request object.
+ *
+ * @return WP_REST_Response The response object.
+ */
+ public static function moderators_get( $request ) {
+ $response = array(
+ '@context' => Activity::CONTEXT,
+ 'id' => get_rest_url_by_path( 'collections/moderators' ),
+ 'type' => 'OrderedCollection',
+ 'orderedItems' => array(),
+ );
+
+ $users = User_Collection::get_collection();
+
+ foreach ( $users as $user ) {
+ $response['orderedItems'][] = $user->get_url();
+ }
+
+ return new WP_REST_Response( $response, 200 );
+ }
+
+ /**
+ * The supported parameters
+ *
+ * @return array list of parameters
+ */
+ public static function request_parameters() {
+ $params = array();
+
+ $params['user_id'] = array(
+ 'required' => true,
+ 'type' => 'string',
+ );
+
+ return $params;
+ }
+}
diff --git a/includes/rest/class-followers.php b/includes/rest/class-followers.php
index 2734c7804..c125fcdfd 100644
--- a/includes/rest/class-followers.php
+++ b/includes/rest/class-followers.php
@@ -1,6 +1,15 @@
\d+)/followers',
+ ACTIVITYPUB_REST_NAMESPACE,
+ '/users/(?P[\w\-\.]+)/followers',
array(
array(
- 'methods' => \WP_REST_Server::READABLE,
- 'callback' => array( '\Activitypub\Rest\Followers', 'get' ),
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( self::class, 'get' ),
'args' => self::request_parameters(),
'permission_callback' => '__return_true',
),
@@ -43,44 +52,58 @@ public static function register_routes() {
*/
public static function get( $request ) {
$user_id = $request->get_param( 'user_id' );
- $user = \get_user_by( 'ID', $user_id );
+ $user = User_Collection::get_by_various( $user_id );
- if ( ! $user ) {
- return new \WP_Error(
- 'rest_invalid_param',
- \__( 'User not found', 'activitypub' ),
- array(
- 'status' => 404,
- 'params' => array(
- 'user_id' => \__( 'User not found', 'activitypub' ),
- ),
- )
- );
+ if ( is_wp_error( $user ) ) {
+ return $user;
}
+ $order = $request->get_param( 'order' );
+ $per_page = (int) $request->get_param( 'per_page' );
+ $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
*/
- \do_action( 'activitypub_outbox_pre' );
+ \do_action( 'activitypub_rest_followers_pre' );
- $json = new \stdClass();
+ $data = Follower_Collection::get_followers_with_count( $user_id, $per_page, $page, array( 'order' => ucwords( $order ) ) );
+ $json = new stdClass();
$json->{'@context'} = \Activitypub\get_context();
- $json->id = \home_url( \add_query_arg( null, null ) );
+ $json->id = get_rest_url_by_path( sprintf( 'users/%d/followers', $user->get__id() ) );
$json->generator = 'http://wordpress.org/?v=' . \get_bloginfo_rss( 'version' );
- $json->actor = \get_author_posts_url( $user_id );
+ $json->actor = $user->get_id();
$json->type = 'OrderedCollectionPage';
- $json->partOf = \get_rest_url( null, "/activitypub/1.0/users/$user_id/followers" ); // phpcs:ignore
- $json->totalItems = \Activitypub\count_followers( $user_id ); // phpcs:ignore
- $json->orderedItems = \Activitypub\Peer\Followers::get_followers( $user_id ); // phpcs:ignore
+ $json->totalItems = $data['total']; // phpcs:ignore
+ $json->partOf = get_rest_url_by_path( sprintf( 'users/%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
- $json->first = $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 && ( $page > 1 ) ) { // phpcs:ignore
+ $json->prev = \add_query_arg( 'page', $page - 1, $json->partOf ); // phpcs:ignore
+ }
- $json->first = \get_rest_url( null, "/activitypub/1.0/users/$user_id/followers" );
+ // phpcs:ignore
+ $json->orderedItems = array_map(
+ function( $item ) use ( $context ) {
+ if ( 'full' === $context ) {
+ return $item->to_array();
+ }
+ return $item->get_url();
+ },
+ $data['followers']
+ );
- $response = new \WP_REST_Response( $json, 200 );
+ $response = new WP_REST_Response( $json, 200 );
$response->header( 'Content-Type', 'application/activity+json' );
return $response;
@@ -96,14 +119,29 @@ public static function request_parameters() {
$params['page'] = array(
'type' => 'integer',
+ 'default' => 1,
+ );
+
+ $params['per_page'] = array(
+ 'type' => 'integer',
+ 'default' => 20,
+ );
+
+ $params['order'] = array(
+ 'type' => 'string',
+ 'default' => 'desc',
+ 'enum' => array( 'asc', 'desc' ),
);
$params['user_id'] = array(
'required' => true,
- 'type' => 'integer',
- 'validate_callback' => function( $param, $request, $key ) {
- return user_can( $param, 'publish_posts' );
- },
+ 'type' => 'string',
+ );
+
+ $params['context'] = array(
+ 'type' => 'string',
+ 'default' => 'simple',
+ 'enum' => array( 'simple', 'full' ),
);
return $params;
diff --git a/includes/rest/class-following.php b/includes/rest/class-following.php
index d7caff446..48e3ca086 100644
--- a/includes/rest/class-following.php
+++ b/includes/rest/class-following.php
@@ -1,6 +1,11 @@
\d+)/following',
+ ACTIVITYPUB_REST_NAMESPACE,
+ '/users/(?P[\w\-\.]+)/following',
array(
array(
'methods' => \WP_REST_Server::READABLE,
- 'callback' => array( '\Activitypub\Rest\Following', 'get' ),
+ 'callback' => array( self::class, 'get' ),
'args' => self::request_parameters(),
'permission_callback' => '__return_true',
),
@@ -43,38 +49,32 @@ public static function register_routes() {
*/
public static function get( $request ) {
$user_id = $request->get_param( 'user_id' );
- $user = \get_user_by( 'ID', $user_id );
+ $user = User_Collection::get_by_various( $user_id );
- if ( ! $user ) {
- return new \WP_Error(
- 'rest_invalid_param',
- \__( 'User not found', 'activitypub' ),
- array(
- 'status' => 404,
- 'params' => array(
- 'user_id' => \__( 'User not found', 'activitypub' ),
- ),
- )
- );
+ if ( is_wp_error( $user ) ) {
+ return $user;
}
/*
* Action triggerd prior to the ActivityPub profile being created and sent to the client
*/
- \do_action( 'activitypub_outbox_pre' );
+ \do_action( 'activitypub_rest_following_pre' );
$json = new \stdClass();
$json->{'@context'} = \Activitypub\get_context();
- $json->id = \home_url( \add_query_arg( null, null ) );
+ $json->id = get_rest_url_by_path( sprintf( 'users/%d/following', $user->get__id() ) );
$json->generator = 'http://wordpress.org/?v=' . \get_bloginfo_rss( 'version' );
- $json->actor = \get_author_posts_url( $user_id );
+ $json->actor = $user->get_id();
$json->type = 'OrderedCollectionPage';
- $json->partOf = \get_rest_url( null, "/activitypub/1.0/users/$user_id/following" ); // phpcs:ignore
- $json->totalItems = 0; // phpcs:ignore
- $json->orderedItems = apply_filters( 'activitypub_following', array(), $user ); // phpcs:ignore
+ $json->partOf = get_rest_url_by_path( sprintf( 'users/%d/following', $user->get__id() ) ); // phpcs:ignore
+
+ $items = apply_filters( 'activitypub_rest_following', array(), $user ); // phpcs:ignore
+
+ $json->totalItems = count( $items ); // phpcs:ignore
+ $json->orderedItems = $items; // phpcs:ignore
$json->first = $json->partOf; // phpcs:ignore
@@ -98,12 +98,32 @@ public static function request_parameters() {
$params['user_id'] = array(
'required' => true,
- 'type' => 'integer',
- 'validate_callback' => function( $param, $request, $key ) {
- return user_can( $param, 'publish_posts' );
- },
+ 'type' => 'string',
);
return $params;
}
+
+ /**
+ * 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.
+ *
+ * @return array The array of following urls.
+ */
+ public static function default_following( $array, $user ) {
+ if ( 0 !== $user->get__id() || is_single_user() ) {
+ return $array;
+ }
+
+ $users = User_Collection::get_collection();
+
+ foreach ( $users as $user ) {
+ $array[] = $user->get_url();
+ }
+
+ return $array;
+ }
}
diff --git a/includes/rest/class-inbox.php b/includes/rest/class-inbox.php
index cd723829d..414fae3bc 100644
--- a/includes/rest/class-inbox.php
+++ b/includes/rest/class-inbox.php
@@ -1,6 +1,17 @@
\WP_REST_Server::EDITABLE,
- 'callback' => array( '\Activitypub\Rest\Inbox', 'shared_inbox_post' ),
+ 'methods' => WP_REST_Server::EDITABLE,
+ 'callback' => array( self::class, 'shared_inbox_post' ),
'args' => self::shared_inbox_post_parameters(),
'permission_callback' => '__return_true',
),
@@ -40,18 +47,18 @@ public static function register_routes() {
);
\register_rest_route(
- 'activitypub/1.0',
- '/users/(?P\d+)/inbox',
+ ACTIVITYPUB_REST_NAMESPACE,
+ '/users/(?P[\w\-\.]+)/inbox',
array(
array(
- 'methods' => \WP_REST_Server::EDITABLE,
- 'callback' => array( '\Activitypub\Rest\Inbox', 'user_inbox_post' ),
+ 'methods' => WP_REST_Server::EDITABLE,
+ 'callback' => array( self::class, 'user_inbox_post' ),
'args' => self::user_inbox_post_parameters(),
'permission_callback' => '__return_true',
),
array(
- 'methods' => \WP_REST_Server::READABLE,
- 'callback' => array( '\Activitypub\Rest\Inbox', 'user_inbox_get' ),
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( self::class, 'user_inbox_get' ),
'args' => self::user_inbox_get_parameters(),
'permission_callback' => '__return_true',
),
@@ -59,35 +66,6 @@ public static function register_routes() {
);
}
- /**
- * Hooks into the REST API request to verify the signature.
- *
- * @param bool $served Whether the request has already been served.
- * @param WP_HTTP_ResponseInterface $result Result to send to the client. Usually a WP_REST_Response.
- * @param WP_REST_Request $request Request used to generate the response.
- * @param WP_REST_Server $server Server instance.
- *
- * @return true
- */
- public static function serve_request( $served, $result, $request, $server ) {
- if ( '/activitypub' !== \substr( $request->get_route(), 0, 12 ) ) {
- return $served;
- }
-
- $signature = $request->get_header( 'signature' );
-
- if ( ! $signature ) {
- return $served;
- }
-
- $headers = $request->get_headers();
-
- // verify signature
- //\Activitypub\Signature::verify_signature( $headers, $key );
-
- return $served;
- }
-
/**
* Renders the user-inbox
*
@@ -96,20 +74,26 @@ public static function serve_request( $served, $result, $request, $server ) {
*/
public static function user_inbox_get( $request ) {
$user_id = $request->get_param( 'user_id' );
+ $user = User_Collection::get_by_various( $user_id );
+
+ if ( is_wp_error( $user ) ) {
+ return $user;
+ }
+
$page = $request->get_param( 'page', 0 );
/*
* Action triggerd prior to the ActivityPub profile being created and sent to the client
*/
- \do_action( 'activitypub_inbox_pre' );
+ \do_action( 'activitypub_rest_inbox_pre' );
$json = new \stdClass();
- $json->{'@context'} = \Activitypub\get_context();
- $json->id = \home_url( \add_query_arg( null, null ) );
+ $json->{'@context'} = get_context();
+ $json->id = get_rest_url_by_path( sprintf( 'users/%d/inbox', $user->get__id() ) );
$json->generator = 'http://wordpress.org/?v=' . \get_bloginfo_rss( 'version' );
$json->type = 'OrderedCollectionPage';
- $json->partOf = \get_rest_url( null, "/activitypub/1.0/users/$user_id/inbox" ); // phpcs:ignore
+ $json->partOf = get_rest_url_by_path( sprintf( 'users/%d/inbox', $user->get__id() ) ); // phpcs:ignore
$json->totalItems = 0; // phpcs:ignore
@@ -118,14 +102,14 @@ public static function user_inbox_get( $request ) {
$json->first = $json->partOf; // phpcs:ignore
// filter output
- $json = \apply_filters( 'activitypub_inbox_array', $json );
+ $json = \apply_filters( 'activitypub_rest_inbox_array', $json );
/*
* Action triggerd after the ActivityPub profile has been created and sent to the client
*/
\do_action( 'activitypub_inbox_post' );
- $response = new \WP_REST_Response( $json, 200 );
+ $response = new WP_REST_Response( $json, 200 );
$response->header( 'Content-Type', 'application/activity+json' );
@@ -141,15 +125,20 @@ public static function user_inbox_get( $request ) {
*/
public static function user_inbox_post( $request ) {
$user_id = $request->get_param( 'user_id' );
+ $user = User_Collection::get_by_various( $user_id );
- $data = $request->get_params();
+ if ( is_wp_error( $user ) ) {
+ return $user;
+ }
+
+ $data = $request->get_json_params();
$type = $request->get_param( 'type' );
$type = \strtolower( $type );
- \do_action( 'activitypub_inbox', $data, $user_id, $type );
- \do_action( "activitypub_inbox_{$type}", $data, $user_id );
+ \do_action( 'activitypub_inbox', $data, $user->get__id(), $type );
+ \do_action( "activitypub_inbox_{$type}", $data, $user->get__id() );
- return new \WP_REST_Response( array(), 202 );
+ return new WP_REST_Response( array(), 202 );
}
/**
@@ -160,12 +149,12 @@ public static function user_inbox_post( $request ) {
* @return WP_REST_Response
*/
public static function shared_inbox_post( $request ) {
- $data = $request->get_params();
+ $data = $request->get_json_params();
$type = $request->get_param( 'type' );
$users = self::extract_recipients( $data );
if ( ! $users ) {
- return new \WP_Error(
+ return new WP_Error(
'rest_invalid_param',
\__( 'No recipients found', 'activitypub' ),
array(
@@ -182,13 +171,19 @@ public static function shared_inbox_post( $request ) {
}
foreach ( $users as $user ) {
+ $user = User_Collection::get_by_various( $user );
+
+ if ( is_wp_error( $user ) ) {
+ continue;
+ }
+
$type = \strtolower( $type );
\do_action( 'activitypub_inbox', $data, $user->ID, $type );
\do_action( "activitypub_inbox_{$type}", $data, $user->ID );
}
- return new \WP_REST_Response( array(), 202 );
+ return new WP_REST_Response( array(), 202 );
}
/**
@@ -205,10 +200,7 @@ public static function user_inbox_get_parameters() {
$params['user_id'] = array(
'required' => true,
- 'type' => 'integer',
- 'validate_callback' => function( $param, $request, $key ) {
- return user_can( $param, 'publish_posts' );
- },
+ 'type' => 'string',
);
return $params;
@@ -228,10 +220,7 @@ public static function user_inbox_post_parameters() {
$params['user_id'] = array(
'required' => true,
- 'type' => 'integer',
- 'validate_callback' => function( $param, $request, $key ) {
- return user_can( $param, 'publish_posts' );
- },
+ 'type' => 'string',
);
$params['id'] = array(
@@ -254,7 +243,7 @@ public static function user_inbox_post_parameters() {
//'type' => 'enum',
//'enum' => array( 'Create' ),
//'sanitize_callback' => function( $param, $request, $key ) {
- // return \strtolower( $param );
+ // return \strtolower( $param );
//},
);
@@ -299,7 +288,7 @@ public static function shared_inbox_post_parameters() {
//'type' => 'enum',
//'enum' => array( 'Create' ),
//'sanitize_callback' => function( $param, $request, $key ) {
- // return \strtolower( $param );
+ // return \strtolower( $param );
//},
);
@@ -426,6 +415,7 @@ public static function handle_reaction( $object, $user_id ) {
/**
* Converts a new ActivityPub object to comment data suitable for creating a comment
+ * Handles "Create" requests
*
* @param array $object The activity-object.
*
@@ -481,7 +471,7 @@ public static function convert_object_to_comment_data( $object ) {
'comment_author' => \esc_attr( $meta['name'] ),
'comment_author_url' => \esc_url_raw( $object['actor'] ),
'comment_content' => \wp_filter_kses( $object['object']['content'] ),
- 'comment_type' => '',
+ 'comment_type' => 'comment',
'comment_author_email' => '',
'comment_parent' => $parent_comment ? $parent_comment->comment_ID : 0,
'comment_meta' => array(
@@ -512,12 +502,23 @@ public static function handle_create( $object, $user_id ) {
\add_filter( 'pre_option_require_name_email', '__return_false' );
$comment_id = \wp_new_comment( $commentdata, true );
- // TODO: search for comments with that source url as their parent url and update their parent
+
+ // No nonce possible for this submission route
+ \add_filter(
+ 'akismet_comment_nonce',
+ function() {
+ return 'inactive';
+ }
+ );
+
+ $state = \wp_new_comment( $commentdata, true );
\remove_filter( 'pre_option_require_name_email', '__return_false' );
// re-add flood control
\add_action( 'check_comment_flood', 'check_comment_flood_db', 10, 4 );
+
+ do_action( 'activitypub_handled_create', $object, $user_id, $state, $commentdata );
}
/**
@@ -579,7 +580,7 @@ public static function get_recipients( $data ) {
$users = array();
foreach ( $recipients as $recipient ) {
- $user_id = \Activitypub\url_to_authorid( $recipient );
+ $user_id = url_to_authorid( $recipient );
$user = get_user_by( 'id', $user_id );
diff --git a/includes/rest/class-nodeinfo.php b/includes/rest/class-nodeinfo.php
index 3106c5efa..711d4fd96 100644
--- a/includes/rest/class-nodeinfo.php
+++ b/includes/rest/class-nodeinfo.php
@@ -1,6 +1,10 @@
\WP_REST_Server::READABLE,
- 'callback' => array( '\Activitypub\Rest\Nodeinfo', 'discovery' ),
+ 'callback' => array( self::class, 'discovery' ),
'permission_callback' => '__return_true',
),
)
);
\register_rest_route(
- 'activitypub/1.0',
+ ACTIVITYPUB_REST_NAMESPACE,
'/nodeinfo',
array(
array(
'methods' => \WP_REST_Server::READABLE,
- 'callback' => array( '\Activitypub\Rest\Nodeinfo', 'nodeinfo' ),
+ 'callback' => array( self::class, 'nodeinfo' ),
'permission_callback' => '__return_true',
),
)
);
\register_rest_route(
- 'activitypub/1.0',
+ ACTIVITYPUB_REST_NAMESPACE,
'/nodeinfo2',
array(
array(
'methods' => \WP_REST_Server::READABLE,
- 'callback' => array( '\Activitypub\Rest\Nodeinfo', 'nodeinfo2' ),
+ 'callback' => array( self::class, 'nodeinfo2' ),
'permission_callback' => '__return_true',
),
)
@@ -67,6 +71,11 @@ public static function register_routes() {
* @return WP_REST_Response
*/
public static function nodeinfo( $request ) {
+ /*
+ * Action triggerd prior to the ActivityPub profile being created and sent to the client
+ */
+ \do_action( 'activitypub_rest_nodeinfo_pre' );
+
$nodeinfo = array();
$nodeinfo['version'] = '2.0';
@@ -75,13 +84,24 @@ public static function nodeinfo( $request ) {
'version' => \get_bloginfo( 'version' ),
);
- $users = \count_users();
+ $users = \get_users(
+ array(
+ 'capability__in' => array( 'publish_posts' ),
+ )
+ );
+
+ if ( is_array( $users ) ) {
+ $users = count( $users );
+ } else {
+ $users = 1;
+ }
+
$posts = \wp_count_posts();
$comments = \wp_count_comments();
$nodeinfo['usage'] = array(
'users' => array(
- 'total' => (int) $users['total_users'],
+ 'total' => $users,
),
'localPosts' => (int) $posts->publish,
'localComments' => (int) $comments->approved,
@@ -95,7 +115,7 @@ public static function nodeinfo( $request ) {
'outbound' => array(),
);
- return new \WP_REST_Response( $nodeinfo, 200 );
+ return new WP_REST_Response( $nodeinfo, 200 );
}
/**
@@ -106,6 +126,11 @@ public static function nodeinfo( $request ) {
* @return WP_REST_Response
*/
public static function nodeinfo2( $request ) {
+ /*
+ * Action triggerd prior to the ActivityPub profile being created and sent to the client
+ */
+ \do_action( 'activitypub_rest_nodeinfo2_pre' );
+
$nodeinfo = array();
$nodeinfo['version'] = '1.0';
@@ -147,7 +172,7 @@ public static function nodeinfo2( $request ) {
'outbound' => array(),
);
- return new \WP_REST_Response( $nodeinfo, 200 );
+ return new WP_REST_Response( $nodeinfo, 200 );
}
/**
@@ -162,7 +187,7 @@ public static function discovery( $request ) {
$discovery['links'] = array(
array(
'rel' => 'http://nodeinfo.diaspora.software/ns/schema/2.0',
- 'href' => \get_rest_url( null, 'activitypub/1.0/nodeinfo' ),
+ 'href' => get_rest_url_by_path( 'nodeinfo' ),
),
);
diff --git a/includes/rest/class-ostatus.php b/includes/rest/class-ostatus.php
index 45ff90103..415d502d4 100644
--- a/includes/rest/class-ostatus.php
+++ b/includes/rest/class-ostatus.php
@@ -14,7 +14,7 @@ class Ostatus {
*/
public static function register_routes() {
\register_rest_route(
- 'activitypub/1.0',
+ ACTIVITYPUB_REST_NAMESPACE,
'/ostatus/remote-follow',
array(
array(
diff --git a/includes/rest/class-outbox.php b/includes/rest/class-outbox.php
index 615f06b9b..2f50bd745 100644
--- a/includes/rest/class-outbox.php
+++ b/includes/rest/class-outbox.php
@@ -1,6 +1,17 @@
\d+)/outbox',
+ ACTIVITYPUB_REST_NAMESPACE,
+ '/users/(?P[\w\-\.]+)/outbox',
array(
array(
- 'methods' => \WP_REST_Server::READABLE,
- 'callback' => array( '\Activitypub\Rest\Outbox', 'user_outbox_get' ),
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( self::class, 'user_outbox_get' ),
'args' => self::request_parameters(),
'permission_callback' => '__return_true',
),
@@ -42,42 +53,31 @@ public static function register_routes() {
*/
public static function user_outbox_get( $request ) {
$user_id = $request->get_param( 'user_id' );
- $author = \get_user_by( 'ID', $user_id );
- $post_types = \get_option( 'activitypub_support_post_types', array( 'post', 'page' ) );
+ $user = User_Collection::get_by_various( $user_id );
- if ( ! $author ) {
- return new \WP_Error(
- 'rest_invalid_param',
- \__( 'User not found', 'activitypub' ),
- array(
- 'status' => 404,
- 'params' => array(
- 'user_id' => \__( 'User not found', 'activitypub' ),
- ),
- )
- );
+ if ( is_wp_error( $user ) ) {
+ return $user;
}
- $page = $request->get_param( 'page', 0 );
+ $post_types = \get_option( 'activitypub_support_post_types', array( 'post', 'page' ) );
+
+ $page = $request->get_param( 'page', 1 );
/*
* Action triggerd prior to the ActivityPub profile being created and sent to the client
*/
- \do_action( 'activitypub_outbox_pre' );
+ \do_action( 'activitypub_rest_outbox_pre' );
- $json = new \stdClass();
+ $json = new stdClass();
- $json->{'@context'} = \Activitypub\get_context();
- $json->id = \home_url( \add_query_arg( null, null ) );
+ $json->{'@context'} = get_context();
+ $json->id = get_rest_url_by_path( sprintf( 'users/%d/outbox', $user_id ) );
$json->generator = 'http://wordpress.org/?v=' . \get_bloginfo_rss( 'version' );
- $json->actor = \get_author_posts_url( $user_id );
+ $json->actor = $user->get_id();
$json->type = 'OrderedCollectionPage';
- $json->partOf = \get_rest_url( null, "/activitypub/1.0/users/$user_id/outbox" ); // phpcs:ignore
+ $json->partOf = get_rest_url_by_path( sprintf( 'users/%d/outbox', $user_id ) ); // phpcs:ignore
$json->totalItems = 0; // phpcs:ignore
- // phpcs:ignore
- $json->totalItems = 0;
-
foreach ( $post_types as $post_type ) {
$count_posts = \wp_count_posts( $post_type );
$json->totalItems += \intval( $count_posts->publish ); // phpcs:ignore
@@ -90,33 +90,40 @@ public static function user_outbox_get( $request ) {
$json->next = \add_query_arg( 'page', $page + 1, $json->partOf ); // phpcs:ignore
}
+ if ( $page && ( $page > 1 ) ) { // phpcs:ignore
+ $json->prev = \add_query_arg( 'page', $page - 1, $json->partOf ); // phpcs:ignore
+ }
+
if ( $page ) {
$posts = \get_posts(
array(
'posts_per_page' => 10,
- 'author' => $user_id,
- 'offset' => ( $page - 1 ) * 10,
- 'post_type' => $post_types,
+ 'author' => $user_id,
+ 'paged' => $page,
+ 'post_type' => $post_types,
)
);
foreach ( $posts as $post ) {
- $activitypub_post = new \Activitypub\Model\Post( $post );
- $activitypub_activity = new \Activitypub\Model\Activity( 'Create', \Activitypub\Model\Activity::TYPE_NONE );
- $activitypub_activity->from_post( $activitypub_post );
- $json->orderedItems[] = $activitypub_activity->to_array(); // phpcs:ignore
+ $post = Post::transform( $post )->to_object();
+ $activity = new Activity();
+ $activity->set_type( 'Create' );
+ $activity->set_context( null );
+ $activity->set_object( $post );
+
+ $json->orderedItems[] = $activity->to_array(); // phpcs:ignore
}
}
// filter output
- $json = \apply_filters( 'activitypub_outbox_array', $json );
+ $json = \apply_filters( 'activitypub_rest_outbox_array', $json );
/*
* Action triggerd after the ActivityPub profile has been created and sent to the client
*/
\do_action( 'activitypub_outbox_post' );
- $response = new \WP_REST_Response( $json, 200 );
+ $response = new WP_REST_Response( $json, 200 );
$response->header( 'Content-Type', 'application/activity+json' );
@@ -133,14 +140,12 @@ public static function request_parameters() {
$params['page'] = array(
'type' => 'integer',
+ 'default' => 1,
);
$params['user_id'] = array(
'required' => true,
- 'type' => 'integer',
- 'validate_callback' => function( $param, $request, $key ) {
- return user_can( $param, 'publish_posts' );
- },
+ 'type' => 'string',
);
return $params;
diff --git a/includes/rest/class-server.php b/includes/rest/class-server.php
new file mode 100644
index 000000000..01d9a9a42
--- /dev/null
+++ b/includes/rest/class-server.php
@@ -0,0 +1,104 @@
+ \WP_REST_Server::READABLE,
+ 'callback' => array( self::class, 'application_actor' ),
+ 'permission_callback' => '__return_true',
+ ),
+ )
+ );
+ }
+
+ /**
+ * Render Application actor profile
+ *
+ * @return WP_REST_Response The JSON profile of the Application Actor.
+ */
+ public static function application_actor() {
+ $user = new Application_User();
+
+ $user->set_context(
+ \Activitypub\Activity\Activity::CONTEXT
+ );
+
+ $json = $user->to_array();
+
+ $response = new WP_REST_Response( $json, 200 );
+
+ $response->header( 'Content-Type', 'application/activity+json' );
+
+ return $response;
+ }
+
+ /**
+ * Callback function to authorize each api requests
+ *
+ * @see WP_REST_Request
+ *
+ * @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 authorize_activitypub_requests( $response, $handler, $request ) {
+ $route = $request->get_route();
+
+ // 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' ) ||
+ \str_starts_with( $route, '/' . \trailingslashit( ACTIVITYPUB_REST_NAMESPACE ) . 'nodeinfo' )
+ ) {
+ return $response;
+ }
+
+ // POST-Requets are always signed
+ if ( 'post' === \strtolower( $request->get_method() ) ) {
+ $verified_request = Signature::verify_http_signature( $request );
+ if ( \is_wp_error( $verified_request ) ) {
+ return $verified_request;
+ }
+ } elseif ( 'get' === \strtolower( $request->get_method() ) ) { // GET-Requests are only signed in secure mode
+ if ( ACTIVITYPUB_AUTHORIZED_FETCH ) {
+ $verified_request = Signature::verify_http_signature( $request );
+ if ( \is_wp_error( $verified_request ) ) {
+ return $verified_request;
+ }
+ }
+ }
+
+ return $response;
+ }
+}
diff --git a/includes/rest/class-users.php b/includes/rest/class-users.php
new file mode 100644
index 000000000..820f6532c
--- /dev/null
+++ b/includes/rest/class-users.php
@@ -0,0 +1,155 @@
+[\w\-\.]+)',
+ array(
+ array(
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( self::class, 'get' ),
+ 'args' => self::request_parameters(),
+ 'permission_callback' => '__return_true',
+ ),
+ )
+ );
+
+ \register_rest_route(
+ ACTIVITYPUB_REST_NAMESPACE,
+ '/users/(?P[\w\-\.]+)/remote-follow',
+ array(
+ array(
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( self::class, 'remote_follow_get' ),
+
+ 'args' => array(
+ 'resource' => array(
+ 'required' => true,
+ 'sanitize_callback' => 'sanitize_text_field',
+ ),
+ ),
+ 'permission_callback' => '__return_true',
+ ),
+ )
+ );
+ }
+
+ /**
+ * Handle GET request
+ *
+ * @param WP_REST_Request $request
+ *
+ * @return WP_REST_Response
+ */
+ public static function get( $request ) {
+ $user_id = $request->get_param( 'user_id' );
+ $user = User_Collection::get_by_various( $user_id );
+
+ if ( is_wp_error( $user ) ) {
+ return $user;
+ }
+
+ // redirect to canonical URL if it is not an ActivityPub request
+ if ( ! is_activitypub_request() ) {
+ header( 'Location: ' . $user->get_canonical_url(), true, 301 );
+ exit;
+ }
+
+ /*
+ * Action triggerd prior to the ActivityPub profile being created and sent to the client
+ */
+ \do_action( 'activitypub_rest_users_pre' );
+
+ $user->set_context(
+ Activity::CONTEXT
+ );
+
+ $json = $user->to_array();
+
+ $response = new WP_REST_Response( $json, 200 );
+ $response->header( 'Content-Type', 'application/activity+json' );
+
+ return $response;
+ }
+
+
+ /**
+ * Endpoint for remote follow UI/Block
+ *
+ * @param WP_REST_Request $request The request object.
+ *
+ * @return void|string The URL to the remote follow page
+ */
+ public static function remote_follow_get( WP_REST_Request $request ) {
+ $resource = $request->get_param( 'resource' );
+ $user_id = $request->get_param( 'user_id' );
+ $user = User_Collection::get_by_various( $user_id );
+
+ if ( is_wp_error( $user ) ) {
+ return $user;
+ }
+
+ $template = Webfinger::get_remote_follow_endpoint( $resource );
+
+ if ( is_wp_error( $template ) ) {
+ return $template;
+ }
+
+ $resource = $user->get_resource();
+ $url = str_replace( '{uri}', $resource, $template );
+
+ return new WP_REST_Response(
+ array( 'url' => $url ),
+ 200
+ );
+ }
+
+ /**
+ * The supported parameters
+ *
+ * @return array list of parameters
+ */
+ public static function request_parameters() {
+ $params = array();
+
+ $params['page'] = array(
+ 'type' => 'string',
+ );
+
+ $params['user_id'] = array(
+ 'required' => true,
+ 'type' => 'string',
+ );
+
+ return $params;
+ }
+}
diff --git a/includes/rest/class-webfinger.php b/includes/rest/class-webfinger.php
index 0c6d5f134..4504e0dda 100644
--- a/includes/rest/class-webfinger.php
+++ b/includes/rest/class-webfinger.php
@@ -1,6 +1,10 @@
\WP_REST_Server::READABLE,
- 'callback' => array( '\Activitypub\Rest\Webfinger', 'webfinger' ),
+ 'callback' => array( self::class, 'webfinger' ),
'args' => self::request_parameters(),
'permission_callback' => '__return_true',
),
@@ -36,53 +45,22 @@ public static function register_routes() {
}
/**
- * Render JRD file
+ * WebFinger endpoint.
+ *
+ * @param WP_REST_Request $request The request object.
*
- * @param WP_REST_Request $request
- * @return WP_REST_Response
+ * @return WP_REST_Response The response object.
*/
public static function webfinger( $request ) {
- $resource = $request->get_param( 'resource' );
-
- if ( \strpos( $resource, '@' ) === false ) {
- return new \WP_Error( 'activitypub_unsupported_resource', \__( 'Resource is invalid', 'activitypub' ), array( 'status' => 400 ) );
- }
-
- $resource = \str_replace( 'acct:', '', $resource );
+ /*
+ * Action triggerd prior to the ActivityPub profile being created and sent to the client
+ */
+ \do_action( 'activitypub_rest_webfinger_pre' );
- $resource_identifier = \substr( $resource, 0, \strrpos( $resource, '@' ) );
- $resource_host = \substr( \strrchr( $resource, '@' ), 1 );
-
- if ( \wp_parse_url( \home_url( '/' ), \PHP_URL_HOST ) !== $resource_host ) {
- return new \WP_Error( 'activitypub_wrong_host', \__( 'Resource host does not match blog host', 'activitypub' ), array( 'status' => 404 ) );
- }
-
- $user = \get_user_by( 'login', \esc_sql( $resource_identifier ) );
-
- if ( ! $user || ! user_can( $user, 'publish_posts' ) ) {
- return new \WP_Error( 'activitypub_user_not_found', \__( 'User not found', 'activitypub' ), array( 'status' => 404 ) );
- }
-
- $json = array(
- 'subject' => $resource,
- 'aliases' => array(
- \get_author_posts_url( $user->ID ),
- ),
- 'links' => array(
- array(
- 'rel' => 'self',
- 'type' => 'application/activity+json',
- 'href' => \get_author_posts_url( $user->ID ),
- ),
- array(
- 'rel' => 'http://webfinger.net/rel/profile-page',
- 'type' => 'text/html',
- 'href' => \get_author_posts_url( $user->ID ),
- ),
- ),
- );
+ $resource = $request->get_param( 'resource' );
+ $response = self::get_profile( $resource );
- return new \WP_REST_Response( $json, 200 );
+ return new WP_REST_Response( $response, 200 );
}
/**
@@ -108,14 +86,73 @@ public static function request_parameters() {
* @param array $array the jrd array
* @param string $resource the WebFinger resource
* @param WP_User $user the WordPress user
+ *
+ * @return array the jrd array
*/
- public static function add_webfinger_discovery( $array, $resource, $user ) {
+ public static function add_user_discovery( $array, $resource, $user ) {
+ $user = User_Collection::get_by_id( $user->ID );
+
$array['links'][] = array(
'rel' => 'self',
'type' => 'application/activity+json',
- 'href' => \get_author_posts_url( $user->ID ),
+ 'href' => $user->get_url(),
);
return $array;
}
+
+ /**
+ * Add WebFinger discovery links
+ *
+ * @param array $array the jrd array
+ * @param string $resource the WebFinger resource
+ * @param WP_User $user the WordPress user
+ *
+ * @return array the jrd array
+ */
+ public static function add_pseudo_user_discovery( $array, $resource ) {
+ if ( $array ) {
+ return $array;
+ }
+
+ return self::get_profile( $resource );
+ }
+
+ /**
+ * Get the WebFinger profile.
+ *
+ * @param string $resource the WebFinger resource.
+ *
+ * @return array the WebFinger profile.
+ */
+ 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(),
+ );
+
+ $profile = array(
+ 'subject' => $resource,
+ '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(),
+ ),
+ ),
+ );
+
+ return $profile;
+ }
}
diff --git a/includes/table/class-followers.php b/includes/table/class-followers.php
new file mode 100644
index 000000000..289a19450
--- /dev/null
+++ b/includes/table/class-followers.php
@@ -0,0 +1,148 @@
+id === 'settings_page_activitypub' ) {
+ $this->user_id = Users::BLOG_USER_ID;
+ } else {
+ $this->user_id = \get_current_user_id();
+ }
+
+ parent::__construct(
+ array(
+ 'singular' => \__( 'Follower', 'activitypub' ),
+ 'plural' => \__( 'Followers', 'activitypub' ),
+ 'ajax' => false,
+ )
+ );
+ }
+
+ public function get_columns() {
+ return array(
+ 'cb' => '%s ',
+ $item['url'],
+ $item['url']
+ );
+ }
+
+ public function column_cb( $item ) {
+ return sprintf( '
@@ -23,4 +24,50 @@
+ error
+
+
+
+
+
+
+ error
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ warning
+
+
+ **/*.asset.php
+
diff --git a/readme.txt b/readme.txt
index 9c7661d24..90e0011ee 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,9 +1,9 @@
=== ActivityPub ===
-Contributors: pfefferle, mediaformat, akirk, automattic
+Contributors: automattic, pfefferle, mediaformat, mattwiebe, akirk, jeherve, nuriapena, cavalierlife
Tags: OStatus, fediverse, activitypub, activitystream
Requires at least: 4.7
-Tested up to: 6.1
-Stable tag: 0.17.0
+Tested up to: 6.3
+Stable tag: 1.0.1
Requires PHP: 5.6
License: MIT
License URI: http://opensource.org/licenses/MIT
@@ -12,38 +12,39 @@ The ActivityPub protocol is a decentralized social networking protocol based upo
== Description ==
-This is BETA software, see the FAQ to see the current feature set or rather what is still planned.
+Enter the fediverse with **ActivityPub**, broadcasting your blog to a wider audience! Attract followers, deliver updates, and receive comments from a diverse user base of **ActivityPub**\-compliant platforms.
-The plugin implements the ActivityPub protocol for your blog, which means that your readers will be able to follow your blog posts on Mastodon and other federated platforms that support ActivityPub. In addition, replies to your posts on Mastodon and related platforms will automatically become comments on your blog post.
+With the ActivityPub plugin installed, your WordPress blog itself function as a federated profile, along with profiles for each author. For instance, if your website is `example.com`, then the blog-wide profile can be found at `@example.com@example.com`, and authors like Jane and Bob would have their individual profiles at `@jane@example.com` and `@bobz@example.com`, respectively.
+
+An example: I give you my Mastodon profile name: `@pfefferle@mastodon.social`. You search, see my profile, and hit follow. Now, any post I make appears in your Home feed. Similarly, with the ActivityPub plugin, you can find and follow Jane's profile at `@jane@example.com`.
+
+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.
The plugin works with the following tested federated platforms, but there may be more that it works with as well:
* [Mastodon](https://joinmastodon.org/)
-* [Pleroma](https://pleroma.social/)
-* [Friendica](https://friendi.ca/)
-* [HubZilla](https://hubzilla.org/)
+* [Pleroma](https://pleroma.social/)/[Akkoma](https://akkoma.social/)
+* [friendica](https://friendi.ca/)
+* [Hubzilla](https://hubzilla.org/)
* [Pixelfed](https://pixelfed.org/)
-* [SocialHome](https://socialhome.network/)
+* [Socialhome](https://socialhome.network/)
* [Misskey](https://join.misskey.page/)
-
-Here’s what that means and what you can expect.
-
-Once the ActivityPub plugin is installed, each author’s page on your WordPress blog will become its own federated instance. In other words, if you have two authors, Jane and Bob, on your website, `example.com`, then your authors would have their own author pages at `example.com/author/jane` and `example.com/author/bob`. Each of those author pages would now be available to Mastodon users (and all other federated platform users) as a profile that can be followed. Let’s break that down further. Let’s say you have a friend on Mastodon who tells you to follow them and they give you their profile name `@janelivesheresomeofthetime@mastodon.social`. You search for her name, see her profile, and click the follow button, right? From then on, everything Jane posts on her profile shows up in your Home feed. Okay, similarly, now that Jane has installed the ActivityPub plugin on her `example.com` site, her friends can also follow her on Mastodon by searching for `@jane@example.com` and clicking the Follow button on that profile.
-
-From now on, every blog post Jane publishes on example.com will show up on your Home feed because you follow her `@jane@example.com` profile.
-Of course, if no one follows your author instance, then no one will ever see the posts - including you! So the easiest way to even know if the plugin is working is to follow your new profile yourself. If you already have a Mastodon profile, just follow your new one from there.
+* [Firefish](https://joinfirefish.org/) (rebrand of Calckey)
Some things to note:
-1. Many single-author blogs have chosen to turn off or redirect their author profile pages, usually via an SEO plugin like Yoast or Rank Math. This is usually done to avoid duplicate content with your blog’s home page. If your author page has been deactivated in this way, then ActivityPub won’t work for you. Instead, you can turn your author profile page back on, and then use the option in your SEO plugin to noindex the author page. This will enable the page to be live and ActivityPub will now work, but the live page won’t cause any duplicate content issues with search engines.
-1. Once ActivityPub is installed, only new posts going forward will be available in the fediverse. Likewise, even if you’ve been using ActivityPub for a while, anyone who follows your site, will only see new posts you publish from that moment on. They will never see previously-published posts in their Home feed. This process is very similar to subscribing to a newsletter. If you subscribe to a newsletter, you will only receive future emails, but not the old archived ones. With ActivityPub, if someone follows your site, they will only receive new blog posts you publish from then on.
+1. The blog-wide profile is only compatible with sites with rewrite rules enabled. If your site does not have rewrite rules enabled, the author-specific profiles may still work.
+1. Many single-author blogs have chosen to turn off or redirect their author profile pages, usually via an SEO plugin like Yoast or Rank Math. This is usually done to avoid duplicate content with your blog’s home page. If your author page has been deactivated in this way, then ActivityPub author profiles won’t work for you. Instead, you can turn your author profile page back on, and then use the option in your SEO plugin to noindex the author page. This will duplicate content issues with search engines and will enable ActivityPub author profiles to work.
+1. Once ActivityPub is installed, *only new posts going forward* will be available in the fediverse. Likewise, even if you’ve been using ActivityPub for a while, anyone who follows your site, will only see new posts you publish from that moment on. They will never see previously-published posts in their Home feed. This process is very similar to subscribing to a newsletter. If you subscribe to a newsletter, you will only receive future emails, but not the old archived ones. With ActivityPub, if someone follows your site, they will only receive new blog posts you publish from then on.
So what’s the process?
1. Install the ActivityPub plugin.
1. Go to the plugin’s settings page and adjust the settings to your liking. Click the Save button when ready.
-1. Make sure your blog’s author profile page is active.
-1. Go to Mastodon or any other federated platform, search for your author’s new federated profile, and follow it. Your new profile will be in the form of @yourauthorname@yourwebsite.com, so that is what you’ll search for.
+1. Make sure your blog’s author profile page is active if you are using author profiles.
+1. Go to Mastodon or any other federated platform, and search for your profile, and follow it. Your new profile will be in the form of either `@your_username@example.com` or `@example.com@example.com`, so that is what you’ll search for.
1. On your blog, publish a new post.
1. From Mastodon, check to see if the new post appears in your Home feed.
@@ -53,34 +54,25 @@ Please note that it may take up to 15 minutes or so for the new post to show up
= tl;dr =
-This plugin connects your WordPress blog to popular social platforms like Mastodon, making your posts more accessible to a wider audience. Once installed, your blog's author pages can be followed by users on these platforms, allowing them to receive your new posts in their feeds.
-
-Here's how it works:
-
-1. Install the plugin and adjust settings as needed.
-1. Ensure your blog's author profile page is active.
-1. On Mastodon or other supported platforms, search for and follow your author's new profile (e.g., `@yourauthorname@yourwebsite.com`).
-1. Publish a new post on your blog and check if it appears in your Mastodon feed.
-
-Please note that it may take up to 15 minutes for a new post to appear in your feed, as messages are sent on a delay to avoid overwhelming your followers. Be patient and give it some time.
+This plugin connects your WordPress blog to popular social platforms like Mastodon, making your posts more accessible to a wider audience. Once installed, your blog can be followed by users on these platforms, allowing them to receive your new posts in their feeds.
= What is the status of this plugin? =
Implemented:
-* profile pages (JSON representation)
+* blog profile pages (JSON representation)
+* author profile pages (JSON representation)
* custom links
* functional inbox/outbox
* follow (accept follows)
* share posts
* receive comments/reactions
+* signature verification
To implement:
-* signature verification
-* better WordPress integration
-* better configuration possibilities
* threaded comments support
+* replace shortcodes with blocks for layout
= What is "ActivityPub for WordPress" =
@@ -94,7 +86,7 @@ In order for webfinger to work, it must be mapped to the root directory of the U
Add the following to the .htaccess file in the root directory:
- RedirectMatch "^\/\.well-known(.*)$" "\/blog\/\.well-known$1"
+ RedirectMatch "^\/\.well-known/(webfinger|nodeinfo|x-nodeinfo2)(.*)$" /blog/.well-known/$1$2
Where 'blog' is the path to the subdirectory at which your blog resides.
@@ -111,7 +103,40 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
== Changelog ==
-Project maintained on GitHub at [pfefferle/wordpress-activitypub](https://github.com/pfefferle/wordpress-activitypub).
+Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
+
+= 1.0.1 =
+
+* Update: improve image attachment detection using the block editor
+* Update: better error code handling for API responses
+* Update: use a tag stack instead of regex for protecting tags for Hashtags and @-Mentions
+* Compatibility: better signature support for subpath-installations
+* Compatibility: allow deactivating blocks registered by the plugin
+* Compatibility: avoid Fatal Errors when using ClassicPress
+* Compatibility: improve the Group-Actor to play nicely with existing implementations
+* Fixed: truncate long blog titles and handles for the "Follow me" block
+* Fixed: ensure that only a valid user can be selected for the "Follow me" block
+* Fixed: fix a typo in a hook name
+* Fixed: a problem with signatures when running WordPress in a sub-path
+
+= 1.0.0 =
+
+* Add: blog-wide Account (catchall, like `example.com@example.com`)
+* Add: a Follow Me block (help visitors to follow your Profile)
+* Add: Signature Verification: https://docs.joinmastodon.org/spec/security/
+* Add: a Followers Block (show off your Followers)
+* Add: Simple caching
+* Add: Collection endpoints for Featured Tags and Featured Posts
+* Add: Better handling of Hashtags in mobile apps
+* Update: Complete rewrite of the Follower-System based on Custom Post Types
+* Update: Improved linter (PHPCS)
+* Compatibility: Add a new conditional, `\Activitypub\is_activitypub_request()`, to allow third-party plugins to detect ActivityPub requests
+* Compatibility: Add hooks to allow modifying images returned in ActivityPub requests
+* Compatibility: Indicate that the plugin is compatible and has been tested with the latest version of WordPress, 6.3
+* Compatibility: Avoid PHP notice on sites using PHP 8.2
+* Fixed: Load the plugin later in the WordPress code lifecycle to avoid errors in some requests
+* Fixed: Updating posts
+* Fixed: Hashtag now support CamelCase and UTF-8
= 0.17.0 =
@@ -373,6 +398,12 @@ Project maintained on GitHub at [pfefferle/wordpress-activitypub](https://github
* initial
+== Upgrade Notice ==
+
+= 1.0.0 =
+
+For version 1.0.0 we have completely rebuilt the followers lists. There is a migration from the old format to the new, but it may take some time until the migration is complete. No data will be lost in the process, please give the migration some time.
+
== Installation ==
Follow the normal instructions for [installing WordPress plugins](https://wordpress.org/support/article/managing-plugins/).
diff --git a/src/follow-me/block.json b/src/follow-me/block.json
new file mode 100644
index 000000000..fba3a2f0a
--- /dev/null
+++ b/src/follow-me/block.json
@@ -0,0 +1,44 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "name": "activitypub/follow-me",
+ "apiVersion": 3,
+ "version": "1.0.0",
+ "title": "Follow me on the Fediverse",
+ "category": "widgets",
+ "description": "Display your Fediverse profile so that visitors can follow you.",
+ "textdomain": "activitypub",
+ "icon": "groups",
+ "supports": {
+ "html": false,
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true,
+ "link": true
+ }
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "width": true,
+ "color": true,
+ "style": true
+ },
+ "typography": {
+ "fontSize": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ }
+ },
+ "attributes": {
+ "selectedUser": {
+ "type": "string",
+ "default": "site"
+ }
+ },
+ "editorScript": "file:./index.js",
+ "viewScript": "file:./view.js",
+ "style": ["file:./style-index.css", "wp-components"]
+}
\ No newline at end of file
diff --git a/src/follow-me/button-style.js b/src/follow-me/button-style.js
new file mode 100644
index 000000000..0c33ca2a3
--- /dev/null
+++ b/src/follow-me/button-style.js
@@ -0,0 +1,75 @@
+function presetVarColorCss( color ) {
+ return `var(--wp--preset--color--${ color })`;
+}
+
+function getBackgroundColor( color ) {
+ // if color is a string, it's a var like this.
+ if ( typeof color === 'string' ) {
+ return presetVarColorCss( color );
+ }
+
+ return color?.color?.background || null;
+}
+
+function getLinkColor( text ) {
+ if ( typeof text !== 'string' ) {
+ return null;
+ }
+ // if it starts with a hash, leave it be
+ if ( text.match( /^#/ ) ) {
+ // we don't handle the alpha channel if present.
+ return text.substring( 0, 7 );
+ }
+ // var:preset|color|luminous-vivid-amber
+ // var(--wp--preset--color--luminous-vivid-amber)
+ // we will receive the top format, we need to output the bottom format
+ const [ , , color ] = text.split( '|' );
+ return presetVarColorCss( color );
+}
+
+function generateSelector( selector, prop, value = null, pseudo = '' ) {
+ if ( ! value ) {
+ return '';
+ }
+ return `${ selector }${ pseudo } { ${ prop }: ${ value }; }\n`;
+}
+
+function getStyles( selector, button, text, hover ) {
+ return generateSelector( selector, 'background-color', button )
+ + generateSelector( selector, 'color', text )
+ + generateSelector( selector, 'background-color', hover, ':hover' )
+ + generateSelector( selector, 'background-color', hover, ':focus' );
+}
+
+function getBlockStyles( base, style, backgroundColor ) {
+ const selector = `${ base } .components-button`;
+ // we grab the background color if set as a good color for our button text
+ const buttonTextColor = getBackgroundColor( backgroundColor )
+ // bg might be in this form.
+ || style?.color?.background;
+ // we misuse the link color for the button background
+ const buttonColor = getLinkColor( style?.elements?.link?.color?.text );
+ // hover!
+ const buttonHoverColor = getLinkColor( style?.elements?.link?.[':hover']?.color?.text );
+
+ return getStyles( selector, buttonColor, buttonTextColor, buttonHoverColor );
+}
+
+export function getPopupStyles( style ) {
+ // we don't acept backgroundColor because the popup is always white (right?)
+ const buttonColor = getLinkColor( style?.elements?.link?.color?.text )
+ || '#111';
+ const buttonTextColor = '#fff';
+ const buttonHoverColor = getLinkColor( style?.elements?.link?.[':hover']?.color?.text )
+ || '#333';
+ const selector = '.apfmd__button-group .components-button';
+
+ return getStyles( selector, buttonColor, buttonTextColor, buttonHoverColor );
+}
+
+export function ButtonStyle( { selector, style, backgroundColor } ) {
+ const css = getBlockStyles( selector, style, backgroundColor );
+ return (
+
+ );
+}
\ No newline at end of file
diff --git a/src/follow-me/edit.js b/src/follow-me/edit.js
new file mode 100644
index 000000000..f40c7a26f
--- /dev/null
+++ b/src/follow-me/edit.js
@@ -0,0 +1,39 @@
+import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
+import { __ } from '@wordpress/i18n';
+import { SelectControl, PanelBody } from '@wordpress/components';
+import { useUserOptions } from '../shared/use-user-options';
+import FollowMe from './follow-me';
+import { useEffect } from '@wordpress/element';
+
+export default function Edit( { attributes, setAttributes } ) {
+ const blockProps = useBlockProps();
+ const usersOptions = useUserOptions();
+ const { selectedUser } = attributes;
+
+ useEffect( () => {
+ // if there are no users yet, do nothing
+ if ( ! usersOptions.length ) {
+ return;
+ }
+ // ensure that the selected user is in the list of options, if not, select the first available user
+ if ( ! usersOptions.find( ( { value } ) => value === selectedUser ) ) {
+ setAttributes( { selectedUser: usersOptions[ 0 ].value } );
+ }
+ }, [ selectedUser, usersOptions ] );
+
+ return (
+
+
+
+ setAttributes( { selectedUser: value } ) }
+ />
+
+
+
+
+
+
+
{ name }
+
{ resource }
+
+
+
setIsOpen( true ) } >
+ { __( 'Follow', 'activitypub' ) }
+
+ { isOpen && (
+ setIsOpen( false ) }
+ title={ title }
+ >
+
+ ) }
+
+ );
+}
+
+function isUrl( string ) {
+ try {
+ new URL( string );
+ return true;
+ } catch ( _ ) {
+ return false;
+ }
+}
+
+function isHandle( string ) {
+ // remove leading @, there should still be an @ in there
+ const parts = string.replace( /^@/, '' ).split( '@' );
+ return parts.length === 2 && isUrl( `https://${ parts[ 1 ] }` );
+}
+
+function Dialog( { profile, userId } ) {
+ const { resource } = profile;
+ const followText = __( 'Follow', 'activitypub' );
+ const loadingText = __( 'Loading...', 'activitypub' );
+ const openingText = __( 'Opening...', 'activitypub' );
+ const errorText = __( 'Error', 'activitypub' );
+ const invalidText = __( 'Invalid', 'activitypub' );
+ const [ buttonText, setButtonText ] = useState( followText );
+ const [ buttonIcon, setButtonIcon ] = useState( copy );
+ const ref = useCopyToClipboard( resource, () => {
+ setButtonIcon( check );
+ setTimeout( () => setButtonIcon( copy ), 1000 );
+ } );
+ const [ remoteProfile, setRemoteProfile ] = useState( '' );
+ const retrieveAndFollow = useCallback( () => {
+ let timeout;
+ if ( ! ( isUrl( remoteProfile ) || isHandle( remoteProfile ) ) ) {
+ setButtonText( invalidText );
+ timeout = setTimeout( () => setButtonText( followText ), 2000 );
+ return () => clearTimeout( timeout );
+ }
+ const path = `/${ namespace }/users/${userId}/remote-follow?resource=${ remoteProfile }`;
+ setButtonText( loadingText );
+ apiFetch( { path } ).then( ( { url } ) => {
+ setButtonText( openingText );
+ setTimeout( () => {
+ window.open( url, '_blank' );
+ setButtonText( followText );
+ }, 200 );
+ } ).catch( () => {
+ setButtonText( errorText );
+ setTimeout( () => setButtonText( followText ), 2000 );
+ } );
+ }, [ remoteProfile ] );
+
+ return (
+
+
+
{ __( 'My Profile', 'activitypub' ) }
+
+ { __( 'Copy and paste my profile into the search field of your favorite fediverse app or server.', 'activitypub' ) }
+
+
+
+
+
+
+
+
{ __( 'Your Profile', 'activitypub' ) }
+
+ { createInterpolateElement(
+ __( 'Or, if you know your own profile, we can start things that way! (eg https://example.com/yourusername or yourusername@example.com)', 'activitypub' ),
+ { code:
+
+ { buttonText }
+
+
+
+
+
+ setAttributes( { title: value } ) }
+ />
+
+
+
+
← Less', 'activitypub' ),
+ {
+ span: ,
+ }
+ );
+ const nextLabel = createInterpolateElement(
+ /* translators: arrow for next followers link */
+ __( 'More → ', 'activitypub' ),
+ {
+ span: ,
+ }
+ );
+
+ useEffect( () => {
+ const path = getPath( userId, per_page, order, page );
+ apiFetch( { path } )
+ .then( ( data ) => {
+ setPages( Math.ceil( data.totalItems / per_page ) );
+ setTotal( data.totalItems );
+ setFollowers( data.orderedItems );
+ } )
+ .catch( () => {} );
+ }, [ userId, per_page, order, page ] );
+ return (
+
+
{ title }
+
+ { followers && followers.map( ( follower ) => (
+
+
+ ) ) }
+
+ { pages > 1 && (
+
+ ) }
+
+
+ { name }
+ /
+ { handle }
+
+
+ )
+}
diff --git a/src/followers/index.js b/src/followers/index.js
new file mode 100644
index 000000000..8aa6208e0
--- /dev/null
+++ b/src/followers/index.js
@@ -0,0 +1,5 @@
+import { registerBlockType } from '@wordpress/blocks';
+import { people } from '@wordpress/icons';
+import edit from './edit';
+const save = () => null;
+registerBlockType( 'activitypub/followers', { edit, save, icon: people } );
\ No newline at end of file
diff --git a/src/followers/pagination-page.js b/src/followers/pagination-page.js
new file mode 100644
index 000000000..3e148b2f5
--- /dev/null
+++ b/src/followers/pagination-page.js
@@ -0,0 +1,18 @@
+import classNames from 'classnames';
+
+export function PaginationPage( { active, children, page, pageClick, className } ) {
+ const handleClick = event => {
+ event.preventDefault();
+ ! active && pageClick( page );
+ };
+
+ const classes = classNames( 'wp-block activitypub-pager', className , {
+ 'current': active,
+ } );
+
+ return (
+
+ { children }
+
+ );
+}
\ No newline at end of file
diff --git a/src/followers/pagination.js b/src/followers/pagination.js
new file mode 100644
index 000000000..c23300680
--- /dev/null
+++ b/src/followers/pagination.js
@@ -0,0 +1,82 @@
+// Adapted from: https://github.com/Automattic/wp-calypso/tree/trunk/client/components/pagination
+// Markup adapted to imitate the core query-pagination component so we can inherit those styles.
+import classnames from 'classnames';
+import { PaginationPage } from './pagination-page';
+
+const PaginationVariant = {
+ outlined: 'outlined',
+ minimal: 'minimal',
+};
+
+export function Pagination( { compact, nextLabel, page, pageClick, perPage, prevLabel, total, variant = PaginationVariant.outlined } ) {
+ const getPageList = ( page, pageCount ) => {
+ let pageList = [ 1, page - 2, page - 1, page, page + 1, page + 2, pageCount ];
+ pageList.sort( ( a, b ) => a - b );
+
+ // Remove pages less than 1, or greater than total number of pages, and remove duplicates
+ pageList = pageList.filter( ( pageNumber, index, originalPageList ) => {
+ return (
+ pageNumber >= 1 &&
+ pageNumber <= pageCount &&
+ originalPageList.lastIndexOf( pageNumber ) === index
+ );
+ } );
+
+ for ( let i = pageList.length - 2; i >= 0; i-- ) {
+ if ( pageList[ i ] === pageList[ i + 1 ] ) {
+ pageList.splice( i + 1, 1 );
+ }
+ }
+
+ return pageList;
+ };
+
+ const pageList = getPageList( page, Math.ceil( total / perPage ) );
+ const className = classnames( 'alignwide wp-block-query-pagination is-content-justification-space-between is-layout-flex wp-block-query-pagination-is-layout-flex', `is-${ variant }`, {
+ 'is-compact': compact,
+ } );
+
+ return (
+
+ { prevLabel && (
+
+ { prevLabel }
+
+ ) }
+ { ! compact && (
+
+ { pageList.map( pageNumber => (
+
+ { pageNumber }
+
+ ) ) }
+
+ { nextLabel }
+
+ ) }
+
+ );
+}
diff --git a/src/followers/pagination.scss b/src/followers/pagination.scss
new file mode 100644
index 000000000..d14400db1
--- /dev/null
+++ b/src/followers/pagination.scss
@@ -0,0 +1,179 @@
+// I like lamp.
+$minimal-inactive: #999;
+$font-body-small: 12px;
+
+
+.followers-pagination {
+ width: 100%;
+
+ &.is-compact .pagination__list-item {
+ .pagination__list-button.button.is-borderless {
+ padding: 5px 8px;
+ }
+
+ &.pagination__ellipsis span {
+ padding: 5px 6px;
+ }
+
+ &.pagination__arrow .pagination__list-button.button.is-borderless {
+ padding: 6px;
+ }
+ }
+
+ &.is-minimal {
+ .pagination__list-item,
+ .pagination__list-item:first-child,
+ .pagination__list-item:last-child {
+ .pagination__list-button.button {
+ padding: 8px 16px;
+ background-color: transparent;
+ border: none;
+ color: $minimal-inactive;
+
+ &:hover {
+ color: var( --wp--preset--color--contrast, #000 );
+ }
+
+ &:disabled {
+ visibility: hidden;
+ }
+ }
+
+ &.pagination__ellipsis span {
+ padding: 8px 16px;
+ background-color: transparent;
+ border: none;
+ color: $minimal-inactive;
+ }
+
+
+ &.is-selected {
+ .pagination__list-button.button {
+ background-color: transparent;
+ color: var( --wp--preset--color--contrast, #000 );
+
+ &:hover {
+ color: var( --wp--preset--color--contrast, #000 );
+ }
+ }
+ }
+
+ &.pagination__arrow {
+ .pagination__list-button {
+ color: var( --wp--preset--color--contrast, #000 );
+ line-height: calc( var( --wp--preset--color--contrast, #000 ) * 1.5 );
+ }
+
+ .gridicon {
+ width: calc( var( --wp--preset--color--contrast, #000 ) * 1.5 );
+ height: calc( var( --wp--preset--color--contrast, #000 ) * 1.5 );
+ }
+ }
+ }
+ }
+}
+
+.pagination__list {
+ display: flex;
+ margin: 0;
+ list-style: none;
+ align-items: center;
+ justify-content: center;
+ flex-wrap: wrap;
+}
+
+// List item styles for all links
+.pagination__list-item {
+ .pagination__list-button.button.is-borderless,
+ &.pagination__ellipsis span {
+ padding: 8px 12px;
+ background-color: var(--color-surface);
+ border: solid 1px var(--color-neutral-10);
+ border-right: none;
+ font-size: $font-body-small;
+ line-height: 18px;
+ color: var(--color-text-subtle);
+ text-align: center;
+ border-radius: 0;
+ display: flex;
+ flex-wrap: nowrap;
+
+ .gridicon {
+ top: 1px;
+
+ .pagination.is-compact & {
+ top: 0;
+ }
+ }
+ }
+
+ &:first-child .pagination__list-button.button.is-borderless {
+ border-top-left-radius: 2px;
+ border-bottom-left-radius: 2px;
+ }
+
+ &:last-child .pagination__list-button.button.is-borderless {
+ border-right: solid 1px var(--color-neutral-10);
+ border-top-right-radius: 2px;
+ border-bottom-right-radius: 2px;
+ }
+}
+
+// Left/right navigation arrows
+.pagination__list-item.pagination__arrow {
+ display: flex;
+ align-items: center;
+
+ &.is-left {
+ padding-left: 14px;
+ float: left;
+
+ .gridicon {
+ margin-right: 2px;
+ }
+ }
+
+ &.is-right {
+ padding-right: 14px;
+ float: right;
+
+ .gridicon {
+ margin-left: 2px;
+ }
+ }
+
+ .gridicon {
+ vertical-align: middle;
+ width: 18px;
+ height: 18px;
+ }
+}
+
+// // Hover/focus states
+.pagination__list-item .pagination__list-button.button.is-borderless:not([disabled]):hover,
+.pagination__list-item .pagination__list-button.button.is-borderless:focus {
+ color: var(--color-neutral-70);
+ outline: none;
+}
+
+// Selected state
+.pagination__list-item.is-selected .pagination__list-button.button.is-borderless {
+ border-color: var(--color-primary);
+ background-color: var(--color-primary);
+ color: var(--color-text-inverted);
+}
+
+.pagination__list-item.is-selected .pagination__list-button.button.is-borderless:hover {
+ color: var(--color-text-inverted);
+}
+
+.pagination__list-item.is-selected + .pagination__list-item
+.pagination__list-button.button.is-borderless {
+ border-left: 0;
+}
+
+// Abridgement indication
+.pagination__ellipsis,
+.pagination__ellipsis:hover {
+ color: var(--color-neutral-light);
+}
diff --git a/src/followers/style.scss b/src/followers/style.scss
new file mode 100644
index 000000000..83d120321
--- /dev/null
+++ b/src/followers/style.scss
@@ -0,0 +1,82 @@
+.activitypub-follower-block {
+ &.is-style-compact {
+ .activitypub-handle, .sep {
+ display: none;
+ }
+ }
+ &.is-style-with-lines {
+ ul li {
+ border-bottom: .5px solid;
+ padding-bottom: .5rem;
+ margin-bottom: .5rem;
+ &:last-child {
+ border-bottom: none;
+ }
+ }
+ .activitypub-name, .activitypub-handle {
+ text-decoration: none;
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+ }
+ ul {
+ margin: 0 !important;
+ padding: 0 !important;
+ }
+ li {
+ display: flex;
+ margin-bottom: 1rem;
+ }
+ img {
+ border-radius: 50%;
+ width: 40px;
+ height: 40px;
+ margin-right: var( --wp--preset--spacing--20, .5rem );
+ }
+ .activitypub-link {
+ display: flex;
+ flex-flow: row nowrap;
+ align-items: center;
+ max-width: 100%;
+ color: inherit !important;
+ text-decoration: none !important; // overrides core styles for external links
+ }
+ .activitypub-name, .activitypub-handle {
+ text-decoration: underline;
+ text-decoration-thickness: .8px;
+ text-underline-position: under;
+
+ &:hover {
+ text-decoration: none;
+ }
+ }
+ .activitypub-name {
+ font-size: var( --wp--preset--font-size--normal, 16px );
+ }
+ .activitypub-actor {
+ font-size: var( --wp--preset--font-size--small, 13px );
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ .sep {
+ padding: 0 .2rem;
+ }
+ .wp-block-query-pagination {
+ margin-top: 1.5rem;
+ }
+ .activitypub-pager {
+ cursor: default;
+ &.current {
+ opacity: .33;
+ }
+ }
+ .page-numbers {
+ padding: 0 .2rem;
+ &.current {
+ opacity: 1;
+ font-weight: bold;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/followers/view.js b/src/followers/view.js
new file mode 100644
index 000000000..8539be725
--- /dev/null
+++ b/src/followers/view.js
@@ -0,0 +1,12 @@
+import './style.scss';
+import { Followers } from './followers';
+import { render } from '@wordpress/element';
+import domReady from '@wordpress/dom-ready';
+
+domReady( () => {
+ // iterate over a nodelist
+ [].forEach.call( document.querySelectorAll( '.activitypub-follower-block' ), ( element ) => {
+ const attrs = JSON.parse( element.dataset.attrs );
+ render( ' . \wp_parse_url( \home_url( '/' ), \PHP_URL_HOST ) . ' ',
- \ENT_QUOTES,
- 'UTF-8'
- ),
-);
-
-$json->attachment['profile_url'] = array(
- 'type' => 'PropertyValue',
- 'name' => \__( 'Profile', 'activitypub' ),
- 'value' => \html_entity_decode(
- '' . \wp_parse_url( \get_author_posts_url( $author_id ), \PHP_URL_HOST ) . ' ',
- \ENT_QUOTES,
- 'UTF-8'
- ),
-);
-
-if ( \get_the_author_meta( 'user_url', $author_id ) ) {
- $json->attachment['user_url'] = array(
- 'type' => 'PropertyValue',
- 'name' => \__( 'Website', 'activitypub' ),
- 'value' => \html_entity_decode(
- '' . \wp_parse_url( \get_the_author_meta( 'user_url', $author_id ), \PHP_URL_HOST ) . ' ',
- \ENT_QUOTES,
- 'UTF-8'
- ),
- );
-}
-
-// filter output
-$json = \apply_filters( 'activitypub_json_author_array', $json, $author_id );
-
-// migrate to ActivityPub standard
-$json->attachment = array_values( $json->attachment );
-
/*
* Action triggerd prior to the ActivityPub profile being created and sent to the client
*/
-\do_action( 'activitypub_json_author_pre', $author_id );
+\do_action( 'activitypub_json_author_pre', $user->get__id() );
$options = 0;
// JSON_PRETTY_PRINT added in PHP 5.4
@@ -101,12 +23,12 @@
*
* @param int $options The current options flags
*/
-$options = \apply_filters( 'activitypub_json_author_options', $options, $author_id );
+$options = \apply_filters( 'activitypub_json_author_options', $options, $user->get__id() );
\header( 'Content-Type: application/activity+json' );
-echo \wp_json_encode( $json, $options );
+echo \wp_json_encode( $user->to_array(), $options );
/*
* Action triggerd after the ActivityPub profile has been created and sent to the client
*/
-\do_action( 'activitypub_json_author_post', $author_id );
+\do_action( 'activitypub_json_author_post', $user->get__id() );
diff --git a/templates/blog-json.php b/templates/blog-json.php
index 4a1efc848..7ce6a270b 100644
--- a/templates/blog-json.php
+++ b/templates/blog-json.php
@@ -1,66 +1,14 @@
{'@context'} = \Activitypub\get_context();
-$json->id = \get_home_url( '/' );
-$json->type = 'Organization';
-$json->name = \get_bloginfo( 'name' );
-$json->summary = \html_entity_decode(
- \get_bloginfo( 'description' ),
- \ENT_QUOTES,
- 'UTF-8'
+$user->set_context(
+ \Activitypub\Activity\Activity::CONTEXT
);
-$json->preferredUsername = \get_bloginfo( 'name' ); // phpcs:ignore
-$json->url = \get_home_url( '/' );
-
-if ( \has_site_icon() ) {
- $json->icon = array(
- 'type' => 'Image',
- 'url' => \get_site_icon_url( 120 ),
- );
-}
-
-if ( \has_header_image() ) {
- $json->image = array(
- 'type' => 'Image',
- 'url' => \get_header_image(),
- );
-}
-
-$json->inbox = \get_rest_url( null, '/activitypub/1.0/blog/inbox' );
-$json->outbox = \get_rest_url( null, '/activitypub/1.0/blog/outbox' );
-$json->followers = \get_rest_url( null, '/activitypub/1.0/blog/followers' );
-$json->following = \get_rest_url( null, '/activitypub/1.0/blog/following' );
-
-$json->manuallyApprovesFollowers = \apply_filters( 'activitypub_json_manually_approves_followers', \__return_false() ); // phpcs:ignore
-
-// phpcs:ignore
-$json->publicKey = array(
- 'id' => \get_home_url( '/' ) . '#main-key',
- 'owner' => \get_home_url( '/' ),
- 'publicKeyPem' => '',
-);
-
-$json->tag = array();
-$json->attachment = array();
-
-$json->attachment[] = array(
- 'type' => 'PropertyValue',
- 'name' => \__( 'Blog', 'activitypub' ),
- 'value' => \html_entity_decode(
- '' . \wp_parse_url( \home_url( '/' ), \PHP_URL_HOST ) . ' ',
- \ENT_QUOTES,
- 'UTF-8'
- ),
-);
-
-// filter output
-$json = \apply_filters( 'activitypub_json_blog_array', $json );
/*
* Action triggerd prior to the ActivityPub profile being created and sent to the client
*/
-\do_action( 'activitypub_json_blog_pre' );
+\do_action( 'activitypub_json_author_pre', $user->get__id() );
$options = 0;
// JSON_PRETTY_PRINT added in PHP 5.4
@@ -75,12 +23,12 @@
*
* @param int $options The current options flags
*/
-$options = \apply_filters( 'activitypub_json_blog_options', $options );
+$options = \apply_filters( 'activitypub_json_author_options', $options, $user->get__id() );
\header( 'Content-Type: application/activity+json' );
-echo \wp_json_encode( $json, $options );
+echo \wp_json_encode( $user->to_array(), $options );
/*
* Action triggerd after the ActivityPub profile has been created and sent to the client
*/
-\do_action( 'activitypub_json_blog_post' );
+\do_action( 'activitypub_json_author_post', $user->get__id() );
diff --git a/templates/blog-user-followers-list.php b/templates/blog-user-followers-list.php
new file mode 100644
index 000000000..42d1b8b39
--- /dev/null
+++ b/templates/blog-user-followers-list.php
@@ -0,0 +1,28 @@
+ '',
+ 'welcome' => '',
+ 'followers' => 'active',
+ )
+);
+$table = new \Activitypub\Table\Followers();
+$follower_count = $table->get_user_count();
+// translators: The follower count.
+$followers_template = _n( 'Your blog profile currently has %s follower.', 'Your blog profile currently has %s followers.', $follower_count, 'activitypub' );
+?>
+
diff --git a/templates/followers-list.php b/templates/followers-list.php
deleted file mode 100644
index 057f498f7..000000000
--- a/templates/followers-list.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
diff --git a/templates/post-json.php b/templates/post-json.php
index 4c597d6d6..89467c466 100644
--- a/templates/post-json.php
+++ b/templates/post-json.php
@@ -2,8 +2,8 @@
// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
$post = \get_post();
-$activitypub_post = new \Activitypub\Model\Post( $post );
-$json = \array_merge( array( '@context' => \Activitypub\get_context() ), $activitypub_post->to_array() );
+$object = new \Activitypub\Transformer\Post( $post );
+$json = \array_merge( array( '@context' => \Activitypub\get_context() ), $object->to_object()->to_array() );
// filter output
$json = \apply_filters( 'activitypub_json_post_array', $json );
diff --git a/templates/settings.php b/templates/settings.php
index 2bfaed49d..fd801458a 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -1,178 +1,263 @@
'active',
- 'welcome' => '',
+ 'settings' => 'active',
+ 'welcome' => '',
+ 'followers' => '',
)
);
?>
-
-
-
- Site Health 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' ) )
- ),
- 'default'
- );
- ?>
-
-
-
-
-
+