modified file bootstrap-buttons.css

wp-content/upgrade-temp-backup/plugins/activitypub/.distignore

@@ -15,6 +15,8 @@ Makefile
 README.md
 readme.md
 CODE_OF_CONDUCT.md
+FEDERATION.md
+SECURITY.md
 LICENSE.md
 _site
 _config.yml
@@ -36,3 +38,4 @@ phpunit.xml.dist
 tests
 node_modules
 vendor
+src

wp-content/upgrade-temp-backup/plugins/activitypub/LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2019 Matthias Pfefferle
+Copyright (c) 2023 Automattic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

wp-content/upgrade-temp-backup/plugins/activitypub/activitypub.php

@@ -3,7 +3,7 @@
  * Plugin Name: ActivityPub
  * Plugin URI: https://github.com/pfefferle/wordpress-activitypub/
  * Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
- * Version: 0.17.0
+ * Version: 1.0.7
  * Author: Matthias Pfefferle & Automattic
  * Author URI: https://automattic.com/
  * License: MIT
@@ -15,85 +15,124 @@
 
 namespace Activitypub;
 
+use function Activitypub\is_blog_public;
+use function Activitypub\site_supports_blocks;
+
+require_once __DIR__ . '/includes/compat.php';
+require_once __DIR__ . '/includes/functions.php';
+
 /**
- * Initialize plugin
+ * Initialize the plugin constants.
  */
-function init() {
-	\defined( 'ACTIVITYPUB_EXCERPT_LENGTH' ) || \define( 'ACTIVITYPUB_EXCERPT_LENGTH', 400 );
-	\defined( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS' ) || \define( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS', 3 );
-	\defined( 'ACTIVITYPUB_HASHTAGS_REGEXP' ) || \define( 'ACTIVITYPUB_HASHTAGS_REGEXP', '(?:(?<=\s)|(?<=<p>)|(?<=<br>)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))' );
-	\defined( 'ACTIVITYPUB_USERNAME_REGEXP' ) || \define( 'ACTIVITYPUB_USERNAME_REGEXP', '(?:([A-Za-z0-9_-]+)@((?:[A-Za-z0-9_-]+\.)+[A-Za-z]+))' );
-	\defined( 'ACTIVITYPUB_ALLOWED_HTML' ) || \define( 'ACTIVITYPUB_ALLOWED_HTML', '<strong><a><p><ul><ol><li><code><blockquote><pre><img>' );
-	\defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "<p><strong>[ap_title]</strong></p>\n\n[ap_content]\n\n<p>[ap_hashtags]</p>\n\n<p>[ap_shortlink]</p>" );
-	\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__ ) );
+\defined( 'ACTIVITYPUB_REST_NAMESPACE' ) || \define( 'ACTIVITYPUB_REST_NAMESPACE', 'activitypub/1.0' );
+\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)|(?<=<p>)|(?<=<br>)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))' );
+\defined( 'ACTIVITYPUB_USERNAME_REGEXP' ) || \define( 'ACTIVITYPUB_USERNAME_REGEXP', '(?:([A-Za-z0-9_-]+)@((?:[A-Za-z0-9_-]+\.)+[A-Za-z]+))' );
+\defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "<strong>[ap_title]</strong>\n\n[ap_content]\n\n[ap_hashtags]\n\n[ap_shortlink]" );
+\defined( 'ACTIVITYPUB_AUTHORIZED_FETCH' ) || \define( 'ACTIVITYPUB_AUTHORIZED_FETCH', false );
+\defined( 'ACTIVITYPUB_DISABLE_REWRITES' ) || \define( 'ACTIVITYPUB_DISABLE_REWRITES', false );
 
-	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';
+\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/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();
-
-	// 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();
+/**
+ * Initialize REST routes.
+ */
+function rest_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();
 
 	// 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();
-	}
-
-	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();
-
-	require_once \dirname( __FILE__ ) . '/includes/class-debug.php';
-	\Activitypub\Debug::init();
-
-	require_once \dirname( __FILE__ ) . '/includes/class-health-check.php';
-	\Activitypub\Health_Check::init();
-
-	if ( \WP_DEBUG ) {
-		require_once \dirname( __FILE__ ) . '/includes/debug.php';
+	if ( is_blog_public() ) {
+		Rest\NodeInfo::init();
 	}
 }
-\add_action( 'plugins_loaded', '\Activitypub\init' );
+\add_action( 'rest_api_init', __NAMESPACE__ . '\rest_init' );
+
+/**
+ * Initialize plugin.
+ */
+function plugin_init() {
+	\add_action( 'init', array( __NAMESPACE__ . '\Migration', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Activitypub', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Activity_Dispatcher', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Collection\Followers', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Admin', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Hashtag', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Shortcodes', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Mention', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Health_Check', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Scheduler', 'init' ) );
+
+	if ( site_supports_blocks() ) {
+		\add_action( 'init', array( __NAMESPACE__ . '\Blocks', 'init' ) );
+	}
+
+	$debug_file = __DIR__ . '/includes/debug.php';
+	if ( \WP_DEBUG && file_exists( $debug_file ) && is_readable( $debug_file ) ) {
+		require_once $debug_file;
+		Debug::init();
+	}
+
+	require_once __DIR__ . '/integration/class-webfinger.php';
+	Integration\Webfinger::init();
+
+	require_once __DIR__ . '/integration/class-nodeinfo.php';
+	Integration\Nodeinfo::init();
+}
+\add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_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 ) ) );
+			}
+		}
+	}
+);
 
 /**
  * Add plugin settings link
  */
 function plugin_settings_link( $actions ) {
+	$settings_link = array();
 	$settings_link[] = \sprintf(
 		'<a href="%1s">%2s</a>',
 		\menu_page_url( 'activitypub', false ),
@@ -102,40 +141,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' );
 
-/**
- * Add rewrite rules
- */
-function add_rewrite_rules() {
-	if ( ! \class_exists( 'Webfinger' ) ) {
-		\add_rewrite_rule( '^.well-known/webfinger', 'index.php?rest_route=/activitypub/1.0/webfinger', 'top' );
-	}
+\register_activation_hook(
+	__FILE__,
+	array(
+		__NAMESPACE__ . '\Activitypub',
+		'activate',
+	)
+);
 
-	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' );
-	}
+\register_deactivation_hook(
+	__FILE__,
+	array(
+		__NAMESPACE__ . '\Activitypub',
+		'deactivate',
+	)
+);
 
-	\add_rewrite_endpoint( 'activitypub', EP_AUTHORS | EP_PERMALINK | EP_PAGES );
-}
-\add_action( 'init', '\Activitypub\add_rewrite_rules', 1 );
-
-/**
- * Flush rewrite rules;
- */
-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' );
+\register_uninstall_hook(
+	__FILE__,
+	array(
+		__NAMESPACE__ . '\Activitypub',
+		'uninstall',
+	)
+);
 
 /**
  * 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();
+add_action(
+	'bp_include',
+	function() {
+		require_once __DIR__ . '/integration/class-buddypress.php';
+		Integration\Buddypress::init();
+	},
+	0
+);
+
+/**
+ * `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',
+		);
+	}
+
+	return \get_file_data( __FILE__, $default_headers, 'plugin' );
+}
+
+/**
+ * Plugin Version Number used for caching.
+ */
+function get_plugin_version() {
+	$meta = get_plugin_meta( array( 'Version' => 'Version' ) );
+
+	return $meta['Version'];
 }
-add_action( 'bp_include', '\Activitypub\enable_buddypress_features' );

wp-content/upgrade-temp-backup/plugins/activitypub/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;
+}

wp-content/upgrade-temp-backup/plugins/activitypub/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"
+  ]
+}

wp-content/upgrade-temp-backup/plugins/activitypub/build/follow-me/index.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '2a185b1c488886051601');

wp-content/upgrade-temp-backup/plugins/activitypub/build/follow-me/style-index.css

@@ -0,0 +1 @@
+.activitypub-follow-me-block-wrapper{width:100%}.activitypub-follow-me-block-wrapper.has-background .activitypub-profile,.activitypub-follow-me-block-wrapper.has-border-color .activitypub-profile{padding-left:1rem;padding-right:1rem}.activitypub-follow-me-block-wrapper .activitypub-profile{align-items:center;display:flex;padding:1rem 0}.activitypub-follow-me-block-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{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{line-height:1.2;margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.activitypub-follow-me-block-wrapper .activitypub-profile .activitypub-profile__name{font-size:1.25em}.activitypub-follow-me-block-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-profile__confirm.components-modal__frame{background-color:#f7f7f7;color:#333}.activitypub-profile__confirm.components-modal__frame .components-modal__header-heading,.activitypub-profile__confirm.components-modal__frame h4{color:#333;letter-spacing:inherit;word-spacing:inherit}.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}

wp-content/upgrade-temp-backup/plugins/activitypub/build/follow-me/view.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('wp-api-fetch', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '17a158ceced1355cc8ea');

wp-content/upgrade-temp-backup/plugins/activitypub/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"
+  ]
+}

wp-content/upgrade-temp-backup/plugins/activitypub/build/followers/index.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => '1cbd9cbfcbd7fc813429');

wp-content/upgrade-temp-backup/plugins/activitypub/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<arguments.length;t++){var a=arguments[t];if(a){var r=typeof a;if("string"===r||"number"===r)e.push(a);else if(Array.isArray(a)){if(a.length){var o=l.apply(null,a);o&&e.push(o)}}else if("object"===r){if(a.toString!==Object.prototype.toString&&!a.toString.toString().includes("[native code]")){e.push(a.toString());continue}for(var i in a)n.call(a,i)&&a[i]&&e.push(i)}}}return e.join(" ")}e.exports?(l.default=l,e.exports=l):void 0===(a=function(){return l}.apply(t,[]))||(e.exports=a)}()}},t={};function a(n){var l=t[n];if(void 0!==l)return l.exports;var r=t[n]={exports:{}};return e[n](r,r.exports,a),r.exports}a.n=e=>{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<arguments.length;t++){var a=arguments[t];for(var n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n])}return e},r.apply(this,arguments)}const o=window.wp.components,i=window.wp.blockEditor,c=window.wp.i18n,s=window.React,p=window.wp.apiFetch;var u=a.n(p);const v=window.wp.url;var m=a(184),b=a.n(m);function w(e){let{active:a,children:n,page:l,pageClick:r,className:o}=e;const i=b()("wp-block activitypub-pager",o,{current:a});return(0,t.createElement)("a",{className:i,onClick:e=>{e.preventDefault(),!a&&r(l)}},n)}const d={outlined:"outlined",minimal:"minimal"};function f(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:g}=window._activityPubOptions;function y(e){let{selectedUser:a,per_page:n,order:l,title:o,page:i,setPage:p,className:m="",followLinks:b=!0,followerData:w=!1}=e;const d="site"===a?0:a,[y,k]=(0,s.useState)([]),[E,_]=(0,s.useState)(0),[x,C]=(0,s.useState)(0),[S,O]=function(){const[e,t]=(0,s.useState)(1);return[e,t]}(),N=i||S,P=p||O,L=(0,t.createInterpolateElement)(/* translators: arrow for previous followers link */
+(0,c.__)("<span>←</span> Less","activitypub"),{span:(0,t.createElement)("span",{class:"wp-block-query-pagination-previous-arrow is-arrow-arrow","aria-hidden":"true"})}),j=(0,t.createInterpolateElement)(/* translators: arrow for next followers link */
+(0,c.__)("More <span>→</span>","activitypub"),{span:(0,t.createElement)("span",{class:"wp-block-query-pagination-next-arrow is-arrow-arrow","aria-hidden":"true"})}),M=(e,t)=>{k(e),C(t),_(Math.ceil(t/n))};return(0,s.useEffect)((()=>{if(w&&1===N)return M(w.followers,w.total);const e=function(e,t,a,n){const l=`/${g}/users/${e}/followers`,r={per_page:t,order:a,page:n,context:"full"};return(0,v.addQueryArgs)(l,r)}(d,n,l,N);u()({path:e}).then((e=>M(e.orderedItems,e.totalItems))).catch((()=>{}))}),[d,n,l,N,w]),(0,t.createElement)("div",{className:"activitypub-follower-block "+m},(0,t.createElement)("h3",null,o),(0,t.createElement)("ul",null,y&&y.map((e=>(0,t.createElement)("li",{key:e.url},(0,t.createElement)(h,r({},e,{followLinks:b})))))),E>1&&(0,t.createElement)(f,{page:N,perPage:n,total:x,pageClick:P,nextLabel:j,prevLabel:L,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])}(),f=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})}),d.length>1&&(0,t.createElement)(o.SelectControl,{label:(0,c.__)("Select User","activitypub"),value:p,options:d,onChange:f("selectedUser")}),(0,t.createElement)(o.SelectControl,{label:(0,c.__)("Sort","activitypub"),value:l,options:w,onChange:f("order")}),(0,t.createElement)(o.RangeControl,{label:(0,c.__)("Number of Followers","activitypub"),value:s,onChange:f("per_page"),min:1,max:10}))),(0,t.createElement)(y,r({},a,{page:m,setPage:b,followLinks:!1})))},save:()=>null,icon:l})})()})();

wp-content/upgrade-temp-backup/plugins/activitypub/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}

wp-content/upgrade-temp-backup/plugins/activitypub/build/followers/view.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => 'f0e21057f7ec615290d6');

wp-content/upgrade-temp-backup/plugins/activitypub/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<arguments.length;t++){var a=arguments[t];for(var r in a)Object.prototype.hasOwnProperty.call(a,r)&&(e[r]=a[r])}return e},n.apply(this,arguments)}const l=window.React,o=window.wp.apiFetch;var i=a.n(o);const c=window.wp.url,s=window.wp.i18n;var p=a(184),u=a.n(p);function m(e){let{active:t,children:a,page:n,pageClick:l,className:o}=e;const i=u()("wp-block activitypub-pager",o,{current:t});return(0,r.createElement)("a",{className:i,onClick:e=>{e.preventDefault(),!t&&l(n)}},a)}const v={outlined:"outlined",minimal:"minimal"};function f(e){let{compact:t,nextLabel:a,page:n,pageClick:l,perPage:o,prevLabel:i,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/o)),f=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:f},i&&(0,r.createElement)(m,{key:"prev",page:n-1,pageClick:l,active:1===n,"aria-label":i,className:"wp-block-query-pagination-previous block-editor-block-list__block"},i),!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/o),"aria-label":a,className:"wp-block-query-pagination-next block-editor-block-list__block"},a))}const b=window.wp.components,{namespace:d}=window._activityPubOptions;function w(e){let{selectedUser:t,per_page:a,order:o,title:p,page:u,setPage:m,className:v="",followLinks:b=!0,followerData:w=!1}=e;const y="site"===t?0:t,[k,h]=(0,l.useState)([]),[E,O]=(0,l.useState)(0),[x,_]=(0,l.useState)(0),[N,j]=function(){const[e,t]=(0,l.useState)(1);return[e,t]}(),S=u||N,C=m||j,L=(0,r.createInterpolateElement)(/* translators: arrow for previous followers link */
+(0,s.__)("<span>←</span> Less","activitypub"),{span:(0,r.createElement)("span",{class:"wp-block-query-pagination-previous-arrow is-arrow-arrow","aria-hidden":"true"})}),q=(0,r.createInterpolateElement)(/* translators: arrow for next followers link */
+(0,s.__)("More <span>→</span>","activitypub"),{span:(0,r.createElement)("span",{class:"wp-block-query-pagination-next-arrow is-arrow-arrow","aria-hidden":"true"})}),P=(e,t)=>{h(e),_(t),O(Math.ceil(t/a))};return(0,l.useEffect)((()=>{if(w&&1===S)return P(w.followers,w.total);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)}(y,a,o,S);i()({path:e}).then((e=>P(e.orderedItems,e.totalItems))).catch((()=>{}))}),[y,a,o,S,w]),(0,r.createElement)("div",{className:"activitypub-follower-block "+v},(0,r.createElement)("h3",null,p),(0,r.createElement)("ul",null,k&&k.map((e=>(0,r.createElement)("li",{key:e.url},(0,r.createElement)(g,n({},e,{followLinks:b})))))),E>1&&(0,r.createElement)(f,{page:S,perPage:a,total:x,pageClick:C,nextLabel:q,prevLabel:L,compact:"is-style-compact"===v}))}function g(e){let{name:t,icon:a,url:l,preferredUsername:o,followLinks:i=!0}=e;const c=`@${o}`,s={};return i||(s.onClick=e=>e.preventDefault()),(0,r.createElement)(b.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<arguments.length;t++){var a=arguments[t];if(a){var l=typeof a;if("string"===l||"number"===l)e.push(a);else if(Array.isArray(a)){if(a.length){var o=n.apply(null,a);o&&e.push(o)}}else if("object"===l){if(a.toString!==Object.prototype.toString&&!a.toString.toString().includes("[native code]")){e.push(a.toString());continue}for(var i in a)r.call(a,i)&&a[i]&&e.push(i)}}}return e.join(" ")}e.exports?(n.default=n,e.exports=n):void 0===(a=function(){return n}.apply(t,[]))||(e.exports=a)}()}},a={};function r(e){var n=a[e];if(void 0!==n)return n.exports;var l=a[e]={exports:{}};return t[e](l,l.exports,r),l.exports}r.m=t,e=[],r.O=(t,a,n,l)=>{if(!a){var o=1/0;for(p=0;p<e.length;p++){for(var[a,n,l]=e[p],i=!0,c=0;c<a.length;c++)(!1&l||o>=l)&&Object.keys(r.O).every((e=>r.O[e](a[c])))?a.splice(c--,1):(i=!1,l<o&&(o=l));if(i){e.splice(p--,1);var s=n();void 0!==s&&(t=s)}}return t}l=l||0;for(var p=e.length;p>0&&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,[o,i,c]=a,s=0;if(o.some((t=>0!==e[t]))){for(n in i)r.o(i,n)&&(r.m[n]=i[n]);if(c)var p=c(r)}for(t&&t(a);s<o.length;s++)l=o[s],r.o(e,l)&&e[l]&&e[l][0](),e[l]=0;return r.O(p)},a=globalThis.webpackChunkwordpress_activitypub=globalThis.webpackChunkwordpress_activitypub||[];a.forEach(t.bind(null,0)),a.push=t.bind(null,a.push.bind(a))})();var n=r.O(void 0,[962],(()=>r(189)));n=r.O(n)})();

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

@@ -0,0 +1,223 @@
+<?php
+/**
+ * Inspired by the PHP ActivityPub Library by @Landrok
+ *
+ * @link https://github.com/landrok/activitypub
+ */
+
+namespace Activitypub\Activity;
+
+use Activitypub\Activity\Base_Object;
+
+/**
+ * \Activitypub\Activity\Activity implements the common
+ * attributes of an Activity.
+ *
+ * @see https://www.w3.org/TR/activitystreams-core/#activities
+ * @see https://www.w3.org/TR/activitystreams-core/#intransitiveactivities
+ */
+class Activity extends Base_Object {
+	const CONTEXT = array(
+		'https://www.w3.org/ns/activitystreams',
+		'https://w3id.org/security/v1',
+		array(
+			'manuallyApprovesFollowers' => '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<Actor>
+	 *    | array<Link>
+	 *    | Link
+	 */
+	protected $actor;
+
+	/**
+	 * The indirect object, or target, of the activity.
+	 * The precise meaning of the target is largely dependent on the
+	 * type of action being described but will often be the object of
+	 * the English preposition "to".
+	 * For instance, in the activity "John added a movie to his
+	 * wishlist", the target of the activity is John's wishlist.
+	 * An activity can have more than one target.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-target
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | array<ObjectType>
+	 *    | Link
+	 *    | array<Link>
+	 */
+	protected $target;
+
+	/**
+	 * Describes the result of the activity.
+	 * For instance, if a particular action results in the creation of
+	 * a new resource, the result property can be used to describe
+	 * that new resource.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-result
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | null
+	 */
+	protected $result;
+
+	/**
+	 * An indirect object of the activity from which the
+	 * activity is directed.
+	 * The precise meaning of the origin is the object of the English
+	 * preposition "from".
+	 * For instance, in the activity "John moved an item to List B
+	 * from List A", the origin of the activity is "List A".
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-origin
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | null
+	 */
+	protected $origin;
+
+	/**
+	 * One or more objects used (or to be used) in the completion of an
+	 * Activity.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-instrument
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | null
+	 */
+	protected $instrument;
+
+	/**
+	 * Set the object and copy Object properties to the Activity.
+	 *
+	 * Any to, bto, cc, bcc, and audience properties specified on the object
+	 * MUST be copied over to the new Create activity by the server.
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#object-without-create
+	 *
+	 * @param string|Base_Objectr|Link|null $object
+	 *
+	 * @return void
+	 */
+	public function set_object( $object ) {
+		$this->set( 'object', $object );
+
+		if ( ! is_object( $object ) ) {
+			return;
+		}
+
+		foreach ( array( 'to', 'bto', 'cc', 'bcc', 'audience' ) as $i ) {
+			$this->set( $i, $object->get( $i ) );
+		}
+
+		if ( $object->get_published() && ! $this->get_published() ) {
+			$this->set( 'published', $object->get_published() );
+		}
+
+		if ( $object->get_updated() && ! $this->get_updated() ) {
+			$this->set( 'updated', $object->get_updated() );
+		}
+
+		if ( $object->get_attributed_to() && ! $this->get_actor() ) {
+			$this->set( 'actor', $object->get_attributed_to() );
+		}
+
+		if ( $object->get_id() && ! $this->get_id() ) {
+			$this->set( 'id', $object->get_id() . '#activity' );
+		}
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/activity/class-actor.php

@@ -0,0 +1,139 @@
+<?php
+/**
+ * Inspired by the PHP ActivityPub Library by @Landrok
+ *
+ * @link https://github.com/landrok/activitypub
+ */
+
+namespace Activitypub\Activity;
+
+/**
+ * \Activitypub\Activity\Actor is an implementation of
+ * one an Activity Streams Actor.
+ *
+ * Represents an individual actor.
+ *
+ * @see https://www.w3.org/TR/activitystreams-vocabulary/#actor-types
+ */
+class Actor extends Base_Object {
+	/**
+	 * @var string
+	 */
+	protected $type = 'Person';
+
+	/**
+	 * A reference to an ActivityStreams OrderedCollection comprised of
+	 * all the messages received by the actor.
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#inbox
+	 *
+	 * @var string
+	 *    | null
+	 */
+	protected $inbox;
+
+	/**
+	 * A reference to an ActivityStreams OrderedCollection comprised of
+	 * all the messages produced by the actor.
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#outbox
+	 *
+	 * @var string
+	 *    | null
+	 */
+	protected $outbox;
+
+	/**
+	 * A link to an ActivityStreams collection of the actors that this
+	 * actor is following.
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#following
+	 *
+	 * @var string
+	 */
+	protected $following;
+
+	/**
+	 * A link to an ActivityStreams collection of the actors that
+	 * follow this actor.
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#followers
+	 *
+	 * @var string
+	 */
+	protected $followers;
+
+	/**
+	 * A link to an ActivityStreams collection of objects this actor has
+	 * liked.
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#liked
+	 *
+	 * @var string
+	 */
+	protected $liked;
+
+	/**
+	 * A list of supplementary Collections which may be of interest.
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#streams-property
+	 *
+	 * @var array
+	 */
+	protected $streams = array();
+
+	/**
+	 * A short username which may be used to refer to the actor, with no
+	 * uniqueness guarantees.
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#preferredUsername
+	 *
+	 * @var string|null
+	 */
+	protected $preferred_username;
+
+	/**
+	 * A JSON object which maps additional typically server/domain-wide
+	 * endpoints which may be useful either for this actor or someone
+	 * referencing this actor. This mapping may be nested inside the
+	 * actor document as the value or may be a link to a JSON-LD
+	 * document with these properties.
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#endpoints
+	 *
+	 * @var string|array|null
+	 */
+	protected $endpoints;
+
+	/**
+	 * It's not part of the ActivityPub protocol but it's a quite common
+	 * practice to handle an actor public key with a publicKey array:
+	 * [
+	 *     'id' => 'https://my-example.com/actor#main-key'
+	 *     'owner' => 'https://my-example.com/actor',
+	 *     'publicKeyPem' => '-----BEGIN PUBLIC KEY-----
+	 *                       MIIBI [...]
+	 *                       DQIDAQAB
+	 *                       -----END PUBLIC KEY-----'
+	 * ]
+	 *
+	 * @see https://www.w3.org/wiki/SocialCG/ActivityPub/Authentication_Authorization#Signing_requests_using_HTTP_Signatures
+	 *
+	 * @var string|array|null
+	 */
+	protected $public_key;
+
+	/**
+	 * It's not part of the ActivityPub protocol but it's a quite common
+	 * practice to lock an account. If anabled, new followers will not be
+	 * automatically accepted, but will instead require you to manually
+	 * approve them.
+	 *
+	 * WordPress does only support 'false' at the moment.
+	 *
+	 * @see https://docs.joinmastodon.org/spec/activitypub/#as
+	 *
+	 * @var boolean
+	 */
+	protected $manually_approves_followers = false;
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/activity/class-base-object.php

@@ -0,0 +1,678 @@
+<?php
+/**
+ * Inspired by the PHP ActivityPub Library by @Landrok
+ *
+ * @link https://github.com/landrok/activitypub
+ */
+
+namespace Activitypub\Activity;
+
+use WP_Error;
+use ReflectionClass;
+
+use function Activitypub\camel_to_snake_case;
+use function Activitypub\snake_to_camel_case;
+
+/**
+ * Base_Object is an implementation of one of the
+ * Activity Streams Core Types.
+ *
+ * The Object is the primary base type for the Activity Streams
+ * vocabulary.
+ *
+ * Note: Object is a reserved keyword in PHP. It has been suffixed with
+ * 'Base_' for this reason.
+ *
+ * @see https://www.w3.org/TR/activitystreams-core/#object
+ */
+class Base_Object {
+	/**
+	 * The object's unique global identifier
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#obj-id
+	 *
+	 * @var string
+	 */
+	protected $id;
+
+	/**
+	 * @var string
+	 */
+	protected $type = 'Object';
+
+	/**
+	 * A resource attached or related to an object that potentially
+	 * requires special handling.
+	 * The intent is to provide a model that is at least semantically
+	 * similar to attachments in email.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-attachment
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | array<ObjectType>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $attachment;
+
+	/**
+	 * One or more entities to which this object is attributed.
+	 * The attributed entities might not be Actors. For instance, an
+	 * object might be attributed to the completion of another activity.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-attributedto
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | array<ObjectType>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $attributed_to;
+
+	/**
+	 * One or more entities that represent the total population of
+	 * entities for which the object can considered to be relevant.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-audience
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | array<ObjectType>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $audience;
+
+	/**
+	 * The content or textual representation of the Object encoded as a
+	 * JSON string. By default, the value of content is HTML.
+	 * The mediaType property can be used in the object to indicate a
+	 * different content type.
+	 *
+	 * The content MAY be expressed using multiple language-tagged
+	 * values.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-content
+	 *
+	 * @var string|null
+	 */
+	protected $content;
+
+	/**
+	 * 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;
+
+	/**
+	 * The content MAY be expressed using multiple language-tagged
+	 * values.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-content
+	 *
+	 * @var array|null
+	 */
+	protected $content_map;
+
+	/**
+	 * A simple, human-readable, plain-text name for the object.
+	 * HTML markup MUST NOT be included.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-name
+	 *
+	 * @var string|null xsd:string
+	 */
+	protected $name;
+
+	/**
+	 * The name MAY be expressed using multiple language-tagged values.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-name
+	 *
+	 * @var array|null rdf:langString
+	 */
+	protected $name_map;
+
+	/**
+	 * The date and time describing the actual or expected ending time
+	 * of the object.
+	 * When used with an Activity object, for instance, the endTime
+	 * property specifies the moment the activity concluded or
+	 * is expected to conclude.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-endtime
+	 *
+	 * @var string|null
+	 */
+	protected $end_time;
+
+	/**
+	 * The entity (e.g. an application) that generated the object.
+	 *
+	 * @var string|null
+	 */
+	protected $generator;
+
+	/**
+	 * An entity that describes an icon for this object.
+	 * The image should have an aspect ratio of one (horizontal)
+	 * to one (vertical) and should be suitable for presentation
+	 * at a small size.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-icon
+	 *
+	 * @var string
+	 *    | Image
+	 *    | Link
+	 *    | array<Image>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $icon;
+
+	/**
+	 * An entity that describes an image for this object.
+	 * Unlike the icon property, there are no aspect ratio
+	 * or display size limitations assumed.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-image-term
+	 *
+	 * @var string
+	 *    | Image
+	 *    | Link
+	 *    | array<Image>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $image;
+
+	/**
+	 * One or more entities for which this object is considered a
+	 * response.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-inreplyto
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | array<ObjectType>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $in_reply_to;
+
+	/**
+	 * One or more physical or logical locations associated with the
+	 * object.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-location
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | array<ObjectType>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $location;
+
+	/**
+	 * An entity that provides a preview of this object.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-preview
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | null
+	 */
+	protected $preview;
+
+	/**
+	 * The date and time at which the object was published
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-published
+	 *
+	 * @var string|null xsd:dateTime
+	 */
+	protected $published;
+
+	/**
+	 * A Collection containing objects considered to be responses to
+	 * this object.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-replies
+	 *
+	 * @var string
+	 *    | Collection
+	 *    | Link
+	 *    | null
+	 */
+	protected $replies;
+
+	/**
+	 * The date and time describing the actual or expected starting time
+	 * of the object.
+	 * When used with an Activity object, for instance, the startTime
+	 * property specifies the moment the activity began
+	 * or is scheduled to begin.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-starttime
+	 *
+	 * @var string|null xsd:dateTime
+	 */
+	protected $start_time;
+
+	/**
+	 * A natural language summarization of the object encoded as HTML.
+	 * Multiple language tagged summaries MAY be provided.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-summary
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | null
+	 */
+	protected $summary;
+
+	/**
+	 * The content MAY be expressed using multiple language-tagged
+	 * values.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-summary
+	 *
+	 * @var array<string>|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<ObjectType>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $tag;
+
+	/**
+	 * The date and time at which the object was updated
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-updated
+	 *
+	 * @var string|null xsd:dateTime
+	 */
+	protected $updated;
+
+	/**
+	 * One or more links to representations of the object.
+	 *
+	 * @var string
+	 *    | array<string>
+	 *    | Link
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $url;
+
+	/**
+	 * An entity considered to be part of the public primary audience
+	 * of an Object
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-to
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | array<ObjectType>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $to;
+
+	/**
+	 * An Object that is part of the private primary audience of this
+	 * Object.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-bto
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | array<ObjectType>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $bto;
+
+	/**
+	 * An Object that is part of the public secondary audience of this
+	 * Object.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-cc
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | array<ObjectType>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $cc;
+
+	/**
+	 * One or more Objects that are part of the private secondary
+	 * audience of this Object.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-bcc
+	 *
+	 * @var string
+	 *    | ObjectType
+	 *    | Link
+	 *    | array<ObjectType>
+	 *    | array<Link>
+	 *    | null
+	 */
+	protected $bcc;
+
+	/**
+	 * The MIME media type of the value of the content property.
+	 * If not specified, the content property is assumed to contain
+	 * text/html content.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-mediatype
+	 *
+	 * @var string|null
+	 */
+	protected $media_type;
+
+	/**
+	 * When the object describes a time-bound resource, such as an audio
+	 * or video, a meeting, etc, the duration property indicates the
+	 * object's approximate duration.
+	 * The value MUST be expressed as an xsd:duration as defined by
+	 * xmlschema11-2, section 3.3.6 (e.g. a period of 5 seconds is
+	 * represented as "PT5S").
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration
+	 *
+	 * @var string|null
+	 */
+	protected $duration;
+
+	/**
+	 * Intended to convey some sort of source from which the content
+	 * markup was derived, as a form of provenance, or to support
+	 * future editing by clients.
+	 *
+	 * @see https://www.w3.org/TR/activitypub/#source-property
+	 *
+	 * @var ObjectType
+	 */
+	protected $source;
+
+	/**
+	 * Magic function to implement getter and setter
+	 *
+	 * @param string $method The method name.
+	 * @param string $params The method params.
+	 *
+	 * @return void
+	 */
+	public function __call( $method, $params ) {
+		$var = \strtolower( \substr( $method, 4 ) );
+
+		if ( \strncasecmp( $method, 'get', 3 ) === 0 ) {
+			if ( ! $this->has( $var ) ) {
+				return new WP_Error( 'invalid_key', __( 'Invalid key', 'activitypub' ), array( 'status' => 404 ) );
+			}
+
+			return $this->$var;
+		}
+
+		if ( \strncasecmp( $method, 'set', 3 ) === 0 ) {
+			$this->set( $var, $params[0] );
+		}
+
+		if ( \strncasecmp( $method, 'add', 3 ) === 0 ) {
+			$this->add( $var, $params[0] );
+		}
+	}
+
+	/**
+	 * Magic function, to transform the object to string.
+	 *
+	 * @return string The object id.
+	 */
+	public function __toString() {
+		return $this->to_string();
+	}
+
+	/**
+	 * Function to transform the object to string.
+	 *
+	 * @return string The object id.
+	 */
+	public function to_string() {
+		return $this->get_id();
+	}
+
+	/**
+	 * Generic getter.
+	 *
+	 * @param string $key The key to get.
+	 *
+	 * @return mixed The value.
+	 */
+	public function get( $key ) {
+		if ( ! $this->has( $key ) ) {
+			return new WP_Error( 'invalid_key', __( 'Invalid key', 'activitypub' ), array( 'status' => 404 ) );
+		}
+
+		return call_user_func( array( $this, 'get_' . $key ) );
+	}
+
+	/**
+	 * Check if the object has a key
+	 *
+	 * @param string $key The key to check.
+	 *
+	 * @return boolean True if the object has the key.
+	 */
+	public function has( $key ) {
+		return property_exists( $this, $key );
+	}
+
+	/**
+	 * Generic setter.
+	 *
+	 * @param string $key   The key to set.
+	 * @param string $value The value to set.
+	 *
+	 * @return mixed The value.
+	 */
+	public function set( $key, $value ) {
+		if ( ! $this->has( $key ) ) {
+			return new WP_Error( 'invalid_key', __( 'Invalid key', 'activitypub' ), array( 'status' => 404 ) );
+		}
+
+		$this->$key = $value;
+
+		return $this->$key;
+	}
+
+	/**
+	 * Generic adder.
+	 *
+	 * @param string $key   The key to set.
+	 * @param mixed  $value The value to add.
+	 *
+	 * @return mixed The value.
+	 */
+	public function add( $key, $value ) {
+		if ( ! $this->has( $key ) ) {
+			return new WP_Error( 'invalid_key', __( 'Invalid key', 'activitypub' ), array( 'status' => 404 ) );
+		}
+
+		if ( ! isset( $this->$key ) ) {
+			$this->$key = array();
+		}
+
+		$attributes   = $this->$key;
+		$attributes[] = $value;
+
+		$this->$key = $attributes;
+
+		return $this->$key;
+	}
+
+	/**
+	 * Convert JSON input to an array.
+	 *
+	 * @return string The JSON string.
+	 *
+	 * @return \Activitypub\Activity\Base_Object An Object built from the JSON string.
+	 */
+	public static function init_from_json( $json ) {
+		$array = \json_decode( $json, true );
+
+		if ( ! is_array( $array ) ) {
+			$array = array();
+		}
+
+		return self::init_from_array( $array );
+	}
+
+	/**
+	 * Convert JSON input to an array.
+	 *
+	 * @return string The object array.
+	 *
+	 * @return \Activitypub\Activity\Base_Object An Object built from the JSON string.
+	 */
+	public static function init_from_array( $array ) {
+		if ( ! is_array( $array ) ) {
+			return new WP_Error( 'invalid_array', __( 'Invalid array', 'activitypub' ), array( 'status' => 404 ) );
+		}
+
+		$object = new static();
+
+		foreach ( $array as $key => $value ) {
+			$key = camel_to_snake_case( $key );
+			$object->set( $key, $value );
+		}
+
+		return $object;
+	}
+
+	/**
+	 * Convert JSON input to an array and pre-fill the object.
+	 *
+	 * @param string $json The JSON string.
+	 */
+	public function from_json( $json ) {
+		$array = \json_decode( $json, true );
+
+		$this->from_array( $array );
+	}
+
+	/**
+	 * Convert JSON input to an array and pre-fill the object.
+	 *
+	 * @param array $array The array.
+	 */
+	public function from_array( $array ) {
+		foreach ( $array as $key => $value ) {
+			if ( $value ) {
+				$key = camel_to_snake_case( $key );
+				$this->set( $key, $value );
+			}
+		}
+	}
+
+	/**
+	 * Convert Object to an array.
+	 *
+	 * It tries to get the object attributes if they exist
+	 * and falls back to the getters. Empty values are ignored.
+	 *
+	 * @return array An array built from the Object.
+	 */
+	public function to_array() {
+		$array = array();
+		$vars  = get_object_vars( $this );
+
+		foreach ( $vars as $key => $value ) {
+			// ignotre all _prefixed keys.
+			if ( '_' === substr( $key, 0, 1 ) ) {
+				continue;
+			}
+
+			// if value is empty, try to get it from a getter.
+			if ( ! $value ) {
+				$value = call_user_func( array( $this, 'get_' . $key ) );
+			}
+
+			if ( is_object( $value ) ) {
+				$value = $value->to_array();
+			}
+
+			// if value is still empty, ignore it for the array and continue.
+			if ( isset( $value ) ) {
+				$array[ snake_to_camel_case( $key ) ] = $value;
+			}
+		}
+
+		// replace 'context' key with '@context' and move it to the top.
+		if ( array_key_exists( 'context', $array ) ) {
+			$context = $array['context'];
+			unset( $array['context'] );
+			$array = array_merge( array( '@context' => $context ), $array );
+		}
+
+		$class = new ReflectionClass( $this );
+		$class = strtolower( $class->getShortName() );
+
+		$array = \apply_filters( 'activitypub_activity_object_array', $array, $class, $this->id, $this );
+		$array = \apply_filters( "activitypub_activity_{$class}_object_array", $array, $this->id, $this );
+
+		return $array;
+	}
+
+	/**
+	 * Convert Object to JSON.
+	 *
+	 * @return string The JSON string.
+	 */
+	public function to_json() {
+		$array = $this->to_array();
+
+		return \wp_json_encode( $array, \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT );
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/class-activity-dispatcher.php

@@ -1,6 +1,16 @@
 <?php
 namespace Activitypub;
 
+use WP_Post;
+use Activitypub\Activity\Activity;
+use Activitypub\Collection\Users;
+use Activitypub\Collection\Followers;
+use Activitypub\Transformer\Post;
+
+use function Activitypub\is_single_user;
+use function Activitypub\is_user_disabled;
+use function Activitypub\safe_remote_post;
+
 /**
  * ActivityPub Activity_Dispatcher Class
  *
@@ -13,87 +23,103 @@ class Activity_Dispatcher {
 	 * Initialize the class, registering WordPress hooks.
 	 */
 	public static function init() {
-		\add_action( 'activitypub_send_post_activity', array( '\Activitypub\Activity_Dispatcher', 'send_post_activity' ) );
-		\add_action( 'activitypub_send_update_activity', array( '\Activitypub\Activity_Dispatcher', 'send_update_activity' ) );
-		\add_action( 'activitypub_send_delete_activity', array( '\Activitypub\Activity_Dispatcher', 'send_delete_activity' ) );
+		\add_action( 'activitypub_send_activity', array( self::class, 'send_activity' ), 10, 2 );
+		\add_action( 'activitypub_send_activity', array( self::class, 'send_activity_or_announce' ), 10, 2 );
 	}
 
 	/**
-	 * Send "create" activities.
+	 * Send Activities to followers and mentioned users or `Announce` (boost) a blog post.
 	 *
-	 * @param \Activitypub\Model\Post $activitypub_post
+	 * @param WP_Post $wp_post The ActivityPub Post.
+	 * @param string  $type    The Activity-Type.
+	 *
+	 * @return void
 	 */
-	public static function send_post_activity( Model\Post $activitypub_post ) {
-		// get latest version of post
-		$user_id = $activitypub_post->get_post_author();
+	public static function send_activity_or_announce( WP_Post $wp_post, $type ) {
+		// check if a migration is needed before sending new posts
+		Migration::maybe_migrate();
 
-		$activitypub_activity = new \Activitypub\Model\Activity( 'Create', \Activitypub\Model\Activity::TYPE_FULL );
-		$activitypub_activity->from_post( $activitypub_post );
-
-		$inboxes = \Activitypub\get_follower_inboxes( $user_id );
-
-		$followers_url = \get_rest_url( null, '/activitypub/1.0/users/' . intval( $user_id ) . '/followers' );
-		foreach ( $activitypub_activity->get_cc() as $cc ) {
-			if ( $cc === $followers_url ) {
-				continue;
-			}
-			$inbox = \Activitypub\get_inbox_by_actor( $cc );
-			if ( ! $inbox || \is_wp_error( $inbox ) ) {
-				continue;
-			}
-			// init array if empty
-			if ( ! isset( $inboxes[ $inbox ] ) ) {
-				$inboxes[ $inbox ] = array();
-			}
-			$inboxes[ $inbox ][] = $cc;
+		if ( is_user_type_disabled( 'blog' ) ) {
+			return;
 		}
 
-		foreach ( $inboxes as $inbox => $to ) {
-			$to = array_values( array_unique( $to ) );
-			$activitypub_activity->set_to( $to );
-			$activity = $activitypub_activity->to_json();
+		$wp_post->post_author = Users::BLOG_USER_ID;
 
-			\Activitypub\safe_remote_post( $inbox, $activity, $user_id );
+		if ( is_single_user() ) {
+			self::send_activity( $wp_post, $type );
+		} else {
+			self::send_announce( $wp_post, $type );
 		}
 	}
 
 	/**
-	 * Send "update" activities.
+	 * Send Activities to followers and mentioned users.
 	 *
-	 * @param \Activitypub\Model\Post $activitypub_post
+	 * @param WP_Post $wp_post The ActivityPub Post.
+	 * @param string  $type    The Activity-Type.
+	 *
+	 * @return void
 	 */
-	public static function send_update_activity( $activitypub_post ) {
-		// get latest version of post
-		$user_id = $activitypub_post->get_post_author();
+	public static function send_activity( WP_Post $wp_post, $type ) {
+		if ( is_user_disabled( $wp_post->post_author ) ) {
+			return;
+		}
 
-		$activitypub_activity = new \Activitypub\Model\Activity( 'Update', \Activitypub\Model\Activity::TYPE_FULL );
-		$activitypub_activity->from_post( $activitypub_post );
+		$object = Post::transform( $wp_post )->to_object();
 
-		foreach ( \Activitypub\get_follower_inboxes( $user_id ) as $inbox => $to ) {
-			$activitypub_activity->set_to( $to );
-			$activity = $activitypub_activity->to_json(); // phpcs:ignore
+		$activity = new Activity();
+		$activity->set_type( $type );
+		$activity->set_object( $object );
 
-			\Activitypub\safe_remote_post( $inbox, $activity, $user_id );
+		$follower_inboxes  = Followers::get_inboxes( $wp_post->post_author );
+		$mentioned_inboxes = Mention::get_inboxes( $activity->get_cc() );
+
+		$inboxes = array_merge( $follower_inboxes, $mentioned_inboxes );
+		$inboxes = array_unique( $inboxes );
+
+		$json = $activity->to_json();
+
+		foreach ( $inboxes as $inbox ) {
+			safe_remote_post( $inbox, $json, $wp_post->post_author );
 		}
 	}
 
 	/**
-	 * Send "delete" activities.
+	 * Send Announces to followers and mentioned users.
 	 *
-	 * @param \Activitypub\Model\Post $activitypub_post
+	 * @param WP_Post $wp_post The ActivityPub Post.
+	 * @param string  $type    The Activity-Type.
+	 *
+	 * @return void
 	 */
-	public static function send_delete_activity( $activitypub_post ) {
-		// get latest version of post
-		$user_id = $activitypub_post->get_post_author();
+	public static function send_announce( WP_Post $wp_post, $type ) {
+		if ( ! in_array( $type, array( 'Create', 'Update' ), true ) ) {
+			return;
+		}
 
-		$activitypub_activity = new \Activitypub\Model\Activity( 'Delete', \Activitypub\Model\Activity::TYPE_FULL );
-		$activitypub_activity->from_post( $activitypub_post );
+		if ( is_user_disabled( Users::BLOG_USER_ID ) ) {
+			return;
+		}
 
-		foreach ( \Activitypub\get_follower_inboxes( $user_id ) as $inbox => $to ) {
-			$activitypub_activity->set_to( $to );
-			$activity = $activitypub_activity->to_json(); // phpcs:ignore
+		$object = Post::transform( $wp_post )->to_object();
 
-			\Activitypub\safe_remote_post( $inbox, $activity, $user_id );
+		$activity = new Activity();
+		$activity->set_type( 'Announce' );
+		// to pre-fill attributes like "published" and "id"
+		$activity->set_object( $object );
+		// send only the id
+		$activity->set_object( $object->get_id() );
+
+		$follower_inboxes  = Followers::get_inboxes( $wp_post->post_author );
+		$mentioned_inboxes = Mention::get_inboxes( $activity->get_cc() );
+
+		$inboxes = array_merge( $follower_inboxes, $mentioned_inboxes );
+		$inboxes = array_unique( $inboxes );
+
+		$json = $activity->to_json();
+
+		foreach ( $inboxes as $inbox ) {
+			safe_remote_post( $inbox, $json, $wp_post->post_author );
 		}
 	}
 }

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

@@ -1,6 +1,9 @@
 <?php
 namespace Activitypub;
 
+use Activitypub\Signature;
+use Activitypub\Collection\Users;
+
 /**
  * ActivityPub Class
  *
@@ -11,9 +14,10 @@ class Activitypub {
 	 * Initialize the class, registering WordPress hooks.
 	 */
 	public static function init() {
-		\add_filter( 'template_include', array( '\Activitypub\Activitypub', 'render_json_template' ), 99 );
-		\add_filter( 'query_vars', array( '\Activitypub\Activitypub', 'add_query_vars' ) );
-		\add_filter( 'pre_get_avatar_data', array( '\Activitypub\Activitypub', 'pre_get_avatar_data' ), 11, 2 );
+		\add_filter( 'template_include', array( self::class, 'render_json_template' ), 99 );
+		\add_filter( 'query_vars', array( self::class, 'add_query_vars' ) );
+		\add_filter( 'pre_get_avatar_data', array( self::class, 'pre_get_avatar_data' ), 11, 2 );
+		\add_filter( 'get_comment_link', array( self::class, 'remote_comment_link' ), 11, 3 );
 
 		// Add support for ActivityPub to custom post types
 		$post_types = \get_option( 'activitypub_support_post_types', array( 'post', 'page' ) ) ? \get_option( 'activitypub_support_post_types', array( 'post', 'page' ) ) : array();
@@ -22,9 +26,45 @@ class Activitypub {
 			\add_post_type_support( $post_type, 'activitypub' );
 		}
 
-		\add_action( 'transition_post_status', array( '\Activitypub\Activitypub', 'schedule_post_activity' ), 33, 3 );
-		\add_action( 'wp_trash_post', array( '\Activitypub\Activitypub', 'trash_post' ), 1 );
-		\add_action( 'untrash_post', array( '\Activitypub\Activitypub', 'untrash_post' ), 1 );
+		\add_action( 'wp_trash_post', array( self::class, 'trash_post' ), 1 );
+		\add_action( 'untrash_post', array( self::class, 'untrash_post' ), 1 );
+
+		\add_action( 'init', array( self::class, 'add_rewrite_rules' ), 11 );
+
+		\add_action( 'after_setup_theme', array( self::class, 'theme_compat' ), 99 );
+
+		\add_action( 'in_plugin_update_message-' . ACTIVITYPUB_PLUGIN_BASENAME, array( self::class, 'plugin_update_message' ) );
+	}
+
+	/**
+	 * Activation Hook
+	 *
+	 * @return void
+	 */
+	public static function activate() {
+		self::flush_rewrite_rules();
+
+		Scheduler::register_schedules();
+	}
+
+	/**
+	 * Deactivation Hook
+	 *
+	 * @return void
+	 */
+	public static function deactivate() {
+		self::flush_rewrite_rules();
+
+		Scheduler::deregister_schedules();
+	}
+
+	/**
+	 * Uninstall Hook
+	 *
+	 * @return void
+	 */
+	public static function uninstall() {
+		Scheduler::deregister_schedules();
 	}
 
 	/**
@@ -35,12 +75,18 @@ class Activitypub {
 	 * @return string The new path to the JSON template.
 	 */
 	public static function render_json_template( $template ) {
-		if ( ! \is_author() && ! \is_singular() && ! \is_home() ) {
+		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
 			return $template;
 		}
 
+		if ( ! is_activitypub_request() ) {
+			return $template;
+		}
+
+		$json_template = false;
+
 		// check if user can publish posts
-		if ( \is_author() && ! user_can( \get_the_author_meta( 'ID' ), 'publish_posts' ) ) {
+		if ( \is_author() && is_wp_error( Users::get_by_id( \get_the_author_meta( 'ID' ) ) ) ) {
 			return $template;
 		}
 
@@ -52,38 +98,15 @@ class Activitypub {
 			$json_template = ACTIVITYPUB_PLUGIN_DIR . '/templates/blog-json.php';
 		}
 
-		global $wp_query;
-
-		if ( isset( $wp_query->query_vars['activitypub'] ) ) {
-			return $json_template;
+		if ( ACTIVITYPUB_AUTHORIZED_FETCH ) {
+			$verification = Signature::verify_http_signature( $_SERVER );
+			if ( \is_wp_error( $verification ) ) {
+				// fallback as template_loader can't return http headers
+				return $template;
+			}
 		}
 
-		if ( ! isset( $_SERVER['HTTP_ACCEPT'] ) ) {
-			return $template;
-		}
-
-		$accept_header = $_SERVER['HTTP_ACCEPT'];
-
-		if (
-			\stristr( $accept_header, 'application/activity+json' ) ||
-			\stristr( $accept_header, 'application/ld+json' )
-		) {
-			return $json_template;
-		}
-
-		// Accept header as an array.
-		$accept = \explode( ',', \trim( $accept_header ) );
-
-		if (
-			\in_array( 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', $accept, true ) ||
-			\in_array( 'application/activity+json', $accept, true ) ||
-			\in_array( 'application/ld+json', $accept, true ) ||
-			\in_array( 'application/json', $accept, true )
-		) {
-			return $json_template;
-		}
-
-		return $template;
+		return $json_template;
 	}
 
 	/**
@@ -95,36 +118,6 @@ class Activitypub {
 		return $vars;
 	}
 
-	/**
-	 * Schedule Activities.
-	 *
-	 * @param string  $new_status New post status.
-	 * @param string  $old_status Old post status.
-	 * @param WP_Post $post       Post object.
-	 */
-	public static function schedule_post_activity( $new_status, $old_status, $post ) {
-		// Do not send activities if post is password protected.
-		if ( \post_password_required( $post ) ) {
-			return;
-		}
-
-		// Check if post-type supports ActivityPub.
-		$post_types = \get_post_types_by_support( 'activitypub' );
-		if ( ! \in_array( $post->post_type, $post_types, true ) ) {
-			return;
-		}
-
-		$activitypub_post = new \Activitypub\Model\Post( $post );
-
-		if ( 'publish' === $new_status && 'publish' !== $old_status ) {
-			\wp_schedule_single_event( \time(), 'activitypub_send_post_activity', array( $activitypub_post ) );
-		} elseif ( 'publish' === $new_status ) {
-			\wp_schedule_single_event( \time(), 'activitypub_send_update_activity', array( $activitypub_post ) );
-		} elseif ( 'trash' === $new_status ) {
-			\wp_schedule_single_event( \time(), 'activitypub_send_delete_activity', array( $activitypub_post ) );
-		}
-	}
-
 	/**
 	 * Replaces the default avatar.
 	 *
@@ -143,7 +136,14 @@ class Activitypub {
 		}
 
 		$allowed_comment_types = \apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-		if ( ! empty( $id_or_email->comment_type ) && ! \in_array( $id_or_email->comment_type, (array) $allowed_comment_types, true ) ) {
+		if (
+			! empty( $id_or_email->comment_type ) &&
+			! \in_array(
+				$id_or_email->comment_type,
+				(array) $allowed_comment_types,
+				true
+			)
+		) {
 			$args['url'] = false;
 			/** This filter is documented in wp-includes/link-template.php */
 			return \apply_filters( 'get_avatar_data', $args, $id_or_email );
@@ -181,14 +181,35 @@ class Activitypub {
 	}
 
 	/**
-	 * Store permalink in meta, to send delete Activity
+	 * Link remote comments to source url.
 	 *
-	 * @param string $post_id The Post ID
+	 * @param string $comment_link
+	 * @param object|WP_Comment $comment
+	 *
+	 * @return string $url
+	 */
+	public static function remote_comment_link( $comment_link, $comment ) {
+		$remote_comment_link = get_comment_meta( $comment->comment_ID, 'source_url', true );
+		if ( $remote_comment_link ) {
+			$comment_link = esc_url( $remote_comment_link );
+		}
+		return $comment_link;
+	}
+
+	/**
+	 * Store permalink in meta, to send delete Activity.
+	 *
+	 * @param string $post_id The Post ID.
 	 *
 	 * @return void
 	 */
 	public static function trash_post( $post_id ) {
-		\add_post_meta( $post_id, 'activitypub_canonical_url', \get_permalink( $post_id ), true );
+		\add_post_meta(
+			$post_id,
+			'activitypub_canonical_url',
+			\get_permalink( $post_id ),
+			true
+		);
 	}
 
 	/**
@@ -201,4 +222,110 @@ class Activitypub {
 	public static function untrash_post( $post_id ) {
 		\delete_post_meta( $post_id, 'activitypub_canonical_url' );
 	}
+
+	/**
+	 * Add rewrite rules
+	 */
+	public static function add_rewrite_rules() {
+		// If another system needs to take precedence over the ActivityPub rewrite rules,
+		// they can define their own and will manually call the appropriate functions as required.
+		if ( ACTIVITYPUB_DISABLE_REWRITES ) {
+			return;
+		}
+
+		if ( ! \class_exists( 'Webfinger' ) ) {
+			\add_rewrite_rule(
+				'^.well-known/webfinger',
+				'index.php?rest_route=/' . ACTIVITYPUB_REST_NAMESPACE . '/webfinger',
+				'top'
+			);
+		}
+
+		if ( ! \class_exists( 'Nodeinfo_Endpoint' ) && true === (bool) \get_option( 'blog_public', 1 ) ) {
+			\add_rewrite_rule(
+				'^.well-known/nodeinfo',
+				'index.php?rest_route=/' . ACTIVITYPUB_REST_NAMESPACE . '/nodeinfo/discovery',
+				'top'
+			);
+			\add_rewrite_rule(
+				'^.well-known/x-nodeinfo2',
+				'index.php?rest_route=/' . ACTIVITYPUB_REST_NAMESPACE . '/nodeinfo2',
+				'top'
+			);
+		}
+
+		\add_rewrite_rule(
+			'^@([\w\-\.]+)',
+			'index.php?rest_route=/' . ACTIVITYPUB_REST_NAMESPACE . '/users/$matches[1]',
+			'top'
+		);
+
+		\add_rewrite_endpoint( 'activitypub', EP_AUTHORS | EP_PERMALINK | EP_PAGES );
+	}
+
+	/**
+	 * Flush rewrite rules;
+	 */
+	public static function flush_rewrite_rules() {
+		self::add_rewrite_rules();
+		\flush_rewrite_rules();
+	}
+
+	/**
+	 * Theme compatibility stuff
+	 *
+	 * @return void
+	 */
+	public static function theme_compat() {
+		$site_icon = get_theme_support( 'custom-logo' );
+
+		if ( ! $site_icon ) {
+			// custom logo support
+			add_theme_support(
+				'custom-logo',
+				array(
+					'height' => 80,
+					'width'  => 80,
+				)
+			);
+		}
+
+		$custom_header = get_theme_support( 'custom-header' );
+
+		if ( ! $custom_header ) {
+			// This theme supports a custom header
+			$custom_header_args = array(
+				'width'       => 1250,
+				'height'      => 600,
+				'header-text' => true,
+			);
+			add_theme_support( 'custom-header', $custom_header_args );
+		}
+	}
+
+	/**
+	 * Display plugin upgrade notice to users
+	 *
+	 * @param array $data The plugin data
+	 *
+	 * @return void
+	 */
+	public static function plugin_update_message( $data ) {
+		if ( ! isset( $data['upgrade_notice'] ) ) {
+			return;
+		}
+
+		printf(
+			'<div class="update-message">%s</div>',
+			wp_kses(
+				wpautop( $data['upgrade_notice '] ),
+				array(
+					'p'      => array(),
+					'a'      => array( 'href', 'title' ),
+					'strong' => array(),
+					'em'     => array(),
+				)
+			)
+		);
+	}
 }

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

@@ -1,6 +1,9 @@
 <?php
 namespace Activitypub;
 
+use WP_User_Query;
+use Activitypub\Model\Blog_User;
+
 /**
  * ActivityPub Admin Class
  *
@@ -11,10 +14,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 +33,17 @@ class Admin {
 			'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 +60,10 @@ class Admin {
 
 		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 +71,7 @@ class Admin {
 				add_thickbox();
 				wp_enqueue_script( 'updates' );
 
-				\load_template( \dirname( __FILE__ ) . '/../templates/welcome.php' );
+				\load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/welcome.php' );
 				break;
 		}
 	}
@@ -69,7 +80,10 @@ class Admin {
 	 * 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 +98,11 @@ class Admin {
 				'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 +135,11 @@ class Admin {
 				'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 +151,7 @@ class Admin {
 			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 +164,106 @@ class Admin {
 				'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'           => 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 );
+					}
+
+					$sanitized = implode( '.', $sanitized );
+
+					// check for login or nicename.
+					$user = new WP_User_Query(
+						array(
+							'search'         => $sanitized,
+							'search_columns' => array( 'user_login', 'user_nicename' ),
+							'number'         => 1,
+							'hide_empty'     => true,
+							'fields'         => 'ID',
+						)
+					);
+
+					if ( $user->results ) {
+						add_settings_error(
+							'activitypub_blog_user_identifier',
+							'activitypub_blog_user_identifier',
+							\esc_html__( 'You cannot use an existing author\'s name for the blog profile ID.', 'activitypub' ),
+							'error'
+						);
+
+						return Blog_User::get_default_username();
+					}
+
+					return $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 ) {
-		?>
-		<h2 id="activitypub"><?php \esc_html_e( 'ActivityPub', 'activitypub' ); ?></h2>
-		<?php
-		\Activitypub\get_identifier_settings( $user->ID );
+	public static function add_profile( $user ) {
+		$description = get_user_meta( $user->ID, 'activitypub_user_description', true );
+
+		\load_template(
+			ACTIVITYPUB_PLUGIN_DIR . 'templates/user-settings.php',
+			true,
+			array(
+				'description' => $description,
+			)
+		);
+	}
+
+	public static function save_user_description( $user_id ) {
+		if ( ! isset( $_REQUEST['_apnonce'] ) ) {
+			return false;
+		}
+		$nonce = sanitize_text_field( wp_unslash( $_REQUEST['_apnonce'] ) );
+		if (
+			! wp_verify_nonce( $nonce, 'activitypub-user-description' ) ||
+			! current_user_can( 'edit_user', $user_id )
+		) {
+			return false;
+		}
+		$description = ! empty( $_POST['activitypub-user-description'] ) ? sanitize_text_field( wp_unslash( $_POST['activitypub-user-description'] ) ) : false;
+		if ( $description ) {
+			update_user_meta( $user_id, 'activitypub_user_description', $description );
+		}
 	}
 
 	public static function enqueue_scripts( $hook_suffix ) {

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

@@ -0,0 +1,151 @@
+<?php
+namespace Activitypub;
+
+use Activitypub\Collection\Followers;
+use Activitypub\Collection\Users as User_Collection;
+use Activitypub\is_user_type_disabled;
+
+class Blocks {
+	public static function init() {
+		// this is already being called on the init hook, so just add it.
+		self::register_blocks();
+		\add_action( 'wp_enqueue_scripts', array( self::class, 'add_data' ) );
+		\add_action( 'enqueue_block_editor_assets', array( self::class, 'add_data' ) );
+	}
+
+	public static function add_data() {
+		$context = is_admin() ? 'editor' : 'view';
+		$followers_handle = 'activitypub-followers-' . $context . '-script';
+		$follow_me_handle = 'activitypub-follow-me-' . $context . '-script';
+		$data = array(
+			'namespace' => ACTIVITYPUB_REST_NAMESPACE,
+			'enabled' => array(
+				'site' => ! is_user_type_disabled( 'blog' ),
+				'users' => ! is_user_type_disabled( 'user' ),
+			),
+		);
+		$js = sprintf( 'var _activityPubOptions = %s;', wp_json_encode( $data ) );
+		\wp_add_inline_script( $followers_handle, $js, 'before' );
+		\wp_add_inline_script( $follow_me_handle, $js, 'before' );
+	}
+
+	public static function register_blocks() {
+		\register_block_type_from_metadata(
+			ACTIVITYPUB_PLUGIN_DIR . '/build/followers',
+			array(
+				'render_callback' => array( self::class, 'render_follower_block' ),
+			)
+		);
+		\register_block_type_from_metadata(
+			ACTIVITYPUB_PLUGIN_DIR . '/build/follow-me',
+			array(
+				'render_callback' => array( self::class, 'render_follow_me_block' ),
+			)
+		);
+	}
+
+	private static function get_user_id( $user_string ) {
+		if ( is_numeric( $user_string ) ) {
+			return absint( $user_string );
+		}
+		// any other non-numeric falls back to 0, including the `site` string used in the UI
+		return 0;
+	}
+
+	/**
+	 * Filter an array by a list of keys.
+	 * @param array $array The array to filter.
+	 * @param array $keys The keys to keep.
+	 * @return array The filtered array.
+	 */
+	protected static function filter_array_by_keys( $array, $keys ) {
+		return array_intersect_key( $array, array_flip( $keys ) );
+	}
+
+	/**
+	 * Render the follow me block.
+	 * @param array $attrs The block attributes.
+	 * @return string The HTML to render.
+	 */
+	public static function render_follow_me_block( $attrs ) {
+		$user_id = self::get_user_id( $attrs['selectedUser'] );
+		$user = User_Collection::get_by_id( $user_id );
+		if ( ! is_wp_error( $user ) ) {
+			$attrs['profileData'] = self::filter_array_by_keys(
+				$user->to_array(),
+				array( 'icon', 'name', 'resource' )
+			);
+		}
+		$wrapper_attributes = get_block_wrapper_attributes(
+			array(
+				'aria-label' => __( 'Follow me on the Fediverse', 'activitypub' ),
+				'class'      => 'activitypub-follow-me-block-wrapper',
+				'data-attrs' => wp_json_encode( $attrs ),
+			)
+		);
+		// todo: render more than an empty div?
+		return '<div ' . $wrapper_attributes . '></div>';
+	}
+
+	public static function render_follower_block( $attrs ) {
+		$followee_user_id = self::get_user_id( $attrs['selectedUser'] );
+		$per_page = absint( $attrs['per_page'] );
+		$follower_data = Followers::get_followers_with_count( $followee_user_id, $per_page );
+
+		$attrs['followerData']['total'] = $follower_data['total'];
+		$attrs['followerData']['followers'] = array_map(
+			function( $follower ) {
+				return self::filter_array_by_keys(
+					$follower->to_array(),
+					array( 'icon', 'name', 'preferredUsername', 'url' )
+				);
+			},
+			$follower_data['followers']
+		);
+		$wrapper_attributes = get_block_wrapper_attributes(
+			array(
+				'aria-label' => __( 'Fediverse Followers', 'activitypub' ),
+				'class'      => 'activitypub-follower-block',
+				'data-attrs' => wp_json_encode( $attrs ),
+			)
+		);
+
+		$html = '<div ' . $wrapper_attributes . '>';
+		if ( $attrs['title'] ) {
+			$html .= '<h3>' . esc_html( $attrs['title'] ) . '</h3>';
+		}
+		$html .= '<ul>';
+		foreach ( $follower_data['followers'] as $follower ) {
+			$html .= '<li>' . self::render_follower( $follower ) . '</li>';
+		}
+		// We are only pagination on the JS side. Could be revisited but we gotta ship!
+		$html .= '</ul></div>';
+		return $html;
+	}
+
+	public static function render_follower( $follower ) {
+		$external_svg = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="components-external-link__icon css-rvs7bx esh4a730" aria-hidden="true" focusable="false"><path d="M18.2 17c0 .7-.6 1.2-1.2 1.2H7c-.7 0-1.2-.6-1.2-1.2V7c0-.7.6-1.2 1.2-1.2h3.2V4.2H7C5.5 4.2 4.2 5.5 4.2 7v10c0 1.5 1.2 2.8 2.8 2.8h10c1.5 0 2.8-1.2 2.8-2.8v-3.6h-1.5V17zM14.9 3v1.5h3.7l-6.4 6.4 1.1 1.1 6.4-6.4v3.7h1.5V3h-6.3z"></path></svg>';
+		$template =
+			'<a href="%s" title="%s" class="components-external-link activitypub-link" target="_blank" rel="external noreferrer noopener">
+				<img width="40" height="40" src="%s" class="avatar activitypub-avatar" />
+				<span class="activitypub-actor">
+					<strong class="activitypub-name">%s</strong>
+					<span class="sep">/</span>
+					<span class="activitypub-handle">@%s</span>
+				</span>
+				%s
+			</a>';
+
+		$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
+		);
+	}
+}

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

@@ -1,6 +1,9 @@
 <?php
 namespace Activitypub;
 
+use WP_DEBUG;
+use WP_DEBUG_LOG;
+
 /**
  * ActivityPub Debug Class
  *
@@ -12,7 +15,7 @@ class Debug {
 	 */
 	public static function init() {
 		if ( WP_DEBUG && WP_DEBUG_LOG ) {
-			\add_action( 'activitypub_safe_remote_post_response', array( '\Activitypub\Debug', 'log_remote_post_responses' ), 10, 4 );
+			\add_action( 'activitypub_safe_remote_post_response', array( self::class, 'log_remote_post_responses' ), 10, 4 );
 		}
 	}
 

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

@@ -12,8 +12,8 @@ class Hashtag {
 	 */
 	public static function init() {
 		if ( '1' === \get_option( 'activitypub_use_hashtags', '1' ) ) {
-			\add_filter( 'wp_insert_post', array( '\Activitypub\Hashtag', 'insert_post' ), 10, 2 );
-			\add_filter( 'the_content', array( '\Activitypub\Hashtag', 'the_content' ), 10, 2 );
+			\add_filter( 'wp_insert_post', array( self::class, 'insert_post' ), 10, 2 );
+			\add_filter( 'the_content', array( self::class, 'the_content' ), 10, 2 );
 		}
 	}
 
@@ -43,34 +43,56 @@ class Hashtag {
 	 * @return string the filtered post-content
 	 */
 	public static function the_content( $the_content ) {
-		$protected_tags = array();
-		$protect = function( $m ) use ( &$protected_tags ) {
-			$c = count( $protected_tags );
-			$protect = '!#!#PROTECT' . $c . '#!#!';
-			$protected_tags[ $protect ] = $m[0];
-			return $protect;
-		};
-		$the_content = preg_replace_callback(
-			'#<!\[CDATA\[.*?\]\]>#is',
-			$protect,
-			$the_content
-		);
-		$the_content = preg_replace_callback(
-			'#<(pre|code|textarea|style)\b[^>]*>.*?</\1[^>]*>#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( '#^<!--[\s\S]*-->$#i', $chunk, $m ) ) {
+				$content_with_links .= $chunk;
+				continue;
+			}
 
-		$the_content = \preg_replace_callback( '/' . ACTIVITYPUB_HASHTAGS_REGEXP . '/i', array( '\Activitypub\Hashtag', 'replace_with_links' ), $the_content );
+			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 = str_replace( array_reverse( array_keys( $protected_tags ) ), array_reverse( array_values( $protected_tags ) ), $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 );
 
-		return $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 $content_with_links;
 	}
 
 	/**
@@ -85,7 +107,7 @@ class Hashtag {
 
 		if ( $tag_object ) {
 			$link = \get_term_link( $tag_object, 'post_tag' );
-			return \sprintf( '<a rel="tag" class="u-tag u-category" href="%s">#%s</a>', $link, $tag );
+			return \sprintf( '<a rel="tag" class="hashtag u-tag u-category" href="%s">#%s</a>', $link, $tag );
 		}
 
 		return '#' . $tag;

wp-content/upgrade-temp-backup/plugins/activitypub/includes/class-health-check.php

@@ -1,6 +1,14 @@
 <?php
 namespace Activitypub;
 
+use WP_Error;
+use Activitypub\Webfinger;
+use Activitypub\Collection\Users;
+
+use function Activitypub\get_plugin_version;
+use function Activitypub\is_user_type_disabled;
+use function Activitypub\get_webfinger_resource;
+
 /**
  * ActivityPub Health_Check Class
  *
@@ -14,19 +22,26 @@ class Health_Check {
 	 * @return void
 	 */
 	public static function init() {
-		\add_filter( 'site_status_tests', array( '\Activitypub\Health_Check', 'add_tests' ) );
-		\add_filter( 'debug_information', array( '\Activitypub\Health_Check', 'debug_information' ) );
+		\add_filter( 'site_status_tests', array( self::class, 'add_tests' ) );
+		\add_filter( 'debug_information', array( self::class, 'debug_information' ) );
 	}
 
 	public static function add_tests( $tests ) {
-		$tests['direct']['activitypub_test_author_url'] = array(
-			'label' => \__( 'Author URL test', 'activitypub' ),
-			'test'  => array( '\Activitypub\Health_Check', 'test_author_url' ),
-		);
+		if ( ! is_user_type_disabled( 'user' ) ) {
+			$tests['direct']['activitypub_test_author_url'] = array(
+				'label' => \__( 'Author URL test', 'activitypub' ),
+				'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;
@@ -35,7 +50,7 @@ class Health_Check {
 	/**
 	 * Author URL tests
 	 *
-	 * @return void
+	 * @return array
 	 */
 	public static function test_author_url() {
 		$result = array(
@@ -70,10 +85,53 @@ class Health_Check {
 		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(
+				'<p>%s</p>',
+				\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(
+			'<p>%s</p>',
+			\__( 'Enhance your WordPress site’s performance and mitigate potential heavy loads caused by plugins like ActivityPub by setting up a system cron job to run WP Cron. This ensures scheduled tasks are executed consistently and reduces the reliance on website traffic for trigger events.', 'activitypub' )
+		);
+		$result['actions'] .= sprintf(
+			'<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+			__( 'https://developer.wordpress.org/plugins/cron/hooking-wp-cron-into-the-system-task-scheduler/', 'activitypub' ),
+			__( 'Learn how to hook the WP-Cron into the System Task Scheduler.', 'activitypub' ),
+			/* translators: Hidden accessibility text. */
+			__( '(opens in a new tab)', 'activitypub' )
+		);
+
+		return $result;
+	}
+
 	/**
 	 * WebFinger tests
 	 *
-	 * @return void
+	 * @return array
 	 */
 	public static function test_webfinger() {
 		$result = array(
@@ -85,7 +143,7 @@ class Health_Check {
 			),
 			'description' => \sprintf(
 				'<p>%s</p>',
-				\__( 'Your WebFinger endpoint is accessible and returns the correct informations.', 'activitypub' )
+				\__( 'Your WebFinger endpoint is accessible and returns the correct information.', 'activitypub' )
 			),
 			'actions'     => '',
 			'test'        => 'test_webfinger',
@@ -109,7 +167,7 @@ class Health_Check {
 	}
 
 	/**
-	 * Check if `author_posts_url` is accessible and that requerst returns correct JSON
+	 * Check if `author_posts_url` is accessible and that request returns correct JSON
 	 *
 	 * @return boolean|WP_Error
 	 */
@@ -120,12 +178,12 @@ class Health_Check {
 
 		// 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
 					\__(
-						'<p>Your author URL <code>%s</code> was replaced, this is often done by plugins.</p>',
+						'Your author URL <code>%s</code> was replaced, this is often done by plugins.',
 						'activitypub'
 					),
 					$author_url
@@ -143,12 +201,12 @@ class Health_Check {
 		);
 
 		if ( \is_wp_error( $response ) ) {
-			return new \WP_Error(
+			return new WP_Error(
 				'author_url_not_accessible',
 				\sprintf(
 					// translators: %s: Author URL
 					\__(
-						'<p>Your author URL <code>%s</code> 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.</p>',
+						'Your author URL <code>%s</code> 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 +218,12 @@ class Health_Check {
 
 		// 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
 					\__(
-						'<p>Your author URL <code>%s</code> is redirecting to another page, this is often done by SEO plugins like "Yoast SEO".</p>',
+						'Your author URL <code>%s</code> is redirecting to another page, this is often done by SEO plugins like "Yoast SEO".',
 						'activitypub'
 					),
 					$author_url
@@ -177,12 +235,12 @@ class Health_Check {
 		$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
 					\__(
-						'<p>Your author URL <code>%s</code> does not return valid JSON for <code>application/activity+json</code>. Please check if your hosting supports alternate <code>Accept</code> headers.</p>',
+						'Your author URL <code>%s</code> does not return valid JSON for <code>application/activity+json</code>. Please check if your hosting supports alternate <code>Accept</code> headers.',
 						'activitypub'
 					),
 					$author_url
@@ -194,31 +252,49 @@ class Health_Check {
 	}
 
 	/**
-	 * Check if WebFinger endoint is accessible and profile requerst returns correct JSON
+	 * Check if WebFinger endpoint is accessible and profile request returns correct JSON
 	 *
 	 * @return boolean|WP_Error
 	 */
 	public static function is_webfinger_endpoint_accessible() {
-		$user    = \wp_get_current_user();
-		$account = \Activitypub\get_webfinger_resource( $user->ID );
+		$user = \wp_get_current_user();
 
-		$url = \Activitypub\Webfinger::resolve( $account );
+		if ( ! is_user_type_disabled( 'blog' ) ) {
+			$account = get_webfinger_resource( $user->ID );
+		} elseif ( ! is_user_type_disabled( 'user' ) ) {
+			$account = get_webfinger_resource( Users::BLOG_USER_ID );
+		} else {
+			$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 <code>%s</code> is not accessible. Please check your WordPress setup or permalink structure.',
+					'activitypub'
+				),
+				$allowed
+			);
+			$invalid_response = wp_kses(
+				// translators: %s: Author URL
+				\__(
+					'Your WebFinger endpoint <code>%s</code> does not return valid JSON for <code>application/jrd+json</code>.',
+					'activitypub'
+				),
+				$allowed
+			);
+
 			$health_messages = array(
 				'webfinger_url_not_accessible' => \sprintf(
-					// translators: %s: Author URL
-					\__(
-						'<p>Your WebFinger endpoint <code>%s</code> is not accessible. Please check your WordPress setup or permalink structure.</p>',
-						'activitypub'
-					),
+					$not_accessible,
 					$url->get_error_data()
 				),
 				'webfinger_url_invalid_response' => \sprintf(
 					// translators: %s: Author URL
-					\__(
-						'<p>Your WebFinger endpoint <code>%s</code> does not return valid JSON for <code>application/jrd+json</code>.</p>',
-						'activitypub'
-					),
+					$invalid_response,
 					$url->get_error_data()
 				),
 			);
@@ -226,7 +302,7 @@ class Health_Check {
 			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()
@@ -272,7 +348,7 @@ class Health_Check {
 	 * Static function for generating site debug data when required.
 	 *
 	 * @param array $info The debug information to be added to the core information page.
-	 * @return array The filtered informations
+	 * @return array The filtered information
 	 */
 	public static function debug_information( $info ) {
 		$info['activitypub'] = array(
@@ -280,7 +356,7 @@ class Health_Check {
 			'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 +364,11 @@ class Health_Check {
 					'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,
+				),
 			),
 		);
 

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

@@ -0,0 +1,111 @@
+<?php
+namespace Activitypub;
+
+use WP_Error;
+use Activitypub\Collection\Users;
+
+/**
+ * ActivityPub HTTP Class
+ *
+ * @author Matthias Pfefferle
+ */
+class Http {
+	/**
+	 * Send a POST Request with the needed HTTP Headers
+	 *
+	 * @param string $url     The URL endpoint
+	 * @param string $body    The Post Body
+	 * @param int    $user_id The WordPress User-ID
+	 *
+	 * @return array|WP_Error The POST Response or an WP_ERROR
+	 */
+	public static function post( $url, $body, $user_id ) {
+		do_action( 'activitypub_pre_http_post', $url, $body, $user_id );
+
+		$date = \gmdate( 'D, d M Y H:i:s T' );
+		$digest = Signature::generate_digest( $body );
+		$signature = Signature::generate_signature( $user_id, 'post', $url, $date, $digest );
+
+		$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' => 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;
+	}
+}

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

@@ -1,6 +1,9 @@
 <?php
 namespace Activitypub;
 
+use WP_Error;
+use Activitypub\Webfinger;
+
 /**
  * ActivityPub Mention Class
  *
@@ -11,8 +14,8 @@ class Mention {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_filter( 'the_content', array( '\Activitypub\Mention', 'the_content' ), 99, 2 );
-		\add_filter( 'activitypub_extract_mentions', array( '\Activitypub\Mention', 'extract_mentions' ), 99, 2 );
+		\add_filter( 'the_content', array( self::class, 'the_content' ), 99, 2 );
+		\add_filter( 'activitypub_extract_mentions', array( self::class, 'extract_mentions' ), 99, 2 );
 	}
 
 	/**
@@ -23,45 +26,69 @@ class Mention {
 	 * @return string the filtered post-content
 	 */
 	public static function the_content( $the_content ) {
-		$protected_tags = array();
-		$protect = function( $m ) use ( &$protected_tags ) {
-			$c = count( $protected_tags );
-			$protect = '!#!#PROTECT' . $c . '#!#!';
-			$protected_tags[ $protect ] = $m[0];
-			return $protect;
-		};
-		$the_content = preg_replace_callback(
-			'#<!\[CDATA\[.*?\]\]>#is',
-			$protect,
-			$the_content
-		);
-		$the_content = preg_replace_callback(
-			'#<(pre|code|textarea|style)\b[^>]*>.*?</\1[^>]*>#is',
-			$protect,
-			$the_content
-		);
-		$the_content = preg_replace_callback(
-			'#<a.*?href=[^>]+>.*?</a>#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( '#^<!--[\s\S]*-->$#i', $chunk, $m ) ) {
+				$content_with_links .= $chunk;
+				continue;
+			}
 
-		$the_content = \preg_replace_callback( '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/', array( '\Activitypub\Mention', 'replace_with_links' ), $the_content );
+			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 = str_replace( array_reverse( array_keys( $protected_tags ) ), array_reverse( array_values( $protected_tags ) ), $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 );
 
-		return $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_USERNAME_REGEXP . '/', array( self::class, 'replace_with_links' ), $chunk );
+		}
+
+		return $content_with_links;
 	}
 
 	/**
 	 * A callback for preg_replace to build the user links
 	 *
 	 * @param array $result the preg_match results
+	 *
 	 * @return string the final string
 	 */
 	public static function replace_with_links( $result ) {
-		$metadata = \ActivityPub\get_remote_metadata_by_actor( $result[0] );
-		if ( ! is_wp_error( $metadata ) && ! empty( $metadata['url'] ) ) {
+		$metadata = get_remote_metadata_by_actor( $result[0] );
+
+		if ( ! empty( $metadata ) && ! is_wp_error( $metadata ) && ! empty( $metadata['url'] ) ) {
 			$username = ltrim( $result[0], '@' );
 			if ( ! empty( $metadata['name'] ) ) {
 				$username = $metadata['name'];
@@ -69,29 +96,74 @@ class Mention {
 			if ( ! empty( $metadata['preferredUsername'] ) ) {
 				$username = $metadata['preferredUsername'];
 			}
-			$username = '@<span>' . $username . '</span>';
-			return \sprintf( '<a rel="mention" class="u-url mention" href="%s">%s</a>', $metadata['url'], $username );
+			return \sprintf( '<a rel="mention" class="u-url mention" href="%s">@<span>%s</span></a>', 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;
-
 	}
 }

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

@@ -0,0 +1,179 @@
+<?php
+namespace Activitypub;
+
+use Activitypub\Activitypub;
+use Activitypub\Model\Blog_User;
+use Activitypub\Collection\Followers;
+
+/**
+ * ActivityPub Migration Class
+ *
+ * @author Matthias Pfefferle
+ */
+class Migration {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
+	public static function init() {
+		\add_action( 'activitypub_schedule_migration', array( self::class, 'maybe_migrate' ) );
+	}
+
+	/**
+	 * Get the target version.
+	 *
+	 * This is the version that the database structure will be updated to.
+	 * It is the same as the plugin version.
+	 *
+	 * @return string The target version.
+	 */
+	public static function get_target_version() {
+		return get_plugin_version();
+	}
+
+	/**
+	 * The current version of the database structure.
+	 *
+	 * @return string The current version.
+	 */
+	public static function get_version() {
+		return get_option( 'activitypub_db_version', 0 );
+	}
+
+	/**
+	 * Locks the database migration process to prevent simultaneous migrations.
+	 *
+	 * @return void
+	 */
+	public static function lock() {
+		\update_option( 'activitypub_migration_lock', \time() );
+	}
+
+	/**
+	 * Unlocks the database migration process.
+	 *
+	 * @return void
+	 */
+	public static function unlock() {
+		\delete_option( 'activitypub_migration_lock' );
+	}
+
+	/**
+	 * Whether the database migration process is locked.
+	 *
+	 * @return boolean
+	 */
+	public static function is_locked() {
+		$lock = \get_option( 'activitypub_migration_lock' );
+
+		if ( ! $lock ) {
+			return false;
+		}
+
+		$lock = (int) $lock;
+
+		if ( $lock < \time() - 1800 ) {
+			self::unlock();
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Whether the database structure is up to date.
+	 *
+	 * @return bool True if the database structure is up to date, false otherwise.
+	 */
+	public static function is_latest_version() {
+		return (bool) version_compare(
+			self::get_version(),
+			self::get_target_version(),
+			'=='
+		);
+	}
+
+	/**
+	 * Updates the database structure if necessary.
+	 */
+	public static function maybe_migrate() {
+		if ( self::is_latest_version() ) {
+			return;
+		}
+
+		if ( self::is_locked() ) {
+			return;
+		}
+
+		self::lock();
+
+		$version_from_db = self::get_version();
+
+		if ( version_compare( $version_from_db, '0.17.0', '<' ) ) {
+			self::migrate_from_0_16();
+		}
+		if ( version_compare( $version_from_db, '1.0.0', '<' ) ) {
+			self::migrate_from_0_17();
+		}
+
+		update_option( 'activitypub_db_version', self::get_target_version() );
+
+		self::unlock();
+	}
+
+	/**
+	 * Updates the DB-schema of the followers-list
+	 *
+	 * @return void
+	 */
+	private static function migrate_from_0_17() {
+		// migrate followers
+		foreach ( get_users( array( 'fields' => '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 );
+		}
+	}
+}

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

@@ -0,0 +1,169 @@
+<?php
+
+namespace Activitypub;
+
+use Activitypub\Collection\Users;
+use Activitypub\Collection\Followers;
+use Activitypub\Transformer\Post;
+
+/**
+ * ActivityPub Scheduler Class
+ *
+ * @author Matthias Pfefferle
+ */
+class Scheduler {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
+	public static function init() {
+		\add_action( 'transition_post_status', array( self::class, 'schedule_post_activity' ), 33, 3 );
+
+		\add_action( 'activitypub_update_followers', array( self::class, 'update_followers' ) );
+		\add_action( 'activitypub_cleanup_followers', array( self::class, 'cleanup_followers' ) );
+
+		\add_action( 'admin_init', array( self::class, 'schedule_migration' ) );
+	}
+
+	/**
+	 * Schedule all ActivityPub schedules.
+	 *
+	 * @return void
+	 */
+	public static function register_schedules() {
+		if ( ! \wp_next_scheduled( 'activitypub_update_followers' ) ) {
+			\wp_schedule_event( time(), 'hourly', 'activitypub_update_followers' );
+		}
+
+		if ( ! \wp_next_scheduled( 'activitypub_cleanup_followers' ) ) {
+			\wp_schedule_event( time(), 'daily', 'activitypub_cleanup_followers' );
+		}
+	}
+
+	/**
+	 * Unscedule all ActivityPub schedules.
+	 *
+	 * @return void
+	 */
+	public static function deregister_schedules() {
+		wp_unschedule_hook( 'activitypub_update_followers' );
+		wp_unschedule_hook( 'activitypub_cleanup_followers' );
+	}
+
+
+	/**
+	 * Schedule Activities.
+	 *
+	 * @param string  $new_status New post status.
+	 * @param string  $old_status Old post status.
+	 * @param WP_Post $post       Post object.
+	 */
+	public static function schedule_post_activity( $new_status, $old_status, $post ) {
+		// Do not send activities if post is password protected.
+		if ( \post_password_required( $post ) ) {
+			return;
+		}
+
+		// Check if post-type supports ActivityPub.
+		$post_types = \get_post_types_by_support( 'activitypub' );
+		if ( ! \in_array( $post->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' );
+		}
+	}
+}

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

@@ -1,37 +1,42 @@
 <?php
 namespace Activitypub;
 
+use function Activitypub\esc_hashtag;
+
 class Shortcodes {
 	/**
-	 * Class constructor, registering WordPress then shortcodes
-	 *
-	 * @param WP_Post  $post    A WordPress Post Object
+	 * Class constructor, registering WordPress then Shortcodes
 	 */
 	public static function init() {
-		foreach ( get_class_methods( 'Activitypub\Shortcodes' ) as $shortcode ) {
+		// do not load on admin pages
+		if ( is_admin() ) {
+			return;
+		}
+
+		foreach ( get_class_methods( self::class ) as $shortcode ) {
 			if ( 'init' !== $shortcode ) {
-				add_shortcode( 'ap_' . $shortcode, array( 'Activitypub\Shortcodes', $shortcode ) );
+				add_shortcode( 'ap_' . $shortcode, array( self::class, $shortcode ) );
 			}
 		}
 	}
 
 	/**
-	 * Generates output for the ap_hashtags shortcode
+	 * Generates output for the 'ap_hashtags' 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 tags as hashtags.
 	 */
 	public static function hashtags( $atts, $content, $tag ) {
-		$post_id = get_the_ID();
+		$item = self::get_item();
 
-		if ( ! $post_id ) {
+		if ( ! $item ) {
 			return '';
 		}
 
-		$tags = \get_the_tags( $post_id );
+		$tags = \get_the_tags( $item->ID );
 
 		if ( ! $tags ) {
 			return '';
@@ -41,9 +46,9 @@ class Shortcodes {
 
 		foreach ( $tags as $tag ) {
 			$hash_tags[] = \sprintf(
-				'<a rel="tag" class="u-tag u-category" href="%s">#%s</a>',
-				\get_tag_link( $tag ),
-				$tag->slug
+				'<a rel="tag" class="hashtag u-tag u-category" href="%s">%s</a>',
+				\esc_url( \get_tag_link( $tag ) ),
+				esc_hashtag( $tag->name )
 			);
 		}
 
@@ -51,38 +56,37 @@ class Shortcodes {
 	}
 
 	/**
-	 * 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 @@ class Shortcodes {
 			$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 @@ class Shortcodes {
 
 				/** This filter is documented in wp-includes/post-template.php */
 				$excerpt = \apply_filters( 'the_content', $excerpt );
-				$excerpt = \str_replace( ']]>', ']]>', $excerpt );
+				$excerpt = \str_replace( ']]>', ']]&gt;', $excerpt );
 			}
 		}
 
@@ -174,28 +178,31 @@ class Shortcodes {
 	}
 
 	/**
-	 * 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 @@ class Shortcodes {
 
 		// replace script and style elements
 		$content = \preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $content );
-
+		$content = strip_shortcodes( $content );
 		$content = \trim( \preg_replace( '/[\n\r\t]/', '', $content ) );
 
+		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 @@ class Shortcodes {
 		);
 
 		if ( 'url' === $atts['type'] ) {
-			return \esc_url( \get_permalink( $post->ID ) );
+			return \esc_url( \get_permalink( $item->ID ) );
 		}
 
-		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \get_permalink( $post->ID ) ) );
+		return \sprintf(
+			'<a href="%1$s">%1$s</a>',
+			\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 @@ class Shortcodes {
 		);
 
 		if ( 'url' === $atts['type'] ) {
-			return \esc_url( \wp_get_shortlink( $post->ID ) );
+			return \esc_url( \wp_get_shortlink( $item->ID ) );
 		}
 
-		return \sprintf( '<a href="%1$s">%1$s</a>', \esc_url( \wp_get_shortlink( $post->ID ) ) );
+		return \sprintf(
+			'<a href="%1$s">%1$s</a>',
+			\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 @@ class Shortcodes {
 			$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 @@ class Shortcodes {
 	}
 
 	/**
-	 * 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 @@ class Shortcodes {
 		$hash_tags = array();
 
 		foreach ( $categories as $category ) {
-			$hash_tags[] = \sprintf( '<a rel="tag" class="u-tag u-category" href="%s">#%s</a>', \get_category_link( $category ), $category->slug );
+			$hash_tags[] = \sprintf(
+				'<a rel="tag" class="hashtag u-tag u-category" href="%s">%s</a>',
+				\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 @@ class Shortcodes {
 	}
 
 	/**
-	 * 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 @@ class Shortcodes {
 	}
 
 	/**
-	 * 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 @@ class Shortcodes {
 	}
 
 	/**
-	 * 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 @@ class Shortcodes {
 
 		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;
+	}
 }

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

@@ -1,55 +1,90 @@
 <?php
 namespace Activitypub;
 
+use WP_Error;
+use DateTime;
+use DateTimeZone;
+use Activitypub\Collection\Users;
+
 /**
  * ActivityPub Signature Class
  *
  * @author Matthias Pfefferle
+ * @author Django Doucet
  */
 class Signature {
 
 	/**
-	 * @param int $user_id
+	 * Return the public key for a given user.
 	 *
-	 * @return mixed
+	 * @param int  $user_id The WordPress User ID.
+	 * @param bool $force   Force the generation of a new key pair.
+	 *
+	 * @return mixed The public key.
 	 */
-	public static function get_public_key( $user_id, $force = false ) {
-		$key = \get_user_meta( $user_id, 'magic_sig_public_key' );
-
-		if ( $key && ! $force ) {
-			return $key[0];
+	public static function get_public_key_for( $user_id, $force = false ) {
+		if ( $force ) {
+			self::generate_key_pair_for( $user_id );
 		}
 
-		self::generate_key_pair( $user_id );
-		$key = \get_user_meta( $user_id, 'magic_sig_public_key' );
+		$key_pair = self::get_keypair_for( $user_id );
 
-		return $key[0];
+		return $key_pair['public_key'];
 	}
 
 	/**
-	 * @param int $user_id
+	 * Return the private key for a given user.
 	 *
-	 * @return mixed
+	 * @param int  $user_id The WordPress User ID.
+	 * @param bool $force   Force the generation of a new key pair.
+	 *
+	 * @return mixed The private key.
 	 */
-	public static function get_private_key( $user_id, $force = false ) {
-		$key = \get_user_meta( $user_id, 'magic_sig_private_key' );
-
-		if ( $key && ! $force ) {
-			return $key[0];
+	public static function get_private_key_for( $user_id, $force = false ) {
+		if ( $force ) {
+			self::generate_key_pair_for( $user_id );
 		}
 
-		self::generate_key_pair( $user_id );
-		$key = \get_user_meta( $user_id, 'magic_sig_private_key' );
+		$key_pair = self::get_keypair_for( $user_id );
 
-		return $key[0];
+		return $key_pair['private_key'];
+	}
+
+	/**
+	 * Return the key pair for a given user.
+	 *
+	 * @param int $user_id The WordPress User ID.
+	 *
+	 * @return array The key pair.
+	 */
+	public static function get_keypair_for( $user_id ) {
+		$option_key = self::get_signature_options_key_for( $user_id );
+		$key_pair = \get_option( $option_key );
+
+		if ( ! $key_pair ) {
+			$key_pair = self::generate_key_pair_for( $user_id );
+		}
+
+		return $key_pair;
 	}
 
 	/**
 	 * Generates the pair keys
 	 *
-	 * @param int $user_id
+	 * @param int $user_id The WordPress User ID.
+	 *
+	 * @return array The key pair.
 	 */
-	public static function generate_key_pair( $user_id ) {
+	protected static function generate_key_pair_for( $user_id ) {
+		$option_key = self::get_signature_options_key_for( $user_id );
+		$key_pair = self::check_legacy_key_pair_for( $user_id );
+
+		if ( $key_pair ) {
+			\add_option( $option_key, $key_pair );
+
+			return $key_pair;
+		}
+
 		$config = array(
 			'digest_alg' => 'sha512',
 			'private_key_bits' => 2048,
@@ -61,17 +96,96 @@ class Signature {
 
 		\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 @@ class Signature {
 			$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 @@ class Signature {
 		\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 @@ class Signature {
 		}
 	}
 
-	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;
 	}
 }

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

@@ -1,6 +1,9 @@
 <?php
 namespace Activitypub;
 
+use WP_Error;
+use Activitypub\Collection\Users;
+
 /**
  * ActivityPub WebFinger Class
  *
@@ -22,25 +25,35 @@ class Webfinger {
 			return \get_webfinger_resource( $user_id, false );
 		}
 
-		$user = \get_user_by( 'id', $user_id );
+		$user = Users::get_by_id( $user_id );
+		if ( ! $user || is_wp_error( $user ) ) {
+			return '';
+		}
 
-		return $user->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;
 		}
@@ -49,14 +62,14 @@ class Webfinger {
 		$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;
 		}
@@ -65,7 +78,7 @@ class Webfinger {
 		$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;
 		}
@@ -77,8 +90,114 @@ class Webfinger {
 			}
 		}
 
-		$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: <identifier>@<host>
+	 * @param string $host       The Host: <identifier>@<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 ) );
+	}
 }

wp-content/upgrade-temp-backup/plugins/activitypub/includes/collection/class-followers.php

@@ -0,0 +1,591 @@
+<?php
+namespace Activitypub\Collection;
+
+use WP_Error;
+use Exception;
+use WP_Query;
+use Activitypub\Http;
+use Activitypub\Webfinger;
+use Activitypub\Model\Follower;
+use Activitypub\Collection\Users;
+use Activitypub\Activity\Activity;
+use Activitypub\Activity\Base_Object;
+
+use function Activitypub\is_tombstone;
+use function Activitypub\get_remote_metadata_by_actor;
+
+/**
+ * ActivityPub Followers Collection
+ *
+ * @author Matt Wiebe
+ * @author Matthias Pfefferle
+ */
+class Followers {
+	const POST_TYPE = 'ap_follower';
+	const CACHE_KEY_INBOXES = 'follower_inboxes_%s';
+
+	/**
+	 * Register WordPress hooks/actions and register Taxonomy
+	 *
+	 * @return void
+	 */
+	public static function init() {
+		// register "followers" post_type
+		self::register_post_type();
+
+		\add_action( 'activitypub_inbox_follow', array( self::class, 'handle_follow_request' ), 10, 2 );
+		\add_action( 'activitypub_inbox_undo', array( self::class, 'handle_undo_request' ), 10, 2 );
+
+		\add_action( 'activitypub_followers_post_follow', array( self::class, 'send_follow_response' ), 10, 4 );
+	}
+
+	/**
+	 * Register the "Followers" Taxonomy
+	 *
+	 * @return void
+	 */
+	private static function register_post_type() {
+		register_post_type(
+			self::POST_TYPE,
+			array(
+				'labels'           => 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
+		);
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/collection/class-users.php

@@ -0,0 +1,209 @@
+<?php
+namespace Activitypub\Collection;
+
+use WP_Error;
+use WP_User_Query;
+use Activitypub\Model\User;
+use Activitypub\Model\Blog_User;
+use Activitypub\Model\Application_User;
+
+use function Activitypub\is_user_disabled;
+
+class Users {
+	/**
+	 * The ID of the Blog User
+	 *
+	 * @var int
+	 */
+	const BLOG_USER_ID = 0;
+
+	/**
+	 * The ID of the Application User
+	 *
+	 * @var int
+	 */
+	const APPLICATION_USER_ID = -1;
+
+	/**
+	 * Get the User by ID
+	 *
+	 * @param int $user_id The User-ID.
+	 *
+	 * @return \Acitvitypub\Model\User The User.
+	 */
+	public static function get_by_id( $user_id ) {
+		if ( is_string( $user_id ) || is_numeric( $user_id ) ) {
+			$user_id = (int) $user_id;
+		}
+
+		if ( is_user_disabled( $user_id ) ) {
+			return new WP_Error(
+				'activitypub_user_not_found',
+				\__( 'User not found', 'activitypub' ),
+				array( 'status' => 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;
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/compat.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * ActivityPub implementation for WordPress/PHP functions either missing from older WordPress/PHP versions or not included by default.
+ */
+
+if ( ! function_exists( 'str_starts_with' ) ) {
+	/**
+	 * Polyfill for `str_starts_with()` function added in PHP 8.0.
+	 *
+	 * Performs a case-sensitive check indicating if
+	 * the haystack begins with needle.
+	 *
+	 * @param string $haystack The string to search in.
+	 * @param string $needle   The substring to search for in the `$haystack`.
+	 * @return bool True if `$haystack` starts with `$needle`, otherwise false.
+	 */
+	function str_starts_with( $haystack, $needle ) {
+		if ( '' === $needle ) {
+			return true;
+		}
+
+		return 0 === strpos( $haystack, $needle );
+	}
+}
+
+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 ) ) );
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/debug.php

@@ -6,7 +6,8 @@ namespace Activitypub;
  *
  * @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;

wp-content/upgrade-temp-backup/plugins/activitypub/includes/functions.php

@@ -1,111 +1,50 @@
 <?php
 namespace Activitypub;
 
+use WP_Error;
+use Activitypub\Http;
+use Activitypub\Activity\Activity;
+use Activitypub\Collection\Followers;
+
 /**
  * Returns the ActivityPub default JSON-context
  *
  * @return array the activitypub context
  */
 function get_context() {
-	$context = array(
-		'https://www.w3.org/ns/activitystreams',
-		'https://w3id.org/security/v1',
-		array(
-			'manuallyApprovesFollowers' => '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 ) {
-	?>
-<table class="form-table">
-	<tbody>
-		<tr>
-			<th scope="row">
-				<label><?php \esc_html_e( 'Profile identifier', 'activitypub' ); ?></label>
-			</th>
-			<td>
-				<p><code><?php echo \esc_html( \Activitypub\get_webfinger_resource( $user_id ) ); ?></code> or <code><?php echo \esc_url( \get_author_posts_url( $user_id ) ); ?></code></p>
-				<?php // translators: the webfinger resource ?>
-				<p class="description"><?php \printf( \esc_html__( 'Try to follow "@%s" by searching for it on Mastodon,Friendica & Co.', 'activitypub' ), \esc_html( \Activitypub\get_webfinger_resource( $user_id ) ) ); ?></p>
-			</td>
-		</tr>
-	</tbody>
-</table>
-	<?php
-}
-
-function get_followers( $user_id ) {
-	$followers = \Activitypub\Peer\Followers::get_followers( $user_id );
-
-	if ( ! $followers ) {
-		return array();
-	}
-
-	return $followers;
-}
-
 function count_followers( $user_id ) {
-	$followers = \Activitypub\get_followers( $user_id );
-
-	return \count( $followers );
+	return Followers::count_followers( $user_id );
 }
 
 /**
@@ -320,3 +172,312 @@ function url_to_authorid( $url ) {
 
 	return 0;
 }
+
+/**
+ * Check for Tombstone Objects
+ *
+ * @see https://www.w3.org/TR/activitypub/#delete-activity-outbox
+ *
+ * @param WP_Error $wp_error A WP_Error-Response of an HTTP-Request
+ *
+ * @return boolean true if HTTP-Code is 410 or 404
+ */
+function is_tombstone( $wp_error ) {
+	if ( ! is_wp_error( $wp_error ) ) {
+		return false;
+	}
+
+	if ( in_array( (int) $wp_error->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( '/(?<!^)[A-Z]/', '_$0', $string ) );
+}
+
+/**
+ * Convert a string from snake_case to camelCase.
+ *
+ * @param string $string The string to convert.
+ *
+ * @return string The converted string.
+ */
+// phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.stringFound
+function snake_to_camel_case( $string ) {
+	return lcfirst( str_replace( '_', '', ucwords( $string, '_' ) ) );
+}
+
+/**
+ * Escapes a Tag, to be used as a hashtag.
+ *
+ * @param string $string The string to escape.
+ *
+ * @return string The escaped hastag.
+ */
+function esc_hashtag( $string ) {
+
+	$hashtag = \wp_specialchars_decode( $string, ENT_QUOTES );
+	// Remove all characters that are not letters, numbers, or underscores.
+	$hashtag = \preg_replace( '/emoji-regex(*SKIP)(?!)|[^\p{L}\p{Nd}_]+/u', '_', $hashtag );
+
+	// Capitalize every letter that is preceded by an underscore.
+	$hashtag = preg_replace_callback(
+		'/_(.)/',
+		function ( $matches ) {
+			return '' . strtoupper( $matches[1] );
+		},
+		$hashtag
+	);
+
+	// Add a hashtag to the beginning of the string.
+	$hashtag = ltrim( $hashtag, '#' );
+	$hashtag = '#' . $hashtag;
+
+	/**
+	 * Allow defining your own custom hashtag generation rules.
+	 *
+	 * @param string $hashtag The hashtag to be returned.
+	 * @param string $string  The original string.
+	 */
+	$hashtag = apply_filters( 'activitypub_esc_hashtag', $hashtag, $string );
+
+	return esc_html( $hashtag );
+}
+
+/**
+ * Check if a request is for an ActivityPub request.
+ *
+ * @return bool False by default.
+ */
+function is_activitypub_request() {
+	global $wp_query;
+
+	/*
+	 * ActivityPub requests are currently only made for
+	 * author archives, singular posts, and the homepage.
+	 */
+	if ( ! \is_author() && ! \is_singular() && ! \is_home() && ! defined( '\REST_REQUEST' ) ) {
+		return false;
+	}
+
+	// One can trigger an ActivityPub request by adding ?activitypub to the URL.
+	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.VariableRedeclaration
+	global $wp_query;
+	if ( isset( $wp_query->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;
+}
+
+/**
+ * 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 ( \version_compare( \get_bloginfo( 'version' ), '5.9', '<' ) ) {
+		return false;
+	}
+
+	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;
+}
+
+/**
+ * Check if a blog is public based on the `blog_public` option
+ *
+ * @return bollean True if public, false if not
+ */
+function is_blog_public() {
+	return (bool) apply_filters( 'activitypub_is_blog_public', \get_option( 'blog_public', 1 ) );
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/help.php

@@ -8,37 +8,37 @@
 			'<p>' . __( 'The following Template Tags are available:', 'activitypub' ) . '</p>' .
 			'<dl>' .
 				'<dt><code>[ap_title]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The post\'s title.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The post\'s title.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_content apply_filters="yes"]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The post\'s content. With <code>apply_filters</code> you can decide if filters should be applied or not (default is <code>yes</code>). The values can be <code>yes</code> or <code>no</code>. <code>apply_filters</code> attribute is optional.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The post\'s content. With <code>apply_filters</code> you can decide if filters (<code>apply_filters( \'the_content\', $content )</code>) should be applied or not (default is <code>yes</code>). The values can be <code>yes</code> or <code>no</code>. <code>apply_filters</code> attribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_excerpt lenght="400"]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The post\'s excerpt (default 400 chars). <code>length</code> attribute is optional.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The post\'s excerpt (default 400 chars). <code>length</code> attribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_permalink type="url"]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The post\'s permalink. <code>type</code> can be either: <code>url</code> or <code>html</code> (an &lt;a /&gt; tag). <code>type</code> attribute is optional.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The post\'s permalink. <code>type</code> can be either: <code>url</code> or <code>html</code> (an &lt;a /&gt; tag). <code>type</code> attribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_shortlink type="url"]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The post\'s shortlink. <code>type</code> can be either <code>url</code> or <code>html</code> (an &lt;a /&gt; tag). I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks. <code>type</code> attribute is optional.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The post\'s shortlink. <code>type</code> can be either <code>url</code> or <code>html</code> (an &lt;a /&gt; tag). I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>, to prettify the Shortlinks. <code>type</code> attribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_hashtags]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The post\'s tags as hashtags.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The post\'s tags as hashtags.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_hashcats]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The post\'s categories as hashtags.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The post\'s categories as hashtags.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_image type=full]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The URL for the post\'s featured image, defaults to full size. The type attribute can be any of the following: <code>thumbnail</code>, <code>medium</code>, <code>large</code>, <code>full</code>. <code>type</code> attribute is optional.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The URL for the post\'s featured image, defaults to full size. The type attribute can be any of the following: <code>thumbnail</code>, <code>medium</code>, <code>large</code>, <code>full</code>. <code>type</code> attribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_author]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The author\'s name.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The author\'s name.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_authorurl]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The URL to the author\'s profile page.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The URL to the author\'s profile page.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_date]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The post\'s date.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The post\'s date.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_time]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The post\'s time.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The post\'s time.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_datetime]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The post\'s date/time formated as "date @ time".', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The post\'s date/time formated as "date @ time".', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_blogurl]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The URL to the site.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The URL to the site.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_blogname]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The name of the site.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The name of the site.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 				'<dt><code>[ap_blogdesc]</code></dt>' .
-				'<dd>' . \wp_kses( __( 'The description of the site.', 'activitypub' ), 'default' ) . '</dd>' .
+				'<dd>' . \wp_kses( __( 'The description of the site.', 'activitypub' ), array( 'code' => array() ) ) . '</dd>' .
 			'</dl>' .
 			'<p>' . __( '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' ) . '</p>' .
 			'<p>' . __( 'Note: the old Template Tags are now deprecated and automatically converted to the new ones.', 'activitypub' ) . '</p>' .
@@ -48,8 +48,8 @@
 
 \get_current_screen()->add_help_tab(
 	array(
-		'id'      => 'glossar',
-		'title'   => \__( 'Glossar', 'activitypub' ),
+		'id'      => 'glossary',
+		'title'   => \__( 'Glossary', 'activitypub' ),
 		'content' =>
 			'<p><h2>' . \__( 'Fediverse', 'activitypub' ) . '</h2></p>' .
 			'<p>' . \__( 'The Fediverse is a new word made of two words: "federation" + "universe"', 'activitypub' ) . '</p>' .
@@ -71,7 +71,5 @@
 \get_current_screen()->set_help_sidebar(
 	'<p><strong>' . \__( 'For more information:', 'activitypub' ) . '</strong></p>' .
 	'<p>' . \__( '<a href="https://wordpress.org/support/plugin/activitypub/">Get support</a>', 'activitypub' ) . '</p>' .
-	'<p>' . \__( '<a href="https://github.com/pfefferle/wordpress-activitypub/issues">Report an issue</a>', 'activitypub' ) . '</p>' .
-	'<hr />' .
-	'<p>' . \__( '<a href="https://notiz.blog/donate">Donate</a>', 'activitypub' ) . '</p>'
+	'<p>' . \__( '<a href="https://github.com/automattic/wordpress-activitypub/issues">Report an issue</a>', 'activitypub' ) . '</p>'
 );

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

@@ -1,126 +0,0 @@
-<?php
-namespace Activitypub\Model;
-
-/**
- * ActivityPub Post Class
- *
- * @author Matthias Pfefferle
- *
- * @see https://www.w3.org/TR/activitypub/
- */
-class Activity {
-	private $context = array( 'https://www.w3.org/ns/activitystreams' );
-	private $published = '';
-	private $id = '';
-	private $type = 'Create';
-	private $actor = '';
-	private $to = array( 'https://www.w3.org/ns/activitystreams#Public' );
-	private $cc = array( 'https://www.w3.org/ns/activitystreams#Public' );
-	private $object = null;
-
-	const TYPE_SIMPLE = 'simple';
-	const TYPE_FULL = 'full';
-	const TYPE_NONE = 'none';
-
-	public function __construct( $type = 'Create', $context = self::TYPE_SIMPLE ) {
-		if ( 'none' === $context ) {
-			$this->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 );
-	}
-}

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

@@ -0,0 +1,72 @@
+<?php
+namespace Activitypub\Model;
+
+use WP_Query;
+use Activitypub\Signature;
+use Activitypub\Collection\Users;
+
+use function Activitypub\get_rest_url_by_path;
+
+class Application_User extends Blog_User {
+	/**
+	 * The User-ID
+	 *
+	 * @var int
+	 */
+	protected $_id = Users::APPLICATION_USER_ID; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
+
+	/**
+	 * The User-Type
+	 *
+	 * @var string
+	 */
+	protected $type = 'Application';
+
+	/**
+	 * If the User is discoverable.
+	 *
+	 * @var boolean
+	 */
+	protected $discoverable = false;
+
+	/**
+	 * Get the User-Url.
+	 *
+	 * @return string The User-Url.
+	 */
+	public function get_url() {
+		return get_rest_url_by_path( 'application' );
+	}
+
+	public function get_name() {
+		return 'application';
+	}
+
+	public function get_preferred_username() {
+		return $this::get_name();
+	}
+
+	public function get_followers() {
+		return null;
+	}
+
+	public function get_following() {
+		return null;
+	}
+
+	public function get_attachment() {
+		return null;
+	}
+
+	public function get_featured_tags() {
+		return null;
+	}
+
+	public function get_featured() {
+		return null;
+	}
+
+	public function get_moderators() {
+		return null;
+	}
+}

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

@@ -0,0 +1,243 @@
+<?php
+namespace Activitypub\Model;
+
+use WP_Query;
+use Activitypub\Signature;
+use Activitypub\Collection\Users;
+
+use function Activitypub\is_single_user;
+use function Activitypub\is_user_disabled;
+use function Activitypub\get_rest_url_by_path;
+
+class Blog_User extends User {
+	/**
+	 * The User-ID
+	 *
+	 * @var int
+	 */
+	protected $_id = Users::BLOG_USER_ID; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
+
+	/**
+	 * The User-Type
+	 *
+	 * @var string
+	 */
+	protected $type = null;
+
+	/**
+	 * Is Account discoverable?
+	 *
+	 * @var boolean
+	 */
+	protected $discoverable = true;
+
+	public static function from_wp_user( $user_id ) {
+		if ( is_user_disabled( $user_id ) ) {
+			return new WP_Error(
+				'activitypub_user_not_found',
+				\__( 'User not found', 'activitypub' ),
+				array( 'status' => 404 )
+			);
+		}
+
+		$object = new static();
+		$object->_id = $user_id;
+
+		return $object;
+	}
+
+	/**
+	 * Get the 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 \wp_strip_all_tags(
+			\html_entity_decode(
+				\get_bloginfo( 'name' ),
+				\ENT_QUOTES,
+				'UTF-8'
+			)
+		);
+	}
+
+	/**
+	 * 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 array();
+	}
+
+	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;
+	}
+}

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

@@ -0,0 +1,366 @@
+<?php
+namespace Activitypub\Model;
+
+use WP_Error;
+use WP_Query;
+use Activitypub\Activity\Actor;
+use Activitypub\Collection\Followers;
+
+/**
+ * ActivityPub Follower Class
+ *
+ * This Object represents a single Follower.
+ * There is no direct reference to a WordPress User here.
+ *
+ * @author Matt Wiebe
+ * @author Matthias Pfefferle
+ *
+ * @see https://www.w3.org/TR/activitypub/#follow-activity-inbox
+ */
+class Follower extends Actor {
+	/**
+	 * The complete Remote-Profile of the Follower
+	 *
+	 * @var array
+	 */
+	protected $_id; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
+
+	/**
+	 * Get the errors.
+	 *
+	 * @return mixed
+	 */
+	public function get_errors() {
+		return get_post_meta( $this->_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;
+	}
+}

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

@@ -1,12 +1,21 @@
 <?php
 namespace Activitypub\Model;
 
+use Activitypub\Transformer\Post as Post_Transformer;
+
 /**
  * ActivityPub Post Class
  *
  * @author Matthias Pfefferle
  */
 class Post {
+	/**
+	 * The \Activitypub\Activity\Base_Object object.
+	 *
+	 * @var \Activitypub\Activity\Base_Object
+	 */
+	protected $object;
+
 	/**
 	 * The WordPress Post Object.
 	 *
@@ -14,154 +23,47 @@ class Post {
 	 */
 	private $post;
 
-	/**
-	 * The Post Author.
-	 *
-	 * @var string
-	 */
-	private $post_author;
-
-	/**
-	 * The Object ID.
-	 *
-	 * @var string
-	 */
-	private $id;
-
-	/**
-	 * The Object Summary.
-	 *
-	 * @var string
-	 */
-	private $summary;
-
-	/**
-	 * The Object Summary
-	 *
-	 * @var string
-	 */
-	private $content;
-
-	/**
-	 * The Object Attachments. This is usually a list of Images.
-	 *
-	 * @var array
-	 */
-	private $attachments;
-
-	/**
-	 * The Object Tags. This is usually the list of used Hashtags.
-	 *
-	 * @var array
-	 */
-	private $tags;
-
-	/**
-	 * The Onject Type
-	 *
-	 * @var string
-	 */
-	private $object_type;
-
-	/**
-	 * The Allowed Tags, used in the content.
-	 *
-	 * @var array
-	 */
-	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(),
-	);
-
 	/**
 	 * Constructor
 	 *
 	 * @param WP_Post $post
+	 * @param int     $post_author
 	 */
-	public function __construct( $post ) {
-		$this->post = \get_post( $post );
+	// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed, VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	public function __construct( $post, $post_author = null ) {
+		_deprecated_function( __CLASS__, '1.0.0', '\Activitypub\Transformer\Post' );
+
+		$this->post   = $post;
+		$this->object = Post_Transformer::transform( $post )->to_object();
 	}
 
 	/**
-	 * Magic function to implement getter and setter
+	 * Returns the User ID.
 	 *
-	 * @param string $method
-	 * @param string $params
-	 *
-	 * @return void
+	 * @return int the User ID.
 	 */
-	public function __call( $method, $params ) {
-		$var = \strtolower( \substr( $method, 4 ) );
-
-		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];
-		}
+	public function get_user_id() {
+		return apply_filters( 'activitypub_post_user_id', $this->post->post_author, $this->post );
 	}
 
 	/**
 	 * Converts this Object into an Array.
 	 *
-	 * @return array
+	 * @return array the array representation of a Post.
 	 */
 	public function to_array() {
-		$post = $this->post;
+		return \apply_filters( 'activitypub_post', $this->object->to_array(), $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(),
-		);
+	/**
+	 * Returns the Actor of this Object.
+	 *
+	 * @return string The URL of the Actor.
+	 */
+	public function get_actor() {
+		$user = User_Factory::get_by_id( $this->get_user_id() );
 
-		return \apply_filters( 'activitypub_post', $array, $this->post );
+		return $user->get_url();
 	}
 
 	/**
@@ -173,27 +75,22 @@ class Post {
 		return \wp_json_encode( $this->to_array(), \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT );
 	}
 
+	/**
+	 * Returns the URL of an Activity Object
+	 *
+	 * @return string
+	 */
+	public function get_url() {
+		return $this->object->get_url();
+	}
+
 	/**
 	 * Returns the ID of an Activity Object
 	 *
 	 * @return string
 	 */
 	public function get_id() {
-		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 @@ class Post {
 	 * @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 @@ class Post {
 	 * @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 @@ class Post {
 	 * @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 @@ class Post {
 	 * @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();
 	}
 }

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

@@ -0,0 +1,318 @@
+<?php
+namespace Activitypub\Model;
+
+use WP_Query;
+use WP_Error;
+use Activitypub\Signature;
+use Activitypub\Collection\Users;
+use Activitypub\Activity\Actor;
+
+use function Activitypub\is_user_disabled;
+use function Activitypub\get_rest_url_by_path;
+
+class User extends Actor {
+	/**
+	 * The local User-ID (WP_User).
+	 *
+	 * @var int
+	 */
+	protected $_id; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
+
+	/**
+	 * The Featured-Tags.
+	 *
+	 * @see https://docs.joinmastodon.org/spec/activitypub/#featuredTags
+	 *
+	 * @var string
+	 */
+	protected $featured_tags;
+
+	/**
+	 * The Featured-Posts.
+	 *
+	 * @see https://docs.joinmastodon.org/spec/activitypub/#featured
+	 *
+	 * @var string
+	 */
+	protected $featured;
+
+	/**
+	 * Moderators endpoint.
+	 *
+	 * @see https://join-lemmy.org/docs/contributors/05-federation.html
+	 *
+	 * @var string
+	 */
+	protected $moderators;
+
+	/**
+	 * The User-Type
+	 *
+	 * @var string
+	 */
+	protected $type = 'Person';
+
+	/**
+	 * If the User is discoverable.
+	 *
+	 * @see https://docs.joinmastodon.org/spec/activitypub/#discoverable
+	 *
+	 * @var boolean
+	 */
+	protected $discoverable = true;
+
+	/**
+	 * If the User is indexable.
+	 *
+	 * @var boolean
+	 */
+	protected $indexable;
+
+	/**
+	 * The WebFinger Resource.
+	 *
+	 * @var string<url>
+	 */
+	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(
+				'<a rel="me" title="' . \esc_attr( \home_url( '/' ) ) . '" target="_blank" href="' . \home_url( '/' ) . '">' . \wp_parse_url( \home_url( '/' ), \PHP_URL_HOST ) . '</a>',
+				\ENT_QUOTES,
+				'UTF-8'
+			),
+		);
+
+		$array[] = array(
+			'type' => 'PropertyValue',
+			'name' => \__( 'Profile', 'activitypub' ),
+			'value' => \html_entity_decode(
+				'<a rel="me" title="' . \esc_attr( \get_author_posts_url( $this->get__id() ) ) . '" target="_blank" href="' . \get_author_posts_url( $this->get__id() ) . '">' . \wp_parse_url( \get_author_posts_url( $this->get__id() ), \PHP_URL_HOST ) . '</a>',
+				\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(
+					'<a rel="me" title="' . \esc_attr( \get_the_author_meta( 'user_url', $this->get__id() ) ) . '" target="_blank" href="' . \get_the_author_meta( 'user_url', $this->get__id() ) . '">' . \wp_parse_url( \get_the_author_meta( 'user_url', $this->get__id() ), \PHP_URL_HOST ) . '</a>',
+					\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_tag() {
+		return array();
+	}
+
+	public function get_indexable() {
+		if ( \get_option( 'blog_public', 1 ) ) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/peer/class-followers.php

@@ -9,76 +9,26 @@ namespace Activitypub\Peer;
 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 );
+		_deprecated_function( __METHOD__, '1.0.0', '\Activitypub\Collection\Followers::add_follower' );
 
-		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,
-				)
-			);
-		}
-
-		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 );
+		_deprecated_function( __METHOD__, '1.0.0', '\Activitypub\Collection\Followers::remove_follower' );
 
-		foreach ( $followers as $key => $value ) {
-			if ( $value === $actor ) {
-				unset( $followers[ $key ] );
-			}
-		}
-
-		\update_user_meta( $author_id, 'activitypub_followers', $followers );
+		return \Activitypub\Collection\Followers::remove_follower( $author_id, $actor );
 	}
 }

wp-content/upgrade-temp-backup/plugins/activitypub/includes/peer/class-users.php

@@ -1,67 +0,0 @@
-<?php
-namespace Activitypub\Peer;
-
-/**
- * ActivityPub Users DB-Class
- *
- * @author Matthias Pfefferle
- */
-class Users {
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return void
-	 */
-	public static function get_user_by_various( $data ) {
-
-	}
-
-	/**
-	 * Examine a url and try to determine the author ID it represents.
-	 *
-	 * Checks are supposedly from the hosted site blog.
-	 *
-	 * @param string $url Permalink to check.
-	 *
-	 * @return int User ID, or 0 on failure.
-	 */
-	public static function url_to_authorid( $url ) {
-		global $wp_rewrite;
-
-		// check if url hase the same host
-		if ( \wp_parse_url( \site_url(), \PHP_URL_HOST ) !== \wp_parse_url( $url, \PHP_URL_HOST ) ) {
-			return 0;
-		}
-
-		// first, check to see if there is a 'author=N' to match against
-		if ( \preg_match( '/[?&]author=(\d+)/i', $url, $values ) ) {
-			$id = \absint( $values[1] );
-			if ( $id ) {
-				return $id;
-			}
-		}
-
-		// check to see if we are using rewrite rules
-		$rewrite = $wp_rewrite->wp_rewrite_rules();
-
-		// not using rewrite rules, and 'author=N' method failed, so we're out of options
-		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;
-	}
-}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/rest/class-collection.php

@@ -0,0 +1,213 @@
+<?php
+namespace Activitypub\Rest;
+
+use WP_Error;
+use WP_REST_Server;
+use WP_REST_Response;
+use Activitypub\Transformer\Post;
+use Activitypub\Activity\Activity;
+use Activitypub\Collection\Users as User_Collection;
+
+use function Activitypub\esc_hashtag;
+use function Activitypub\is_single_user;
+use function Activitypub\get_rest_url_by_path;
+
+/**
+ * ActivityPub Collections REST-Class
+ *
+ * @author Matthias Pfefferle
+ *
+ * @see https://docs.joinmastodon.org/spec/activitypub/#featured
+ * @see https://docs.joinmastodon.org/spec/activitypub/#featuredTags
+ */
+class Collection {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
+	public static function init() {
+		self::register_routes();
+	}
+
+	/**
+	 * Register routes
+	 */
+	public static function register_routes() {
+		\register_rest_route(
+			ACTIVITYPUB_REST_NAMESPACE,
+			'/users/(?P<user_id>[\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<user_id>[\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;
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/rest/class-followers.php

@@ -1,6 +1,15 @@
 <?php
 namespace Activitypub\Rest;
 
+use WP_Error;
+use stdClass;
+use WP_REST_Server;
+use WP_REST_Response;
+use Activitypub\Collection\Users as User_Collection;
+use Activitypub\Collection\Followers as Follower_Collection;
+
+use function Activitypub\get_rest_url_by_path;
+
 /**
  * ActivityPub Followers REST-Class
  *
@@ -13,7 +22,7 @@ class Followers {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( '\Activitypub\Rest\Followers', 'register_routes' ) );
+		self::register_routes();
 	}
 
 	/**
@@ -21,12 +30,12 @@ class Followers {
 	 */
 	public static function register_routes() {
 		\register_rest_route(
-			'activitypub/1.0',
-			'/users/(?P<user_id>\d+)/followers',
+			ACTIVITYPUB_REST_NAMESPACE,
+			'/users/(?P<user_id>[\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 @@ class Followers {
 	 */
 	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 = $json->partOf; // 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 = \get_rest_url( null, "/activitypub/1.0/users/$user_id/followers" );
+		if ( $page && ( ( \ceil ( $json->totalItems / $per_page ) ) > $page ) ) { // phpcs:ignore
+			$json->next  = \add_query_arg( 'page', $page + 1, $json->partOf ); // phpcs:ignore
+		}
 
-		$response = new \WP_REST_Response( $json, 200 );
+		if ( $page && ( $page > 1 ) ) { // phpcs:ignore
+			$json->prev  = \add_query_arg( 'page', $page - 1, $json->partOf ); // phpcs:ignore
+		}
+
+		// 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->header( 'Content-Type', 'application/activity+json' );
 
 		return $response;
@@ -96,14 +119,29 @@ class Followers {
 
 		$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;

wp-content/upgrade-temp-backup/plugins/activitypub/includes/rest/class-following.php

@@ -1,6 +1,11 @@
 <?php
 namespace Activitypub\Rest;
 
+use Activitypub\Collection\Users as User_Collection;
+
+use function Activitypub\is_single_user;
+use function Activitypub\get_rest_url_by_path;
+
 /**
  * ActivityPub Following REST-Class
  *
@@ -13,7 +18,9 @@ class Following {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( '\Activitypub\Rest\Following', 'register_routes' ) );
+		self::register_routes();
+
+		\add_filter( 'activitypub_rest_following', array( self::class, 'default_following' ), 10, 2 );
 	}
 
 	/**
@@ -21,12 +28,12 @@ class Following {
 	 */
 	public static function register_routes() {
 		\register_rest_route(
-			'activitypub/1.0',
-			'/users/(?P<user_id>\d+)/following',
+			ACTIVITYPUB_REST_NAMESPACE,
+			'/users/(?P<user_id>[\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 +50,32 @@ class Following {
 	 */
 	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 +99,32 @@ class Following {
 
 		$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;
+	}
 }

wp-content/upgrade-temp-backup/plugins/activitypub/includes/rest/class-inbox.php

@@ -1,6 +1,17 @@
 <?php
 namespace Activitypub\Rest;
 
+use WP_Error;
+use WP_REST_Server;
+use WP_REST_Response;
+use Activitypub\Activity\Activity;
+use Activitypub\Collection\Users as User_Collection;
+
+use function Activitypub\get_context;
+use function Activitypub\url_to_authorid;
+use function Activitypub\get_rest_url_by_path;
+use function Activitypub\get_remote_metadata_by_actor;
+
 /**
  * ActivityPub Inbox REST-Class
  *
@@ -13,13 +24,9 @@ class Inbox {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( '\Activitypub\Rest\Inbox', 'register_routes' ) );
-		\add_filter( 'rest_pre_serve_request', array( '\Activitypub\Rest\Inbox', 'serve_request' ), 11, 4 );
-		\add_action( 'activitypub_inbox_follow', array( '\Activitypub\Rest\Inbox', 'handle_follow' ), 10, 2 );
-		\add_action( 'activitypub_inbox_undo', array( '\Activitypub\Rest\Inbox', 'handle_unfollow' ), 10, 2 );
-		//\add_action( 'activitypub_inbox_like', array( '\Activitypub\Rest\Inbox', 'handle_reaction' ), 10, 2 );
-		//\add_action( 'activitypub_inbox_announce', array( '\Activitypub\Rest\Inbox', 'handle_reaction' ), 10, 2 );
-		\add_action( 'activitypub_inbox_create', array( '\Activitypub\Rest\Inbox', 'handle_create' ), 10, 2 );
+		self::register_routes();
+
+		\add_action( 'activitypub_inbox_create', array( self::class, 'handle_create' ), 10, 2 );
 	}
 
 	/**
@@ -27,12 +34,12 @@ class Inbox {
 	 */
 	public static function register_routes() {
 		\register_rest_route(
-			'activitypub/1.0',
+			ACTIVITYPUB_REST_NAMESPACE,
 			'/inbox',
 			array(
 				array(
-					'methods'             => \WP_REST_Server::EDITABLE,
-					'callback'            => array( '\Activitypub\Rest\Inbox', 'shared_inbox_post' ),
+					'methods'             => WP_REST_Server::CREATABLE,
+					'callback'            => array( self::class, 'shared_inbox_post' ),
 					'args'                => self::shared_inbox_post_parameters(),
 					'permission_callback' => '__return_true',
 				),
@@ -40,18 +47,18 @@ class Inbox {
 		);
 
 		\register_rest_route(
-			'activitypub/1.0',
-			'/users/(?P<user_id>\d+)/inbox',
+			ACTIVITYPUB_REST_NAMESPACE,
+			'/users/(?P<user_id>[\w\-\.]+)/inbox',
 			array(
 				array(
-					'methods'             => \WP_REST_Server::EDITABLE,
-					'callback'            => array( '\Activitypub\Rest\Inbox', 'user_inbox_post' ),
+					'methods'             => WP_REST_Server::CREATABLE,
+					'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 @@ class Inbox {
 		);
 	}
 
-	/**
-	 * 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 @@ class Inbox {
 	 */
 	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 @@ class Inbox {
 		$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 @@ class Inbox {
 	 */
 	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 @@ class Inbox {
 	 * @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 @@ class Inbox {
 		}
 
 		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 @@ class Inbox {
 
 		$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 @@ class Inbox {
 
 		$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 @@ class Inbox {
 			//'type' => 'enum',
 			//'enum' => array( 'Create' ),
 			//'sanitize_callback' => function( $param, $request, $key ) {
-			//	return \strtolower( $param );
+			//  return \strtolower( $param );
 			//},
 		);
 
@@ -299,7 +288,7 @@ class Inbox {
 			//'type' => 'enum',
 			//'enum' => array( 'Create' ),
 			//'sanitize_callback' => function( $param, $request, $key ) {
-			//	return \strtolower( $param );
+			//  return \strtolower( $param );
 			//},
 		);
 
@@ -342,88 +331,6 @@ class Inbox {
 		return $params;
 	}
 
-	/**
-	 * Handles "Follow" requests
-	 *
-	 * @param  array $object  The activity-object
-	 * @param  int   $user_id The id of the local blog-user
-	 */
-	public static function handle_follow( $object, $user_id ) {
-		// save follower
-		\Activitypub\Peer\Followers::add_follower( $object['actor'], $user_id );
-
-		// get inbox
-		$inbox = \Activitypub\get_inbox_by_actor( $object['actor'] );
-
-		// send "Accept" activity
-		$activity = new \Activitypub\Model\Activity( 'Accept', \Activitypub\Model\Activity::TYPE_SIMPLE );
-		$activity->set_object( $object );
-		$activity->set_actor( \get_author_posts_url( $user_id ) );
-		$activity->set_to( $object['actor'] );
-		$activity->set_id( \get_author_posts_url( $user_id ) . '#follow-' . \preg_replace( '~^https?://~', '', $object['actor'] ) );
-
-		$activity = $activity->to_simple_json();
-
-		$response = \Activitypub\safe_remote_post( $inbox, $activity, $user_id );
-	}
-
-	/**
-	 * Handles "Unfollow" requests
-	 *
-	 * @param  array $object  The activity-object
-	 * @param  int   $user_id The id of the local blog-user
-	 */
-	public static function handle_unfollow( $object, $user_id ) {
-		if ( isset( $object['object'] ) && isset( $object['object']['type'] ) && 'Follow' === $object['object']['type'] ) {
-			\Activitypub\Peer\Followers::remove_follower( $object['actor'], $user_id );
-		}
-	}
-
-	/**
-	 * Handles "Reaction" requests
-	 *
-	 * @param  array $object  The activity-object
-	 * @param  int   $user_id The id of the local blog-user
-	 */
-	public static function handle_reaction( $object, $user_id ) {
-		$meta = \Activitypub\get_remote_metadata_by_actor( $object['actor'] );
-
-		$comment_post_id = \url_to_postid( $object['object'] );
-
-		// save only replys and reactions
-		if ( ! $comment_post_id ) {
-			return false;
-		}
-
-		$commentdata = array(
-			'comment_post_ID' => $comment_post_id,
-			'comment_author' => \esc_attr( $meta['name'] ),
-			'comment_author_email' => '',
-			'comment_author_url' => \esc_url_raw( $object['actor'] ),
-			'comment_content' => \esc_url_raw( $object['actor'] ),
-			'comment_type' => \esc_attr( \strtolower( $object['type'] ) ),
-			'comment_parent' => 0,
-			'comment_meta' => array(
-				'source_url' => \esc_url_raw( $object['id'] ),
-				'avatar_url' => \esc_url_raw( $meta['icon']['url'] ),
-				'protocol' => 'activitypub',
-			),
-		);
-
-		// disable flood control
-		\remove_action( 'check_comment_flood', 'check_comment_flood_db', 10 );
-
-		// do not require email for AP entries
-		\add_filter( 'pre_option_require_name_email', '__return_false' );
-
-		$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 );
-	}
-
 	/**
 	 * Handles "Create" requests
 	 *
@@ -431,7 +338,7 @@ class Inbox {
 	 * @param  int   $user_id The id of the local blog-user
 	 */
 	public static function handle_create( $object, $user_id ) {
-		$meta = \Activitypub\get_remote_metadata_by_actor( $object['actor'] );
+		$meta = get_remote_metadata_by_actor( $object['actor'] );
 
 		if ( ! isset( $object['object']['inReplyTo'] ) ) {
 			return;
@@ -455,7 +362,7 @@ class Inbox {
 			'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' => 0,
 			'comment_meta' => array(
@@ -471,12 +378,22 @@ class Inbox {
 		// do not require email for AP entries
 		\add_filter( 'pre_option_require_name_email', '__return_false' );
 
+		// No nonce possible for this submission route
+		\add_filter(
+			'akismet_comment_nonce',
+			function() {
+				return 'inactive';
+			}
+		);
+
 		$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 );
 	}
 
 	/**
@@ -538,7 +455,7 @@ class Inbox {
 		$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 );
 

wp-content/upgrade-temp-backup/plugins/activitypub/includes/rest/class-nodeinfo.php

@@ -1,6 +1,10 @@
 <?php
 namespace Activitypub\Rest;
 
+use WP_REST_Response;
+
+use function Activitypub\get_rest_url_by_path;
+
 /**
  * ActivityPub NodeInfo REST-Class
  *
@@ -13,9 +17,7 @@ class Nodeinfo {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( '\Activitypub\Rest\Nodeinfo', 'register_routes' ) );
-		\add_filter( 'nodeinfo_data', array( '\Activitypub\Rest\Nodeinfo', 'add_nodeinfo_discovery' ), 10, 2 );
-		\add_filter( 'nodeinfo2_data', array( '\Activitypub\Rest\Nodeinfo', 'add_nodeinfo2_discovery' ), 10 );
+		self::register_routes();
 	}
 
 	/**
@@ -23,36 +25,36 @@ class Nodeinfo {
 	 */
 	public static function register_routes() {
 		\register_rest_route(
-			'activitypub/1.0',
+			ACTIVITYPUB_REST_NAMESPACE,
 			'/nodeinfo/discovery',
 			array(
 				array(
 					'methods'             => \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 +69,11 @@ class Nodeinfo {
 	 * @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 +82,24 @@ class Nodeinfo {
 			'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 +113,7 @@ class Nodeinfo {
 			'outbound' => array(),
 		);
 
-		return new \WP_REST_Response( $nodeinfo, 200 );
+		return new WP_REST_Response( $nodeinfo, 200 );
 	}
 
 	/**
@@ -106,6 +124,11 @@ class Nodeinfo {
 	 * @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 +170,7 @@ class Nodeinfo {
 			'outbound' => array(),
 		);
 
-		return new \WP_REST_Response( $nodeinfo, 200 );
+		return new WP_REST_Response( $nodeinfo, 200 );
 	}
 
 	/**
@@ -162,42 +185,10 @@ class Nodeinfo {
 		$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' ),
 			),
 		);
 
 		return new \WP_REST_Response( $discovery, 200 );
 	}
-
-	/**
-	 * Extend NodeInfo data
-	 *
-	 * @param array  $nodeinfo NodeInfo data
-	 * @param string           The NodeInfo Version
-	 *
-	 * @return array           The extended array
-	 */
-	public static function add_nodeinfo_discovery( $nodeinfo, $version ) {
-		if ( '2.0' === $version ) {
-			$nodeinfo['protocols'][] = 'activitypub';
-		} else {
-			$nodeinfo['protocols']['inbound'][]  = 'activitypub';
-			$nodeinfo['protocols']['outbound'][] = 'activitypub';
-		}
-
-		return $nodeinfo;
-	}
-
-	/**
-	 * Extend NodeInfo2 data
-	 *
-	 * @param  array $nodeinfo NodeInfo2 data
-	 *
-	 * @return array           The extended array
-	 */
-	public static function add_nodeinfo2_discovery( $nodeinfo ) {
-		$nodeinfo['protocols'][] = 'activitypub';
-
-		return $nodeinfo;
-	}
 }

wp-content/upgrade-temp-backup/plugins/activitypub/includes/rest/class-ostatus.php

@@ -1,33 +0,0 @@
-<?php
-namespace Activitypub\Rest;
-
-/**
- * ActivityPub OStatus REST-Class
- *
- * @author Matthias Pfefferle
- *
- * @see https://www.w3.org/community/ostatus/
- */
-class Ostatus {
-	/**
-	 * Register routes
-	 */
-	public static function register_routes() {
-		\register_rest_route(
-			'activitypub/1.0',
-			'/ostatus/remote-follow',
-			array(
-				array(
-					'methods'             => \WP_REST_Server::READABLE,
-					'callback'            => array( '\Activitypub\Rest\Ostatus', 'get' ),
-					// 'args'     => self::request_parameters(),
-					'permission_callback' => '__return_true',
-				),
-			)
-		);
-	}
-
-	public static function get() {
-		// @todo implement
-	}
-}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/rest/class-outbox.php

@@ -1,6 +1,17 @@
 <?php
 namespace Activitypub\Rest;
 
+use stdClass;
+use WP_Error;
+use WP_REST_Server;
+use WP_REST_Response;
+use Activitypub\Transformer\Post;
+use Activitypub\Activity\Activity;
+use Activitypub\Collection\Users as User_Collection;
+
+use function Activitypub\get_context;
+use function Activitypub\get_rest_url_by_path;
+
 /**
  * ActivityPub Outbox REST-Class
  *
@@ -13,7 +24,7 @@ class Outbox {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( '\Activitypub\Rest\Outbox', 'register_routes' ) );
+		self::register_routes();
 	}
 
 	/**
@@ -21,12 +32,12 @@ class Outbox {
 	 */
 	public static function register_routes() {
 		\register_rest_route(
-			'activitypub/1.0',
-			'/users/(?P<user_id>\d+)/outbox',
+			ACTIVITYPUB_REST_NAMESPACE,
+			'/users/(?P<user_id>[\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 @@ class Outbox {
 	 */
 	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 @@ class Outbox {
 			$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 @@ class Outbox {
 
 		$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;

wp-content/upgrade-temp-backup/plugins/activitypub/includes/rest/class-server.php

@@ -0,0 +1,105 @@
+<?php
+namespace Activitypub\Rest;
+
+use stdClass;
+use WP_REST_Response;
+use Activitypub\Signature;
+use Activitypub\Model\Application_User;
+
+/**
+ * ActivityPub Server REST-Class
+ *
+ * @author Django Doucet
+ *
+ * @see https://www.w3.org/TR/activitypub/#security-verification
+ */
+class Server {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
+	public static function init() {
+		self::register_routes();
+
+		\add_filter( 'rest_request_before_callbacks', array( self::class, 'authorize_activitypub_requests' ), 10, 3 );
+	}
+
+	/**
+	 * Register routes
+	 */
+	public static function register_routes() {
+		\register_rest_route(
+			ACTIVITYPUB_REST_NAMESPACE,
+			'/application',
+			array(
+				array(
+					'methods'             => \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 ( 'get' !== \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;
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/rest/class-users.php

@@ -0,0 +1,155 @@
+<?php
+namespace Activitypub\Rest;
+
+use WP_Error;
+use WP_REST_Server;
+use WP_REST_Request;
+use WP_REST_Response;
+use Activitypub\Webfinger;
+use Activitypub\Activity\Activity;
+use Activitypub\Collection\Users as User_Collection;
+
+use function Activitypub\is_activitypub_request;
+
+/**
+ * ActivityPub Followers REST-Class
+ *
+ * @author Matthias Pfefferle
+ *
+ * @see https://www.w3.org/TR/activitypub/#followers
+ */
+class Users {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
+	public static function init() {
+		self::register_routes();
+	}
+
+	/**
+	 * Register routes
+	 */
+	public static function register_routes() {
+		\register_rest_route(
+			ACTIVITYPUB_REST_NAMESPACE,
+			'/users/(?P<user_id>[\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<user_id>[\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;
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/rest/class-webfinger.php

@@ -1,6 +1,10 @@
 <?php
 namespace Activitypub\Rest;
 
+use WP_Error;
+use WP_REST_Response;
+use Activitypub\Collection\Users as User_Collection;
+
 /**
  * ActivityPub WebFinger REST-Class
  *
@@ -10,24 +14,27 @@ namespace Activitypub\Rest;
  */
 class Webfinger {
 	/**
-	 * Initialize the class, registering WordPress hooks
+	 * Initialize the class, registering WordPress hooks.
+	 *
+	 * @return void
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( '\Activitypub\Rest\Webfinger', 'register_routes' ) );
-		\add_action( 'webfinger_user_data', array( '\Activitypub\Rest\Webfinger', 'add_webfinger_discovery' ), 10, 3 );
+		self::register_routes();
 	}
 
 	/**
-	 * Register routes
+	 * Register routes.
+	 *
+	 * @return void
 	 */
 	public static function register_routes() {
 		\register_rest_route(
-			'activitypub/1.0',
+			ACTIVITYPUB_REST_NAMESPACE,
 			'/webfinger',
 			array(
 				array(
 					'methods'             => \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 +43,22 @@ class Webfinger {
 	}
 
 	/**
-	 * Render JRD file
+	 * WebFinger endpoint.
 	 *
-	 * @param  WP_REST_Request   $request
-	 * @return WP_REST_Response
+	 * @param WP_REST_Request $request The request object.
+	 *
+	 * @return WP_REST_Response The response object.
 	 */
 	public static function webfinger( $request ) {
+		/*
+		 * Action triggerd prior to the ActivityPub profile being created and sent to the client
+		 */
+		\do_action( 'activitypub_rest_webfinger_pre' );
+
 		$resource = $request->get_param( 'resource' );
+		$response = self::get_profile( $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 = \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 ),
-				),
-			),
-		);
-
-		return new \WP_REST_Response( $json, 200 );
+		return new WP_REST_Response( $response, 200 );
 	}
 
 	/**
@@ -103,19 +79,40 @@ class Webfinger {
 	}
 
 	/**
-	 * Add WebFinger discovery links
+	 * Get the WebFinger profile.
 	 *
-	 * @param array   $array    the jrd array
-	 * @param string  $resource the WebFinger resource
-	 * @param WP_User $user     the WordPress user
+	 * @param string $resource the WebFinger resource.
+	 *
+	 * @return array the WebFinger profile.
 	 */
-	public static function add_webfinger_discovery( $array, $resource, $user ) {
-		$array['links'][] = array(
-			'rel'  => 'self',
-			'type' => 'application/activity+json',
-			'href' => \get_author_posts_url( $user->ID ),
+	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(),
 		);
 
-		return $array;
+		$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;
 	}
 }

wp-content/upgrade-temp-backup/plugins/activitypub/includes/table/class-followers.php

@@ -0,0 +1,148 @@
+<?php
+namespace Activitypub\Table;
+
+use WP_List_Table;
+use Activitypub\Collection\Users;
+use Activitypub\Collection\Followers as FollowerCollection;
+
+if ( ! \class_exists( '\WP_List_Table' ) ) {
+		require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+}
+
+class Followers extends WP_List_Table {
+	private $user_id;
+
+	public function __construct() {
+		if ( get_current_screen()->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'           => '<input type="checkbox" />',
+			'avatar'       => \__( 'Avatar', 'activitypub' ),
+			'name'         => \__( 'Name', 'activitypub' ),
+			'username'     => \__( 'Username', 'activitypub' ),
+			'url'          => \__( 'URL', 'activitypub' ),
+			'updated'      => \__( 'Last updated', 'activitypub' ),
+			//'errors'       => \__( 'Errors', 'activitypub' ),
+			//'latest-error' => \__( 'Latest Error Message', 'activitypub' ),
+		);
+	}
+
+	public function get_sortable_columns() {
+		return array();
+	}
+
+	public function prepare_items() {
+		$columns = $this->get_columns();
+		$hidden  = array();
+
+		$this->process_action();
+		$this->_column_headers = array( $columns, $hidden, $this->get_sortable_columns() );
+
+		$page_num = $this->get_pagenum();
+		$per_page = 20;
+
+		$followers = FollowerCollection::get_followers( $this->user_id, $per_page, $page_num );
+		$counter   = FollowerCollection::count_followers( $this->user_id );
+
+		$this->items = array();
+		$this->set_pagination_args(
+			array(
+				'total_items' => $counter,
+				'total_pages' => ceil( $counter / $per_page ),
+				'per_page'    => $per_page,
+			)
+		);
+
+		foreach ( $followers as $follower ) {
+			$item = array(
+				'icon'         => esc_attr( $follower->get_icon_url() ),
+				'name'         => esc_attr( $follower->get_name() ),
+				'username'     => esc_attr( $follower->get_preferred_username() ),
+				'url'          => esc_attr( $follower->get_url() ),
+				'identifier'   => esc_attr( $follower->get_id() ),
+				'updated'      => esc_attr( $follower->get_updated() ),
+				'errors'       => $follower->count_errors(),
+				'latest-error' => $follower->get_latest_error_message(),
+			);
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function get_bulk_actions() {
+		return array(
+			'delete' => __( 'Delete', 'activitypub' ),
+		);
+	}
+
+	public function column_default( $item, $column_name ) {
+		if ( ! array_key_exists( $column_name, $item ) ) {
+			return __( 'None', 'activitypub' );
+		}
+		return $item[ $column_name ];
+	}
+
+	public function column_avatar( $item ) {
+		return sprintf(
+			'<img src="%s" width="25px;" />',
+			$item['icon']
+		);
+	}
+
+	public function column_url( $item ) {
+		return sprintf(
+			'<a href="%s" target="_blank">%s</a>',
+			$item['url'],
+			$item['url']
+		);
+	}
+
+	public function column_cb( $item ) {
+		return sprintf( '<input type="checkbox" name="followers[]" value="%s" />', esc_attr( $item['identifier'] ) );
+	}
+
+	public function process_action() {
+		if ( ! isset( $_REQUEST['followers'] ) || ! isset( $_REQUEST['_apnonce'] ) ) {
+			return false;
+		}
+		$nonce = sanitize_text_field( wp_unslash( $_REQUEST['_apnonce'] ) );
+		if ( ! wp_verify_nonce( $nonce, 'activitypub-followers-list' ) ) {
+			return false;
+		}
+
+		if ( ! current_user_can( 'edit_user', $this->user_id ) ) {
+			return false;
+		}
+
+		$followers = $_REQUEST['followers']; // phpcs:ignore
+
+		switch ( $this->current_action() ) {
+			case 'delete':
+				if ( ! is_array( $followers ) ) {
+					$followers = array( $followers );
+				}
+				foreach ( $followers as $follower ) {
+					FollowerCollection::remove_follower( $this->user_id, $follower );
+				}
+				break;
+		}
+	}
+
+	public function get_user_count() {
+		return FollowerCollection::count_followers( $this->user_id );
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/includes/table/followers-list.php

@@ -1,36 +0,0 @@
-<?php
-namespace Activitypub\Table;
-
-if ( ! \class_exists( '\WP_List_Table' ) ) {
-		require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
-}
-
-class Followers_List extends \WP_List_Table {
-	public function get_columns() {
-		return array(
-			'identifier' => \__( 'Identifier', 'activitypub' ),
-		);
-	}
-
-	public function get_sortable_columns() {
-		return array();
-	}
-
-	public function prepare_items() {
-		$columns = $this->get_columns();
-		$hidden  = array();
-
-		$this->process_action();
-		$this->_column_headers = array( $columns, $hidden, $this->get_sortable_columns() );
-
-		$this->items = array();
-
-		foreach ( \Activitypub\Peer\Followers::get_followers( \get_current_user_id() ) as $follower ) {
-			$this->items[]['identifier'] = \esc_attr( $follower );
-		}
-	}
-
-	public function column_default( $item, $column_name ) {
-		return $item[ $column_name ];
-	}
-}

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

@@ -0,0 +1,512 @@
+<?php
+namespace Activitypub\Transformer;
+
+use WP_Post;
+use Activitypub\Collection\Users;
+use Activitypub\Model\Blog_User;
+use Activitypub\Activity\Base_Object;
+
+use function Activitypub\esc_hashtag;
+use function Activitypub\is_single_user;
+use function Activitypub\get_rest_url_by_path;
+use function Activitypub\site_supports_blocks;
+
+/**
+ * WordPress Post Transformer
+ *
+ * The Post Transformer is responsible for transforming a WP_Post object into different othe
+ * Object-Types.
+ *
+ * Currently supported are:
+ *
+ * - Activitypub\Activity\Base_Object
+ */
+class Post {
+
+	/**
+	 * The WP_Post object.
+	 *
+	 * @var WP_Post
+	 */
+	protected $wp_post;
+
+	/**
+	 * Static function to Transform a WP_Post Object.
+	 *
+	 * This helps to chain the output of the Transformer.
+	 *
+	 * @param WP_Post $wp_post The WP_Post object
+	 *
+	 * @return void
+	 */
+	public static function transform( WP_Post $wp_post ) {
+		return new static( $wp_post );
+	}
+
+	/**
+	 *
+	 *
+	 * @param WP_Post $wp_post
+	 */
+	public function __construct( WP_Post $wp_post ) {
+		$this->wp_post = $wp_post;
+	}
+
+	/**
+	 * Transforms the WP_Post object to an ActivityPub Object
+	 *
+	 * @see \Activitypub\Activity\Base_Object
+	 *
+	 * @return \Activitypub\Activity\Base_Object The ActivityPub Object
+	 */
+	public function to_object() {
+		$wp_post = $this->wp_post;
+		$object = new Base_Object();
+
+		$object->set_id( $this->get_id() );
+		$object->set_url( $this->get_url() );
+		$object->set_type( $this->get_object_type() );
+
+		$published = \strtotime( $wp_post->post_date_gmt );
+
+		$object->set_published( \gmdate( 'Y-m-d\TH:i:s\Z', $published ) );
+
+		$updated = \strtotime( $wp_post->post_modified_gmt );
+
+		if ( $updated > $published ) {
+			$object->set_updated( \gmdate( 'Y-m-d\TH:i:s\Z', $updated ) );
+		}
+
+		$object->set_attributed_to( $this->get_attributed_to() );
+		$object->set_content( $this->get_content() );
+		$object->set_content_map(
+			array(
+				\strstr( \get_locale(), '_', true ) => $this->get_content(),
+			)
+		);
+		$path = sprintf( 'users/%d/followers', intval( $wp_post->post_author ) );
+
+		$object->set_to(
+			array(
+				'https://www.w3.org/ns/activitystreams#Public',
+				get_rest_url_by_path( $path ),
+			)
+		);
+		$object->set_cc( $this->get_cc() );
+		$object->set_attachment( $this->get_attachments() );
+		$object->set_tag( $this->get_tags() );
+
+		return $object;
+	}
+
+	/**
+	 * Returns the ID of the Post.
+	 *
+	 * @return string The Posts ID.
+	 */
+	public function get_id() {
+		return $this->get_url();
+	}
+
+	/**
+	 * Returns the URL of the Post.
+	 *
+	 * @return string The Posts URL.
+	 */
+	public function get_url() {
+		$post = $this->wp_post;
+
+		if ( 'trash' === get_post_status( $post ) ) {
+			$permalink = \get_post_meta( $post->ID, 'activitypub_canonical_url', true );
+		} else {
+			$permalink = \get_permalink( $post );
+		}
+
+		return \esc_url( $permalink );
+	}
+
+	/**
+	 * Returns the User-URL of the Author of the Post.
+	 *
+	 * If `single_user` mode is enabled, the URL of the Blog-User is returned.
+	 *
+	 * @return string The User-URL.
+	 */
+	protected function get_attributed_to() {
+		if ( is_single_user() ) {
+			$user = new Blog_User();
+			return $user->get_url();
+		}
+
+		return Users::get_by_id( $this->wp_post->post_author )->get_url();
+	}
+
+	/**
+	 * Returns the Image Attachments for this Post, parsed from blocks.
+	 * @param int $max_images The maximum number of images to return.
+	 * @param array $image_ids The image IDs to append new IDs to.
+	 *
+	 * @return array The image IDs.
+	 */
+	protected function get_block_image_ids( $max_images, $image_ids = [] ) {
+		$blocks = \parse_blocks( $this->wp_post->post_content );
+		return self::get_image_ids_from_blocks( $blocks, $image_ids, $max_images );
+	}
+
+	/**
+	 * Recursively get image IDs from blocks.
+	 * @param array $blocks The blocks to search for image IDs
+	 * @param array $image_ids The image IDs to append new IDs to
+	 * @param int $max_images The maximum number of images to return.
+	 *
+	 * @return array The image IDs.
+	 */
+	protected static function get_image_ids_from_blocks( $blocks, $image_ids, $max_images ) {
+		foreach ( $blocks as $block ) {
+			// recurse into inner blocks
+			if ( ! empty( $block['innerBlocks'] ) ) {
+				$image_ids = self::get_image_ids_from_blocks( $block['innerBlocks'], $image_ids, $max_images );
+			}
+
+			switch ( $block['blockName'] ) {
+				case 'core/image':
+				case 'core/cover':
+					if ( ! empty( $block['attrs']['id'] ) ) {
+						$image_ids[] = $block['attrs']['id'];
+					}
+					break;
+				case 'jetpack/slideshow':
+				case 'jetpack/tiled-gallery':
+					if ( ! empty( $block['attrs']['ids'] ) ) {
+						$image_ids = array_merge( $image_ids, $block['attrs']['ids'] );
+					}
+					break;
+				case 'jetpack/image-compare':
+					if ( ! empty( $block['attrs']['beforeImageId'] ) ) {
+						$image_ids[] = $block['attrs']['beforeImageId'];
+					}
+					if ( ! empty( $block['attrs']['afterImageId'] ) ) {
+						$image_ids[] = $block['attrs']['afterImageId'];
+					}
+					break;
+			}
+
+			// we could be at or over max, stop unneeded work
+			if ( count( $image_ids ) >= $max_images ) {
+				break;
+			}
+		}
+
+		// still need to slice it because one gallery could knock us over the limit
+		return \array_slice( $image_ids, 0, $max_images );
+	}
+
+	/**
+	 * Generates all Image Attachments for a Post.
+	 *
+	 * @return array The Image Attachments.
+	 */
+	protected function get_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->wp_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 ) {
+			// first try to get images that are actually in the post content
+			if ( site_supports_blocks() && \has_blocks( $this->wp_post->post_content ) ) {
+				$block_image_ids = $this->get_block_image_ids( $max_images, $image_ids );
+				$image_ids = \array_merge( $image_ids, $block_image_ids );
+			} else {
+				// fallback to images attached to the post
+				$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 ) {
+			$image_size = 'full';
+
+			/**
+			 * Filter the image URL returned for each post.
+			 *
+			 * @param array|false $thumbnail The image URL, or false if no image is available.
+			 * @param int         $id        The attachment ID.
+			 * @param string      $image_size The image size to retrieve. Set to 'full' by default.
+			 */
+			$thumbnail = apply_filters(
+				'activitypub_get_image',
+				$this->get_image( $id, $image_size ),
+				$id,
+				$image_size
+			);
+
+			if ( $thumbnail ) {
+				$mimetype = \get_post_mime_type( $id );
+				$alt      = \get_post_meta( $id, '_wp_attachment_image_alt', true );
+				$image    = array(
+					'type'      => 'Image',
+					'url'       => $thumbnail[0],
+					'mediaType' => $mimetype,
+				);
+
+				if ( $alt ) {
+					$image['name'] = $alt;
+				}
+				$images[] = $image;
+			}
+		}
+
+		return $images;
+	}
+
+	/**
+	 * Return details about an image attachment.
+	 *
+	 * @param int    $id         The attachment ID.
+	 * @param string $image_size The image size to retrieve. Set to 'full' by default.
+	 *
+	 * @return array|false Array of image data, or boolean false if no image is available.
+	 */
+	protected function get_image( $id, $image_size = 'full' ) {
+		/**
+		 * Hook into the image retrieval process. Before image retrieval.
+		 *
+		 * @param int    $id         The attachment ID.
+		 * @param string $image_size The image size to retrieve. Set to 'full' by default.
+		 */
+		do_action( 'activitypub_get_image_pre', $id, $image_size );
+
+		$thumbnail = \wp_get_attachment_image_src( $id, $image_size );
+
+		/**
+		 * Hook into the image retrieval process. After image retrieval.
+		 *
+		 * @param int    $id         The attachment ID.
+		 * @param string $image_size The image size to retrieve. Set to 'full' by default.
+		 */
+		do_action( 'activitypub_get_image_post', $id, $image_size );
+
+		return $thumbnail;
+	}
+
+	/**
+	 * Returns the ActivityStreams 2.0 Object-Type for a Post based on the
+	 * settings and the Post-Type.
+	 *
+	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#activity-types
+	 *
+	 * @return string The Object-Type.
+	 */
+	protected function get_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->wp_post );
+		switch ( $post_type ) {
+			case 'post':
+				$post_format = \get_post_format( $this->wp_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;
+		}
+
+		return $object_type;
+	}
+
+	/**
+	 * Returns a list of Mentions, used in the Post.
+	 *
+	 * @see https://docs.joinmastodon.org/spec/activitypub/#Mention
+	 *
+	 * @return array The list of Mentions.
+	 */
+	protected function get_cc() {
+		$cc = array();
+
+		$mentions = $this->get_mentions();
+		if ( $mentions ) {
+			foreach ( $mentions as $url ) {
+				$cc[] = $url;
+			}
+		}
+
+		return $cc;
+	}
+
+	/**
+	 * Returns a list of Tags, used in the Post.
+	 *
+	 * This includes Hash-Tags and Mentions.
+	 *
+	 * @return array The list of Tags.
+	 */
+	protected function get_tags() {
+		$tags = array();
+
+		$post_tags = \get_the_tags( $this->wp_post->ID );
+		if ( $post_tags ) {
+			foreach ( $post_tags as $post_tag ) {
+				$tag = array(
+					'type' => 'Hashtag',
+					'href' => \esc_url( \get_tag_link( $post_tag->term_id ) ),
+					'name' => esc_hashtag( $post_tag->name ),
+				);
+				$tags[] = $tag;
+			}
+		}
+
+		$mentions = $this->get_mentions();
+		if ( $mentions ) {
+			foreach ( $mentions as $mention => $url ) {
+				$tag = array(
+					'type' => 'Mention',
+					'href' => \esc_url( $url ),
+					'name' => \esc_html( $mention ),
+				);
+				$tags[] = $tag;
+			}
+		}
+
+		return $tags;
+	}
+
+	/**
+	 * Returns the content for the ActivityPub Item.
+	 *
+	 * The content will be generated based on the user settings.
+	 *
+	 * @return string The content.
+	 */
+	protected function get_content() {
+		global $post;
+
+		/**
+		 * Provides an action hook so plugins can add their own hooks/filters before AP content is generated.
+		 *
+		 * Example: if a plugin adds a filter to `the_content` to add a button to the end of posts, it can also remove that filter here.
+		 *
+		 * @param WP_Post $post The post object.
+		 */
+		do_action( 'activitypub_before_get_content', $post );
+
+		// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+		$post    = $this->wp_post;
+		$content = $this->get_post_content_template();
+
+		// Fill in the shortcodes.
+		setup_postdata( $post );
+		$content = do_shortcode( $content );
+		wp_reset_postdata();
+
+		$content = \wpautop( $content );
+		$content = \preg_replace( '/[\n\r\t]/', '', $content );
+		$content = \trim( $content );
+
+		$content = \apply_filters( 'activitypub_the_content', $content, $post );
+
+		return $content;
+	}
+
+	/**
+	 * Gets the template to use to generate the content of the activitypub item.
+	 *
+	 * @return string The Template.
+	 */
+	protected 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_permalink type=\"html\"]\n\n[ap_hashtags]";
+		}
+
+		return \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT );
+	}
+
+	/**
+	 * Helper function to get the @-Mentions from the post content.
+	 *
+	 * @return array The list of @-Mentions.
+	 */
+	protected function get_mentions() {
+		return apply_filters( 'activitypub_extract_mentions', array(), $this->wp_post->post_content, $this->wp_post );
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/integration/class-buddypress.php

@@ -1,9 +1,17 @@
 <?php
 namespace Activitypub\Integration;
 
+/**
+ * Compatibility with the BuddyPress plugin
+ *
+ * @see https://buddypress.org/
+ */
 class Buddypress {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
 	public static function init() {
-		\add_filter( 'activitypub_json_author_array', array( 'Activitypub\Integration\Buddypress', 'add_user_metadata' ), 11, 2 );
+		\add_filter( 'activitypub_json_author_array', array( self::class, 'add_user_metadata' ), 11, 2 );
 	}
 
 	public static function add_user_metadata( $object, $author_id ) {

wp-content/upgrade-temp-backup/plugins/activitypub/integration/class-nodeinfo.php

@@ -0,0 +1,49 @@
+<?php
+namespace Activitypub\Integration;
+
+/**
+ * Compatibility with the NodeInfo plugin
+ *
+ * @see https://wordpress.org/plugins/nodeinfo/
+ */
+class Nodeinfo {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
+	public static function init() {
+		\add_filter( 'nodeinfo_data', array( self::class, 'add_nodeinfo_discovery' ), 10, 2 );
+		\add_filter( 'nodeinfo2_data', array( self::class, 'add_nodeinfo2_discovery' ), 10 );
+	}
+
+	/**
+	 * Extend NodeInfo data
+	 *
+	 * @param array  $nodeinfo NodeInfo data
+	 * @param string           The NodeInfo Version
+	 *
+	 * @return array The extended array
+	 */
+	public static function add_nodeinfo_discovery( $nodeinfo, $version ) {
+		if ( $version >= '2.0' ) {
+			$nodeinfo['protocols'][] = 'activitypub';
+		} else {
+			$nodeinfo['protocols']['inbound'][]  = 'activitypub';
+			$nodeinfo['protocols']['outbound'][] = 'activitypub';
+		}
+
+		return $nodeinfo;
+	}
+
+	/**
+	 * Extend NodeInfo2 data
+	 *
+	 * @param  array $nodeinfo NodeInfo2 data
+	 *
+	 * @return array The extended array
+	 */
+	public static function add_nodeinfo2_discovery( $nodeinfo ) {
+		$nodeinfo['protocols'][] = 'activitypub';
+
+		return $nodeinfo;
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/integration/class-webfinger.php

@@ -0,0 +1,58 @@
+<?php
+namespace Activitypub\Integration;
+
+use Activitypub\Rest\Webfinger as Webfinger_Rest;
+use Activitypub\Collection\Users as User_Collection;
+
+/**
+ * Compatibility with the WebFinger plugin
+ *
+ * @see https://wordpress.org/plugins/webfinger/
+ */
+class Webfinger {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
+	public static function init() {
+		\add_filter( 'webfinger_user_data', array( self::class, 'add_user_discovery' ), 10, 3 );
+		\add_filter( 'webfinger_data', array( self::class, 'add_pseudo_user_discovery' ), 99, 2 );
+	}
+
+	/**
+	 * 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_user_discovery( $array, $resource, $user ) {
+		$user = User_Collection::get_by_id( $user->ID );
+
+		$array['links'][] = array(
+			'rel'  => 'self',
+			'type' => 'application/activity+json',
+			'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 Webfinger_Rest::get_profile( $resource );
+	}
+}

wp-content/upgrade-temp-backup/plugins/activitypub/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.7
 Requires PHP: 5.6
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -12,54 +12,72 @@ 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. Your readers will be able to follow your blogposts on Mastodon and other federated platforms that support ActivityPub.
+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.
 
-The plugin works with the following federated platforms:
+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/)
+* [Firefish](https://joinfirefish.org/) (rebrand of Calckey)
+
+Some things to note:
+
+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 still resolve 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 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.
+
+Please note that it may take up to 15 minutes or so for the new post to show up in your federated feed. This is because the messages are sent to the federated platforms using a delayed cron. This avoids breaking the publishing process for those cases where users might have lots of followers. So please don’t assume that just because you didn’t see it show up right away that something is broken. Give it some time. In most cases, it will show up within a few minutes, and you’ll know everything is working as expected.
 
 == Frequently Asked Questions ==
 
+= 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 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" =
 
 *ActivityPub for WordPress* extends WordPress with some Fediverse features, but it does not compete with platforms like Friendica or Mastodon. If you want to run a **decentralized social network**, please use [Mastodon](https://joinmastodon.org/) or [GNU social](https://gnusocial.network/).
 
-= What are the differences between this plugin and Pterotype? =
-
-**Compatibility**
-
-*ActivityPub for WordPress* is compatible with OStatus and IndieWeb plugin suites. *Pterotype* is incompatible with the standalone [WebFinger plugin](https://wordpress.org/plugins/webfinger/), so it can't be run together with OStatus.
-
-**Custom tables**
-
-*Pterotype* creates/uses a bunch of custom tables, *ActivityPub for WordPress* only uses the native tables and adds as little meta data as possible.
-
 = What if you are running your blog in a subdirectory? =
 
 In order for webfinger to work, it must be mapped to the root directory of the URL on which your blog resides.
@@ -68,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.
 
@@ -85,7 +103,78 @@ 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.7 =
+
+* Fixed: broken function call
+* Add: filter to hook into "is blog public" check
+
+= 1.0.6 =
+
+* Fixed: more restrictive request verification
+
+= 1.0.5 =
+
+* Fixed: compatibility with WebFinger and NodeInfo plugin
+
+= 1.0.4 =
+
+* Fixed: Constants were not loaded early enough, resulting in a race condition
+* Fixed: Featured image was ignored when using the block editor
+
+= 1.0.3 =
+
+* Fixed: compatibility with older WordPress/PHP versions
+* Update: refactoring of the Plugin init process
+* Update: better frontend UX and improved theme compat for blocks
+* Compatibility: add a ACTIVITYPUB_DISABLE_REWRITES constant
+* Compatibility: add pre-fetch hook to allow plugins to hang filters on
+
+= 1.0.2 =
+
+* Updated: improved hashtag visibility in default template
+* Updated: reduced number of followers to be checked/updated via Cron, when System Cron is not set up
+* Updated: check if username of Blog-User collides with an Authors name
+* Compatibility: improved Group meta informations
+* Fixed: detection of single user mode
+* Fixed: remote delete
+* Fixed: styles in Follow-Me block
+* Fixed: various encoding and formatting issues
+* Fixed: (health) check Author URLs only if Authors are enabled
+
+= 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 =
 
@@ -347,6 +436,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/).

wp-content/upgrade-temp-backup/plugins/activitypub/templates/admin-header.php

@@ -1,9 +1,12 @@
+<?php
+// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+?>
 <div class="activitypub-settings-header">
 	<div class="activitypub-settings-title-section">
 		<h1><?php \esc_html_e( 'ActivityPub', 'activitypub' ); ?></h1>
 	</div>
 
-	<nav class="activitypub-settings-tabs-wrapper hide-if-no-js" aria-label="<?php \esc_attr_e( 'Secondary menu', 'activitypub' ); ?>">
+	<nav class="activitypub-settings-tabs-wrapper" aria-label="<?php \esc_attr_e( 'Secondary menu', 'activitypub' ); ?>">
 		<a href="<?php echo \esc_url_raw( admin_url( 'options-general.php?page=activitypub' ) ); ?>" class="activitypub-settings-tab <?php echo \esc_attr( $args['welcome'] ); ?>">
 			<?php \esc_html_e( 'Welcome', 'activitypub' ); ?>
 		</a>
@@ -11,6 +14,14 @@
 		<a href="<?php echo \esc_url_raw( admin_url( 'options-general.php?page=activitypub&tab=settings' ) ); ?>" class="activitypub-settings-tab <?php echo \esc_attr( $args['settings'] ); ?>">
 			<?php \esc_html_e( 'Settings', 'activitypub' ); ?>
 		</a>
+
+		<?php if ( ! \Activitypub\is_user_disabled( \Activitypub\Collection\Users::BLOG_USER_ID ) ) : ?>
+
+		<a href="<?php echo \esc_url_raw( admin_url( 'options-general.php?page=activitypub&tab=followers' ) ); ?>" class="activitypub-settings-tab <?php echo \esc_attr( $args['followers'] ); ?>">
+			<?php \esc_html_e( 'Followers', 'activitypub' ); ?>
+		</a>
+
+		<?php endif; ?>
 	</nav>
 </div>
 <hr class="wp-header-end">

wp-content/upgrade-temp-backup/plugins/activitypub/templates/author-json.php

@@ -1,92 +1,14 @@
 <?php
-$author_id = \get_the_author_meta( 'ID' );
+$user = \Activitypub\Collection\Users::get_by_id( \get_the_author_meta( 'ID' ) );
 
-$json = new \stdClass();
-
-$json->{'@context'} = \Activitypub\get_context();
-$json->id = \get_author_posts_url( $author_id );
-$json->type = 'Person';
-$json->name = \get_the_author_meta( 'display_name', $author_id );
-$json->summary = \html_entity_decode(
-	\get_the_author_meta( 'description', $author_id ),
-	\ENT_QUOTES,
-	'UTF-8'
+$user->set_context(
+	\Activitypub\Activity\Activity::CONTEXT
 );
-$json->preferredUsername = \get_the_author_meta( 'login', $author_id ); // phpcs:ignore
-$json->url = \get_author_posts_url( $author_id );
-$json->icon = array(
-	'type' => 'Image',
-	'url'  => \get_avatar_url( $author_id, array( 'size' => 120 ) ),
-);
-
-$json->published = \gmdate( 'Y-m-d\TH:i:s\Z', \strtotime( \get_the_author_meta( 'registered', $author_id ) ) );
-
-if ( \has_header_image() ) {
-	$json->image = array(
-		'type' => 'Image',
-		'url'  => \get_header_image(),
-	);
-}
-
-$json->inbox = \get_rest_url( null, "/activitypub/1.0/users/$author_id/inbox" );
-$json->outbox = \get_rest_url( null, "/activitypub/1.0/users/$author_id/outbox" );
-$json->followers = \get_rest_url( null, "/activitypub/1.0/users/$author_id/followers" );
-$json->following = \get_rest_url( null, "/activitypub/1.0/users/$author_id/following" );
-
-$json->manuallyApprovesFollowers = \apply_filters( 'activitypub_json_manually_approves_followers', \__return_false() ); // phpcs:ignore
-
-// phpcs:ignore
-$json->publicKey = array(
-	'id' => \get_author_posts_url( $author_id ) . '#main-key',
-	'owner' => \get_author_posts_url( $author_id ),
-	'publicKeyPem' => \trim( \Activitypub\Signature::get_public_key( $author_id ) ),
-);
-
-$json->tag = array();
-$json->attachment = array();
-
-$json->attachment['blog_url'] = array(
-	'type' => 'PropertyValue',
-	'name' => \__( 'Blog', 'activitypub' ),
-	'value' => \html_entity_decode(
-		'<a rel="me" title="' . \esc_attr( \home_url( '/' ) ) . '" target="_blank" href="' . \home_url( '/' ) . '">' . \wp_parse_url( \home_url( '/' ), \PHP_URL_HOST ) . '</a>',
-		\ENT_QUOTES,
-		'UTF-8'
-	),
-);
-
-$json->attachment['profile_url'] = array(
-	'type' => 'PropertyValue',
-	'name' => \__( 'Profile', 'activitypub' ),
-	'value' => \html_entity_decode(
-		'<a rel="me" title="' . \esc_attr( \get_author_posts_url( $author_id ) ) . '" target="_blank" href="' . \get_author_posts_url( $author_id ) . '">' . \wp_parse_url( \get_author_posts_url( $author_id ), \PHP_URL_HOST ) . '</a>',
-		\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(
-			'<a rel="me" title="' . \esc_attr( \get_the_author_meta( 'user_url', $author_id ) ) . '" target="_blank" href="' . \get_the_author_meta( 'user_url', $author_id ) . '">' . \wp_parse_url( \get_the_author_meta( 'user_url', $author_id ), \PHP_URL_HOST ) . '</a>',
-			\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 @@ $options |= \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT;
  *
  * @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() );

wp-content/upgrade-temp-backup/plugins/activitypub/templates/blog-json.php

@@ -1,66 +1,14 @@
 <?php
-$json = new \stdClass();
+$user = new \Activitypub\Model\Blog_User();
 
-$json->{'@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(
-		'<a rel="me" title="' . \esc_attr( \home_url( '/' ) ) . '" target="_blank" href="' . \home_url( '/' ) . '">' . \wp_parse_url( \home_url( '/' ), \PHP_URL_HOST ) . '</a>',
-		\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 @@ $options |= \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT;
  *
  * @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() );

wp-content/upgrade-temp-backup/plugins/activitypub/templates/blog-user-followers-list.php

@@ -0,0 +1,28 @@
+<?php
+\load_template(
+	__DIR__ . '/admin-header.php',
+	true,
+	array(
+		'settings' => '',
+		'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' );
+?>
+<div class="wrap activitypub-followers-page">
+	<p><?php \printf( \esc_html( $followers_template ), \esc_attr( $follower_count ) ); ?></p>
+
+	<form method="get">
+		<input type="hidden" name="page" value="activitypub" />
+		<input type="hidden" name="tab" value="followers" />
+		<?php
+		$table->prepare_items();
+		$table->display();
+		?>
+		<?php wp_nonce_field( 'activitypub-followers-list', '_apnonce' ); ?>
+		</form>
+</div>

wp-content/upgrade-temp-backup/plugins/activitypub/templates/followers-list.php

@@ -1,16 +0,0 @@
-<div class="wrap">
-	<h1><?php \esc_html_e( 'Followers (Fediverse)', 'activitypub' ); ?></h1>
-
-	<?php // translators: ?>
-	<p><?php \printf( \esc_html__( 'You currently have %s followers.', 'activitypub' ), \esc_attr( \Activitypub\Peer\Followers::count_followers( \get_current_user_id() ) ) ); ?></p>
-
-	<?php $token_table = new \Activitypub\Table\Followers_List(); ?>
-
-	<form method="get">
-		<input type="hidden" name="page" value="indieauth_user_token" />
-		<?php
-		$token_table->prepare_items();
-		$token_table->display();
-		?>
-		</form>
-</div>

wp-content/upgrade-temp-backup/plugins/activitypub/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 );

wp-content/upgrade-temp-backup/plugins/activitypub/templates/settings.php

@@ -1,180 +1,263 @@
 <?php
 \load_template(
-	\dirname( __FILE__ ) . '/admin-header.php',
+	__DIR__ . '/admin-header.php',
 	true,
 	array(
-		'settings' => 'active',
-		'welcome' => '',
+		'settings'  => 'active',
+		'welcome'   => '',
+		'followers' => '',
 	)
 );
 ?>
 
-<div class="privacy-settings-body hide-if-no-js">
-	<div class="notice notice-info">
-		<p>
-			<?php
-			echo \wp_kses(
-				\sprintf(
-					// translators:
-					\__( 'If you have problems using this plugin, please check the <a href="%s">Site Health</a> 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'
-			);
-			?>
-		</p>
-	</div>
-
-	<p><?php \esc_html_e( 'Customize your ActivityPub settings to suit your needs.', 'activitypub' ); ?></p>
-
+<div class="activitypub-settings activitypub-settings-page hide-if-no-js">
 	<form method="post" action="options.php">
 		<?php \settings_fields( 'activitypub' ); ?>
 
-		<h3><?php \esc_html_e( 'Activities', 'activitypub' ); ?></h3>
+		<div class="box">
+			<h3><?php \esc_html_e( 'Profiles', 'activitypub' ); ?></h3>
+			<table class="form-table">
+				<tbody>
+					<tr>
+						<th scope="row">
+							<?php \esc_html_e( 'Enable profiles by type', 'activitypub' ); ?>
+						</th>
+						<td>
+							<p>
+								<label>
+									<input type="checkbox" name="activitypub_enable_users" id="activitypub_enable_users" value="1" <?php echo \checked( '1', \get_option( 'activitypub_enable_users', '1' ) ); ?> />
+									<?php \esc_html_e( 'Enable authors', 'activitypub' ); ?>
+								</label>
+							</p>
+							<p class="description">
+								<?php echo \wp_kses( \__( 'Every author on this blog (with the <code>publish_posts</code> capability) gets their own ActivityPub profile.', 'activitypub' ), array( 'code' => array() ) ); ?>
+							</p>
+							<p>
+								<label>
+									<input type="checkbox" name="activitypub_enable_blog_user" id="activitypub_enable_blog_user" value="1" <?php echo \checked( '1', \get_option( 'activitypub_enable_blog_user', '0' ) ); ?> />
+									<?php \esc_html_e( 'Enable blog', 'activitypub' ); ?>
+								</label>
+							</p>
+							<p class="description">
+								<?php \esc_html_e( 'Your blog becomes an ActivityPub profile.', 'activitypub' ); ?>
+							</p>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<?php \esc_html_e( 'Change blog profile ID', 'activitypub' ); ?>
+						</th>
+						<td>
+							<label for="activitypub_blog_user_identifier">
+								<input class="blog-user-identifier" name="activitypub_blog_user_identifier" id="activitypub_blog_user_identifier" type="text" value="<?php echo esc_attr( \get_option( 'activitypub_blog_user_identifier', \Activitypub\Model\Blog_User::get_default_username() ) ); ?>" />
+								@<?php echo esc_html( \wp_parse_url( \home_url(), PHP_URL_HOST ) ); ?>
+							</label>
+							<p class="description">
+								<?php \esc_html_e( 'This profile name will federate all posts written on your blog, regardless of the author who posted it.', 'activitypub' ); ?>
+							</p>
+							<p>
+								<strong>
+									<?php \esc_html_e( 'Please avoid using an existing author’s name as the blog profile ID. Fediverse platforms might use caching and this could break the functionality completely.', 'activitypub' ); ?>
+								</strong>
+							</p>
+						</td>
+					</tr>
+				</tbody>
+			</table>
 
-		<p><?php \esc_html_e( 'All activity related settings.', 'activitypub' ); ?></p>
+			<?php \do_settings_fields( 'activitypub', 'user' ); ?>
+		</div>
 
-		<table class="form-table">
-			<tbody>
-				<tr>
-					<th scope="row">
-						<?php \esc_html_e( 'Post-Content', 'activitypub' ); ?>
-					</th>
-					<td>
-						<p>
-							<label><input type="radio" name="activitypub_post_content_type" id="activitypub_post_content_type_title_link" value="title" <?php echo \checked( 'title', \get_option( 'activitypub_post_content_type', 'content' ) ); ?> /> <?php \esc_html_e( 'Title and link', 'activitypub' ); ?></label> - <span class="description"><?php \esc_html_e( 'Only the title and a link.', 'activitypub' ); ?></span>
-						</p>
-						<p>
-							<label><input type="radio" name="activitypub_post_content_type" id="activitypub_post_content_type_excerpt" value="excerpt" <?php echo \checked( 'excerpt', \get_option( 'activitypub_post_content_type', 'content' ) ); ?> /> <?php \esc_html_e( 'Excerpt', 'activitypub' ); ?></label> - <span class="description"><?php \esc_html_e( 'A content summary, shortened to 400 characters and without markup.', 'activitypub' ); ?></span>
-						</p>
-						<p>
-							<label><input type="radio" name="activitypub_post_content_type" id="activitypub_post_content_type_content" value="content" <?php echo \checked( 'content', \get_option( 'activitypub_post_content_type', 'content' ) ); ?> /> <?php \esc_html_e( 'Content (default)', 'activitypub' ); ?></label> - <span class="description"><?php \esc_html_e( 'The full content.', 'activitypub' ); ?></span>
-						</p>
-						<p>
-							<label><input type="radio" name="activitypub_post_content_type" id="activitypub_post_content_type_custom" value="custom" <?php echo \checked( 'custom', \get_option( 'activitypub_post_content_type', 'content' ) ); ?> /> <?php \esc_html_e( 'Custom', 'activitypub' ); ?></label> - <span class="description"><?php \esc_html_e( 'Use the text-area below, to customize your activities.', 'activitypub' ); ?></span>
-						</p>
-						<p>
-							<textarea name="activitypub_custom_post_content" id="activitypub_custom_post_content" rows="10" cols="50" class="large-text" placeholder="<?php echo wp_kses( ACTIVITYPUB_CUSTOM_POST_CONTENT, 'post' ); ?>"><?php echo wp_kses( \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT ), 'post' ); ?></textarea>
-							<details>
-								<summary><?php esc_html_e( 'See a list of ActivityPub Template Tags.', 'activitypub' ); ?></summary>
-								<div class="description">
-									<ul>
-										<li><code>[ap_title]</code> - <?php \esc_html_e( 'The post\'s title.', 'activitypub' ); ?></li>
-										<li><code>[ap_content]</code> - <?php \esc_html_e( 'The post\'s content.', 'activitypub' ); ?></li>
-										<li><code>[ap_excerpt]</code> - <?php \esc_html_e( 'The post\'s excerpt (default 400 chars).', 'activitypub' ); ?></li>
-										<li><code>[ap_permalink]</code> - <?php \esc_html_e( 'The post\'s permalink.', 'activitypub' ); ?></li>
-										<li><code>[ap_shortlink]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>.', 'activitypub' ), 'default' ); ?></li>
-										<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The post\'s tags as hashtags.', 'activitypub' ); ?></li>
-										<li><code>[ap_hashcats]</code> - <?php \esc_html_e( 'The post\'s categories as hashtags.', 'activitypub' ); ?></li>
-										<li><code>[ap_image]</code> - <?php \esc_html_e( 'The URL for the post\'s featured image.', 'activitypub' ); ?></li>
-									</ul>
-									<p><?php \esc_html_e( 'You can find the full list with all possible attributes in the help section on the top-right of the screen.', 'activitypub' ); ?></p>
-								</div>
-							</details>
-						</p>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row">
-						<?php \esc_html_e( 'Number of images', 'activitypub' ); ?>
-					</th>
-					<td>
-						<input value="<?php echo esc_attr( \get_option( 'activitypub_max_image_attachments', ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS ) ); ?>" name="activitypub_max_image_attachments" id="activitypub_max_image_attachments" type="number" min="0" />
-						<p class="description">
-							<?php
-							echo \wp_kses(
-								\sprintf(
-									// translators:
-									\__( 'The number of images to attach to posts. Default: <code>%s</code>', 'activitypub' ),
-									\esc_html( ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS )
-								),
-								'default'
-							);
-							?>
-						</p>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row">
-						<?php \esc_html_e( 'Activity-Object-Type', 'activitypub' ); ?>
-					</th>
-					<td>
-						<p>
-							<label><input type="radio" name="activitypub_object_type" id="activitypub_object_type_note" value="note" <?php echo \checked( 'note', \get_option( 'activitypub_object_type', 'note' ) ); ?> /> <?php \esc_html_e( 'Note (default)', 'activitypub' ); ?></label> - <span class="description"><?php \esc_html_e( 'Should work with most platforms.', 'activitypub' ); ?></span>
-						</p>
-						<p>
-							<label><input type="radio" name="activitypub_object_type" id="activitypub_object_type_article" value="article" <?php echo \checked( 'article', \get_option( 'activitypub_object_type', 'note' ) ); ?> /> <?php \esc_html_e( 'Article', 'activitypub' ); ?></label> - <span class="description"><?php \esc_html_e( 'The presentation of the "Article" might change on different platforms. Mastodon for example shows the "Article" type as a simple link.', 'activitypub' ); ?></span>
-						</p>
-						<p>
-							<label><input type="radio" name="activitypub_object_type" id="activitypub_object_type" value="wordpress-post-format" <?php echo \checked( 'wordpress-post-format', \get_option( 'activitypub_object_type', 'note' ) ); ?> /> <?php \esc_html_e( 'WordPress Post-Format', 'activitypub' ); ?></label> - <span class="description"><?php \esc_html_e( 'Maps the WordPress Post-Format to the ActivityPub Object Type.', 'activitypub' ); ?></span>
-						</p>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"><?php \esc_html_e( 'Supported post types', 'activitypub' ); ?></th>
-					<td>
-						<fieldset>
-							<?php \esc_html_e( 'Enable ActivityPub support for the following post types:', 'activitypub' ); ?>
+		<div class="box">
+			<h3><?php \esc_html_e( 'Activities', 'activitypub' ); ?></h3>
+			<table class="form-table">
+				<tbody>
+					<tr>
+						<th scope="row">
+							<?php \esc_html_e( 'Post content', 'activitypub' ); ?>
+						</th>
+						<td>
+							<p>
+								<label for="activitypub_post_content_type_title_link">
+									<input type="radio" name="activitypub_post_content_type" id="activitypub_post_content_type_title_link" value="title" <?php echo \checked( 'title', \get_option( 'activitypub_post_content_type', 'content' ) ); ?> />
+									<?php \esc_html_e( 'Title and link', 'activitypub' ); ?>
+									-
+									<span class="description">
+										<?php \esc_html_e( 'Only the title and a link.', 'activitypub' ); ?>
+									</span>
+								</label>
+							</p>
+							<p>
+								<label for="activitypub_post_content_type_excerpt">
+									<input type="radio" name="activitypub_post_content_type" id="activitypub_post_content_type_excerpt" value="excerpt" <?php echo \checked( 'excerpt', \get_option( 'activitypub_post_content_type', 'content' ) ); ?> />
+									<?php \esc_html_e( 'Excerpt', 'activitypub' ); ?>
+									-
+									<span class="description">
+										<?php \esc_html_e( 'A content summary, shortened to 400 characters and without markup.', 'activitypub' ); ?>
+									</span>
+								</label>
+							</p>
+							<p>
+								<label for="activitypub_post_content_type_content">
+									<input type="radio" name="activitypub_post_content_type" id="activitypub_post_content_type_content" value="content" <?php echo \checked( 'content', \get_option( 'activitypub_post_content_type', 'content' ) ); ?> />
+									<?php \esc_html_e( 'Content (default)', 'activitypub' ); ?>
+									-
+									<span class="description">
+										<?php \esc_html_e( 'The full content.', 'activitypub' ); ?>
+									</span>
+								</label>
+							</p>
+							<p>
+								<label for="activitypub_post_content_type_custom">
+									<input type="radio" name="activitypub_post_content_type" id="activitypub_post_content_type_custom" value="custom" <?php echo \checked( 'custom', \get_option( 'activitypub_post_content_type', 'content' ) ); ?> />
+									<?php \esc_html_e( 'Custom', 'activitypub' ); ?>
+									-
+									<span class="description">
+										<?php \esc_html_e( 'Use the text area below, to customize your activities.', 'activitypub' ); ?>
+									</span>
+								</label>
+							</p>
+							<p>
+								<textarea name="activitypub_custom_post_content" id="activitypub_custom_post_content" rows="10" cols="50" class="large-text" placeholder="<?php echo wp_kses( ACTIVITYPUB_CUSTOM_POST_CONTENT, 'post' ); ?>"><?php echo wp_kses( \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT ), 'post' ); ?></textarea>
+								<details>
+									<summary><?php esc_html_e( 'See a list of ActivityPub Template Tags.', 'activitypub' ); ?></summary>
+									<div class="description">
+										<ul>
+											<li><code>[ap_title]</code> - <?php \esc_html_e( 'The post\'s title.', 'activitypub' ); ?></li>
+											<li><code>[ap_content]</code> - <?php \esc_html_e( 'The post\'s content.', 'activitypub' ); ?></li>
+											<li><code>[ap_excerpt]</code> - <?php \esc_html_e( 'The post\'s excerpt (default 400 chars).', 'activitypub' ); ?></li>
+											<li><code>[ap_permalink]</code> - <?php \esc_html_e( 'The post\'s permalink.', 'activitypub' ); ?></li>
+											<li><code>[ap_shortlink]</code> - <?php echo \wp_kses( \__( 'The post\'s shortlink. I can recommend <a href="https://wordpress.org/plugins/hum/" target="_blank">Hum</a>.', 'activitypub' ), 'default' ); ?></li>
+											<li><code>[ap_hashtags]</code> - <?php \esc_html_e( 'The post\'s tags as hashtags.', 'activitypub' ); ?></li>
+										</ul>
+										<p><?php \esc_html_e( 'You can find the full list with all possible attributes in the help section on the top-right of the screen.', 'activitypub' ); ?></p>
+									</div>
+								</details>
+							</p>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<?php \esc_html_e( 'Number of images', 'activitypub' ); ?>
+						</th>
+						<td>
+							<input value="<?php echo esc_attr( \get_option( 'activitypub_max_image_attachments', ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS ) ); ?>" name="activitypub_max_image_attachments" id="activitypub_max_image_attachments" type="number" min="0" />
+							<p class="description">
+								<?php
+								echo \wp_kses(
+									\sprintf(
+										// translators:
+										\__( 'The number of images to attach to posts. Default: <code>%s</code>', 'activitypub' ),
+										\esc_html( ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS )
+									),
+									'default'
+								);
+								?>
+							</p>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<?php \esc_html_e( 'Activity-Object-Type', 'activitypub' ); ?>
+						</th>
+						<td>
+							<p>
+								<label for="activitypub_object_type_note">
+									<input type="radio" name="activitypub_object_type" id="activitypub_object_type_note" value="note" <?php echo \checked( 'note', \get_option( 'activitypub_object_type', 'note' ) ); ?> />
+									<?php \esc_html_e( 'Note (default)', 'activitypub' ); ?>
+									-
+									<span class="description">
+										<?php \esc_html_e( 'Should work with most platforms.', 'activitypub' ); ?>
+									</span>
+								</label>
+							</p>
+							<p><strong><?php \esc_html_e( 'Please note that the following "Activity-Object-Type" options may cause your texts to be displayed differently on each platform and/or parts may be completely ignored. Mastodon, for example, displays all content that is not of the "Note" type as links only.', 'activitypub' ); ?></strong></p>
+							<p>
+								<label for="activitypub_object_type_article">
+									<input type="radio" name="activitypub_object_type" id="activitypub_object_type_article" value="article" <?php echo \checked( 'article', \get_option( 'activitypub_object_type', 'note' ) ); ?> />
+									<?php \esc_html_e( 'Article', 'activitypub' ); ?>
+									-
+									<span class="description">
+										<?php \esc_html_e( 'The presentation of the "Article" might change on different platforms.', 'activitypub' ); ?>
+									</span>
+								</label>
+							</p>
+							<p>
+								<label>
+									<input type="radio" name="activitypub_object_type" id="activitypub_object_type" value="wordpress-post-format" <?php echo \checked( 'wordpress-post-format', \get_option( 'activitypub_object_type', 'note' ) ); ?> />
+									<?php \esc_html_e( 'WordPress Post-Format', 'activitypub' ); ?>
+									-
+									<span class="description">
+										<?php \esc_html_e( 'Maps the WordPress Post-Format to the ActivityPub Object Type.', 'activitypub' ); ?>
+									</span>
+								</label>
+							</p>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row"><?php \esc_html_e( 'Supported post types', 'activitypub' ); ?></th>
+						<td>
+							<fieldset>
+								<?php \esc_html_e( 'Enable ActivityPub support for the following post types:', 'activitypub' ); ?>
 
-							<?php $post_types = \get_post_types( array( 'public' => true ), 'objects' ); ?>
-							<?php $support_post_types = \get_option( 'activitypub_support_post_types', array( 'post', 'page' ) ) ? \get_option( 'activitypub_support_post_types', array( 'post', 'page' ) ) : array(); ?>
-							<ul>
-							<?php // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited ?>
-							<?php foreach ( $post_types as $post_type ) { ?>
-								<li>
-									<input type="checkbox" id="activitypub_support_post_types" name="activitypub_support_post_types[]" value="<?php echo \esc_attr( $post_type->name ); ?>" <?php echo \checked( true, \in_array( $post_type->name, $support_post_types, true ) ); ?> />
-									<label for="<?php echo \esc_attr( $post_type->name ); ?>"><?php echo \esc_html( $post_type->label ); ?></label>
-								</li>
-							<?php } ?>
-							</ul>
-						</fieldset>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row">
-						<?php \esc_html_e( 'Hashtags (beta)', 'activitypub' ); ?>
-					</th>
-					<td>
-						<p>
-							<label><input type="checkbox" name="activitypub_use_hashtags" id="activitypub_use_hashtags" value="1" <?php echo \checked( '1', \get_option( 'activitypub_use_hashtags', '1' ) ); ?> /> <?php echo wp_kses( \__( 'Add hashtags in the content as native tags and replace the <code>#tag</code> with the tag-link. <strong>This feature is experimental! Please disable it, if you find any HTML or CSS errors.</strong>', 'activitypub' ), 'default' ); ?></label>
-						</p>
-					</td>
-				</tr>
-			</tbody>
-		</table>
+								<?php $post_types = \get_post_types( array( 'public' => true ), 'objects' ); ?>
+								<?php $support_post_types = \get_option( 'activitypub_support_post_types', array( 'post', 'page' ) ) ? \get_option( 'activitypub_support_post_types', array( 'post', 'page' ) ) : array(); ?>
+								<ul>
+								<?php // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited ?>
+								<?php foreach ( $post_types as $post_type ) { ?>
+									<li>
+										<input type="checkbox" id="activitypub_support_post_type_<?php echo \esc_attr( $post_type->name ); ?>" name="activitypub_support_post_types[]" value="<?php echo \esc_attr( $post_type->name ); ?>" <?php echo \checked( \in_array( $post_type->name, $support_post_types, true ) ); ?> />
+										<label for="activitypub_support_post_type_<?php echo \esc_attr( $post_type->name ); ?>"><?php echo \esc_html( $post_type->label ); ?></label>
+									</li>
+								<?php } ?>
+								</ul>
+							</fieldset>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<?php \esc_html_e( 'Hashtags (beta)', 'activitypub' ); ?>
+						</th>
+						<td>
+							<p>
+								<label><input type="checkbox" name="activitypub_use_hashtags" id="activitypub_use_hashtags" value="1" <?php echo \checked( '1', \get_option( 'activitypub_use_hashtags', '1' ) ); ?> /> <?php echo wp_kses( \__( 'Add hashtags in the content as native tags and replace the <code>#tag</code> with the tag link. <strong>This feature is experimental! Please disable it, if you find any HTML or CSS errors.</strong>', 'activitypub' ), 'default' ); ?></label>
+							</p>
+						</td>
+					</tr>
+				</tbody>
+			</table>
 
-		<?php \do_settings_fields( 'activitypub', 'activity' ); ?>
+			<?php \do_settings_fields( 'activitypub', 'activity' ); ?>
+		</div>
 
-		<h3><?php \esc_html_e( 'Server', 'activitypub' ); ?></h3>
-
-		<p><?php \esc_html_e( 'Server related settings.', 'activitypub' ); ?></p>
-
-		<table class="form-table">
-			<tbody>
-				<tr>
-					<th scope="row">
-						<?php \esc_html_e( 'Blocklist', 'activitypub' ); ?>
-					</th>
-					<td>
-						<p class="description">
-							<?php
-							echo \wp_kses(
-								\sprintf(
-									// translators: %s is a URL.
-									\__( 'To block servers, add the host of the server to the "<a href="%s">Disallowed Comment Keys</a>" list.', 'activitypub' ),
-									\esc_attr( \admin_url( 'options-discussion.php#disallowed_keys' ) )
-								),
-								'default'
-							);
-							?>
-						</p>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-
-		<?php \do_settings_fields( 'activitypub', 'server' ); ?>
+		<div class="box">
+			<h3><?php \esc_html_e( 'Server', 'activitypub' ); ?></h3>
+			<table class="form-table">
+				<tbody>
+					<tr>
+						<th scope="row">
+							<?php \esc_html_e( 'Blocklist', 'activitypub' ); ?>
+						</th>
+						<td>
+							<p class="description">
+								<?php
+								echo \wp_kses(
+									\sprintf(
+										// translators: %s is a URL.
+										\__( 'To block servers, add the host of the server to the "<a href="%s">Disallowed Comment Keys</a>" list.', 'activitypub' ),
+										\esc_attr( \admin_url( 'options-discussion.php#disallowed_keys' ) )
+									),
+									'default'
+								);
+								?>
+							</p>
+						</td>
+					</tr>
+				</tbody>
+			</table>
 
+			<?php \do_settings_fields( 'activitypub', 'server' ); ?>
+		</div>
 		<?php \do_settings_sections( 'activitypub' ); ?>
 
 		<?php \submit_button(); ?>

wp-content/upgrade-temp-backup/plugins/activitypub/templates/user-followers-list.php

@@ -0,0 +1,21 @@
+<?php
+
+$follower_count = \Activitypub\Collection\Followers::count_followers( \get_current_user_id() );
+// translators: The follower count.
+$followers_template = _n( 'Your author profile currently has %s follower.', 'Your author profile currently has %s followers.', $follower_count, 'activitypub' );
+?>
+<div class="wrap">
+	<h1><?php \esc_html_e( 'Author Followers', 'activitypub' ); ?></h1>
+	<p><?php \printf( \esc_html( $followers_template ), \esc_attr( $follower_count ) ); ?></p>
+
+	<?php $table = new \Activitypub\Table\Followers(); ?>
+
+	<form method="get">
+		<input type="hidden" name="page" value="activitypub-followers-list" />
+		<?php
+		$table->prepare_items();
+		$table->display();
+		?>
+		<?php wp_nonce_field( 'activitypub-followers-list', '_apnonce' ); ?>
+		</form>
+</div>

wp-content/upgrade-temp-backup/plugins/activitypub/templates/user-settings.php

@@ -0,0 +1,32 @@
+<?php
+// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+$user = \Activitypub\Collection\Users::get_by_id( \get_current_user_id() ); ?>
+<h2 id="activitypub"><?php \esc_html_e( 'ActivityPub', 'activitypub' ); ?></h2>
+
+<table class="form-table">
+	<tbody>
+		<tr>
+			<th scope="row">
+				<label><?php \esc_html_e( 'Profile URL', 'activitypub' ); ?></label>
+			</th>
+			<td>
+				<p>
+					<code><?php echo \esc_html( $user->get_resource() ); ?></code> or
+					<code><?php echo \esc_url( $user->get_url() ); ?></code>
+				</p>
+				<?php // translators: the webfinger resource ?>
+				<p class="description"><?php \printf( \esc_html__( 'Follow "@%s" by searching for it on Mastodon, Friendica, etc.', 'activitypub' ), \esc_html( $user->get_resource() ) ); ?></p>
+			</td>
+		</tr>
+		<tr class="activitypub-user-description-wrap">
+			<th>
+				<label for="activitypub-user-description"><?php \esc_html_e( 'Biography', 'activitypub' ); ?></label>
+			</th>
+			<td>
+				<textarea name="activitypub-user-description" id="activitypub-user-description" rows="5" cols="30" placeholder="<?php echo \esc_html( get_user_meta( \get_current_user_id(), 'description', true ) ); ?>"><?php echo \esc_html( $args['description'] ); ?></textarea>
+				<p class="description"><?php \esc_html_e( 'If you wish to use different biographical info for the fediverse, enter your alternate bio here.', 'activitypub' ); ?></p>
+			</td>
+			<?php wp_nonce_field( 'activitypub-user-description', '_apnonce' ); ?>
+		</tr>
+	</tbody>
+</table>

wp-content/upgrade-temp-backup/plugins/activitypub/templates/welcome.php

@@ -1,55 +1,113 @@
 <?php
 \load_template(
-	\dirname( __FILE__ ) . '/admin-header.php',
+	__DIR__ . '/admin-header.php',
 	true,
 	array(
-		'settings' => '',
-		'welcome' => 'active',
+		'settings'  => '',
+		'welcome'   => 'active',
+		'followers' => '',
 	)
 );
 ?>
 
-<div class="privacy-settings-body hide-if-no-js">
-	<h2><?php \esc_html_e( 'Welcome', 'activitypub' ); ?></h2>
+<div class="activitypub-settings activitypub-welcome-page hide-if-no-js">
+	<div class="box">
+		<h2><?php \esc_html_e( 'Welcome', 'activitypub' ); ?></h2>
 
-	<p><?php \esc_html_e( 'With ActivityPub your blog becomes part of a federated social network. This means you can share and talk to everyone using the ActivityPub protocol, including users of Friendica, Pleroma and Mastodon.', 'activitypub' ); ?></p>
-	<p>
-		<?php
-		echo wp_kses(
-			\sprintf(
-				// translators:
-				\__(
-					'People can follow you by using the username <code>%1$s</code> or the URL <code>%2$s</code>. Users who can not access this settings page will find their username on the <a href="%3$s">Edit Profile</a> page.',
-					'activitypub'
+		<p><?php echo wp_kses( \__( 'Enter the fediverse with <strong>ActivityPub</strong>, broadcasting your blog to a wider audience. Attract followers, deliver updates, and receive comments from a diverse user base on <strong>Mastodon</strong>, <strong>Friendica</strong>, <strong>Pleroma</strong>, <strong>Pixelfed</strong>, and all <strong>ActivityPub</strong>-compliant platforms.', 'activitypub' ), array( 'strong' => array() ) ); ?></p>
+	</div>
+
+	<?php
+	if ( ! \Activitypub\is_user_disabled( \Activitypub\Collection\Users::BLOG_USER_ID ) ) :
+		$blog_user = new \Activitypub\Model\Blog_User();
+		?>
+	<div class="box">
+		<h3><?php \esc_html_e( 'Blog profile', 'activitypub' ); ?></h3>
+		<p>
+			<?php \esc_html_e( 'People can follow your blog by using:', 'activitypub' ); ?>
+		</p>
+		<p>
+			<label for="activitypub-blog-identifier"><?php \esc_html_e( 'Username', 'activitypub' ); ?></label>
+		</p>
+		<p>
+			<input type="text" class="regular-text" id="activitypub-blog-identifier" value="<?php echo \esc_attr( $blog_user->get_resource() ); ?>" readonly />
+		</p>
+		<p>
+			<label for="activitypub-blog-url"><?php \esc_html_e( 'Profile URL', 'activitypub' ); ?></label>
+		</p>
+		<p>
+			<input type="text" class="regular-text" id="activitypub-blog-url" value="<?php echo \esc_attr( $blog_user->get_url() ); ?>" readonly />
+		</p>
+		<p>
+			<?php \esc_html_e( 'This blog profile will federate all posts written on your blog, regardless of the author who posted it.', 'activitypub' ); ?>
+		<p>
+		<p>
+			<a href="<?php echo \esc_url_raw( \admin_url( '/options-general.php?page=activitypub&tab=settings' ) ); ?>">
+				<?php \esc_html_e( 'Customize the blog profile', 'activitypub' ); ?>
+			</a>
+		</p>
+	</div>
+	<?php endif; ?>
+
+	<?php
+	if ( ! \Activitypub\is_user_disabled( get_current_user_id() ) ) :
+		$user = \Activitypub\Collection\Users::get_by_id( wp_get_current_user()->ID );
+		?>
+	<div class="box">
+		<h3><?php \esc_html_e( 'Author profile', 'activitypub' ); ?></h3>
+		<p>
+			<?php \esc_html_e( 'People can follow you by using your author name:', 'activitypub' ); ?>
+		</p>
+		<p>
+			<label for="activitypub-user-identifier"><?php \esc_html_e( 'Username', 'activitypub' ); ?></label>
+		</p>
+		<p>
+			<input type="text" class="regular-text" id="activitypub-user-identifier" value="<?php echo \esc_attr( $user->get_resource() ); ?>" readonly />
+		</p>
+		<p>
+			<label for="activitypub-user-url"><?php \esc_html_e( 'Profile URL', 'activitypub' ); ?></label>
+		</p>
+		<p>
+			<input type="text" class="regular-text" id="activitypub-user-url" value="<?php echo \esc_attr( $user->get_url() ); ?>" readonly />
+		</p>
+		<p>
+			<?php \esc_html_e( 'Authors who can not access this settings page will find their username on the "Edit Profile" page.', 'activitypub' ); ?>
+		<p>
+		<p>
+			<a href="<?php echo \esc_url_raw( \admin_url( '/profile.php#activitypub' ) ); ?>">
+			<?php \esc_html_e( 'Customize username on "Edit Profile" page.', 'activitypub' ); ?>
+			</a>
+		</p>
+	</div>
+	<?php endif; ?>
+
+	<div class="box">
+		<h3><?php \esc_html_e( 'Troubleshooting', 'activitypub' ); ?></h3>
+		<p>
+			<?php
+			echo wp_kses(
+				\sprintf(
+					/* translators: the placeholder is the Site Health URL */
+					\__(
+						'If you have problems using this plugin, please check the <a href="%s">Site Health</a> page to ensure that your site is compatible and/or use the "Help" tab (in the top right of the settings pages).',
+						'activitypub'
+					),
+					\esc_url_raw( admin_url( 'site-health.php' ) )
 				),
-				\esc_attr( \Activitypub\get_webfinger_resource( wp_get_current_user()->ID ) ),
-				\esc_url_raw( \get_author_posts_url( wp_get_current_user()->ID ) ),
-				\esc_url_raw( \admin_url( 'profile.php#activitypub' ) )
-			),
-			'default'
-		);
-		?>
-	</p>
-	<p>
-		<?php
-		echo wp_kses(
-			\sprintf(
-				// translators:
-				\__( 'If you have problems using this plugin, please check the <a href="%s">Site Health</a> 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'
-		);
-		?>
-	</p>
+				'default'
+			);
+			?>
+		</p>
+	</div>
 
-	<hr />
-
-	<h3><?php \esc_html_e( 'Recommended Plugins', 'activitypub' ); ?></h3>
-
-	<p><?php \esc_html_e( 'ActivityPub works as is and there is no need for you to install additional plugins, nevertheless there are some plugins that extends the functionality of ActivityPub.', 'activitypub' ); ?></p>
+	<?php if ( ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS ) : ?>
+	<div class="box plugin-recommendations">
+		<h3><?php \esc_html_e( 'Recommended Plugins', 'activitypub' ); ?></h3>
 
+		<p><?php \esc_html_e( 'ActivityPub works as is and there is no need for you to install additional plugins, nevertheless there are some plugins that extends the functionality of ActivityPub.', 'activitypub' ); ?></p>
+	</div>
 	<div class="activitypub-settings-accordion">
+		<?php if ( ! \defined( 'FRIENDS_VERSION' ) ) : ?>
 		<h4 class="activitypub-settings-accordion-heading">
 			<button aria-expanded="true" class="activitypub-settings-accordion-trigger" aria-controls="activitypub-settings-accordion-block-friends-plugin" type="button">
 				<span class="title"><?php \esc_html_e( 'Following Others', 'activitypub' ); ?></span>
@@ -58,8 +116,10 @@
 		</h4>
 		<div id="activitypub-settings-accordion-block-friends-plugin" class="activitypub-settings-accordion-panel plugin-card-friends">
 			<p><?php \esc_html_e( 'To follow people on Mastodon or similar platforms using your own WordPress, you can use the Friends Plugin for WordPress which uses this plugin to receive posts and display them on your own WordPress, thus making your own WordPress a Fediverse instance of its own.', 'activitypub' ); ?></p>
-			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=friends&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install the Friends Plugin for WordPress', 'activitypub' ); ?></a></p>
+			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=friends&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install the Friends Plugin', 'activitypub' ); ?></a></p>
 		</div>
+		<?php endif; ?>
+		<?php if ( ! \class_exists( 'Hum' ) ) : ?>
 		<h4 class="activitypub-settings-accordion-heading">
 			<button aria-expanded="false" class="activitypub-settings-accordion-trigger" aria-controls="activitypub-settings-accordion-block-activitypub-hum-plugin" type="button">
 				<span class="title"><?php \esc_html_e( 'Add a URL Shortener', 'activitypub' ); ?></span>
@@ -68,8 +128,10 @@
 		</h4>
 		<div id="activitypub-settings-accordion-block-activitypub-hum-plugin" class="activitypub-settings-accordion-panel plugin-card-hum" hidden="hidden">
 			<p><?php \esc_html_e( 'Hum is a personal URL shortener for WordPress, designed to provide short URLs to your personal content, both hosted on WordPress and elsewhere.', 'activitypub' ); ?></p>
-			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=hum&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install Hum Plugin for WordPress', 'activitypub' ); ?></a></p>
+			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=hum&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install the Hum Plugin', 'activitypub' ); ?></a></p>
 		</div>
+		<?php endif; ?>
+		<?php if ( ! \class_exists( 'Webfinger' ) ) : ?>
 		<h4 class="activitypub-settings-accordion-heading">
 			<button aria-expanded="false" class="activitypub-settings-accordion-trigger" aria-controls="activitypub-settings-accordion-block-activitypub-webfinger-plugin" type="button">
 				<span class="title"><?php \esc_html_e( 'Advanced WebFinger Support', 'activitypub' ); ?></span>
@@ -79,8 +141,10 @@
 		<div id="activitypub-settings-accordion-block-activitypub-webfinger-plugin" class="activitypub-settings-accordion-panel plugin-card-webfinger" hidden="hidden">
 			<p><?php \esc_html_e( 'WebFinger is a protocol that allows for discovery of information about people and things identified by a URI. Information about a person might be discovered via an "acct:" URI, for example, which is a URI that looks like an email address.', 'activitypub' ); ?></p>
 			<p><?php \esc_html_e( 'The ActivityPub plugin comes with basic WebFinger support, if you need more configuration options and compatibility with other Fediverse/IndieWeb plugins, please install the WebFinger plugin.', 'activitypub' ); ?></p>
-			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=webfinger&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install WebFinger Plugin for WordPress', 'activitypub' ); ?></a></p>
+			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=webfinger&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install the WebFinger Plugin', 'activitypub' ); ?></a></p>
 		</div>
+		<?php endif; ?>
+		<?php if ( ! \function_exists( 'nodeinfo_init' ) ) : ?>
 		<h4 class="activitypub-settings-accordion-heading">
 			<button aria-expanded="false" class="activitypub-settings-accordion-trigger" aria-controls="activitypub-settings-accordion-block-activitypub-nodeinfo-plugin" type="button">
 				<span class="title"><?php \esc_html_e( 'Provide Enhanced Information about Your Blog', 'activitypub' ); ?></span>
@@ -90,7 +154,9 @@
 		<div id="activitypub-settings-accordion-block-activitypub-nodeinfo-plugin" class="activitypub-settings-accordion-panel plugin-card-nodeinfo" hidden="hidden">
 			<p><?php \esc_html_e( 'NodeInfo is an effort to create a standardized way of exposing metadata about a server running one of the distributed social networks. The two key goals are being able to get better insights into the user base of distributed social networking and the ability to build tools that allow users to choose the best fitting software and server for their needs.', 'activitypub' ); ?></p>
 			<p><?php \esc_html_e( 'The ActivityPub plugin comes with a simple NodeInfo endpoint. If you need more configuration options and compatibility with other Fediverse plugins, please install the NodeInfo plugin.', 'activitypub' ); ?></p>
-			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=nodeinfo&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install NodeInfo Plugin for WordPress', 'activitypub' ); ?></a></p>
+			<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=nodeinfo&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install the NodeInfo Plugin', 'activitypub' ); ?></a></p>
 		</div>
+		<?php endif; ?>
 	</div>
+	<?php endif; ?>
 </div>

wp-content/upgrade-temp-backup/plugins/authldap/LICENSE.md

@@ -1,7 +0,0 @@
-Copyright <YEAR> <COPYRIGHT HOLDER>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

wp-content/upgrade-temp-backup/plugins/authldap/README.md

@@ -1,95 +0,0 @@
-# authLDAP
-
-[![Join the chat at https://gitter.im/heiglandreas/authLdap](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/heiglandreas/authLdap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-Use your existing LDAP as authentication-backend for your wordpress!
-
-[![Build Status](https://travis-ci.org/heiglandreas/authLdap.svg?branch=master)](https://travis-ci.org/heiglandreas/authLdap)
-[![WordPress Stats](https://img.shields.io/wordpress/plugin/dt/authldap.svg)](https://wordpress.org/plugins/authldap/stats/)
-[![WordPress Version](https://img.shields.io/wordpress/plugin/v/authldap.svg)](https://wordpress.org/plugins/authldap/)
-[![WordPress testet](https://img.shields.io/wordpress/v/authldap.svg)](https://wordpress.org/plugins/authldap/)
-[![Code Climate](https://codeclimate.com/github/heiglandreas/authLdap/badges/gpa.svg)](https://codeclimate.com/github/heiglandreas/authLdap)
-[![Test Coverage](https://codeclimate.com/github/heiglandreas/authLdap/badges/coverage.svg)](https://codeclimate.com/github/heiglandreas/authLdap)
-
-So what are the differences to other Wordpress-LDAP-Authentication-Plugins?
-
-* **Flexible**: You are totaly free in which LDAP-backend to use. Due to the extensive configuration you can
-freely decide how to do the authentication of your users. It simply depends on your
-filters
-* **Independent**: As soon as a user logs in, it is added/updated to the Wordpress' user-database
-to allow wordpress to always use the correct data. You only have to administer your users once.
-* **Failsafe**: Due to the users being created in Wordpress' User-database they can
-also log in when the LDAP-backend currently is gone.
-* **Role-Aware**: You can map Wordpress' roles to values of an existing LDAP-attribute.
-
-## How does the plugin work?
-
-Well, as a matter of fact it is rather simple. The plugin verifies, that the user
-seeking authentification can bind to the LDAP using the provided password.
-
-If that is so, the user is either created or updated in the wordpress-user-database.
-This update includes the provided password (so the wordpress can authenticate users
-even without the LDAP), the users name according to the authLDAP-preferences and
-the status of the user depending on the groups-settings of the authLDAP-preferences
-
-Writing this plugin would not have been as easy as it has been, without the
-wonderfull plugin of Alistair Young from http://www.weblogs.uhi.ac.uk/sm00ay/?p=45
-
-## Configuration
-
-### Usage Settings
-
-* **Enable Authentication via LDAP** Whether you want to enable authLdap for login or not
-* **debug authLdap** When you have problems with authentication via LDAP you can enable a debugging mode here.
-* **Save entered Password** Decide whether passwords will be cached in your wordpress-installation. **Attention:** Without the cache your users will not be able to log into your site when your LDAP is down!
-
-### Server Settings
-
-* **LDAP Uri** This is the URI where your ldap-backend can be reached. More information are actually on the Configuration page
-* **Filter** This is the real McCoy! The filter you define here specifies how a user will be found. Before applying the filter a %s will be replaced with the given username. This means, when a user logs in using ‘foobar’ as username the following happens:
-
-    * **uid=%1$s** check for any LDAP-Entry that has an attribute ‘uid’ with value ‘foobar’
-    * **(&(objectclass=posixAccount)(|(uid=%1$s)(mail=%1$s)))** check for any LDAP-Entry that has an attribute ‘objectclass’ with value ‘posixAccout’ and either a UID- or a mail-attribute with value ‘foobar’
-
-    This filter is rather powerfull if used wisely.
-
-### Creating Users
-
-* **Name-Attribute** Which Attribute from the LDAP contains the Full or the First name of the user trying to log in. This defaults to name
-* **Second Name Attribute** If the above Name-Attribute only contains the First Name of the user you can here specify an Attribute that contains the second name. This field is empty by default
-* **User-ID Attribute** This field will be used as login-name for wordpress. Please give the Attribute, that is used to identify the user. This should be the same as you used in the above Filter-Option. This field defaults to uid
-* **Mail Attribute** Which Attribute holds the eMail-Address of the user? If more than one eMail-Address are stored in the LDAP, only the first given is used. This field defaults to mail
-* **Web-Attribute** If your users have a personal page (URI) stored in the LDAP, it can be provided here. This field is empty by default
-
-### User-Groups for Roles
-
-* **Group-Attribute** This is the attribute that defines the Group-ID that can be matched against the Groups defined further down This field defaults to gidNumber.
-* **Group-Filter** Here you can add the filter for selecting groups for the currentlly logged in user The Filter should contain the string %s which will be replaced by the login-name of the currently logged in
-
-
-## FAQ
-
-<dl>
-    <dt>Can I change a users password with this plugin?</dt>
-    <dd>Short Answer: <strong>No</strong>!<br>Long Answer: As the users credentials are not
-    only used for a wordpress-site when you authenticate against an LDAP but for
-    many other services also chances are great that there is a centralized place
-    where password-changes shall be made. We'll later allow inclusion of a link
-    to such a place but currently it's not available. And as password-hashing and
-    where to store it requires deeper insight into the LDAP-Server then most users
-    have and admins are willing to give, password changes are out of scope of this
-    plugin. If you know exactyl what you do, you might want to have a look at
-    <a href="https://github.com/heiglandreas/authLdap/issues/54#issuecomment-125851029">
-    issue 54</a>
-    wherer a way of adding it is described!
-    </dd>
-    <dt>Can I add a user to the LDAP when she creates a user-account on wordpress?</dt>
-    <dd>Short Answer: <strong>No</strong>!<br>Long Answer: Even though that is technically possible
-    it's not in the scope of this plugin. As creating a user in an LDAP often involves
-    an administrative process that has already been implemented in your departments
-    administration it doesn't make sense to rebuild that - in most cases highly
-    individual - process in this plugin. If you know exactly what you do, have a look at
-    <a href="https://github.com/heiglandreas/authLdap/issues/65">issue 65</a>
-    where <a href="https://github.com/wtfiwtz">wtfiwtz</a> shows how to implement that feature.
-    </dd>
-    </dl>

wp-content/upgrade-temp-backup/plugins/authldap/authLdap.css

@@ -1,13 +0,0 @@
-.row {
-	overflow: hidden;
-	padding-top: 10px;
-}
-
-.element {
-	float: right;
-	text-align: left;
-}
-
-.authldap-options input[type=text] {
-	width: 100%;
-}

wp-content/upgrade-temp-backup/plugins/authldap/authLdap.php

@@ -1,886 +0,0 @@
-<?php
-/*
-Plugin Name: AuthLDAP
-Plugin URI: https://github.com/heiglandreas/authLdap
-Description: This plugin allows you to use your existing LDAP as authentication base for WordPress
-Version: 2.5.2
-Author: Andreas Heigl <andreas@heigl.org>
-Author URI: http://andreas.heigl.org
-License: MIT
-License URI: https://opensource.org/licenses/MIT
-*/
-
-// phpcs:disable PSR1.Files.SideEffects
-
-use Org_Heigl\AuthLdap\LdapUri;
-
-require_once dirname(__FILE__) . '/ldap.php';
-require_once __DIR__ . '/src/LdapUri.php';
-require_once __DIR__ . '/src/Exception/Error.php';
-require_once __DIR__ . '/src/Exception/InvalidLdapUri.php';
-
-function authLdap_debug($message)
-{
-    if (authLdap_get_option('Debug')) {
-        error_log('[AuthLDAP] ' . $message, 0);
-    }
-}
-
-
-function authLdap_addmenu()
-{
-    if (! is_multisite()) {
-        add_options_page(
-            'AuthLDAP',
-            'AuthLDAP',
-            'manage_options',
-            basename(__FILE__),
-            'authLdap_options_panel'
-        );
-    } else {
-        add_submenu_page(
-            'settings.php',
-            'AuthLDAP',
-            'AuthLDAP',
-            'manage_options',
-            'authldap',
-            'authLdap_options_panel'
-        );
-    }
-}
-
-function authLdap_get_post($name, $default = '')
-{
-    return isset($_POST[$name]) ? $_POST[$name] : $default;
-}
-
-function authLdap_options_panel()
-{
-    // inclusde style sheet
-    wp_enqueue_style('authLdap-style', plugin_dir_url(__FILE__) . 'authLdap.css');
-
-    if (($_SERVER['REQUEST_METHOD'] == 'POST') && array_key_exists('ldapOptionsSave', $_POST)) {
-        $new_options = array(
-            'Enabled'       => authLdap_get_post('authLDAPAuth', false),
-            'CachePW'       => authLdap_get_post('authLDAPCachePW', false),
-            'URI'           => authLdap_get_post('authLDAPURI'),
-            'URISeparator'  => authLdap_get_post('authLDAPURISeparator'),
-            'StartTLS'      => authLdap_get_post('authLDAPStartTLS', false),
-            'Filter'        => authLdap_get_post('authLDAPFilter'),
-            'NameAttr'      => authLdap_get_post('authLDAPNameAttr'),
-            'SecName'       => authLdap_get_post('authLDAPSecName'),
-            'UidAttr'       => authLdap_get_post('authLDAPUidAttr'),
-            'MailAttr'      => authLdap_get_post('authLDAPMailAttr'),
-            'WebAttr'       => authLdap_get_post('authLDAPWebAttr'),
-            'Groups'        => authLdap_get_post('authLDAPGroups', array()),
-            'GroupSeparator'=> authLdap_get_post('authLDAPGroupSeparator', ','),
-            'Debug'         => authLdap_get_post('authLDAPDebug', false),
-            'GroupBase'     => authLdap_get_post('authLDAPGroupBase'),
-            'GroupAttr'     => authLdap_get_post('authLDAPGroupAttr'),
-            'GroupFilter'   => authLdap_get_post('authLDAPGroupFilter'),
-            'DefaultRole'   => authLdap_get_post('authLDAPDefaultRole'),
-            'GroupEnable'   => authLdap_get_post('authLDAPGroupEnable', false),
-            'GroupOverUser' => authLdap_get_post('authLDAPGroupOverUser', false),
-            'DoNotOverwriteNonLdapUsers' => authLdap_get_post('authLDAPDoNotOverwriteNonLdapUsers', false),
-			'UserRead' => authLdap_get_post('authLDAPUseUserAccount', false),
-        );
-        if (authLdap_set_options($new_options)) {
-            echo "<div class='updated'><p>Saved Options!</p></div>";
-        } else {
-            echo "<div class='error'><p>Could not save Options!</p></div>";
-        }
-    }
-
-    // Do some initialization for the admin-view
-    $authLDAP              = authLdap_get_option('Enabled');
-    $authLDAPCachePW       = authLdap_get_option('CachePW');
-    $authLDAPURI           = authLdap_get_option('URI');
-    $authLDAPURISeparator  = authLdap_get_option('URISeparator');
-    $authLDAPStartTLS      = authLdap_get_option('StartTLS');
-    $authLDAPFilter        = authLdap_get_option('Filter');
-    $authLDAPNameAttr      = authLdap_get_option('NameAttr');
-    $authLDAPSecName       = authLdap_get_option('SecName');
-    $authLDAPMailAttr      = authLdap_get_option('MailAttr');
-    $authLDAPUidAttr       = authLdap_get_option('UidAttr');
-    $authLDAPWebAttr       = authLdap_get_option('WebAttr');
-    $authLDAPGroups        = authLdap_get_option('Groups');
-    $authLDAPGroupSeparator= authLdap_get_option('GroupSeparator');
-    $authLDAPDebug         = authLdap_get_option('Debug');
-    $authLDAPGroupBase     = authLdap_get_option('GroupBase');
-    $authLDAPGroupAttr     = authLdap_get_option('GroupAttr');
-    $authLDAPGroupFilter   = authLdap_get_option('GroupFilter');
-    $authLDAPDefaultRole   = authLdap_get_option('DefaultRole');
-    $authLDAPGroupEnable   = authLdap_get_option('GroupEnable');
-    $authLDAPGroupOverUser = authLdap_get_option('GroupOverUser');
-    $authLDAPDoNotOverwriteNonLdapUsers = authLdap_get_option('DoNotOverwriteNonLdapUsers');
-	$authLDAPUseUserAccount= authLdap_get_option('UserRead');
-
-    $tChecked              = ($authLDAP)               ? ' checked="checked"' : '';
-    $tDebugChecked         = ($authLDAPDebug)          ? ' checked="checked"' : '';
-    $tPWChecked            = ($authLDAPCachePW)        ? ' checked="checked"' : '';
-    $tGroupChecked         = ($authLDAPGroupEnable)    ? ' checked="checked"' : '';
-    $tGroupOverUserChecked = ($authLDAPGroupOverUser)  ? ' checked="checked"' : '';
-    $tStartTLSChecked      = ($authLDAPStartTLS)       ? ' checked="checked"' : '';
-    $tDoNotOverwriteNonLdapUsers = ($authLDAPDoNotOverwriteNonLdapUsers)       ? ' checked="checked"' : '';
-	$tUserRead             = ($authLDAPUseUserAccount) ? ' checked="checked"' : '';
-
-    $roles = new WP_Roles();
-
-    $action = $_SERVER['REQUEST_URI'];
-    if (! extension_loaded('ldap')) {
-        echo '<div class="warning">The LDAP-Extension is not available on your '
-            . 'WebServer. Therefore Everything you can alter here does not '
-            . 'make any sense!</div>';
-    }
-
-    include dirname(__FILE__) . '/view/admin.phtml';
-}
-
-/**
- * get a LDAP server object
- *
- * throws exception if there is a problem connecting
- *
- * @conf boolean authLDAPDebug true, if debugging should be turned on
- * @conf string  authLDAPURI LDAP server URI
- *
- * @return Org_Heigl\AuthLdap\LdapList LDAP server object
- */
-function authLdap_get_server()
-{
-    static $_ldapserver = null;
-    if (is_null($_ldapserver)) {
-        $authLDAPDebug = authLdap_get_option('Debug');
-        $authLDAPURI   = explode(
-            authLdap_get_option('URISeparator', ' '),
-            authLdap_get_option('URI')
-        );
-        $authLDAPStartTLS = authLdap_get_option('StartTLS');
-
-        //$authLDAPURI = 'ldap:/foo:bar@server/trallala';
-        authLdap_debug('connect to LDAP server');
-        require_once dirname(__FILE__) . '/src/LdapList.php';
-        $_ldapserver = new \Org_Heigl\AuthLdap\LdapList();
-        foreach ($authLDAPURI as $uri) {
-            $_ldapserver->addLdap(new \Org_Heigl\AuthLdap\LDAP(
-                LdapUri::fromString($uri),
-                $authLDAPDebug,
-                $authLDAPStartTLS
-            ));
-        }
-    }
-    return $_ldapserver;
-}
-
-
-/**
- * This method authenticates a user using either the LDAP or, if LDAP is not
- * available, the local database
- *
- * For this we store the hashed passwords in the WP_Database to ensure working
- * conditions even without an LDAP-Connection
- *
- * @param null|WP_User|WP_Error
- * @param string $username
- * @param string $password
- * @param boolean $already_md5
- * @return boolean true, if login was successfull or false, if it wasn't
- * @conf boolean authLDAP true, if authLDAP should be used, false if not. Defaults to false
- * @conf string authLDAPFilter LDAP filter to use to find correct user, defaults to '(uid=%s)'
- * @conf string authLDAPNameAttr LDAP attribute containing user (display) name, defaults to 'name'
- * @conf string authLDAPSecName LDAP attribute containing second name, defaults to ''
- * @conf string authLDAPMailAttr LDAP attribute containing user e-mail, defaults to 'mail'
- * @conf string authLDAPUidAttr LDAP attribute containing user id (the username we log on with), defaults to 'uid'
- * @conf string authLDAPWebAttr LDAP attribute containing user website, defaults to ''
- * @conf string authLDAPDefaultRole default role for authenticated user, defaults to ''
- * @conf boolean authLDAPGroupEnable true, if we try to map LDAP groups to Wordpress roles
- * @conf boolean authLDAPGroupOverUser true, if LDAP Groups have precedence over existing user roles
- */
-function authLdap_login($user, $username, $password, $already_md5 = false)
-{
-    // don't do anything when authLDAP is disabled
-    if (! authLdap_get_option('Enabled')) {
-        authLdap_debug(
-            'LDAP disabled in AuthLDAP plugin options (use the first option in the AuthLDAP options to enable it)'
-        );
-        return $user;
-    }
-
-    // If the user has already been authenticated (only in that case we get a
-    // WP_User-Object as $user) we skip LDAP-authentication and simply return
-    // the existing user-object
-    if ($user instanceof WP_User) {
-        authLdap_debug(sprintf(
-            'User %s has already been authenticated - skipping LDAP-Authentication',
-            $user->get('nickname')
-        ));
-        return $user;
-    }
-
-    authLdap_debug("User '$username' logging in");
-
-    if ($username == 'admin') {
-        authLdap_debug('Doing nothing for possible local user admin');
-        return $user;
-    }
-
-    global $wpdb, $error;
-    try {
-        $authLDAP               = authLdap_get_option('Enabled');
-        $authLDAPFilter         = authLdap_get_option('Filter');
-        $authLDAPNameAttr       = authLdap_get_option('NameAttr');
-        $authLDAPSecName        = authLdap_get_option('SecName');
-        $authLDAPMailAttr       = authLdap_get_option('MailAttr');
-        $authLDAPUidAttr        = authLdap_get_option('UidAttr');
-        $authLDAPWebAttr        = authLdap_get_option('WebAttr');
-        $authLDAPDefaultRole    = authLdap_get_option('DefaultRole');
-        $authLDAPGroupEnable    = authLdap_get_option('GroupEnable');
-        $authLDAPGroupOverUser  = authLdap_get_option('GroupOverUser');
-		$authLDAPUseUserAccount = authLdap_get_option('UserRead');
-
-        if (! $username) {
-            authLdap_debug('Username not supplied: return false');
-            return false;
-        }
-
-        if (! $password) {
-            authLdap_debug('Password not supplied: return false');
-            $error = __('<strong>Error</strong>: The password field is empty.');
-            return false;
-        }
-        // First check for valid values and set appropriate defaults
-        if (! $authLDAPFilter) {
-            $authLDAPFilter = '(uid=%s)';
-        }
-        if (! $authLDAPNameAttr) {
-            $authLDAPNameAttr = 'name';
-        }
-        if (! $authLDAPMailAttr) {
-            $authLDAPMailAttr = 'mail';
-        }
-        if (! $authLDAPUidAttr) {
-            $authLDAPUidAttr = 'uid';
-        }
-
-        // If already_md5 is TRUE, then we're getting the user/password from the cookie. As we don't want
-        // to store LDAP passwords in any
-        // form, we've already replaced the password with the hashed username and LDAP_COOKIE_MARKER
-        if ($already_md5) {
-            if ($password == md5($username).md5($ldapCookieMarker)) {
-                authLdap_debug('cookie authentication');
-                return true;
-            }
-        }
-
-        // Remove slashes as noted on https://github.com/heiglandreas/authLdap/issues/108
-        $password = stripslashes_deep($password);
-
-        // No cookie, so have to authenticate them via LDAP
-        $result = false;
-        try {
-            authLdap_debug('about to do LDAP authentication');
-            $result = authLdap_get_server()->Authenticate($username, $password, $authLDAPFilter);
-        } catch (Exception $e) {
-            authLdap_debug('LDAP authentication failed with exception: ' . $e->getMessage());
-            return false;
-        }
-
-		// Make optional querying from the admin account #213
-        if (! authLdap_get_option('UserRead')) {
-			// Rebind with the default credentials after the user has been loged in
-			// Otherwise the credentials of the user trying to login will be used
-			// This fixes #55
-			authLdap_get_server()->bind();
-		}
-
-        if (true !== $result) {
-            authLdap_debug('LDAP authentication failed');
-            // TODO what to return? WP_User object, true, false, even an WP_Error object...
-            // all seem to fall back to normal wp user authentication
-            return;
-        }
-
-        authLdap_debug('LDAP authentication successful');
-        $attributes = array_values(
-            array_filter(
-                apply_filters(
-                    'authLdap_filter_attributes',
-                    array(
-                        $authLDAPNameAttr,
-                        $authLDAPSecName,
-                        $authLDAPMailAttr,
-                        $authLDAPWebAttr,
-                        $authLDAPUidAttr
-                    )
-                )
-            )
-        );
-
-        try {
-            $attribs = authLdap_get_server()->search(
-                sprintf($authLDAPFilter, $username),
-                $attributes
-            );
-            // First get all the relevant group informations so we can see if
-            // whether have been changes in group association of the user
-            if (! isset($attribs[0]['dn'])) {
-                authLdap_debug('could not get user attributes from LDAP');
-                throw new UnexpectedValueException('dn has not been returned');
-            }
-            if (! isset($attribs[0][strtolower($authLDAPUidAttr)][0])) {
-                authLdap_debug('could not get user attributes from LDAP');
-                throw new UnexpectedValueException('The user-ID attribute has not been returned');
-            }
-
-            $dn = $attribs[0]['dn'];
-            $realuid = $attribs[0][strtolower($authLDAPUidAttr)][0];
-        } catch (Exception $e) {
-            authLdap_debug('Exception getting LDAP user: ' . $e->getMessage());
-            return false;
-        }
-
-        $uid = authLdap_get_uid($realuid);
-
-        // This fixes #172
-        if (true == authLdap_get_option('DoNotOverwriteNonLdapUsers', false)) {
-            if (! get_user_meta($uid, 'authLDAP')) {
-                return null;
-            }
-        }
-
-        $role = '';
-
-        // we only need this if either LDAP groups are disabled or
-        // if the WordPress role of the user overrides LDAP groups
-        if (!$authLDAPGroupEnable || !$authLDAPGroupOverUser) {
-            $role = authLdap_user_role($uid);
-        }
-
-        // do LDAP group mapping if needed
-        // (if LDAP groups override worpress user role, $role is still empty)
-        if (empty($role) && $authLDAPGroupEnable) {
-            $role = authLdap_groupmap($realuid, $dn);
-            authLdap_debug('role from group mapping: ' . $role);
-        }
-
-        // if we don't have a role yet, use default role
-        if (empty($role) && !empty($authLDAPDefaultRole)) {
-            authLdap_debug('no role yet, set default role');
-            $role = $authLDAPDefaultRole;
-        }
-
-        if (empty($role)) {
-            // Sorry, but you are not in any group that is allowed access
-            trigger_error('no group found');
-            authLdap_debug('user is not in any group that is allowed access');
-            return false;
-        } else {
-            $roles = new WP_Roles();
-            // not sure if this is needed, but it can't hurt
-            if (!$roles->is_role($role)) {
-                trigger_error('no group found');
-                authLdap_debug('role is invalid');
-                return false;
-            }
-        }
-
-        // from here on, the user has access!
-        // now, lets update some user details
-        $user_info = array();
-        $user_info['user_login'] = $realuid;
-        $user_info['role'] = $role;
-        $user_info['user_email'] = '';
-        $user_info['user_nicename'] = '';
-
-        // first name
-        if (isset($attribs[0][strtolower($authLDAPNameAttr)][0])) {
-            $user_info['first_name'] = $attribs[0][strtolower($authLDAPNameAttr)][0];
-        }
-
-        // last name
-        if (isset($attribs[0][strtolower($authLDAPSecName)][0])) {
-            $user_info['last_name'] = $attribs[0][strtolower($authLDAPSecName)][0];
-        }
-
-        // mail address
-        if (isset($attribs[0][strtolower($authLDAPMailAttr)][0])) {
-            $user_info['user_email'] = $attribs[0][strtolower($authLDAPMailAttr)][0];
-        }
-
-        // website
-        if (isset($attribs[0][strtolower($authLDAPWebAttr)][0])) {
-            $user_info['user_url'] = $attribs[0][strtolower($authLDAPWebAttr)][0];
-        }
-        // display name, nickname, nicename
-        if (array_key_exists('first_name', $user_info)) {
-            $user_info['display_name'] = $user_info['first_name'];
-            $user_info['nickname'] = $user_info['first_name'];
-            $user_info['user_nicename'] = sanitize_title_with_dashes($user_info['first_name']);
-            if (array_key_exists('last_name', $user_info)) {
-                $user_info['display_name'] .= ' ' . $user_info['last_name'];
-                $user_info['nickname'] .= ' ' . $user_info['last_name'];
-                $user_info['user_nicename'] .= '_' . sanitize_title_with_dashes($user_info['last_name']);
-            }
-        }
-        $user_info['user_nicename'] = substr($user_info['user_nicename'], 0, 50);
-
-        // optionally store the password into the wordpress database
-        if (authLdap_get_option('CachePW')) {
-            // Password will be hashed inside wp_update_user or wp_insert_user
-            $user_info['user_pass'] = $password;
-        } else {
-            // clear the password
-            $user_info['user_pass'] = '';
-        }
-
-        // add uid if user exists
-        if ($uid) {
-            // found user in the database
-            authLdap_debug('The LDAP user has an entry in the WP-Database');
-            $user_info['ID'] = $uid;
-            unset($user_info['display_name'], $user_info['nickname']);
-            $userid = wp_update_user($user_info);
-        } else {
-            // new wordpress account will be created
-            authLdap_debug('The LDAP user does not have an entry in the WP-Database, a new WP account will be created');
-
-            $userid = wp_insert_user($user_info);
-        }
-
-        // if the user exists, wp_insert_user will update the existing user record
-        if (is_wp_error($userid)) {
-            authLdap_debug('Error creating user : ' . $userid->get_error_message());
-            trigger_error('Error creating user: ' . $userid->get_error_message());
-            return $userid;
-        }
-
-        /**
-         * Add hook for custom updates
-         *
-         * @param int $userid User ID.
-         * @param array $attribs[0] Attributes retrieved from LDAP for the user.
-         */
-        do_action('authLdap_login_successful', $userid, $attribs[0]);
-
-        authLdap_debug('user id = ' . $userid);
-
-        // flag the user as an ldap user so we can hide the password fields in the user profile
-        update_user_meta($userid, 'authLDAP', true);
-
-        // return a user object upon positive authorization
-        return new WP_User($userid);
-    } catch (Exception $e) {
-        authLdap_debug($e->getMessage() . '. Exception thrown in line ' . $e->getLine());
-        trigger_error($e->getMessage() . '. Exception thrown in line ' . $e->getLine());
-    }
-}
-
-/**
- * Get user's user id
- *
- * Returns null if username not found
- *
- * @param string $username username
- * @param string user id, null if not found
- */
-function authLdap_get_uid($username)
-{
-    global $wpdb;
-
-    // find out whether the user is already present in the database
-    $uid = $wpdb->get_var(
-        $wpdb->prepare(
-            "SELECT ID FROM {$wpdb->users} WHERE user_login = %s",
-            $username
-        )
-    );
-    if ($uid) {
-        authLdap_debug("Existing user, uid = {$uid}");
-        return $uid;
-    } else {
-        return  null;
-    }
-}
-
-/**
- * Get the user's current role
- *
- * Returns empty string if not found.
- *
- * @param int $uid wordpress user id
- * @return string role, empty if none found
- */
-function authLdap_user_role($uid)
-{
-    global $wpdb, $wp_roles;
-
-    if (!$uid) {
-        return '';
-    }
-
-    /** @var array<string, bool> $usercapabilities */
-    $usercapabilities = get_user_meta( $uid, "{$wpdb->prefix}capabilities", true);
-    if ( ! is_array( $usercapabilities ) ) {
-        return '';
-    }
-
-    /** @var array<string, array{name: string, capabilities: array<mixed>} $editable_roles */
-    $editable_roles = $wp_roles->roles;
-
-    // By using this approach we are now using the order of the roles from the WP_Roles object
-    // and not from the capabilities any more.
-    $userroles = array_keys(array_intersect_key($editable_roles, $usercapabilities));
-    $role = $userroles[0];
-
-    authLdap_debug("Existing user's role: {$role}");
-    return $role;
-}
-
-/**
- * Get LDAP groups for user and map to role
- *
- * @param string $username
- * @param string $dn
- * @return string role, empty string if no mapping found, first found role otherwise
- * @conf array authLDAPGroups, associative array, role => ldap_group
- * @conf string authLDAPGroupBase, base dn to look up groups
- * @conf string authLDAPGroupAttr, ldap attribute that holds name of group
- * @conf string authLDAPGroupFilter, LDAP filter to find groups. can contain %s and %dn% placeholders
- */
-function authLdap_groupmap($username, $dn)
-{
-    $authLDAPGroups         = authLdap_sort_roles_by_capabilities(
-        authLdap_get_option('Groups')
-    );
-    $authLDAPGroupBase      = authLdap_get_option('GroupBase');
-    $authLDAPGroupAttr      = authLdap_get_option('GroupAttr');
-    $authLDAPGroupFilter    = authLdap_get_option('GroupFilter');
-    $authLDAPGroupSeparator = authLdap_get_option('GroupSeparator');
-    if (! $authLDAPGroupAttr) {
-        $authLDAPGroupAttr = 'gidNumber';
-    }
-    if (! $authLDAPGroupFilter) {
-        $authLDAPGroupFilter = '(&(objectClass=posixGroup)(memberUid=%s))';
-    }
-    if (! $authLDAPGroupSeparator) {
-        $authLDAPGroupSeparator = ',';
-    }
-
-    if (!is_array($authLDAPGroups) || count(array_filter(array_values($authLDAPGroups))) == 0) {
-        authLdap_debug('No group names defined');
-        return '';
-    }
-
-    try {
-        // To allow searches based on the DN instead of the uid, we replace the
-        // string %dn% with the users DN.
-        $authLDAPGroupFilter = str_replace(
-            '%dn%',
-            ldap_escape($dn, '', LDAP_ESCAPE_FILTER),
-            $authLDAPGroupFilter
-        );
-        authLdap_debug('Group Filter: ' . json_encode($authLDAPGroupFilter));
-        authLdap_debug('Group Base: ' . $authLDAPGroupBase);
-        $groups = authLdap_get_server()->search(
-            sprintf($authLDAPGroupFilter, ldap_escape($username, '', LDAP_ESCAPE_FILTER)),
-            array($authLDAPGroupAttr),
-            $authLDAPGroupBase
-        );
-    } catch (Exception $e) {
-        authLdap_debug('Exception getting LDAP group attributes: ' . $e->getMessage());
-        return '';
-    }
-
-    $grp = array();
-    for ($i = 0; $i < $groups ['count']; $i++) {
-        for ($k = 0; $k < $groups[$i][strtolower($authLDAPGroupAttr)]['count']; $k++) {
-            $grp[] = $groups[$i][strtolower($authLDAPGroupAttr)][$k];
-        }
-    }
-
-    authLdap_debug('LDAP groups: ' . json_encode($grp));
-
-    // Check whether the user is member of one of the groups that are
-    // allowed acces to the blog. If the user is not member of one of
-    // The groups throw her out! ;-)
-    // If the user is member of more than one group only the first one
-    // will be taken into account!
-
-    $role = '';
-    foreach ($authLDAPGroups as $key => $val) {
-        $currentGroup = explode($authLDAPGroupSeparator, $val);
-        // Remove whitespaces around the group-ID
-        $currentGroup = array_map('trim', $currentGroup);
-        if (0 < count(array_intersect($currentGroup, $grp))) {
-            $role = $key;
-            break;
-        }
-    }
-
-    authLdap_debug("Role from LDAP group: {$role}");
-    return $role;
-}
-
-/**
- * This function disables the password-change fields in the users preferences.
- *
- * It does not make sense to authenticate via LDAP and then allow the user to
- * change the password only in the wordpress database. And changing the password
- * LDAP-wide can not be the scope of Wordpress!
- *
- * Whether the user is an LDAP-User or not is determined using the authLDAP-Flag
- * of the users meta-informations
- *
- * @return false, if the user whose prefs are viewed is an LDAP-User, true if
- * he isn't
- * @conf boolean authLDAP
- */
-function authLdap_show_password_fields($return, $user)
-{
-    if (! $user) {
-        return true;
-    }
-
-    if (get_user_meta($user->ID, 'authLDAP')) {
-        return false;
-    }
-
-    return $return;
-}
-
-/**
- * This function disables the password reset for a user.
- *
- * It does not make sense to authenticate via LDAP and then allow the user to
- * reset the password only in the wordpress database. And changing the password
- * LDAP-wide can not be the scope of Wordpress!
- *
- * Whether the user is an LDAP-User or not is determined using the authLDAP-Flag
- * of the users meta-informations
- *
- * @author chaplina (https://github.com/chaplina)
- * @conf boolean authLDAP
- * @return false, if the user is an LDAP-User, true if he isn't
- */
-function authLdap_allow_password_reset($return, $userid)
-{
-    if (!(isset($userid))) {
-        return true;
-    }
-
-    if (get_user_meta($userid, 'authLDAP')) {
-        return false;
-    }
-    return $return;
-}
-
-/**
- * Sort the given roles by number of capabilities
- *
- * @param array $roles
- *
- * @return array
- */
-function authLdap_sort_roles_by_capabilities($roles)
-{
-    global $wpdb;
-    $myRoles = get_option($wpdb->get_blog_prefix() . 'user_roles');
-
-    authLdap_debug(print_r($roles, true));
-    uasort($myRoles, 'authLdap_sortByCapabilitycount');
-
-    $return = array();
-
-    foreach ($myRoles as $key => $role) {
-        if (isset($roles[$key])) {
-            $return[$key] = $roles[$key];
-        }
-    }
-
-    authLdap_debug(print_r($return, true));
-    return $return;
-}
-
-/**
- * Sort according to the number of capabilities
- *
- * @param $a
- * @param $b
- */
-function authLdap_sortByCapabilitycount($a, $b)
-{
-    if (count($a['capabilities']) > count($b['capabilities'])) {
-        return -1;
-    }
-    if (count($a['capabilities']) < count($b['capabilities'])) {
-        return 1;
-    }
-
-    return 0;
-}
-
-/**
- * Load AuthLDAP Options
- *
- * Sets and stores defaults if options are not up to date
- */
-function authLdap_load_options($reload = false)
-{
-    static $options = null;
-
-    // the current version for options
-    $option_version_plugin = 1;
-
-    $optionFunction = 'get_option';
-    if (is_multisite()) {
-        $optionFunction = 'get_site_option';
-    }
-    if (is_null($options) || $reload) {
-        $options = $optionFunction('authLDAPOptions', array());
-    }
-
-    // check if option version has changed (or if it's there at all)
-    if (!isset($options['Version']) || ($options['Version'] != $option_version_plugin)) {
-        // defaults for all options
-        $options_default = array(
-            'Enabled'       => false,
-            'CachePW'       => false,
-            'URI'           => '',
-            'URISeparator'  => ' ',
-            'Filter'        => '', // '(uid=%s)'
-            'NameAttr'      => '', // 'name'
-            'SecName'       => '',
-            'UidAttr'       => '', // 'uid'
-            'MailAttr'      => '', // 'mail'
-            'WebAttr'       => '',
-            'Groups'        => array(),
-            'Debug'         => false,
-            'GroupAttr'     => '', // 'gidNumber'
-            'GroupFilter'   => '', // '(&(objectClass=posixGroup)(memberUid=%s))'
-            'DefaultRole'   => '',
-            'GroupEnable'   => true,
-            'GroupOverUser' => true,
-            'Version'       => $option_version_plugin,
-            'DoNotOverwriteNonLdapUsers' => false,
-        );
-
-        // check if we got a version
-        if (!isset($options['Version'])) {
-            // we just changed to the new option format
-            // read old options, then delete them
-            $old_option_new_option = array(
-                'authLDAP'              => 'Enabled',
-                'authLDAPCachePW'       => 'CachePW',
-                'authLDAPURI'           => 'URI',
-                'authLDAPFilter'        => 'Filter',
-                'authLDAPNameAttr'      => 'NameAttr',
-                'authLDAPSecName'       => 'SecName',
-                'authLDAPUidAttr'       => 'UidAttr',
-                'authLDAPMailAttr'      => 'MailAttr',
-                'authLDAPWebAttr'       => 'WebAttr',
-                'authLDAPGroups'        => 'Groups',
-                'authLDAPDebug'         => 'Debug',
-                'authLDAPGroupAttr'     => 'GroupAttr',
-                'authLDAPGroupFilter'   => 'GroupFilter',
-                'authLDAPDefaultRole'   => 'DefaultRole',
-                'authLDAPGroupEnable'   => 'GroupEnable',
-                'authLDAPGroupOverUser' => 'GroupOverUser',
-            );
-            foreach ($old_option_new_option as $old_option => $new_option) {
-                $value = get_option($old_option, null);
-                if (!is_null($value)) {
-                    $options[$new_option] = $value;
-                }
-                delete_option($old_option);
-            }
-            delete_option('authLDAPCookieMarker');
-            delete_option('authLDAPCookierMarker');
-        }
-
-        // set default for all options that are missing
-        foreach ($options_default as $key => $default) {
-            if (!isset($options[$key])) {
-                $options[$key] = $default;
-            }
-        }
-
-        // set new version and save
-        $options['Version'] = $option_version_plugin;
-        update_option('authLDAPOptions', $options);
-    }
-    return $options;
-}
-
-/**
- * Get an individual option
- */
-function authLdap_get_option($optionname, $default = null)
-{
-    $options = authLdap_load_options();
-    if (isset($options[$optionname]) && $options[$optionname]) {
-        return $options[$optionname];
-    }
-
-    if (null !== $default) {
-        return $default;
-    }
-
-    //authLdap_debug('option name invalid: ' . $optionname);
-    return null;
-}
-
-/**
- * Set new options
- */
-function authLdap_set_options($new_options = array())
-{
-    // initialize the options with what we currently have
-    $options = authLdap_load_options();
-
-    // set the new options supplied
-    foreach ($new_options as $key => $value) {
-        $options[$key] = $value;
-    }
-
-    // store options
-    $optionFunction = 'update_option';
-    if (is_multisite()) {
-        $optionFunction = 'update_site_option';
-    }
-    if ($optionFunction('authLDAPOptions', $options)) {
-        // reload the option cache
-        authLdap_load_options(true);
-
-        return true;
-    }
-
-    // could not set options
-    return false;
-}
-
-/**
- * Do not send an email after changing the password or the email of the user!
- *
- * @param boolean $result      The initial resturn value
- * @param array   $user        The old userdata
- * @param array   $newUserData The changed userdata
- *
- * @return bool
- */
-function authLdap_send_change_email($result, $user, $newUserData)
-{
-    if (get_user_meta($user['ID'], 'authLDAP')) {
-        return false;
-    }
-
-    return $result;
-}
-
-$hook = is_multisite() ? 'network_' : '';
-add_action($hook . 'admin_menu', 'authLdap_addmenu');
-add_filter('show_password_fields', 'authLdap_show_password_fields', 10, 2);
-add_filter('allow_password_reset', 'authLdap_allow_password_reset', 10, 2);
-add_filter('authenticate', 'authLdap_login', 10, 3);
-/** This only works from WP 4.3.0 on */
-add_filter('send_password_change_email', 'authLdap_send_change_email', 10, 3);
-add_filter('send_email_change_email', 'authLdap_send_change_email', 10, 3);

wp-content/upgrade-temp-backup/plugins/authldap/ldap.php

@@ -1,275 +0,0 @@
-<?php
-/**
- * $Id: ldap.php 2676679 2022-02-10 18:26:37Z heiglandreas $
- *
- * authLdap - Authenticate Wordpress against an LDAP-Backend.
- * Copyright (c) 2008 Andreas Heigl<andreas@heigl.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * This file handles the basic LDAP-Tasks
- *
- * @author Andreas Heigl<andreas@heigl.org>
- * @package authLdap
- * @category authLdap
- * @since 2008
- */
-namespace Org_Heigl\AuthLdap;
-
-use Exception;
-use Org_Heigl\AuthLdap\Exception\Error;
-use function ldap_escape;
-
-class LDAP
-{
-    private $server = '';
-
-    private $scheme = 'ldap';
-
-    private $port = 389;
-
-    private $baseDn = '';
-
-    private $debug = false;
-    /**
-     * This property contains the connection handle to the ldap-server
-     *
-     * @var Ressource|Connection|null
-     */
-    private $ch = null;
-
-    private $username = '';
-
-    private $password = '';
-
-    private $starttls = false;
-
-    public function __construct(LdapUri $URI, $debug = false, $starttls = false)
-    {
-        $this->debug=$debug;
-        $array = parse_url($URI->toString());
-        if (! is_array($array)) {
-            throw new Exception($URI . ' seems not to be a valid URI');
-        }
-        $url = array_map(function ($item) {
-            return urldecode($item);
-        }, $array);
-
-        if (false === $url) {
-            throw new Exception($URI . ' is an invalid URL');
-        }
-        if (! isset($url['scheme'])) {
-            throw new Exception($URI . ' does not provide a scheme');
-        }
-        if (0 !== strpos($url['scheme'], 'ldap')) {
-            throw new Exception($URI . ' is an invalid LDAP-URI');
-        }
-        if (! isset($url['host'])) {
-            throw new Exception($URI . ' does not provide a server');
-        }
-        if (! isset($url['path'])) {
-            throw new Exception($URI . ' does not provide a search-base');
-        }
-        if (1 == strlen($url['path'])) {
-            throw new Exception($URI . ' does not provide a valid search-base');
-        }
-        $this -> server = $url['host'];
-        $this -> scheme = $url['scheme'];
-        $this -> baseDn = substr($url['path'], 1);
-        if (isset($url['user'])) {
-            $this -> username = $url['user'];
-        }
-        if ('' == trim($this -> username)) {
-            $this -> username = 'anonymous';
-        }
-        if (isset($url['pass'])) {
-            $this -> password = $url['pass'];
-        }
-        if (isset($url['port'])) {
-            $this -> port = $url['port'];
-        }
-        $this->starttls = $starttls;
-    }
-
-    /**
-     * Connect to the given LDAP-Server
-     *
-     * @return LDAP
-     * @throws Error
-     */
-    public function connect()
-    {
-        $this -> disconnect();
-        if ('ldaps' == $this->scheme && 389 == $this->port) {
-            $this->port = 636;
-        }
-
-        $this->ch = @ldap_connect($this->scheme . '://' . $this->server . ':' . $this -> port);
-        if (false === $this->ch) {
-            $this->ch = null;
-            throw new Error('Could not connect to the server');
-        }
-        ldap_set_option($this->ch, LDAP_OPT_PROTOCOL_VERSION, 3);
-        ldap_set_option($this->ch, LDAP_OPT_REFERRALS, 0);
-        //if configured try to upgrade encryption to tls for ldap connections
-        if ($this->starttls) {
-            ldap_start_tls($this->ch);
-        }
-        return $this;
-    }
-
-    /**
-     * Disconnect from a resource if one is available
-     *
-     * @return LDAP
-     */
-    public function disconnect()
-    {
-        if (null !== $this->ch ) {
-            @ldap_unbind($this->ch);
-        }
-        $this->ch = null;
-        return $this;
-    }
-
-    /**
-     * Bind to an LDAP-Server with the given credentials
-     *
-     * @return LDAP
-     * @throw AuthLdap_Exception
-     */
-    public function bind()
-    {
-        if (! $this->ch) {
-            $this->connect();
-        }
-        if (null === $this->ch) {
-            throw new Error('No valid LDAP connection available');
-        }
-        $bind = false;
-        if (( ( $this->username )
-            && ( $this->username != 'anonymous') )
-            && ( $this->password != '' )) {
-            $bind = @ldap_bind($this->ch, $this->username, $this->password);
-        } else {
-            $bind = @ldap_bind($this->ch);
-        }
-        if (! $bind) {
-            throw new Error('bind was not successfull: ' . ldap_error($this->ch));
-        }
-        return $this;
-    }
-
-    public function getErrorNumber()
-    {
-        return @ldap_errno($this->ch);
-    }
-
-    public function getErrorText()
-    {
-        return @ldap_error($this->ch);
-    }
-
-    /**
-     * This method does the actual ldap-serch.
-     *
-     * This is using the filter <var>$filter</var> for retrieving the attributes
-     * <var>$attributes</var>
-     *
-     *
-     * @param string $filter
-     * @param array $attributes
-     * @param string $base
-     * @return array
-     */
-    public function search($filter, $attributes = array('uid'), $base = '')
-    {
-        if (null === $this->ch) {
-            throw new Error('No resource handle avbailable');
-        }
-        if (! $base) {
-            $base = $this->baseDn;
-        }
-        $result = ldap_search($this->ch, $base, $filter, $attributes);
-        if ($result === false) {
-            throw new Error('no result found');
-        }
-        $this->_info = @ldap_get_entries($this->ch, $result);
-        if ($this->_info === false) {
-            throw new Error('invalid results found');
-        }
-        return $this -> _info;
-    }
-
-    /**
-     * This method sets debugging to ON
-     */
-    public function debugOn()
-    {
-        $this->debug = true;
-        return $this;
-    }
-
-    /**
-     * This method sets debugging to OFF
-     */
-    public function debugOff()
-    {
-        $this->debug = false;
-        return $this;
-    }
-
-    /**
-     * This method authenticates the user <var>$username</var> using the
-     * password <var>$password</var>
-     *
-     * @param string $username
-     * @param string $password
-     * @param string $filter OPTIONAL This parameter defines the Filter to be used
-     * when searchin for the username. This MUST contain the string '%s' which
-     * will be replaced by the vaue given in <var>$username</var>
-     * @return boolean true or false depending on successfull authentication or not
-     */
-    public function authenticate($username, $password, $filter = '(uid=%s)')
-    {
-        //return true;
-        $this->connect();
-        $this->bind();
-        $res = $this->search(sprintf($filter, ldap_escape($username, '', LDAP_ESCAPE_FILTER)));
-        if (! $res || ! is_array($res) || ( $res ['count'] != 1 )) {
-            return false;
-        }
-        $dn = $res[0]['dn'];
-        if ($username && $password) {
-            if (@ldap_bind($this->ch, $dn, $password)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    /**
-     * $this method loggs errors if debugging is set to ON
-     */
-    public function logError()
-    {
-        if ($this->debug) {
-            $_v = debug_backtrace();
-            throw new Error(
-                '[LDAP_ERROR]' . ldap_errno($this->ch) . ':' . ldap_error($this->ch),
-                $_v[0]['line']
-            );
-        }
-    }
-}

wp-content/upgrade-temp-backup/plugins/authldap/readme.txt

@@ -1,133 +0,0 @@
-=== authLdap ===
-Contributors: heiglandreas
-Tags: ldap, auth, authentication, active directory, AD, openLDAP, Open Directory
-Requires at least: 2.5.0
-Tested up to: 5.9.0
-Requires PHP: 7.2
-Stable tag: trunk
-License: MIT
-License URI: https://opensource.org/licenses/MIT
-
-Use your existing LDAP flexible as authentication backend for WordPress
-
-== Description ==
-
-Use your existing LDAP as authentication-backend for your wordpress!
-
-So what are the differences to other Wordpress-LDAP-Authentication-Plugins?
-
-* Flexible: You are totaly free in which LDAP-backend to use. Due to the extensive configuration you can freely decide how to do the authentication of your users. It simply depends on your filters
-* Independent: As soon as a user logs in, it is added/updated to the Wordpress' user-database to allow wordpress to always use the correct data. You only have to administer your users once.
-* Failsafe: Due to the users being created in Wordpress' User-database they can also log in when the LDAP-backend currently is gone.
-* Role-Aware: You can map Wordpress' roles to values of an existing LDAP-attribute.
-
-For more Information on the configuration have a look at https://github.com/heiglandreas/authLdap
-
-== Installation ==
-
-1. Upload the extracted folder `authLdap` to the `/wp-content/plugins/` directory
-2. Activate the plugin through the 'Plugins' menu in WordPress
-3. Configure the Plugin via the 'authLdap'-Configuration-Page.
-
-== Frequently Asked Questions ==
-
-= Where can I find more Informations about the plugin? =
-
-Go to https://github.com/heiglandreas/authLdap
-
-= Where can I report issues with the plugin? =
-
-Please use the issuetracker at https://github.com/heiglandreas/authLdap/issues
-
-== Changelog ==
-
-= 2.5.0 =
-* Ignore the order of capabilities to tell the role. In addition the filter `editable_roles` can be used to limit the roles
-
-= 2.4.11 =
-* Fix issue with running on PHP8.1
-
-= 2.4.9 =
-* Improve group-assignement UI
-
-= 2.4.8 =
-* Make textfields in settings-page wider
-
-= 2.4.7 =
-* Replace deprecated function
-* Fix undefined index
-* Add filter for retrieving other params at login (authLdap_filter_attributes)
-* Add do_action after successfull login (authLdap_login_successful)
-
-= 2.4.0 =
-* Allow to use environment variables for LDAP-URI configuration
-
-= 2.3.0 =
-* Allow to not overwrite existing WordPress-Users with LDAP-Users as that can be a security issue.
-
-= 2.1.0 =
-* Add search-base for groups. This might come in handy for multisite-instances
-
-= 2.0.0 =
-* This new release adds Multi-Site support. It will no longer be possible to use this plugin just in one subsite of a multisite installation!
-* Adds a warning screen to the config-section when no LDAPextension could be found
-* Fixes an issue with the max-length of the username
-
-= 1.5.1 =
-* Fixes an issue with escaped backslashes and quotes
-
-= 1.5.0 =
-* Allows parts of the LDAP-URI to be URLEncoded
-* Drops support for PHP 5.4
-
-= 1.4.20 =
-* Allows multiple LDAP-servers to be queried (given that they use the same attributes)
-* Fixes issue with URL-Encoded informations (see https://github.com/heiglandreas/authLdap/issues/108)
-
-= 1.4.19 =
-* Adds support for TLS
-
-= 1.4.14 =
-* Update to showing password-fields check (thanks to @chaplina)
-
-= 1.4.13 =
-* Removed generation of default email-address (thanks to @henryk)
-* Fixes password-hashing when caching passwords (thanks to @litinoveweedle)
-* Removes the possibility to reset a password for LDAP-based users (thanks to @chaplina)
-* Removes the password-change-Email from 4.3 on (thanks to @litinoveweedle)
-* Fixes double authentication-attempt (that resulted in failed authentication) (thanks to @litinoveweedle)
-
-= 1.4.10 =
-* Cleanup by removing deprecated code
-* Fixes issues with undefined variables
-* Enables internal option-versioning
-* Setting users nickname initially to the realname instead of the uid
-* Fixes display of password-change possibility in users profile-page
-= 1.4.9 =
-* Fixed an issue with changing display name on every login
-* Use proper way of looking up user-roles in setups w/o DB-prefix
-= 1.4.8 =
-* Updated version string
-= 1.4.7 =
-* Use default user to retrieve group menberships and not logging in user.
-* return the UID from the LDAP instead of the value given by the user
-* remove unnecessary checkbox
-* Adds a testsuite
-* Fixes PSR2 violations
-
-[…]
-
-= 1.2.1 =
-* Fixed an issue with group-ids
-* Moved the code to GitHub (https://github.com/heiglandreas/authLdap)
-= 1.1.0 =
-* Changed the login-process. Now users that are not allowed to login due to
-missing group-memberships are not created within your blog as was the standard
-until Version 1.0.3 - Thanks to alex@tayts.com
-* Changed the default mail-address that is created when no mail-address can be
-retrieved from the LDAP from me@example.com to $username@example.com so that
-a new user can be created even though the mail address already exists in your
-blog - Also thanks to alex@tayts.com
-* Added support for WordPress-Table-prefixes as the capabilities of a user
-are interlany stored in a field that is named "$tablePrefix_capabilities" -
-again thanks to alex@tayts.com and also to sim0n of silicium.mine.nu

wp-content/upgrade-temp-backup/plugins/authldap/src/Exception/Error.php

@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Copyright Andrea Heigl <andreas@heigl.org>
- *
- * Licenses under the MIT-license. For details see the included file LICENSE.md
- */
-
-namespace Org_Heigl\AuthLdap\Exception;
-
-use Exception;
-
-class Error extends Exception
-{
-    public function __construct($message, $line = null)
-    {
-        parent::__construct($message);
-        if ($line) {
-            $this -> line = $line;
-        }
-    }
-}

wp-content/upgrade-temp-backup/plugins/authldap/src/Exception/InvalidLdapUri.php

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Org_Heigl\AuthLdap\Exception;
-
-use RuntimeException;
-
-class InvalidLdapUri extends RuntimeException
-{
-    public static function fromLdapUriString(string $ldapUri): InvalidLdapUri
-    {
-        return new self('"%s" is not a valid LDAP-URI.');
-    }
-}

wp-content/upgrade-temp-backup/plugins/authldap/src/LdapList.php

@@ -1,90 +0,0 @@
-<?php
-/**
- * Copyright (c) Andreas Heigl<andreas@heigl.org>
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @author    Andreas Heigl<andreas@heigl.org>
- * @copyright Andreas Heigl
- * @license   http://www.opensource.org/licenses/mit-license.php MIT-License
- * @since     07.07.2016
- * @link      http://github.com/heiglandreas/authLDAP
- */
-
-namespace Org_Heigl\AuthLdap;
-
-use Org_Heigl\AuthLdap\Exception\Error;
-
-class LdapList
-{
-    /**
-     * @var \LDAP[]
-     */
-    protected $items = [];
-
-    public function addLdap(LDAP $ldap)
-    {
-        $this->items[] = $ldap;
-    }
-
-    public function authenticate($username, $password, $filter = '(uid=%s)')
-    {
-        /** @var LDAP $item */
-        foreach ($this->items as $key => $item) {
-            if (! $item->authenticate($username, $password, $filter)) {
-                unset($this->items[$key]);
-                continue;
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    public function bind()
-    {
-        $allFailed = true;
-        foreach ($this->items as $key => $item) {
-            try {
-                $item->bind();
-            } catch (\Exception $e) {
-                unset($this->items[$key]);
-                continue;
-            }
-            $allFailed = false;
-        }
-
-        if ($allFailed) {
-            throw new Error('No bind successfull');
-        }
-
-        return true;
-    }
-
-    public function search($filter, $attributes = array('uid'), $base = '')
-    {
-        foreach ($this->items as $item) {
-            try {
-                $result = $item->search($filter, $attributes, $base);
-                return $result;
-            } catch (Exception $e) {
-                throw $e;
-            }
-        }
-
-        throw new \AuthLDAP_Exception('No Results found');
-    }
-}

wp-content/upgrade-temp-backup/plugins/authldap/src/LdapUri.php

@@ -1,72 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Copyright (c) Andreas Heigl<andreas@heigl.org>
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @author    Andreas Heigl<andreas@heigl.org>
- * @copyright Andreas Heigl
- * @license   http://www.opensource.org/licenses/mit-license.php MIT-License
- * @since     19.07.2020
- * @link      http://github.com/heiglandreas/authLDAP
- */
-
-namespace Org_Heigl\AuthLdap;
-
-use Org_Heigl\AuthLdap\Exception\InvalidLdapUri;
-use function getenv;
-use function preg_replace;
-use function urlencode;
-
-final class LdapUri
-{
-    private $uri;
-
-    private function __construct(string $uri)
-    {
-        if (! preg_match('/^(ldap|ldaps|env)/', $uri)) {
-            throw InvalidLdapUri::fromLdapUriString($uri);
-        }
-        $this->uri = $uri;
-    }
-
-    public static function fromString(string $uri): LdapUri
-    {
-        return new LdapUri($uri);
-    }
-
-    public function toString(): string
-    {
-        $uri = $this->uri;
-        if (0 === strpos($uri, 'env:')) {
-            $uri = getenv(substr($this->uri, 4));
-        }
-
-        $uri = preg_replace_callback('/%env:([^%]+)%/', function (array $matches) {
-            return rawurlencode(getenv($matches[1]));
-        }, $uri);
-
-        return $uri;
-    }
-
-    public function __toString()
-    {
-        return $this->toString();
-    }
-}

wp-content/upgrade-temp-backup/plugins/authldap/view/admin.phtml

@@ -1,453 +0,0 @@
-<?php
-/**
- * Copyright (c)2014-2014 heiglandreas
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIBILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @category
- * @author    Andreas Heigl<andreas@heigl.org>
- * @copyright ©2014-2014 Andreas Heigl
- * @license   http://www.opesource.org/licenses/mit-license.php MIT-License
- * @version   0.0
- * @since     19.12.14
- * @link      https://github.com/heiglandreas/authLdap
- */
-?><div class="wrap">
-    <?php if (! extension_loaded('ldap')) : ?>
-    <div class="error"><strong>Caveat:</strong> The LDAP-extension is not loaded!
-        Without that extension it is not possible to query an LDAP-Server! Please have a look
-        at <a href="http://php.net/manual/install.php">the PHP-Installation page</a>
-    </div>
-    <?php endif ?>
-    <h2>AuthLDAP Options</h2>
-    <form class="authldap-options" method="post" id="authLDAP_options" action="<?php echo $action;?>">
-        <h3 class="title">General Usage of authLDAP</h3>
-        <fieldset class="options">
-            <table class="form-table">
-                <tr>
-                    <th>
-                        <label for="authLDAPAuth">Enable Authentication via LDAP?</label>
-                    </th>
-                    <td>
-                        <input type="checkbox" name="authLDAPAuth" id="authLDAPAuth" value="1"<?php echo $tChecked; ?>/>
-                    </td>
-                </tr>
-                <tr>
-                    <th>
-                        <label for="authLDAPDebug">Debug AuthLDAP?</label>
-                    </th>
-                    <td>
-                        <input type="checkbox" name="authLDAPDebug" id="authLDAPDebug" value="1"<?php echo $tDebugChecked; ?>/>
-                    </td>
-                </tr>
-                <tr>
-                    <th>
-                        <label for="authLDAPDoNotOverwriteNonLdapUsers">Do not authenticate existing WordPress-Users</label>
-                    </th>
-                    <td>
-                        <input type="checkbox" name="authLDAPDoNotOverwriteNonLdapUsers" id="authLDAPDoNotOverwriteNonLdapUsers" value="1"<?php echo $tDoNotOverwriteNonLdapUsers; ?>/>
-                        <p class="description">
-                            Shall we prohibit authenticating already in WordPress created users using LDAP? If you enable this, LDAP-Users with the same user-ID
-                        as existing WordPress-Users can no longer take over the WordPress-Users account. This also means that LDAP-Users with the same User-ID as existing
-                        WordPress-Users will <strong>not</strong> be able to authenticate anymore! Accounts that have been taken over already will not be affected by this setting.
-                        </p>
-                        <p class="description">This should only be checked if you know what you are doing!</p>
-                    </td>
-                </tr>
-                <tr>
-                    <th>
-                        <label for="authLDAPCachePW">Save entered passwords in the wordpress user table?</label>
-                    </th>
-                    <td>
-                        <input type="checkbox" name="authLDAPCachePW" id="authLDAPCachePW" value="1"<?php echo $tPWChecked; ?>/>
-                    </td>
-                </tr>
-                <tr>
-                    <th>
-                        <label for="authLDAPGroupEnable">Map LDAP Groups to wordpress Roles?</label>
-                    </th>
-                    <td>
-                        <input type="checkbox" name="authLDAPGroupEnable" id="authLDAPGroupEnable" value="1"<?php echo $tGroupChecked; ?>/>
-                        <p class="description">
-                            Search LDAP for user's groups and map to Wordpress Roles.
-                        </p>
-                    </td>
-                </tr>
-            </table>
-        </fieldset>
-        <h3 class="title">General Server Settings</h3>
-        <fieldset class="options">
-            <table class="form-table">
-                <tr>
-                    <th>
-                        <label for="authLDAPURI">LDAP URI</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPURI" id="authLDAPURI" placeholder="LDAP-URI"
-                          class="regular-text" value="<?php echo $authLDAPURI; ?>"/>
-                        <p class="description">
-                            The <abbr title="Uniform Ressource Identifier">URI</abbr>
-                            for connecting to the LDAP-Server. This usualy takes the form
-                            <var>&lt;scheme&gt;://&lt;user&gt;:&lt;password&gt;@&lt;server&gt;/&lt;path&gt;</var>
-                            according to RFC 1738.</p>
-                        <p class="description">
-                            In this case it schould be something like
-                            <var>ldap://uid=adminuser,dc=example,c=com:secret@ldap.example.com/dc=basePath,dc=example,c=com</var>.
-                        </p>
-                        <p class="description">
-                            If your LDAP accepts anonymous login, you can ommit the user and
-                            password-Part of the URI
-                        </p>
-                        <p class="description">
-                            You can use the pseudo-schema <em>env</em> to provide your LDAP-URI from an environment-variable. So if you have your
-                            LDAP-URI in a variable called <code>LDAP_URI</code> you can enter <code>env:LDAP_URI</code> in this field and at runtime the
-                            appropriate value will be taken from the Environment-variable <code>LDAP_URI</code>. If the varialbe is not set, then the value will be empty.
-                        </p>
-                        <p class="description">
-                            You can also provide different parts of the LDP-URI from environment variables by providing
-                            <code>%env:[VARIABLENAME]%</code> within your LDAP-URI. So if you want to provide the
-                            password from an Environment-variable <code>LDAP_PASSWORD</code> your LDAP-URI looks like
-                            <code>ldap://uid=adminuser,dc=example,c=com:%env:LDAP_PASSWORD%@ldap.example.com/dc=basePath,dc=example,c=com</code>
-                        </p>
-                        <p class="description">
-                            <strong>Caveat!</strong><br/>
-                            If you are using Environment-variables for parts of the LDAP-URL then those <strong>must not</strong> be URL-Encoded!<br/>
-                            Otherwise the different parts <strong>must</strong> be URL-Encoded!
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <th>
-                        <label for="authLDAPURISeparator">LDAP URI-Separator</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPURISeparator" id="authLDAPURISeparator" placeholder="LDAP-URI Separator"
-                               class="regular-text" value="<?php echo $authLDAPURISeparator; ?>"/>
-                        <p class="description">
-                            A separator that separates multiple LDAP-URIs from one another.
-                            You can use that feature to try to authenticate against multiple LDAP-Servers
-                            as long as they all have the same attribute-settings. The first LDAP-Server the user can
-                            authenticate against will be used to handle the user.
-                    </td>
-                </tr>
-                <tr>
-                      <th>
-                          <label for="authLDAPStartTLS" class="description">StartTLS</label>
-                      </th>
-                      <td>
-                          <input type="checkbox" name="authLDAPStartTLS" id="authLDAPStartTLS" value="1"<?php echo $tStartTLSChecked; ?>/>
-                          <p class="description">
-                              Use StartTLS for encryption of ldap connections. This setting is not to be used in combination with ldaps connections (ldap:// only).
-                          </p>
-                      </td>
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPFilter" class="description">Filter</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPFilter" id="authLDAPFilter" placeholder="(uid=%s)"
-                          class="regular-text" value="<?php echo $authLDAPFilter; ?>"/>
-                        <p class="description">
-                            Please provide a valid filter that can be used for querying the
-                            <abbr title="Lightweight Directory Access Protocol">LDAP</abbr>
-                            for the correct user. For more information on this
-                            feature have a look at <a href="http://andreas.heigl.org/cat/dev/wp/authldap">http://andreas.heigl.org/cat/dev/wp/authldap</a>
-                        </p>
-                        <p class="description">
-                            This field <strong>should</strong> include the string <code>%s</code>
-                            that will be replaced with the username provided during log-in
-                        </p>
-                        <p class="description">
-                            If you leave this field empty it defaults to <strong>(uid=%s)</strong>
-                        </p>
-                    </td>
-                </tr>
-            </table>
-        </fieldset>
-
-        <h3 class="title">Settings for creating new Users</h3>
-        <fieldset class="options">
-            <table class="form-table">
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPUseUserAccount">User-Read</label>
-                    </th>
-                    <td>
-                        <input type="checkbox" name="authLDAPUseUserAccount" id="authLDAPUseUserAccount" value="1"<?php echo $tUserRead; ?>/><br />
-                        <p class="description">
-                            If checked the plugin will use the user's account to query their own information. If not it will use the admin account.
-                        </p>
-						
-                    </td>
-                </tr>
-				<tr>
-                    <th scope="row">
-                        <label for="authLDAPNameAttr">Name-Attribute</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPNameAttr" id="authLDAPNameAttr" placeholder="name"
-                          class="regular-text" value="<?php echo $authLDAPNameAttr; ?>"/><br />
-                        <p class="description">
-                            Which Attribute from the LDAP contains the Full or the First name
-                            of the user trying to log in.
-                        </p>
-                        <p class="description">
-                            This defaults to <strong>name</strong>
-                        </p>
-
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPSecName">Second Name Attribute</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPSecName" id="authLDAPSecName" placeholder=""
-                          class="regular-text" value="<?php echo $authLDAPSecName; ?>" />
-                        <p class="description">
-                            If the above Name-Attribute only contains the First Name of the
-                            user you can here specify an Attribute that contains the second name.
-                        </p>
-                        <p class="description">
-                            This field is empty by default
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPUidAttr">User-ID Attribute</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPUidAttr" id="authLDAPUidAttr" placeholder="uid"
-                          class="regular-text" value="<?php echo $authLDAPUidAttr; ?>" />
-                        <p class="description">
-                            Please give the Attribute, that is used to identify the user. This
-                            should be the same as you used in the above <em>Filter</em>-Option
-                        </p>
-                        <p class="description">
-                            This field defaults to <strong>uid</strong>
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPMailAttr">Mail Attribute</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPMailAttr" id="authLDAPMailAttr" placeholder="mail"
-                          class="regular-text" value="<?php echo $authLDAPMailAttr; ?>" />
-                        <p class="description">
-                            Which Attribute holds the eMail-Address of the user?
-                        </p>
-                        <p class="description">
-                            If more than one eMail-Address are stored in the LDAP, only the first given is used
-                        </p>
-                        <p class="description">
-                            This field defaults to <strong>mail</strong>
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPWebAttr">Web-Attribute</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPWebAttr" id="authLDAPWebAttr" placeholder=""
-                          class="regular-text" value="<?php echo $authLDAPWebAttr; ?>" />
-                        <p class="description">
-                            If your users have a personal page (URI) stored in the LDAP, it can
-                            be provided here.
-                        </p>
-                        <p class="description">
-                            This field is empty by default
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPDefaultRole">Default Role</label>
-                    </th>
-                    <td>
-                        <select name="authLDAPDefaultRole" id="authLDAPDefaultRole">
-                            <option value="" <?php echo ( $authLDAPDefaultRole == '' ? 'selected="selected"' : '' ); ?>>
-                                None (deny access)
-                            </option>
-<?php foreach ($roles->get_names() as $group => $vals) : ?>
-                            <option value="<?php echo $group; ?>" <?php echo ( $authLDAPDefaultRole == $group ? 'selected="selected"' : '' ); ?>>
-                                <?php echo $vals; ?>
-                            </option>
-<?php endforeach; ?>
-                        </select>
-                        <p class="description">
-                            Here you can select the default role for users.
-                            If you enable LDAP Groups below, they will take precedence over the Default Role.
-                        </p>
-                        <p class="description">
-                            Existing users will retain their roles unless overriden by LDAP Groups below.
-                        </p>
-                    </td>
-                </tr>
-            </table>
-        </fieldset>
-
-
-        <div id="authldaprolemapping">
-        <h3 class="title">Groups for Roles</h3>
-        <fieldset class="options">
-            <table class="form-table">
-                <tr>
-                    <th>
-                        <label for="authLDAPGroupOverUser">LDAP Groups override role of existing users?</label>
-                    </th>
-                    <td>
-                        <input type="checkbox" name="authLDAPGroupOverUser" id="authLDAPGroupOverUser" value="1"<?php echo $tGroupOverUserChecked; ?>/>
-                        <p class="description">
-                            If role determined by LDAP Group differs from existing Wordpress User's role, use LDAP Group.
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPGroupBase">Group-Base</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPGroupBase" id="authLDAPGroupBase" placeholder=""
-                          class="regular-text" value="<?php echo $authLDAPGroupBase; ?>" />
-                        <p class="description">
-                            This is the base dn to lookup groups.
-                        </p>
-                        <p class="description">
-                            If empty the base dn of the LDAP URI will be used
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPGroupAttr">Group-Attribute</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPGroupAttr" id="authLDAPGroupAttr" placeholder="gidNumber"
-                          class="regular-text" value="<?php echo $authLDAPGroupAttr; ?>" />
-                        <p class="description">
-                            This is the attribute that defines the Group-ID that can be matched
-                            against the Groups defined further down
-                        </p>
-                        <p class="description">
-                            This field defaults to <strong>gidNumber</strong>
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPGroupSeparator">Group-Separator</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPGroupSeparator" id="authLDAPGroupSeparator" placeholder=","
-                          class="regular-text" value="<?php echo $authLDAPGroupSeparator; ?>" />
-                        <p class="description">
-                            This attribute defines the separator used for the Group-IDs listed in the
-                            Groups defined further down. This is useful if the value of Group-Attribute
-                            listed above can contain a comma (for example, when using the memberof attribute)
-                        </p>
-                        <p class="description">
-                            This field defaults to <strong>, (comma)</strong>
-                        </p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row">
-                        <label for="authLDAPGroupFilter">Group-Filter</label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPGroupFilter" id="authLDAPGroupFilter"
-                          placeholder="(&amp;(objectClass=posixGroup)(memberUid=%s))"
-                          class="regular-text" value="<?php echo $authLDAPGroupFilter; ?>" />
-                        <p class="description">
-                            Here you can add the filter for selecting groups for ther
-                            currentlly logged in user
-                        </p>
-                        <p class="description">
-                            The Filter should contain the string <code>%s</code> which will be replaced by
-                            the login-name of the currently logged in user
-                        </p>
-                        <p class="description">
-                            Alternatively the string <code>%dn%</code> will be replaced by the
-                            DN of the currently logged in user. This can be helpfull if
-                            group-memberships are defined with DNs rather than UIDs
-                        </p>
-                        <p class="description">This field defaults to
-                            <strong>(&amp;(objectClass=posixGroup)(memberUid=%s))</strong>
-                        </p>
-                    </td>
-                </tr>
-            </table>
-        </fieldset>
-
-        <h3 class="title">Role - group mapping</h3>
-        <fieldset class="options">
-            <p class="description">You can set multiple values per role by separating them with a coma</p>
-            <p class="description">The values are empty by default</p>
-            <table class="form-table">
-                <thead>
-                    <th scope="row">Assign this WordPress-Role</th>
-                    <th style="width:auto;">to members of this/these LDAP-Groups</th>
-                </thead>
-                <tbody>
-<?php
-    foreach ($roles->get_names() as $group => $vals) :
-        $aGroup=$authLDAPGroups[$group]; ?>
-                <tr>
-                    <th scope="row" style="width:auto; min-width: 200px;">
-                        <label for="authLDAPGroups[<?php echo $group; ?>]">
-                            <?php echo $vals; ?>
-                        </label>
-                    </th>
-                    <td>
-                        <input type="text" name="authLDAPGroups[<?php echo $group; ?>]" id="authLDAPGroups[<?php echo $group; ?>]"
-                          value="<?php echo $aGroup; ?>" />
-                    </td>
-                </tr>
-<?php endforeach; ?>
-                </tbody>
-            </table>
-        </fieldset>
-            </div>
-        <fieldset class="buttons">
-            <p class="submit">
-                <input type="submit" name="ldapOptionsSave" class="button button-primary" value="Save Changes" />
-            </p>
-        </fieldset>
-    </form>
-</div>
-
-<script type="text/javascript">
-    elem = document.getElementById('authLDAPGroupEnable');
-    if(! elem.checked) {
-        document.getElementById('authldaprolemapping').setAttribute('style', 'display:none;');
-    }
-
-    elem.addEventListener('change', function(e){
-        if(! e.target.checked) {
-            document.getElementById('authldaprolemapping').setAttribute('style', 'display:none;');
-        } else {
-            document.getElementById('authldaprolemapping').removeAttribute('style');
-        }
-    });
-
-</script>

wp-content/upgrade-temp-backup/plugins/gitium/functions.php

@@ -0,0 +1,420 @@
+<?php
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+function gitium_error_log( $message ) {
+	if ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) { return; }
+	error_log( "gitium_error_log: $message" );
+}
+
+function wp_content_is_versioned() {
+	return file_exists( WP_CONTENT_DIR . '/.git' );
+}
+
+if ( ! function_exists( 'gitium_enable_maintenance_mode' ) ) :
+	function gitium_enable_maintenance_mode() {
+		$file = ABSPATH . '/.maintenance';
+
+		if ( false === file_put_contents( $file, '<?php $upgrading = ' . time() .';' ) ) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+endif;
+
+if ( ! function_exists( 'gitium_disable_maintenance_mode' ) ) :
+	function gitium_disable_maintenance_mode() {
+		return unlink( ABSPATH . '/.maintenance' );
+	}
+endif;
+
+function gitium_get_versions() {
+	$versions = get_transient( 'gitium_versions' );
+	if ( empty( $versions ) ) {
+		$versions = gitium_update_versions();
+	}
+	return $versions;
+}
+
+function _gitium_commit_changes( $message, $dir = '.' ) {
+	global $git;
+
+	list( , $git_private_key ) = gitium_get_keypair();
+	if (!$git_private_key)
+		return false;
+	$git->set_key( $git_private_key );
+
+	$git->add( $dir );
+	gitium_update_versions();
+	$current_user = wp_get_current_user();
+	return $git->commit( $message, $current_user->display_name, $current_user->user_email );
+}
+
+function _gitium_format_message( $name, $version = false, $prefix = '' ) {
+	$commit_message = "`$name`";
+	if ( $version ) {
+		$commit_message .= " version $version";
+	}
+	if ( $prefix ) {
+		$commit_message = "$prefix $commit_message";
+	}
+	return $commit_message;
+}
+
+/**
+ * This function return the basic info about a path.
+ *
+ * base_path - means the path after wp-content dir (themes/plugins)
+ * type      - can be file/theme/plugin
+ * name      - the file name of the path, if it is a file, or the theme/plugin name
+ * version   - the theme/plugin version, othewise null
+ */
+/* Some examples:
+
+  with 'wp-content/themes/twentyten/style.css' will return:
+  array(
+    'base_path' => 'wp-content/themes/twentyten'
+    'type'      => 'theme'
+    'name'      => 'TwentyTen'
+    'version'   => '1.12'
+  )
+
+  with 'wp-content/themes/twentyten/img/foo.png' will return:
+  array(
+    'base_path' => 'wp-content/themes/twentyten'
+    'type'      => 'theme'
+    'name'      => 'TwentyTen'
+    'version'   => '1.12'
+  )
+
+  with 'wp-content/plugins/foo.php' will return:
+  array(
+    'base_path' => 'wp-content/plugins/foo.php'
+    'type'      => 'plugin'
+    'name'      => 'Foo'
+    'varsion'   => '2.0'
+  )
+
+  with 'wp-content/plugins/autover/autover.php' will return:
+  array(
+    'base_path' => 'wp-content/plugins/autover'
+    'type'      => 'plugin'
+    'name'      => 'autover'
+    'version'   => '3.12'
+  )
+
+  with 'wp-content/plugins/autover/' will return:
+  array(
+    'base_path' => 'wp-content/plugins/autover'
+    'type'      => 'plugin'
+    'name'      => 'autover'
+    'version'   => '3.12'
+  )
+*/
+function _gitium_module_by_path( $path ) {
+	$versions = gitium_get_versions();
+
+	// default values
+	$module   = array(
+		'base_path' => $path,
+		'type'      => 'file',
+		'name'      => basename( $path ),
+		'version'   => null,
+	);
+
+	// find the base_path
+	$split_path = explode( '/', $path );
+	if ( 2 < count( $split_path ) ) {
+		$module['base_path'] = "{$split_path[0]}/{$split_path[1]}/{$split_path[2]}";
+	}
+
+	// find other data for theme
+	if ( array_key_exists( 'themes', $versions ) && 0 === strpos( $path, 'wp-content/themes/' ) ) {
+		$module['type'] = 'theme';
+		foreach ( $versions['themes'] as $theme => $data ) {
+			if ( 0 === strpos( $path, "wp-content/themes/$theme" ) ) {
+				$module['name']    = $data['name'];
+				$module['version'] = $data['version'];
+				break;
+			}
+		}
+	}
+
+	// find other data for plugin
+	if ( array_key_exists( 'plugins', $versions ) && 0 === strpos( $path, 'wp-content/plugins/' ) ) {
+		$module['type'] = 'plugin';
+		foreach ( $versions['plugins'] as $plugin => $data ) {
+			if ( '.' === dirname( $plugin ) ) { // single file plugin
+				if ( "wp-content/plugins/$plugin" === $path ) {
+					$module['base_path'] = $path;
+					$module['name']      = $data['name'];
+					$module['version']   = $data['version'];
+					break;
+				}
+			} else if ( 'wp-content/plugins/' . dirname( $plugin ) === $module['base_path'] ) {
+				$module['name']    = $data['name'];
+				$module['version'] = $data['version'];
+				break;
+			}
+		}
+	}
+
+	return $module;
+}
+
+function gitium_group_commit_modified_plugins_and_themes( $msg_append = '' ) {
+	global $git;
+
+	$uncommited_changes = $git->get_local_changes();
+	$commit_groups = array();
+	$commits = array();
+
+	if ( ! empty( $msg_append ) ) {
+		$msg_append = "($msg_append)";
+	}
+	foreach ( $uncommited_changes as $path => $action ) {
+		$change = _gitium_module_by_path( $path );
+		$change['action'] = $action;
+		$commit_groups[ $change['base_path'] ] = $change;
+	}
+
+	foreach ( $commit_groups as $base_path => $change ) {
+		$commit_message = _gitium_format_message( $change['name'], $change['version'], "${change['action']} ${change['type']}" );
+		$commit = _gitium_commit_changes( "$commit_message $msg_append", $base_path, false );
+		if ( $commit ) {
+			$commits[] = $commit;
+		}
+	}
+
+	return $commits;
+}
+
+function gitium_commit_and_push_gitignore_file( $path = '' ) {
+	global $git;
+
+	$current_user = wp_get_current_user();
+	if ( ! empty( $path ) ) { $git->rm_cached( $path ); }
+	$git->add( '.gitignore' );
+	$commit = $git->commit( 'Update the `.gitignore` file', $current_user->display_name, $current_user->user_email );
+	gitium_merge_and_push( $commit );
+}
+
+if ( ! function_exists( 'gitium_acquire_merge_lock' ) ) :
+	function gitium_acquire_merge_lock() {
+		$gitium_lock_path   = apply_filters( 'gitium_lock_path', sys_get_temp_dir().'/.gitium-lock' );
+		$gitium_lock_handle = fopen( $gitium_lock_path, 'w+' );
+
+		$lock_timeout    = intval( ini_get( 'max_execution_time' ) ) > 10 ? intval( ini_get( 'max_execution_time' ) ) - 5 : 10;
+		$lock_timeout_ms = 10;
+		$lock_retries    = 0;
+		while ( ! flock( $gitium_lock_handle, LOCK_EX | LOCK_NB ) ) {
+			usleep( $lock_timeout_ms * 1000 );
+			$lock_retries++;
+			if ( $lock_retries * $lock_timeout_ms > $lock_timeout * 1000 ) {
+				return false; // timeout
+			}
+		}
+		gitium_error_log( __FUNCTION__ );
+		return array( $gitium_lock_path, $gitium_lock_handle );
+	}
+endif;
+
+if ( ! function_exists( 'gitium_release_merge_lock' ) ) :
+	function gitium_release_merge_lock( $lock ) {
+		list( $gitium_lock_path, $gitium_lock_handle ) = $lock;
+		gitium_error_log( __FUNCTION__ );
+		flock( $gitium_lock_handle, LOCK_UN );
+		fclose( $gitium_lock_handle );
+	}
+endif;
+
+// Merges the commits with remote and pushes them back
+function gitium_merge_and_push( $commits ) {
+	global $git;
+
+	$lock = gitium_acquire_merge_lock()
+		or trigger_error( 'Timeout when gitium lock was acquired', E_USER_WARNING );
+
+	if ( ! $git->fetch_ref() ) {
+		return false;
+	}
+
+	$merge_status = $git->merge_with_accept_mine( $commits );
+
+	gitium_release_merge_lock( $lock );
+
+	return $git->push() && $merge_status;
+}
+
+function gitium_check_after_event( $plugin, $event = 'activation' ) {
+	global $git;
+
+	if ( 'gitium/gitium.php' == $plugin ) { return; } // do not hook on activation of this plugin
+
+	if ( $git->is_dirty() ) {
+		$versions = gitium_update_versions();
+		if ( isset( $versions['plugins'][ $plugin ] ) ) {
+			$name    = $versions['plugins'][ $plugin ]['name'];
+			$version = $versions['plugins'][ $plugin ]['version'];
+		} else {
+			$name = $plugin;
+		}
+		gitium_auto_push( _gitium_format_message( $name, $version, "after $event of" ) );
+	}
+}
+
+function gitium_update_remote_tracking_branch() {
+	global $git;
+	$remote_branch = $git->get_remote_tracking_branch();
+	set_transient( 'gitium_remote_tracking_branch', $remote_branch );
+
+	return $remote_branch;
+}
+
+function _gitium_get_remote_tracking_branch( $update_transient = false ) {
+	if ( ! $update_transient && ( false !== ( $remote_branch = get_transient( 'gitium_remote_tracking_branch' ) ) ) ) {
+		return $remote_branch;
+	} else {
+		return gitium_update_remote_tracking_branch();
+	}
+}
+
+function gitium_update_is_status_working() {
+	global $git;
+	$is_status_working = $git->is_status_working();
+	set_transient( 'gitium_is_status_working', $is_status_working );
+	return $is_status_working;
+}
+
+function _gitium_is_status_working( $update_transient = false ) {
+	if ( ! $update_transient && ( false !== ( $is_status_working = get_transient( 'gitium_is_status_working' ) ) ) ) {
+		return $is_status_working;
+	} else {
+		return gitium_update_is_status_working();
+	}
+}
+
+function _gitium_status( $update_transient = false ) {
+	global $git;
+
+	if ( ! $update_transient && ( false !== ( $changes = get_transient( 'gitium_uncommited_changes' ) ) ) ) {
+		return $changes;
+	}
+
+	$git_version = get_transient( 'gitium_git_version' );
+	if ( false === $git_version ) {
+		set_transient( 'gitium_git_version', $git->get_version() );
+	}
+
+	if ( $git->is_status_working() && $git->get_remote_tracking_branch() ) {
+		if ( ! $git->fetch_ref() ) {
+			set_transient( 'gitium_remote_disconnected', $git->get_last_error() );
+		} else {
+			delete_transient( 'gitium_remote_disconnected' );
+		}
+		$changes = $git->status();
+	} else {
+		delete_transient( 'gitium_remote_disconnected' );
+		$changes = array();
+	}
+
+	set_transient( 'gitium_uncommited_changes', $changes, 12 * 60 * 60 ); // cache changes for half-a-day
+	return $changes;
+}
+
+function _gitium_ssh_encode_buffer( $buffer ) {
+	$len = strlen( $buffer );
+	if ( ord( $buffer[0] ) & 0x80 ) {
+		$len++;
+		$buffer = "\x00" . $buffer;
+	}
+	return pack( 'Na*', $len, $buffer );
+}
+
+function _gitium_generate_keypair() {
+	$rsa_key = openssl_pkey_new(
+		array(
+			'private_key_bits' => 2048,
+			'private_key_type' => OPENSSL_KEYTYPE_RSA,
+		)
+	);
+
+	try {
+		$private_key = openssl_pkey_get_private( $rsa_key );
+		$try = openssl_pkey_export( $private_key, $pem ); //Private Key
+		if (!$try)
+			return false;
+	} catch (Exception $e) {
+		return false;
+	}
+
+	$key_info   = openssl_pkey_get_details( $rsa_key );
+	$buffer     = pack( 'N', 7 ) . 'ssh-rsa' .
+					_gitium_ssh_encode_buffer( $key_info['rsa']['e'] ) .
+					_gitium_ssh_encode_buffer( $key_info['rsa']['n'] );
+	$public_key = 'ssh-rsa ' . base64_encode( $buffer ) . ' gitium@' . parse_url( get_home_url(), PHP_URL_HOST );
+
+	return array( $public_key, $pem );
+}
+
+function gitium_get_keypair( $generate_new_keypair = false ) {
+	if ( $generate_new_keypair ) {
+		$keypair = _gitium_generate_keypair();
+		delete_option( 'gitium_keypair' );
+		add_option( 'gitium_keypair', $keypair, '', false );
+	}
+	if ( false === ( $keypair = get_option( 'gitium_keypair', false ) ) ) {
+		$keypair = _gitium_generate_keypair();
+		add_option( 'gitium_keypair', $keypair, '', false );
+	}
+	return $keypair;
+}
+
+function _gitium_generate_webhook_key() {
+	return md5( str_shuffle( 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.()[]{}-_=+!@#%^&*~<>:;' ) );
+}
+
+function gitium_get_webhook_key( $generate_new_webhook_key = false ) {
+	if ( $generate_new_webhook_key ) {
+		$key = _gitium_generate_webhook_key();
+		delete_option( 'gitium_webhook_key' );
+		add_option( 'gitium_webhook_key', $key, '', false );
+		return $key;
+	}
+	if ( false === ( $key = get_option( 'gitium_webhook_key', false ) ) ) {
+		$key = _gitium_generate_webhook_key();
+		add_option( 'gitium_webhook_key', $key, '', false );
+	}
+	return $key;
+}
+
+function gitium_get_webhook() {
+	if ( defined( 'GIT_WEBHOOK_URL' ) && GIT_WEBHOOK_URL ) { return GIT_WEBHOOK_URL; }
+	$key = gitium_get_webhook_key();
+	$url = add_query_arg( 'key', $key, plugins_url( 'gitium-webhook.php', __FILE__ ) );
+	return apply_filters( 'gitium_webhook_url', $url, $key );
+}
+
+function gitium_admin_init() {
+	global $git;
+
+	$git_version = get_transient( 'gitium_git_version' );
+	if ( false === $git_version ) {
+		set_transient( 'gitium_git_version', $git->get_version() );
+	}
+}
+add_action( 'admin_init', 'gitium_admin_init' );

wp-content/upgrade-temp-backup/plugins/gitium/gitium-webhook.php

@@ -0,0 +1,49 @@
+<?php
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+header( 'Content-Type: text/html' );
+define( 'SHORTINIT', true );
+//$wordpress_loader = $_SERVER['DOCUMENT_ROOT'] . '/wp-load.php';
+$wordpress_loader = filter_input(INPUT_SERVER, 'DOCUMENT_ROOT', FILTER_SANITIZE_STRING) . '/wp-load.php';
+
+require_once $wordpress_loader;
+require_once __DIR__ . '/functions.php';
+require_once __DIR__ . '/inc/class-git-wrapper.php';
+
+$webhook_key = get_option( 'gitium_webhook_key', '' );
+$get_key = filter_input(INPUT_GET, 'key', FILTER_SANITIZE_STRING);
+if ( ! empty ( $webhook_key ) && isset( $get_key ) && $webhook_key == $get_key ) :
+	( '1.7' <= substr( $git->get_version(), 0, 3 ) ) or wp_die( 'Gitium plugin require minimum `git version 1.7`!' );
+
+	list( $git_public_key, $git_private_key ) = gitium_get_keypair();
+	if ( ! $git_public_key || ! $git_private_key )
+		wp_die('Not ready.', 'Not ready.', array( 'response' => 403 ));
+	else
+		$git->set_key( $git_private_key );
+
+	$commits   = array();
+	$commitmsg = sprintf( 'Merged changes from %s on %s', $_SERVER['SERVER_NAME'], date( 'm.d.Y' ) );
+	
+	if ( $git->is_dirty() && $git->add() > 0 ) {
+		$commits[] = $git->commit( $commitmsg ) or trigger_error( 'Could not commit local changes!', E_USER_ERROR );
+	}
+	gitium_merge_and_push( $commits ) or trigger_error( 'Failed merge & push: ' . serialize( $git->get_last_error() ), E_USER_ERROR );
+
+	wp_die( $commitmsg , 'Pull done!', array( 'response' => 200 ) );
+else :
+	wp_die( 'Cheating uh?', 'Cheating uh?', array( 'response' => 403 ) );
+endif;

wp-content/upgrade-temp-backup/plugins/gitium/gitium.php

@@ -0,0 +1,374 @@
+<?php
+/**
+ * Plugin Name: Gitium
+ * Version: 1.0.5
+ * Author: Presslabs
+ * Author URI: https://www.presslabs.com
+ * License: GPL2
+ * Description: Keep all your code on git version control system.
+ * Text Domain: gitium
+ * Domain Path: /languages/
+ */
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+define( 'GITIUM_LAST_COMMITS', 20 );
+define( 'GITIUM_MIN_GIT_VER', '1.7' );
+define( 'GITIUM_MIN_PHP_VER', '5.6' );
+
+if ( is_multisite() ) {
+	define( 'GITIUM_ADMIN_MENU_ACTION', 'network_admin_menu' );
+	define( 'GITIUM_ADMIN_NOTICES_ACTION', 'network_admin_notices' );
+	define( 'GITIUM_MANAGE_OPTIONS_CAPABILITY', 'manage_network_options' );
+} else {
+	define( 'GITIUM_ADMIN_MENU_ACTION', 'admin_menu' );
+	define( 'GITIUM_ADMIN_NOTICES_ACTION', 'admin_notices' );
+	define( 'GITIUM_MANAGE_OPTIONS_CAPABILITY', 'manage_options' );
+}
+
+require_once __DIR__ . '/functions.php';
+require_once __DIR__ . '/inc/class-git-wrapper.php';
+require_once __DIR__ . '/inc/class-gitium-requirements.php';
+require_once __DIR__ . '/inc/class-gitium-admin.php';
+require_once __DIR__ . '/inc/class-gitium-help.php';
+require_once __DIR__ . '/inc/class-gitium-menu.php';
+require_once __DIR__ . '/inc/class-gitium-menu-bubble.php';
+require_once __DIR__ . '/inc/class-gitium-submenu-configure.php';
+require_once __DIR__ . '/inc/class-gitium-submenu-status.php';
+require_once __DIR__ . '/inc/class-gitium-submenu-commits.php';
+require_once __DIR__ . '/inc/class-gitium-submenu-settings.php';
+
+function gitium_load_textdomain() {
+	load_plugin_textdomain( 'gitium', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+}
+add_action( 'plugins_loaded', 'gitium_load_textdomain' );
+
+function _gitium_make_ssh_git_file_exe() {
+	$ssh_wrapper = dirname( __FILE__ ) . '/inc/ssh-git';
+	$process = proc_open(
+		"chmod -f +x $ssh_wrapper",
+		array(
+			0 => array( 'pipe', 'r' ),  // stdin
+			1 => array( 'pipe', 'w' ),  // stdout
+		),
+		$pipes
+	);
+	if ( is_resource( $process ) ) {
+		fclose( $pipes[0] );
+		proc_close( $process );
+	}
+}
+register_activation_hook( __FILE__, '_gitium_make_ssh_git_file_exe' );
+
+function gitium_deactivation() {
+	delete_transient( 'gitium_git_version' );
+}
+register_deactivation_hook( __FILE__, 'gitium_deactivation' );
+
+function gitium_uninstall_hook() {
+	delete_transient( 'gitium_remote_tracking_branch' );
+	delete_transient( 'gitium_remote_disconnected' );
+	delete_transient( 'gitium_uncommited_changes' );
+	delete_transient( 'gitium_git_version' );
+	delete_transient( 'gitium_versions' );
+	delete_transient( 'gitium_menu_bubble' );
+	delete_transient( 'gitium_is_status_working' );
+
+	delete_option( 'gitium_keypair' );
+	delete_option( 'gitium_webhook_key' );
+}
+register_uninstall_hook( __FILE__, 'gitium_uninstall_hook' );
+
+/* Array
+(
+    [themes] => Array
+        (
+            [twentytwelve] => `Twenty Twelve` version 1.3
+        )
+    [plugins] => Array
+        (
+            [cron-view/cron-gui.php] => `Cron GUI` version 1.03
+            [hello-dolly/hello.php] => `Hello Dolly` version 1.6
+        )
+
+) */
+function gitium_update_versions() {
+	$new_versions = [];
+
+	// get all themes from WP
+	$all_themes = wp_get_themes( array( 'allowed' => true ) );
+	foreach ( $all_themes as $theme_name => $theme ) :
+		$theme_versions[ $theme_name ] = array(
+			'name'    => $theme->Name,
+			'version' => null,
+			'msg'     => '',
+		);
+		$theme_versions[ $theme_name ]['msg'] = '`' . $theme->Name . '`';
+		$version = $theme->Version;
+		if ( ! empty( $version ) ) {
+			$theme_versions[ $theme_name ]['msg']     .= " version $version";
+			$theme_versions[ $theme_name ]['version'] .= $version;
+		}
+	endforeach;
+
+	if ( ! empty( $theme_versions ) ) {
+		$new_versions['themes'] = $theme_versions;
+	}
+	// get all plugins from WP
+	if ( ! function_exists( 'get_plugins' ) ) {
+		require_once ABSPATH . 'wp-admin/includes/plugin.php';
+	}
+	$all_plugins = get_plugins();
+	foreach ( $all_plugins as $name => $data ) :
+		$plugin_versions[ $name ] = array(
+			'name'    => $data['Name'],
+			'version' => null,
+			'msg'     => '',
+		);
+		$plugin_versions[ $name ]['msg'] = "`{$data['Name']}`";
+		if ( ! empty( $data['Version'] ) ) {
+			$plugin_versions[ $name ]['msg']     .= ' version ' . $data['Version'];
+			$plugin_versions[ $name ]['version'] .= $data['Version'];
+		}
+	endforeach;
+
+	if ( ! empty( $plugin_versions ) ) {
+		$new_versions['plugins'] = $plugin_versions;
+	}
+
+	set_transient( 'gitium_versions', $new_versions );
+
+	return $new_versions;
+}
+add_action( 'load-plugins.php', 'gitium_update_versions', 999 );
+
+function gitium_upgrader_post_install( $res, $hook_extra, $result ) {
+	_gitium_make_ssh_git_file_exe();
+
+	$action = null;
+	$type   = null;
+
+	// install logic
+	if ( isset( $hook_extra['type'] ) && ( 'plugin' === $hook_extra['type'] ) ) {
+		$action = 'installed';
+		$type   = 'plugin';
+	} else if ( isset( $hook_extra['type'] ) && ( 'theme' === $hook_extra['type'] ) ) {
+		$action = 'installed';
+		$type   = 'theme';
+        }
+
+	// update/upgrade logic
+	if ( isset( $hook_extra['plugin'] ) ) {
+		$action = 'updated';
+		$type   = 'plugin';
+	} else if ( isset( $hook_extra['theme'] ) ) {
+		$action = 'updated';
+		$type   = 'theme';
+	}
+
+	// get action if missed above
+	if ( isset( $hook_extra['action'] ) ) {
+		$action = $hook_extra['action'];
+		if ( 'install' === $action ) {
+			$action = 'installed';
+		}
+		if ( 'update' === $action ) {
+			$action = 'updated';
+		}
+	}
+
+	if ( WP_DEBUG ) {
+		error_log( __FUNCTION__ . ':hook_extra:' . serialize( $hook_extra ) );
+		error_log( __FUNCTION__ . ':action:type:' . $action . ':' . $type );
+	}
+
+	$git_dir = $result['destination'];
+	$version = '';
+
+	if ( ABSPATH == substr( $git_dir, 0, strlen( ABSPATH ) ) ) {
+		$git_dir = substr( $git_dir, strlen( ABSPATH ) );
+	}
+	switch ( $type ) {
+		case 'theme':
+			wp_clean_themes_cache();
+			$theme_data = wp_get_theme( $result['destination_name'] );
+			$name       = $theme_data->get( 'Name' );
+			$version    = $theme_data->get( 'Version' );
+		break;
+		case 'plugin':
+			foreach ( $result['source_files'] as $file ) :
+				if ( '.php' != substr( $file, -4 ) ) { continue; }
+				// every .php file is a possible plugin so we check if it's a plugin
+				$filepath    = trailingslashit( $result['destination'] ) . $file;
+				$plugin_data = get_plugin_data( $filepath );
+				if ( $plugin_data['Name'] ) :
+					$name    = $plugin_data['Name'];
+					$version = $plugin_data['Version'];
+					// We get info from the first plugin in the package
+					break;
+				endif;
+			endforeach;
+		break;
+	}
+	if ( empty( $name ) ) {
+		$name = $result['destination_name'];
+	}
+	$commit_message = _gitium_format_message( $name,$version,"$action $type" );
+	$commit = _gitium_commit_changes( $commit_message, $git_dir, false );
+	gitium_merge_and_push( $commit );
+
+	return $res;
+}
+add_filter( 'upgrader_post_install', 'gitium_upgrader_post_install', 10, 3 );
+
+// Checks for local changes, tries to group them by plugin/theme and pushes the changes
+function gitium_auto_push( $msg_prepend = '' ) {
+	global $git;
+	list( , $git_private_key ) = gitium_get_keypair();
+	if ( ! $git_private_key )
+		return;
+	$git->set_key( $git_private_key );
+
+	$commits = gitium_group_commit_modified_plugins_and_themes( $msg_prepend );
+	gitium_merge_and_push( $commits );
+	gitium_update_versions();
+}
+add_action( 'upgrader_process_complete', 'gitium_auto_push', 11, 0 );
+
+function gitium_check_after_activate_modifications( $plugin ) {
+	gitium_check_after_event( $plugin );
+}
+add_action( 'activated_plugin', 'gitium_check_after_activate_modifications', 999 );
+
+function gitium_check_after_deactivate_modifications( $plugin ) {
+	gitium_check_after_event( $plugin, 'deactivation' );
+}
+add_action( 'deactivated_plugin', 'gitium_check_after_deactivate_modifications', 999 );
+
+function gitium_check_for_plugin_deletions() { // Handle plugin deletion
+    // $_GET['deleted'] used to resemble if a plugin has been deleted (true)
+    // ...meanwhile commit b28dd45f3dad19f0e06c546fdc89ed5b24bacd72 in github.com/WordPress/WordPress...
+    // Now it resembles the number of deleted plugins (a number). Thanks WP
+	if ( isset( $_GET['deleted'] ) && ( 1 <= (int) $_GET['deleted'] || 'true' == $_GET['deleted'] ) ) {
+		gitium_auto_push();
+	}
+}
+add_action( 'load-plugins.php', 'gitium_check_for_plugin_deletions' );
+
+add_action( 'wp_ajax_wp-plugin-delete-success', 'gitium_auto_push' );
+add_action( 'wp_ajax_wp-theme-delete-success', 'gitium_auto_push' );
+
+function gitium_wp_plugin_delete_success() {
+?>
+	<script type='text/javascript'>
+			jQuery(document).ready(function() {
+					jQuery(document).on( 'wp-plugin-delete-success', function() {
+							jQuery.post(ajaxurl, data={'action': 'wp-plugin-delete-success'});
+					});
+			});
+	</script>
+<?php
+}
+add_action( 'admin_head', 'gitium_wp_plugin_delete_success' );
+
+function gitium_wp_theme_delete_success() {
+?>
+	<script type='text/javascript'>
+			jQuery(document).ready(function() {
+					jQuery(document).on( 'wp-theme-delete-success', function() {
+							jQuery.post(ajaxurl, data={'action': 'wp-theme-delete-success'});
+					});
+			});
+	</script>
+<?php
+}
+add_action( 'admin_head', 'gitium_wp_theme_delete_success' );
+
+function gitium_check_for_themes_deletions() { // Handle theme deletion
+	if ( isset( $_GET['deleted'] ) && 'true' == $_GET['deleted'] ) {
+		gitium_auto_push();
+	}
+}
+add_action( 'load-themes.php', 'gitium_check_for_themes_deletions' );
+
+// Deprecated function - backward compatibility
+function gitium_hook_plugin_and_theme_editor_page( $hook )
+{
+    switch ($hook) {
+        case 'plugin-editor.php':
+            if (isset($_GET['a']) && 'te' == $_GET['a']) {
+                gitium_auto_push();
+            }
+            break;
+
+        case 'theme-editor.php':
+            if (isset($_GET['updated']) && 'true' == $_GET['updated']) {
+                gitium_auto_push();
+            }
+            break;
+    }
+
+    return;
+}
+
+/*
+ * We execute the "gitium_auto_push" on "wp_die_ajax_handler" filter to make sure we are
+ * at the end of our request and the latest file is saved on disk.
+ */
+function gitium_check_ajax_success_call($callback)
+{
+    gitium_auto_push();
+
+    return $callback;
+}
+
+/*
+ * We add this filer on "wp_die_ajax_handler" since our action executes before the actual file is saved on disk
+ * which results in a race condition that would commit only the previously saved data not the
+ * currently saved one.
+ */
+function add_filter_for_ajax_save()
+{
+	add_filter('wp_die_ajax_handler', 'gitium_check_ajax_success_call', 1);
+}
+
+/*
+ * We need to apply different filters while checking for WP version to maintain
+ * backworks compatibility since the Code Editor has changed drastically
+ * with the 4.9 WP update.
+ */
+if ( version_compare( $GLOBALS['wp_version'], '4.9', '>=' ) )
+    add_action( 'wp_ajax_edit-theme-plugin-file', 'add_filter_for_ajax_save', 1, 0 );
+else
+    add_action( 'admin_enqueue_scripts', 'gitium_hook_plugin_and_theme_editor_page' );
+
+function gitium_options_page_check() {
+	global $git;
+	if ( ! $git->can_exec_git() ) { wp_die( 'Cannot exec git' ); }
+	return true;
+}
+
+function gitium_remote_disconnected_notice() {
+	if ( current_user_can( GITIUM_MANAGE_OPTIONS_CAPABILITY ) && $message = get_transient( 'gitium_remote_disconnected' ) ) : ?>
+		<div class="error-nag error">
+			<p>
+				Could not connect to remote repository.
+				<pre><?php echo esc_html( $message ); ?></pre>
+			</p>
+		</div>
+	<?php endif;
+}
+add_action( 'admin_notices', 'gitium_remote_disconnected_notice' );

wp-content/upgrade-temp-backup/plugins/gitium/img/gitium.svg

@@ -0,0 +1,26 @@
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In  -->
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+     x="0px" y="0px" width="233.9px" height="204.1px" viewBox="0 0 233.9 204.1" enable-background="new 0 0 233.9 204.1"
+     xml:space="preserve">
+<defs>
+</defs>
+<path fill="#496567" d="M233.9,0v172.3c0,16.8-14.7,31.8-30,31.8H39c-25.4,0-39-13.2-39-45.4V35.1h37.9V0H233.9L233.9,0z"/>
+<path fill="#FFFFFF" d="M37.9,46.8H12.4v113.8c0,17.5,6.5,25.8,12.6,25.8c7.4,0,12.8-8.2,12.8-25.8V46.8z M219.4,14H51.5v149.2
+    c0,12.1-2.2,20.8-5.6,27.6h156.9c6.7,0,17.7-9,16.5-22.1V14z"/>
+<path fill="#496567" d="M192.4,46.4H79.5c-3.4,0-6.1-2.7-6.1-6.1c0-3.4,2.7-6.1,6.1-6.1h112.9c3.4,0,6.1,2.7,6.1,6.1
+    C198.5,43.7,195.8,46.4,192.4,46.4z M149.7,118.3c-1-1.4-2.2-2.3-3.8-2.7s-3.5-0.6-5.8-0.6h-18.5c-2.2,0-4,0.6-5.3,1.8
+    c-1.3,1.2-2,2.7-2,4.5c0,2.2,0.8,3.8,2.3,4.7s3.9,1.4,6.9,1.4h12.6v13.1c-3.4,1.8-6.8,3.2-10.1,4.2c-3.3,1-6.9,1.5-10.6,1.5
+    c-7.8,0-13.8-2.5-18.2-7.6c-4.3-5.1-6.5-12.4-6.5-21.8c0-4.4,0.6-8.3,1.7-11.9s2.7-6.6,4.8-9.1c2.1-2.5,4.6-4.4,7.6-5.7
+    c3-1.3,6.3-2,10.1-2c3.7,0,6.7,0.5,9,1.6s4.2,2.5,5.6,4.1s3.1,4,5.1,7.1c0.7,1,1.6,1.8,2.7,2.3s2.2,0.8,3.4,0.8
+    c2.1,0,3.9-0.7,5.5-2.2c1.5-1.4,2.3-3.2,2.3-5.3c0-1.9-0.7-4.1-2-6.5c-1.3-2.5-3.3-4.8-5.9-7c-2.6-2.2-6-4-10.2-5.5
+    c-4.2-1.4-9-2.2-14.4-2.2c-6.6,0-12.5,1-17.7,2.9c-5.2,1.9-9.6,4.7-13.3,8.3s-6.4,8-8.2,13.3s-2.8,10.9-2.8,17.2
+    c0,6.4,1,12.2,2.9,17.3c1.9,5.2,4.7,9.6,8.3,13.2s7.9,6.4,13,8.3c5.1,1.9,10.7,2.9,16.9,2.9c5.3,0,10.2-0.6,14.7-1.8
+    c4.5-1.2,9.2-3.1,14.1-5.8c1.7-0.9,3.1-1.9,4.2-2.9s1.8-2.1,2.2-3.3c0.4-1.2,0.6-2.9,0.6-4.9v-15.5
+    C151.1,121.8,150.7,119.7,149.7,118.3z M161.3,100.5c-1.2,1-1.8,2.3-1.8,3.9c0,1.6,0.6,2.9,1.7,3.9s2.8,1.5,4.9,1.5h2v28.8
+    c0,4.7,0.4,8.4,1.1,11.2s2.3,5,4.8,6.5c2.4,1.6,6,2.4,10.7,2.4c4.9,0,8.7-0.6,11.4-1.9c2.6-1.3,4-3.1,4-5.6c0-1.4-0.5-2.6-1.5-3.6
+    c-1-1-2.1-1.5-3.3-1.5c-0.8,0-2,0.2-3.5,0.5c-1.5,0.3-2.7,0.5-3.6,0.5c-1.6,0-2.8-0.4-3.5-1.2c-0.7-0.8-1.2-1.8-1.3-3.1
+    c-0.2-1.3-0.2-3.1-0.2-5.4v-27.6h2.8c3,0,5.3-0.4,6.8-1.2c1.6-0.8,2.4-2.2,2.4-4.2c0-1.6-0.6-2.9-1.7-3.9c-1.1-1-2.7-1.5-4.9-1.5
+    h-5.5V88.8c0-2.5-0.1-4.5-0.4-5.9c-0.3-1.4-0.9-2.5-2-3.5c-1.5-1.4-3.3-2.1-5.2-2.1c-1.4,0-2.6,0.3-3.7,1c-1.1,0.6-1.9,1.5-2.5,2.5
+    c-0.6,1-0.9,2.2-1.1,3.5c-0.1,1.4-0.2,3.3-0.2,5.7v9h-1.6C164.2,99,162.5,99.5,161.3,100.5z"/>
+</svg>

wp-content/upgrade-temp-backup/plugins/gitium/inc/class-git-wrapper.php

@@ -0,0 +1,669 @@
+<?php
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+define('GITIGNORE', <<<EOF
+*.log
+*.swp
+*.back
+*.bak
+*.sql
+*.sql.gz
+~*
+
+.htaccess
+.maintenance
+
+wp-config.php
+sitemap.xml
+sitemap.xml.gz
+wp-content/uploads/
+wp-content/blogs.dir/
+wp-content/upgrade/
+wp-content/backup-db/
+wp-content/cache/
+wp-content/backups/
+
+wp-content/advanced-cache.php
+wp-content/object-cache.php
+wp-content/wp-cache-config.php
+wp-content/db.php
+
+wp-admin/
+wp-includes/
+/index.php
+/license.txt
+/readme.html
+
+# de_DE
+/liesmich.html
+
+# it_IT
+/LEGGIMI.txt
+/licenza.html
+
+# da_DK
+/licens.html
+
+# es_ES, es_PE
+/licencia.txt
+
+# hu_HU
+/licenc.txt
+/olvasdel.html
+
+# sk_SK
+/licencia-sk_SK.txt
+
+# sv_SE
+/licens-sv_SE.txt
+
+/wp-activate.php
+/wp-blog-header.php
+/wp-comments-post.php
+/wp-config-sample.php
+/wp-cron.php
+/wp-links-opml.php
+/wp-load.php
+/wp-login.php
+/wp-mail.php
+/wp-settings.php
+/wp-signup.php
+/wp-trackback.php
+/xmlrpc.php
+EOF
+);
+
+
+class Git_Wrapper {
+
+	private $last_error = '';
+	private $gitignore  = GITIGNORE;
+
+	function __construct( $repo_dir ) {
+		$this->repo_dir    = $repo_dir;
+		$this->private_key = '';
+	}
+
+	function _rrmdir( $dir ) {
+		if ( empty( $dir ) || ! is_dir( $dir ) ) {
+			return false;
+		}
+
+		$files = array_diff( scandir( $dir ), array( '.', '..' ) );
+		foreach ( $files as $file ) {
+			$filepath = realpath("$dir/$file");
+			( is_dir( $filepath ) ) ? $this->_rrmdir( $filepath ) : unlink( $filepath );
+		}
+		return rmdir( $dir );
+	}
+
+	function _log(...$args) {
+		if ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) { return; }
+
+		$output = '';
+		if (isset($args) && $args) foreach ( $args as $arg ) {
+			$output .= var_export($arg, true).'/n/n';
+		}
+
+		if ($output) error_log($output);
+	}
+
+	function _git_temp_key_file() {
+		$key_file = tempnam( sys_get_temp_dir(), 'ssh-git' );
+		return $key_file;
+	}
+
+	function set_key( $private_key ) {
+		$this->private_key = $private_key;
+	}
+
+	private function get_env() {
+		$env      = array();
+		$key_file = null;
+
+		if ( defined( 'GIT_SSH' ) && GIT_SSH ) {
+			$env['GIT_SSH'] = GIT_SSH;
+		} else {
+			$env['GIT_SSH'] = dirname( __FILE__ ) . '/ssh-git';
+		}
+
+		if ( defined( 'GIT_KEY_FILE' ) && GIT_KEY_FILE ) {
+			$env['GIT_KEY_FILE'] = GIT_KEY_FILE;
+		} elseif ( $this->private_key ) {
+			$key_file = $this->_git_temp_key_file();
+			chmod( $key_file, 0600 );
+			file_put_contents( $key_file, $this->private_key );
+			$env['GIT_KEY_FILE'] = $key_file;
+		}
+
+		return $env;
+	}
+
+	protected function _call(...$args) {
+		$args     = join( ' ', array_map( 'escapeshellarg', $args ) );
+		$return   = -1;
+		$response = array();
+		$env      = $this->get_env();
+
+		$git_bin_path = apply_filters( 'gitium_git_bin_path', '' );
+		$cmd = "${git_bin_path}git $args 2>&1";
+
+		$proc = proc_open(
+			$cmd,
+			array(
+				0 => array( 'pipe', 'r' ),  // stdin
+				1 => array( 'pipe', 'w' ),  // stdout
+			),
+			$pipes,
+			$this->repo_dir,
+			$env
+		);
+		if ( is_resource( $proc ) ) {
+			fclose( $pipes[0] );
+			while ( $line = fgets( $pipes[1] ) ) {
+				$response[] = rtrim( $line, "\n\r" );
+			}
+			$return = (int)proc_close( $proc );
+		}
+		$this->_log( "$return $cmd", join( "\n", $response ) );
+		if ( ! defined( 'GIT_KEY_FILE' ) && isset( $env['GIT_KEY_FILE'] ) ) {
+			unlink( $env['GIT_KEY_FILE'] );
+		}
+		if ( 0 != $return ) {
+			$this->last_error = join( "\n", $response );
+		} else {
+			$this->last_error = null;
+		}
+		return array( $return, $response );
+	}
+
+	function get_last_error() {
+		return $this->last_error;
+	}
+
+	function can_exec_git() {
+		list( $return, ) = $this->_call( 'version' );
+		return ( 0 == $return );
+	}
+
+	function is_status_working() {
+		list( $return, ) = $this->_call( 'status', '-s' );
+		return ( 0 == $return );
+	}
+
+	function get_version() {
+		list( $return, $version ) = $this->_call( 'version' );
+		if ( 0 != $return ) { return ''; }
+		if ( ! empty( $version[0] ) ) {
+			return substr( $version[0], 12 );
+		}
+		return '';
+	}
+
+	// git rev-list @{u}..
+	function get_ahead_commits() {
+		list( , $commits ) = $this->_call( 'rev-list', '@{u}..' );
+		return $commits;
+	}
+
+	// git rev-list ..@{u}
+	function get_behind_commits() {
+		list( , $commits  ) = $this->_call( 'rev-list', '..@{u}' );
+		return $commits;
+	}
+
+	function init() {
+		file_put_contents( "$this->repo_dir/.gitignore", $this->gitignore );
+		list( $return, ) = $this->_call( 'init' );
+		$this->_call( 'config', 'user.email', 'gitium@presslabs.com' );
+		$this->_call( 'config', 'user.name', 'Gitium' );
+		$this->_call( 'config', 'push.default', 'matching' );
+		return ( 0 == $return );
+	}
+
+	function is_dot_git_dir( $dir ) {
+		$realpath   = realpath( $dir );
+		$git_config = realpath( $realpath . '/config' );
+		$git_index  = realpath( $realpath . '/index' );
+		if ( ! empty( $realpath ) && is_dir( $realpath ) && file_exists( $git_config ) && file_exists( $git_index ) ) {
+			return True;
+		}
+		return False;
+	}
+
+	function cleanup() {
+		$dot_git_dir = realpath( $this->repo_dir . '/.git' );
+		if ( $this->is_dot_git_dir( $dot_git_dir ) && $this->_rrmdir( $dot_git_dir ) ) {
+			if ( WP_DEBUG ) {
+				error_log( "Gitium cleanup successfull. Removed '$dot_git_dir'." );
+			}
+			return True;
+		}
+		if ( WP_DEBUG ) {
+			error_log( "Gitium cleanup failed. '$dot_git_dir' is not a .git dir." );
+		}
+		return False;
+	}
+
+	function add_remote_url( $url ) {
+		list( $return, ) = $this->_call( 'remote', 'add', 'origin', $url );
+		return ( 0 == $return );
+	}
+
+	function get_remote_url() {
+		list( , $response ) = $this->_call( 'config', '--get', 'remote.origin.url' );
+		if ( isset( $response[0] ) ) {
+			return $response[0];
+		}
+		return '';
+	}
+
+	function remove_remote() {
+		list( $return, ) = $this->_call( 'remote', 'rm', 'origin');
+		return ( 0 == $return );
+	}
+
+	function get_remote_tracking_branch() {
+		list( $return, $response ) = $this->_call( 'rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}' );
+		if ( 0 == $return ) {
+			return $response[0];
+		}
+		return false;
+	}
+
+	function get_local_branch() {
+		list( $return, $response ) = $this->_call( 'rev-parse', '--abbrev-ref', 'HEAD' );
+		if ( 0 == $return ) {
+			return $response[0];
+		}
+		return false;
+	}
+
+	function fetch_ref() {
+		list( $return, ) = $this->_call( 'fetch', 'origin' );
+		return ( 0 == $return );
+	}
+
+	protected function _resolve_merge_conflicts( $message ) {
+		list( , $changes ) = $this->status( true );
+		$this->_log( $changes );
+		foreach ( $changes as $path => $change ) {
+			if ( in_array( $change, array( 'UD', 'DD' ) ) ) {
+				$this->_call( 'rm', $path );
+				$message .= "\n\tConflict: $path [removed]";
+			} elseif ( 'DU' == $change ) {
+				$this->_call( 'add', $path );
+				$message .= "\n\tConflict: $path [added]";
+			} elseif ( in_array( $change, array( 'AA', 'UU', 'AU', 'UA' ) ) ) {
+				$this->_call( 'checkout', '--theirs', $path );
+				$this->_call( 'add', '--all', $path );
+				$message .= "\n\tConflict: $path [local version]";
+			}
+		}
+		$this->commit( $message );
+	}
+
+	function get_commit_message( $commit ) {
+		list( $return, $response ) = $this->_call( 'log', '--format=%B', '-n', '1', $commit );
+		return ( $return !== 0 ? false : join( "\n", $response ) );
+	}
+
+	private function strpos_haystack_array( $haystack, $needle, $offset=0 ) {
+		if ( ! is_array( $haystack ) ) { $haystack = array( $haystack ); }
+
+		foreach ( $haystack as $query ) {
+			if ( strpos( $query, $needle, $offset) !== false ) { return true; }
+		}
+		return false;
+	}
+
+	private function cherry_pick( $commits ) {
+		foreach ( $commits as $commit ) {
+			if ( empty( $commit ) ) { return false; }
+
+			list( $return, $response ) = $this->_call( 'cherry-pick', $commit );
+
+			// abort the cherry-pick if the changes are already pushed
+			if ( false !== $this->strpos_haystack_array( $response, 'previous cherry-pick is now empty' ) ) {
+				$this->_call( 'cherry-pick', '--abort' );
+				continue;
+			}
+
+			if ( $return != 0 ) {
+				$this->_resolve_merge_conflicts( $this->get_commit_message( $commit ) );
+			}
+		}
+	}
+
+	function merge_with_accept_mine(...$commits) {
+		do_action( 'gitium_before_merge_with_accept_mine' );
+
+		if ( 1 == count($commits) && is_array( $commits[0] ) ) {
+			$commits = $commits[0];
+		}
+
+		// get ahead commits
+		$ahead_commits = $this->get_ahead_commits();
+
+		// combine all commits with the ahead commits
+		$commits = array_unique( array_merge( array_reverse( $commits ), $ahead_commits ) );
+		$commits = array_reverse( $commits );
+
+		// get the remote branch
+		$remote_branch = $this->get_remote_tracking_branch();
+
+		// get the local branch
+		$local_branch  = $this->get_local_branch();
+
+		// rename the local branch to 'merge_local'
+		$this->_call( 'branch', '-m', 'merge_local' );
+
+		// local branch set up to track remote branch
+		$this->_call( 'branch', $local_branch, $remote_branch );
+
+		// checkout to the $local_branch
+		list( $return, ) = $this->_call( 'checkout', $local_branch );
+		if ( $return != 0 ) {
+			$this->_call( 'branch', '-M', $local_branch );
+			return false;
+		}
+
+		// don't cherry pick if there are no commits
+		if ( count( $commits ) > 0 ) {
+			$this->cherry_pick( $commits );
+		}
+
+		if ( $this->successfully_merged() ) { // git status without states: AA, DD, UA, AU ...
+			// delete the 'merge_local' branch
+			$this->_call( 'branch', '-D', 'merge_local' );
+			return true;
+		} else {
+			$this->_call( 'cherry-pick', '--abort' );
+			$this->_call( 'checkout', '-b', 'merge_local' );
+			$this->_call( 'branch', '-M', $local_branch );
+			return false;
+		}
+	}
+
+	function successfully_merged() {
+		list( , $response ) = $this->status( true );
+		$changes = array_values( $response );
+		return ( 0 == count( array_intersect( $changes, array( 'DD', 'AU', 'UD', 'UA', 'DU', 'AA', 'UU' ) ) ) );
+	}
+
+	function merge_initial_commit( $commit, $branch ) {
+		list( $return, ) = $this->_call( 'branch', '-m', 'initial' );
+		if ( 0 != $return ) {
+			return false;
+		}
+		list( $return, ) = $this->_call( 'checkout', $branch );
+		if ( 0 != $return ) {
+			return false;
+		}
+		list( $return, ) = $this->_call(
+			'cherry-pick', '--strategy', 'recursive', '--strategy-option', 'theirs', $commit
+		);
+		if ( $return != 0 ) {
+			$this->_resolve_merge_conflicts( $this->get_commit_message( $commit ) );
+			if ( ! $this->successfully_merged() ) {
+				$this->_call( 'cherry-pick', '--abort' );
+				$this->_call( 'checkout', 'initial' );
+				return false;
+			}
+		}
+		$this->_call( 'branch', '-D', 'initial' );
+		return true;
+	}
+
+	function get_remote_branches() {
+		list( , $response ) = $this->_call( 'branch', '-r' );
+		$response = array_map( 'trim', $response );
+		$response = array_map( function( $b ) { return str_replace( "origin/", "", $b ); }, $response );
+		return $response;
+	}
+
+	function add(...$args) {
+		if ( 1 == count($args) && is_array( $args[0] ) ) {
+			$args = $args[0];
+		}
+		$params = array_merge( array( 'add', '-n', '--all' ), $args );
+		list ( , $response ) = call_user_func_array( array( $this, '_call' ), $params );
+		$count = count( $response );
+
+		$params = array_merge( array( 'add', '--all' ), $args );
+		list ( , $response ) = call_user_func_array( array( $this, '_call' ), $params );
+
+		return $count;
+	}
+
+	function commit( $message, $author_name = '', $author_email = '' ) {
+		$author = '';
+		if ( $author_email ) {
+			if ( empty( $author_name ) ) {
+				$author_name = $author_email;
+			}
+			$author = "$author_name <$author_email>";
+		}
+
+		if ( ! empty( $author ) ) {
+			list( $return, $response ) = $this->_call( 'commit', '-m', $message, '--author', $author );
+		} else {
+			list( $return, $response ) = $this->_call( 'commit', '-m', $message );
+		}
+		if ( $return !== 0 ) { return false; }
+
+		list( $return, $response ) = $this->_call( 'rev-parse', 'HEAD' );
+
+		return ( $return === 0 ) ? $response[0] : false;
+	}
+
+	function push( $branch = '' ) {
+		if ( ! empty( $branch ) ) {
+			list( $return, ) = $this->_call( 'push', '--porcelain', '-u', 'origin', $branch );
+		} else {
+			list( $return, ) = $this->_call( 'push', '--porcelain', '-u', 'origin', 'HEAD' );
+		}
+		return ( $return == 0 );
+	}
+
+	/*
+	 * Get uncommited changes with status porcelain
+	 * git status --porcelain
+	 * It returns an array like this:
+	 array(
+		file => deleted|modified
+		...
+	)
+	 */
+	function get_local_changes() {
+		list( $return, $response ) = $this->_call( 'status', '--porcelain'  );
+
+		if ( 0 !== $return ) {
+			return array();
+		}
+		$new_response = array();
+		if ( ! empty( $response ) ) {
+			foreach ( $response as $line ) :
+				$work_tree_status = substr( $line, 1, 1 );
+				$path = substr( $line, 3 );
+
+				if ( ( '"' == $path[0] ) && ('"' == $path[strlen( $path ) - 1] ) ) {
+					// git status --porcelain will put quotes around paths with whitespaces
+					// we don't want the quotes, let's get rid of them
+					$path = substr( $path, 1, strlen( $path ) - 2 );
+				}
+
+				if ( 'D' == $work_tree_status ) {
+					$action = 'deleted';
+				} else {
+					$action = 'modified';
+				}
+				$new_response[ $path ] = $action;
+			endforeach;
+		}
+		return $new_response;
+	}
+
+	function get_uncommited_changes() {
+		list( , $changes ) = $this->status();
+		return $changes;
+	}
+
+	function local_status() {
+		list( $return, $response ) = $this->_call( 'status', '-s', '-b', '-u' );
+		if ( 0 !== $return ) {
+			return array( '', array() );
+		}
+
+		$new_response = array();
+		if ( ! empty( $response ) ) {
+			$branch_status = array_shift( $response );
+			foreach ( $response as $idx => $line ) :
+				unset( $index_status, $work_tree_status, $path, $new_path, $old_path );
+
+				if ( empty( $line ) ) { continue; } // ignore empty lines like the last item
+				if ( '#' == $line[0] ) { continue; } // ignore branch status
+
+				$index_status     = substr( $line, 0, 1 );
+				$work_tree_status = substr( $line, 1, 1 );
+				$path             = substr( $line, 3 );
+
+				$old_path = '';
+				$new_path = explode( '->', $path );
+				if ( ( 'R' === $index_status ) && ( ! empty( $new_path[1] ) ) ) {
+					$old_path = trim( $new_path[0] );
+					$path     = trim( $new_path[1] );
+				}
+				$new_response[ $path ] = trim( $index_status . $work_tree_status . ' ' . $old_path );
+			endforeach;
+		}
+
+		return array( $branch_status, $new_response );
+	}
+
+	function status( $local_only = false ) {
+		list( $branch_status, $new_response ) = $this->local_status();
+
+		if ( $local_only ) { return array( $branch_status, $new_response ); }
+
+		$behind_count = 0;
+		$ahead_count  = 0;
+		if ( preg_match( '/## ([^.]+)\.+([^ ]+)/', $branch_status, $matches ) ) {
+			$local_branch  = $matches[1];
+			$remote_branch = $matches[2];
+
+			list( , $response ) = $this->_call( 'rev-list', "$local_branch..$remote_branch", '--count' );
+			$behind_count = (int)$response[0];
+
+			list( , $response ) = $this->_call( 'rev-list', "$remote_branch..$local_branch", '--count' );
+			$ahead_count = (int)$response[0];
+		}
+
+		if ( $behind_count ) {
+			list( , $response ) = $this->_call( 'diff', '-z', '--name-status', "$local_branch~$ahead_count", $remote_branch );
+			$response = explode( chr( 0 ), $response[0] );
+			array_pop( $response );
+			for ( $idx = 0 ; $idx < count( $response ) / 2 ; $idx++ ) {
+				$file   = $response[ $idx * 2 + 1 ];
+				$change = $response[ $idx * 2 ];
+				if ( ! isset( $new_response[ $file ] ) ) {
+					$new_response[ $file ] = "r$change";
+				}
+			}
+		}
+		return array( $branch_status, $new_response );
+	}
+
+	/*
+	 * Checks if repo has uncommited changes
+	 * git status --porcelain
+	 */
+	function is_dirty() {
+		$changes = $this->get_uncommited_changes();
+		return ! empty( $changes );
+	}
+
+	/**
+	 * Return the last n commits
+	 */
+	function get_last_commits( $n = 20 ) {
+		list( $return, $message )  = $this->_call( 'log', '-n', $n, '--pretty=format:%s' );
+		if ( 0 !== $return ) { return false; }
+
+		list( $return, $response ) = $this->_call( 'log', '-n', $n, '--pretty=format:%h|%an|%ae|%ad|%cn|%ce|%cd' );
+		if ( 0 !== $return ) { return false; }
+
+		foreach ( $response as $index => $value ) {
+			$commit_info = explode( '|', $value );
+			$commits[ $commit_info[0] ] = array(
+				'subject'         => $message[ $index ],
+				'author_name'     => $commit_info[1],
+				'author_email'    => $commit_info[2],
+				'author_date'     => $commit_info[3],
+			);
+			if ( $commit_info[1] != $commit_info[4] && $commit_info[2] != $commit_info[5] ) {
+				$commits[ $commit_info[0] ]['committer_name']  = $commit_info[4];
+				$commits[ $commit_info[0] ]['committer_email'] = $commit_info[5];
+				$commits[ $commit_info[0] ]['committer_date']  = $commit_info[6];
+			}
+		}
+		return $commits;
+	}
+
+	public function set_gitignore( $content ) {
+		file_put_contents( $this->repo_dir . '/.gitignore', $content );
+		return true;
+	}
+
+	public function get_gitignore() {
+		return file_get_contents( $this->repo_dir . '/.gitignore' );
+	}
+
+	/**
+	 * Remove files in .gitignore from version control
+	 */
+	function rm_cached( $path ) {
+		list( $return, ) = $this->_call( 'rm', '--cached', $path );
+		return ( $return == 0 );
+	}
+
+	function remove_wp_content_from_version_control() {
+		$process = proc_open(
+			'rm -rf ' . ABSPATH . '/wp-content/.git',
+			array(
+				0 => array( 'pipe', 'r' ),  // stdin
+				1 => array( 'pipe', 'w' ),  // stdout
+			),
+			$pipes
+		);
+		if ( is_resource( $process ) ) {
+			fclose( $pipes[0] );
+			proc_close( $process );
+			return true;
+		}
+		return false;
+	}
+}
+
+if ( ! defined( 'GIT_DIR' ) ) {
+	define( 'GIT_DIR', dirname( WP_CONTENT_DIR ) );
+}
+
+# global is needed here for wp-cli as it includes/exec files inside a function scope
+# this forces the context to really be global :\.
+global $git;
+$git = new Git_Wrapper( GIT_DIR );

wp-content/upgrade-temp-backup/plugins/gitium/inc/class-gitium-admin.php

@@ -0,0 +1,53 @@
+<?php
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+class Gitium_Admin {
+
+	public function __construct() {
+		global $git;
+
+		list( , $git_private_key ) = gitium_get_keypair();
+		$git->set_key( $git_private_key );
+
+		if ( current_user_can( GITIUM_MANAGE_OPTIONS_CAPABILITY ) ) {
+			$req = new Gitium_Requirements();
+			if ( ! $req->get_status() ) {
+				return false;
+			}
+
+			if ( $this->has_configuration() ) {
+				new Gitium_Submenu_Status();
+				new Gitium_Submenu_Commits();
+				new Gitium_Submenu_Settings();
+				new Gitium_Menu_Bubble();
+			} else {
+				new Gitium_Submenu_Configure();
+			}
+		}
+	}
+
+	public function has_configuration() {
+		return _gitium_is_status_working() && _gitium_get_remote_tracking_branch();
+	}
+}
+
+if ( ( is_admin() && ! is_multisite() ) || ( is_network_admin() && is_multisite() ) ) {
+	add_action( 'init', 'gitium_admin_page' );
+	function gitium_admin_page() {
+		new Gitium_Admin();
+	}
+}

wp-content/upgrade-temp-backup/plugins/gitium/inc/class-gitium-help.php

@@ -0,0 +1,107 @@
+<?php
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+class Gitium_Help {
+
+	public function __construct( $hook, $help = 'gitium' ) {
+		add_action( "load-{$hook}", array( $this, $help ), 20 );
+	}
+
+	private function general() {
+		$screen = get_current_screen();
+		$screen->add_help_tab( array( 'id' => 'gitium', 'title' => __( 'Gitium', 'gitium' ), 'callback' => array( $this, 'gitium' ) ) );
+		$screen->add_help_tab( array( 'id' => 'faq', 'title' => __( 'F.A.Q.', 'gitium' ), 'callback' => array( $this, 'faq' ) ) );
+		$screen->add_help_tab( array( 'id' => 'requirements', 'title' => __( 'Requirements', 'gitium' ), 'callback' => array( $this, 'requirements_callback' ) ) );
+		$screen->set_help_sidebar( '<div style="width:auto; height:auto; float:right; padding-right:28px; padding-top:15px"><img src="' . plugins_url( 'img/gitium.svg', dirname( __FILE__ ) ) . '" width="96"></div>' );
+	}
+
+	public function gitium() {
+		echo '<p>' . __( 'Gitium enables continuous deployment for WordPress integrating with tools such as Github, Bitbucket or Travis-CI. Plugin and theme updates, installs and removals are automatically versioned.', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'Ninja code edits from the WordPress editor are also tracked into version control. Gitium is designed for sane development environments.', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'Staging and production can follow different branches of the same repository. You can deploy code simply trough git push.', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'Gitium requires <code>git</code> command line tool minimum version 1.7 installed on the server and <code>proc_open</code> PHP function enabled.', 'gitium' ) . '</p>';
+	}
+
+	public function faq() {
+		echo '<p><strong>' . __( 'Could not connect to remote repository?', 'gitium' ) . '</strong><br />'. __( 'If you encounter this kind of error you can try to fix it by setting the proper username of the .git directory.', 'gitium' ) . '<br />' . __( 'Example', 'gitium' ) .': <code>chown -R www-data:www-data .git</code></p>';
+		echo '<p><strong>' . __( 'Is this plugin considered stable?', 'gitium' ) . '</strong><br />'. __( 'Right now this plugin is considered alpha quality and should be used in production environments only by adventurous kinds.', 'gitium' ) . '</p>';
+		echo '<p><strong>' . __( 'What happens in case of conflicts?', 'gitium' ) . '</strong><br />'. __( 'The behavior in case of conflicts is to overwrite the changes on the origin repository with the local changes (ie. local modifications take precedence over remote ones).', 'gitium' ) . '</p>';
+		echo '<p><strong>' . __( 'How to deploy automatically after a push?', 'gitium' ) . '</strong><br />'. __( 'You can ping the webhook url after a push to automatically deploy the new code. The webhook url can be found under Code menu. This url plays well with Github or Bitbucket webhooks.', 'gitium' ) . '</p>';
+		echo '<p><strong>' . __( 'Does it works on multi site setups?', 'gitium' ) . '</strong><br />'. __( 'Gitium is not supporting multisite setups at the moment.', 'gitium' ) . '</p>';
+		echo '<p><strong>' . __( 'How does gitium handle submodules?', 'gitium' ) . '</strong><br />'. __( 'Currently submodules are not supported.', 'gitium' ) . '</p>';
+	}
+
+	public function requirements_callback() {
+		echo '<p>' . __( 'Gitium requires:', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'the function proc_open available', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'can exec the file inc/ssh-git', 'gitium' ) . '</p>';
+
+		printf( '<p>' . __( 'git version >= %s', 'gitium' ) . '</p>', GITIUM_MIN_GIT_VER );
+		printf( '<p>' . __( 'PHP version >= %s', 'gitium' ) . '</p>', GITIUM_MIN_PHP_VER );
+	}
+
+	public function configuration() {
+		$screen = get_current_screen();
+		$screen->add_help_tab( array( 'id' => 'configuration', 'title' => __( 'Configuration', 'gitium' ), 'callback' => array( $this, 'configuration_callback' ) ) );
+		$this->general();
+	}
+
+	public function configuration_callback() {
+		echo '<p><strong>' . __( 'Configuration step 1', 'gitium' ) . '</strong><br />' . __( 'In this step you must specify the <code>Remote URL</code>. This URL represents the link between the git sistem and your site.', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'You can get this URL from your Git repository and it looks like this:', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'github.com -> git@github.com:user/example.git', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'bitbucket.org -> git@bitbucket.org:user/glowing-happiness.git', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'To go to the next step, fill the <code>Remote URL</code> and then press the <code>Fetch</code> button.', 'gitium' ) . '</p>';
+		echo '<p><strong>' . __( 'Configuration step 2', 'gitium' ) . '</strong><br />' . __( 'In this step you must select the <code>branch</code> you want to follow.', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'Only this branch will have all of your code modifications.', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'When you push the button <code>Merge & Push</code>, all code(plugins & themes) will be pushed on the git repository.', 'gitium' ) . '</p>';
+	}
+
+	public function status() {
+		$screen = get_current_screen();
+		$screen->add_help_tab( array( 'id' => 'status', 'title' => __( 'Status', 'gitium' ), 'callback' => array( $this, 'status_callback' ) ) );
+		$this->general();
+	}
+
+	public function status_callback() {
+		echo '<p>' . __( 'On status page you can see what files are modified, and you can commit the changes to git.', 'gitium' ) . '</p>';
+	}
+
+	public function commits() {
+		$screen = get_current_screen();
+		$screen->add_help_tab( array( 'id' => 'commits', 'title' => __( 'Commits', 'gitium' ), 'callback' => array( $this, 'commits_callback' ) ) );
+		$this->general();
+	}
+
+	public function commits_callback() {
+		echo '<p>' . __( 'You may be wondering what is the difference between author and committer.', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'The <code>author</code> is the person who originally wrote the patch, whereas the <code>committer</code> is the person who last applied the patch.', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'So, if you send in a patch to a project and one of the core members applies the patch, both of you get credit — you as the author and the core member as the committer.', 'gitium' ) . '</p>';
+	}
+
+	public function settings() {
+		$screen = get_current_screen();
+		$screen->add_help_tab( array( 'id' => 'settings', 'title' => __( 'Settings', 'gitium' ), 'callback' => array( $this, 'settings_callback' ) ) );
+		$this->general();
+	}
+
+	public function settings_callback() {
+		echo '<p>' . __( 'Each line from the gitignore file specifies a pattern.', 'gitium' ) . '</p>';
+		echo '<p>' . __( 'When deciding whether to ignore a path, Git normally checks gitignore patterns from multiple sources, with the following order of precedence, from highest to lowest (within one level of precedence, the last matching pattern decides the outcome)', 'gitium' ) . '</p>';
+		echo '<p>' . sprintf( __( 'Read more on %s', 'gitium' ), '<a href="http://git-scm.com/docs/gitignore" target="_blank">git documentation</a>' ) . '</p>';
+	}
+}

wp-content/upgrade-temp-backup/plugins/gitium/inc/class-gitium-menu-bubble.php

@@ -0,0 +1,55 @@
+<?php
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+class Gitium_Menu_Bubble extends Gitium_Menu {
+
+	public function __construct() {
+		parent::__construct( $this->gitium_menu_slug, $this->gitium_menu_slug );
+		add_action( GITIUM_ADMIN_MENU_ACTION, array( $this, 'add_menu_bubble' ) );
+	}
+
+	public function add_menu_bubble() {
+		global $menu;
+
+		if ( ! _gitium_is_status_working()  ) {
+			foreach ( $menu as $key => $value  ) {
+				if ( $this->menu_slug == $menu[ $key ][2] ) {
+					$menu_bubble = get_transient( 'gitium_menu_bubble' );
+					if ( false === $menu_bubble ) { $menu_bubble = ''; }
+					$menu[ $key ][0] = str_replace( $menu_bubble, '', $menu[ $key ][0] );
+					delete_transient( 'gitium_menu_bubble' );
+					return;
+				}
+			}
+		}
+
+		list( , $changes ) = _gitium_status();
+
+		if ( ! empty( $changes ) ) :
+			$bubble_count = count( $changes );
+			foreach ( $menu as $key => $value  ) {
+				if ( $this->menu_slug == $menu[ $key ][2] ) {
+					$menu_bubble = " <span class='update-plugins count-$bubble_count'><span class='plugin-count'>"
+						. $bubble_count . '</span></span>';
+					$menu[ $key ][0] .= $menu_bubble;
+					set_transient( 'gitium_menu_bubble', $menu_bubble );
+					return;
+				}
+			}
+		endif;
+	}
+}

wp-content/upgrade-temp-backup/plugins/gitium/inc/class-gitium-menu.php

@@ -0,0 +1,97 @@
+<?php
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+class Gitium_Menu {
+
+	public $gitium_menu_slug   = 'gitium/gitium.php';
+	public $commits_menu_slug  = 'gitium/gitium-commits.php';
+	public $settings_menu_slug = 'gitium/gitium-settings.php';
+
+	public $git = null;
+
+	public $menu_slug;
+	public $submenu_slug;
+
+	public function __construct( $menu_slug, $submenu_slug ) {
+		global $git;
+		$this->git = $git;
+
+		$this->menu_slug    = $menu_slug;
+		$this->submenu_slug = $submenu_slug;
+	}
+
+	public function redirect( $message = '', $success = false, $menu_slug = '' ) {
+		$message_id = substr(
+			md5( str_shuffle( 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789' ) . time() ), 0, 8
+		);
+		if ( $message ) {
+			set_transient( 'message_' . $message_id, $message, 900 );
+		}
+		if ( '' === $menu_slug ) { $menu_slug = $this->menu_slug; }
+		$url = network_admin_url( 'admin.php?page=' . $menu_slug );
+		$url = esc_url_raw( add_query_arg(
+			array(
+				'message' => $message_id,
+				'success' => $success,
+			),
+			$url
+		) );
+		wp_safe_redirect( $url );
+		exit;
+	}
+
+	public function success_redirect( $message = '', $menu_slug = '' ) {
+		$this->redirect( $message, true, $menu_slug );
+	}
+
+	public function disconnect_repository() {
+        $gitium_disconnect_repo = filter_input(INPUT_POST, 'GitiumSubmitDisconnectRepository', FILTER_SANITIZE_STRING);
+
+		if ( ! isset( $gitium_disconnect_repo ) ) {
+			return;
+		}
+		check_admin_referer( 'gitium-admin' );
+		gitium_uninstall_hook();
+		if ( ! $this->git->remove_remote() ) {
+			$this->redirect( __('Could not remove remote.', 'gitium') );
+		}
+		$this->success_redirect( __('You are now disconnected from the repository. New key pair generated.', 'gitium') );
+	}
+
+	public function show_message() {
+	    $get_message = filter_input(INPUT_GET, 'message', FILTER_SANITIZE_STRING);
+	    $get_success = filter_input(INPUT_GET, 'success', FILTER_SANITIZE_STRING);
+		if ( isset( $get_message ) && $get_message ) {
+			$type    = ( isset( $get_success ) && $get_success == 1 ) ? 'updated' : 'error';
+			$message = get_transient( 'message_'. $get_message );
+			if ( $message  ) : ?>
+				<div class="<?php echo esc_attr( $type ); ?>"><p><?php echo esc_html( $message ); ?></p></div>
+			<?php endif;
+		}
+	}
+
+	protected function show_disconnect_repository_button() {
+		?>
+		<form name="gitium_form_disconnect" id="gitium_form_disconnect" action="" method="POST">
+			<?php
+				wp_nonce_field( 'gitium-admin' );
+		  ?>
+			<input type="submit" name="GitiumSubmitDisconnectRepository" value='<?php _e( 'Disconnect from repo', 'gitium' ); ?>' class="button secondary" onclick="return confirm('<?php _e( 'Are you sure you want to disconnect from the remote repository?', 'gitium' ); ?>')"/>&nbsp;
+		</form>
+		<?php
+	}
+}

wp-content/upgrade-temp-backup/plugins/gitium/inc/class-gitium-requirements.php

@@ -0,0 +1,117 @@
+<?php
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+class Gitium_Requirements {
+
+	private $req = array();
+	private $msg = array();
+
+	/**
+	 * Gitium requires:
+	 * git min version
+	 * the function proc_open available
+	 * PHP min version
+	 * can exec the file inc/ssh-git
+	 */
+	public function __construct() {
+		$this->_check_req();
+		add_action( GITIUM_ADMIN_NOTICES_ACTION, array( $this, 'admin_notices' ) );
+	}
+
+	private function _check_req() {
+		list($this->req['is_git_version'],       $this->msg['is_git_version']       ) = $this->is_git_version();
+		list($this->req['is_proc_open'],         $this->msg['is_proc_open']         ) = $this->is_proc_open();
+		list($this->req['is_php_verion'],        $this->msg['is_php_verion']        ) = $this->is_php_version();
+		list($this->req['can_exec_ssh_git_file'],$this->msg['can_exec_ssh_git_file']) = $this->can_exec_ssh_git_file();
+
+		return $this->req;
+	}
+
+	public function admin_notices() {
+		if ( ! current_user_can( GITIUM_MANAGE_OPTIONS_CAPABILITY ) ) {
+			return;
+		}
+
+		foreach ( $this->req as $key => $value ) {
+			if ( false === $value ) {
+				echo "<div class='error-nag error'><p>Gitium Requirement: {$this->msg[$key]}</p></div>";
+			}
+		}
+	}
+
+	public function get_status() {
+		$requirements = $this->req;
+
+		foreach ( $requirements as $req ) :
+			if ( false === $req ) :
+				return false;
+			endif;
+		endforeach;
+
+		return true;
+	}
+
+	private function is_git_version() {
+		$git_version = get_transient( 'gitium_git_version' );
+
+		if ( GITIUM_MIN_GIT_VER > substr( $git_version, 0, 3 ) ) {
+			global $git;
+			$git_version = $git->get_version();
+			set_transient( 'gitium_git_version', $git_version );
+			if ( empty( $git_version ) ) {
+				return array( false, 'There is no git installed on this server.' );
+			} else if ( GITIUM_MIN_GIT_VER > substr( $git_version, 0, 3 ) ) {
+				return array( false, "The git version is `$git_version` and must be greater than `" . GITIUM_MIN_GIT_VER . "`!" );
+			}
+		}
+
+		return array( true, "The git version is `$git_version`." );
+	}
+
+	private function is_proc_open() {
+		if ( ! function_exists( 'proc_open' ) ) {
+			return array( false, 'The function `proc_open` is disabled!' );
+		} else {
+			return array( true, 'The function `proc_open` is enabled!' );
+		}
+	}
+
+	private function is_php_version() {
+		if ( ! function_exists( 'phpversion' ) ) {
+			return array( false, 'The function `phpversion` is disabled!' );
+		} else {
+			$php_version = phpversion();
+			if ( GITIUM_MIN_PHP_VER <= substr( $php_version, 0, 3 ) ) {
+				return array( true, "The PHP version is `$php_version`." );
+			} else {
+				return array( false, "The PHP version is `$php_version` and is not greater or equal to " . GITIUM_MIN_PHP_VER );
+			}
+		}
+	}
+
+	private function can_exec_ssh_git_file() {
+		$filepath = dirname( __FILE__ ) . '/ssh-git';
+
+		if ( ! function_exists( 'is_executable' ) ) {
+			return array( false, 'The function `is_executable` is disabled!' );
+		} else if ( is_executable( $filepath ) ) {
+			return array( true, "The `$filepath` file can be executed!" );
+		} else {
+			return array( false, "The `$filepath` file is not executable" );
+		}
+	}
+}

wp-content/upgrade-temp-backup/plugins/gitium/inc/class-gitium-submenu-commits.php

@@ -0,0 +1,94 @@
+<?php
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+class Gitium_Submenu_Commits extends Gitium_Menu {
+
+	public function __construct() {
+		parent::__construct( $this->gitium_menu_slug, $this->commits_menu_slug );
+		add_action( GITIUM_ADMIN_MENU_ACTION, array( $this, 'admin_menu' ) );
+	}
+
+	public function admin_menu() {
+		$submenu_hook = add_submenu_page(
+			$this->menu_slug,
+			__( 'Git Commits', 'gitium' ),
+			__( 'Commits', 'gitium' ),
+			GITIUM_MANAGE_OPTIONS_CAPABILITY,
+			$this->submenu_slug,
+			array( $this, 'page' )
+		);
+		new Gitium_Help( $submenu_hook, 'commits' );
+	}
+
+	public function table_head() {
+		?>
+		<thead>
+		<tr>
+			<th scope="col"><?php _e( 'Commits', 'gitium' ); ?></th>
+			<th scope="col"></th>
+		</tr>
+		</thead>
+		<?php
+	}
+
+	public function table_end_row() {
+		echo '</tr>';
+	}
+
+	public function table_start_row() {
+		static $counter = 0;
+		$counter++;
+		echo ( 0 != $counter % 2 ) ? '<tr class="active">' : '<tr class="inactive">';
+	}
+
+	public function page() {
+		?>
+		<div class="wrap">
+		<h2><?php printf( __( 'Last %s commits', 'gitium' ), GITIUM_LAST_COMMITS ); ?></h2>
+		<table class="wp-list-table widefat plugins">
+		<?php $this->table_head(); ?>
+		<tbody>
+		<?php
+		foreach ( $this->git->get_last_commits( GITIUM_LAST_COMMITS ) as $commit_id => $data ) {
+			unset( $committer_name );
+			extract( $data );
+			if ( isset( $committer_name ) ) {
+				$committer         = "<span title='$committer_email'> -> $committer_name " . sprintf( __( 'committed %s ago', 'gitium' ), human_time_diff( strtotime( $committer_date ) ) ) . '</span>';
+				$committers_avatar = '<div style="position:absolute; left:30px; border: 1px solid white; background:white; height:17px; top:30px; border-radius:2px">' . get_avatar( $committer_email, 16 ) . '</div>';
+			} else {
+				$committer = '';
+				$committers_avatar = '';
+			}
+			$this->table_start_row();
+			?>
+			<td style="position:relative">
+				<div style="float:left; width:auto; height:auto; padding-left:2px; padding-right:5px; padding-top:2px; margin-right:5px; border-radius:2px"><?php echo get_avatar( $author_email, 32 ); ?></div>
+				<?php echo $committers_avatar; ?>
+				<div style="float:left; width:auto; height:auto;"><strong><?php echo esc_html( $subject ); ?></strong><br />
+				<span title="<?php echo esc_attr( $author_email ); ?>"><?php echo esc_html( $author_name ) . ' ' . sprintf( __( 'authored %s ago', 'gitium' ), human_time_diff( strtotime( $author_date ) ) ); ?></span><?php echo $committer; ?></div>
+			</td>
+			<td><p style="padding-top:8px"><?php echo $commit_id; ?></p></td>
+		<?php
+			$this->table_end_row();
+		}
+		?>
+		</tbody>
+		</table>
+		</div>
+		<?php
+	}
+}

wp-content/upgrade-temp-backup/plugins/gitium/inc/class-gitium-submenu-configure.php

@@ -0,0 +1,253 @@
+<?php
+/*  Copyright 2014-2016 Presslabs SRL <ping@presslabs.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+class Gitium_Submenu_Configure extends Gitium_Menu {
+
+	public function __construct() {
+		parent::__construct( $this->gitium_menu_slug, $this->gitium_menu_slug );
+
+		if ( current_user_can( GITIUM_MANAGE_OPTIONS_CAPABILITY ) ) {
+			add_action( GITIUM_ADMIN_MENU_ACTION, array( $this, 'admin_menu' ) );
+			add_action( 'admin_init', array( $this, 'regenerate_keypair' ) );
+			add_action( 'admin_init', array( $this, 'gitium_warning' ) );
+			add_action( 'admin_init', array( $this, 'init_repo' ) );
+			add_action( 'admin_init', array( $this, 'choose_branch' ) );
+			add_action( 'admin_init', array( $this, 'disconnect_repository' ) );
+		}
+	}
+
+	public function admin_menu() {
+		add_menu_page(
+			__( 'Git Configuration', 'gitium' ),
+			'Gitium',
+			GITIUM_MANAGE_OPTIONS_CAPABILITY,
+			$this->menu_slug,
+			array( $this, 'page' ),
+			plugins_url( 'img/gitium.png', dirname( __FILE__ ) )
+		);
+
+		$submenu_hook = add_submenu_page(
+			$this->menu_slug,
+			__( 'Git Configuration', 'gitium' ),
+			__( 'Configuration', 'gitium' ),
+			GITIUM_MANAGE_OPTIONS_CAPABILITY,
+			$this->menu_slug,
+			array( $this, 'page' )
+		);
+		new Gitium_Help( $submenu_hook, 'configuration' );
+	}
+
+	public function regenerate_keypair() {
+	    $submit_keypair = filter_input(INPUT_POST, 'GitiumSubmitRegenerateKeypair', FILTER_SANITIZE_STRING);
+		if ( ! isset( $submit_keypair ) ) {
+			return;
+		}
+		check_admin_referer( 'gitium-admin' );
+		gitium_get_keypair( true );
+		$this->success_redirect( __( 'Keypair successfully regenerated.', 'gitium' ) );
+	}
+
+	public function gitium_warning() {
+		$submit_warning = filter_input(INPUT_POST, 'GitiumSubmitWarning', FILTER_SANITIZE_STRING);
+		if ( ! isset( $submit_warning ) ) {
+			return;
+		}
+		check_admin_referer( 'gitium-admin' );
+		$this->git->remove_wp_content_from_version_control();
+	}
+
+	public function init_process( $remote_url ) {
+		$git = $this->git;
+		$git->init();
+		$git->add_remote_url( $remote_url );
+		$git->fetch_ref();
+		if ( count( $git->get_remote_branches() ) == 0 ) {
+			$git->add( 'wp-content', '.gitignore' );
+			$current_user = wp_get_current_user();
+			$git->commit( __( 'Initial commit', 'gitium' ), $current_user->display_name, $current_user->user_email );
+			if ( ! $git->push( 'master' ) ) {
+				$git->cleanup();
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public function init_repo() {
+		$remote_url = filter_input(INPUT_POST, 'remote_url', FILTER_SANITIZE_STRING);
+	    $gitium_submit_fetch = filter_input(INPUT_POST, 'GitiumSubmitFetch', FILTER_SANITIZE_STRING);
+		if ( ! isset( $gitium_submit_fetch ) || ! isset( $remote_url ) ) {
+			return;
+		}
+		check_admin_referer( 'gitium-admin' );
+
+		if ( empty( $remote_url ) ) {
+			$this->redirect( __( 'Please specify a valid repo.', 'gitium' ) );
+		}
+		if ( $this->init_process( $remote_url ) ) {
+			$this->success_redirect( __( 'Repository initialized successfully.', 'gitium' ) );
+		} else {
+			global $git;
+			$this->redirect( __( 'Could not push to remote: ', 'gitium' ) . $remote_url . ' ERROR: ' . serialize( $git->get_last_error() ) );
+		}
+	}
+
+	public function choose_branch() {
+	    $gitium_submit_merge_push = filter_input(INPUT_POST, 'GitiumSubmitMergeAndPush', FILTER_SANITIZE_STRING);
+        $tracking_branch = filter_input(INPUT_POST, 'tracking_branch', FILTER_SANITIZE_STRING);
+		if ( ! isset( $gitium_submit_merge_push ) || ! isset( $tracking_branch ) ) {
+			return;
+		}
+		check_admin_referer( 'gitium-admin' );
+		$this->git->add();
+
+		$branch = $tracking_branch;
+		set_transient( 'gitium_remote_tracking_branch', $branch );
+		$current_user = wp_get_current_user();
+
+		$commit = $this->git->commit( __( 'Merged existing code from ', 'gitium' ) . get_home_url(), $current_user->display_name, $current_user->user_email );
+		if ( ! $commit ) {
+			$this->git->cleanup();
+			$this->redirect( __( 'Could not create initial commit -> ', 'gitium' ) . $this->git->get_last_error() );
+		}
+		if ( ! $this->git->merge_initial_commit( $commit, $branch ) ) {
+			$this->git->cleanup();
+			$this->redirect( __( 'Could not merge the initial commit -> ', 'gitium' ) . $this->git->get_last_error() );
+		}
+		$this->git->push( $branch );
+		$this->success_redirect( __( 'Branch selected successfully.', 'gitium' ) );
+	}
+
+	private function setup_step_1_remote_url() {
+		?>
+		<tr>
+		<th scope="row"><label for="remote_url"><?php _e( 'Remote URL', 'gitium' ); ?></label></th>
+			<td>
+				<input type="text" class="regular-text" name="remote_url" id="remote_url" placeholder="git@github.com:user/example.git" value="">
+				<p class="description"><?php _e( 'This URL provide access to a Git repository via SSH, HTTPS, or Subversion.', 'gitium' ); ?><br />
+		<?php _e( 'If you need to authenticate over "https://" instead of SSH use: <code>https://user:pass@github.com/user/example.git</code>', 'gitium' ); ?></p>
+			</td>
+		</tr>
+		<?php
+	}
+
+	private function setup_step_1_key_pair() {
+		if ( ! defined( 'GIT_KEY_FILE' ) || GIT_KEY_FILE == '' ) :
+			list( $git_public_key, ) = gitium_get_keypair(); ?>
+			<tr>
+			<th scope="row"><label for="key_pair"><?php _e( 'Key pair', 'gitium' ); ?></label></th>
+				<td>
+					<p>
+					<input type="text" class="regular-text" name="key_pair" id="key_pair" value="<?php echo esc_attr( $git_public_key ); ?>" readonly="readonly">
+					<input type="submit" name="GitiumSubmitRegenerateKeypair" class="button" value="<?php _e( 'Regenerate Key', 'gitium' ); ?>" />
+					</p>
+					<p class="description"><?php _e( 'If your code use ssh keybased authentication for git you need to allow write access to your repository using this key.', 'gitium' ); ?><br />
+			<?php _e( 'Checkout instructions for <a href="https://help.github.com/articles/generating-ssh-keys#step-3-add-your-ssh-key-to-github" target="_blank">github</a> or <a href="https://confluence.atlassian.com/display/BITBUCKET/Add+an+SSH+key+to+an+account#AddanSSHkeytoanaccount-HowtoaddakeyusingSSHforOSXorLinux" target="_blank">bitbucket</a>.', 'gitium' ); ?>
+					</p>
+				</td>
+			</tr>
+		<?php endif;
+	}
+
+	private function setup_warning() {
+		?>
+		<div class="wrap">
+			<h2><?php _e( 'Warning!', 'gitium' ); ?></h2>
+			<form name="gitium_form_warning" id="gitium_form_warning" action="" method="POST">
+				<?php wp_nonce_field( 'gitium-admin' ); ?>
+				<p><code>wp-content</code> is already under version control. You <a onclick="document.getElementById('gitium_form_warning').submit();" style="color:red;" href="#">must remove it from version control</a> in order to continue.</p>
+				<p><strong>NOTE</strong> by doing this you WILL LOSE commit history, but NOT the actual files.</p>
+				<input type="hidden" name="GitiumSubmitWarning" class="button-primary" value="1" />
+			</form>
+		</div>
+		<?php
+	}
+
+	private function setup_step_1() {
+		?>
+		<div class="wrap">
+			<h2><?php _e( 'Configuration step 1', 'gitium' ); ?></h2>
+			<p><?php _e( 'If you need help to set this up, please click on the "Help" button from the top right corner of this screen.' ); ?></p>
+			<form action="" method="POST">
+				<?php wp_nonce_field( 'gitium-admin' ); ?>
+				<table class="form-table">
+					<?php $this->setup_step_1_remote_url(); ?>
+					<?php $this->setup_step_1_key_pair(); ?>
+				</table>
+				<p class="submit">
+				<input type="submit" name="GitiumSubmitFetch" class="button-primary" value="<?php _e( 'Fetch', 'gitium' ); ?>" />
+				</p>
+			</form>
+		</div>
+		<?php
+	}
+
+	private function setup_step_2() {
+		$git = $this->git; ?>
+		<div class="wrap">
+		<h2><?php _e( 'Configuration step 2', 'gitium' ); ?></h2>
+		<p><?php _e( 'If you need help to set this up, please click on the "Help" button from the top right corner of this screen.' ); ?></p>
+
+
+		<form action="" method="POST">
+		<?php wp_nonce_field( 'gitium-admin' ); ?>
+
+		<table class="form-table">
+		<tr>
+		<th scope="row"><label for="tracking_branch"><?php _e( 'Choose tracking branch', 'gitium' ); ?></label></th>
+			<td>
+				<select name="tracking_branch" id="tracking_branch">
+				<?php foreach ( $git->get_remote_branches() as $branch ) : ?>
+					<option value="<?php echo esc_attr( $branch ); ?>"><?php echo esc_html( $branch ); ?></option>
+				<?php endforeach; ?>
+				</select>
+				<p class="description"><?php _e( 'Your code origin is set to', 'gitium' ); ?> <code><?php echo esc_html( $git->get_remote_url() ); ?></code></p>
+			</td>
+		</tr>
+		</table>
+
+		<p class="submit">
+		<input type="submit" name="GitiumSubmitMergeAndPush" class="button-primary" value="<?php _e( 'Merge & Push', 'gitium' ); ?>" />
+		</p>
+		</form>
+		<?php
+			$this->show_disconnect_repository_button();
+		?>
+		</div>
+		<?php
+	}
+
+	public function page() {
+		$this->show_message();
+
+		if ( wp_content_is_versioned() ) {
+			return $this->setup_warning();
+		}
+
+		if ( ! $this->git->is_status_working() || ! $this->git->get_remote_url() ) {
+			return $this->setup_step_1();
+		}
+
+		if ( ! $this->git->get_remote_tracking_branch() ) {
+			return $this->setup_step_2();
+		}
+
+		_gitium_status( true );
+		gitium_update_is_status_working();
+		gitium_update_remote_tracking_branch();
+	}
+}