)|^)#([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', '
' ); - \defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "
[ap_title]
\n\n[ap_content]\n\n[ap_hashtags]
\n\n[ap_shortlink]
" ); - \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)|(?<=)|(?<=
)|^)#([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', "[ap_title]\n\n[ap_content]\n\n[ap_hashtags]\n\n[ap_shortlink]" ); +\defined( 'ACTIVITYPUB_AUTHORIZED_FETCH' ) || \define( 'ACTIVITYPUB_AUTHORIZED_FETCH', false ); +\defined( 'ACTIVITYPUB_DISABLE_REWRITES' ) || \define( 'ACTIVITYPUB_DISABLE_REWRITES', false ); - 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( '%2s', \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' ); diff --git a/wp-content/plugins/activitypub/assets/css/activitypub-admin.css b/wp-content/plugins/activitypub/assets/css/activitypub-admin.css index cd1808cd..07aadcad 100644 --- a/wp-content/plugins/activitypub/assets/css/activitypub-admin.css +++ b/wp-content/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; +} diff --git a/wp-content/plugins/activitypub/assets/img/mp.jpg b/wp-content/plugins/activitypub/assets/img/mp.jpg new file mode 100644 index 00000000..05964b49 Binary files /dev/null and b/wp-content/plugins/activitypub/assets/img/mp.jpg differ diff --git a/wp-content/plugins/activitypub/assets/img/wp-logo.png b/wp-content/plugins/activitypub/assets/img/wp-logo.png new file mode 100644 index 00000000..b48f08e8 Binary files /dev/null and b/wp-content/plugins/activitypub/assets/img/wp-logo.png differ diff --git a/wp-content/plugins/activitypub/build/follow-me/block.json b/wp-content/plugins/activitypub/build/follow-me/block.json new file mode 100644 index 00000000..8dcb824d --- /dev/null +++ b/wp-content/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" + ] +} \ No newline at end of file diff --git a/wp-content/plugins/activitypub/build/follow-me/index.asset.php b/wp-content/plugins/activitypub/build/follow-me/index.asset.php new file mode 100644 index 00000000..4e87a6f4 --- /dev/null +++ b/wp-content/plugins/activitypub/build/follow-me/index.asset.php @@ -0,0 +1 @@ + array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '2a185b1c488886051601'); diff --git a/wp-content/plugins/activitypub/build/follow-me/index.js b/wp-content/plugins/activitypub/build/follow-me/index.js new file mode 100644 index 00000000..89618f03 --- /dev/null +++ b/wp-content/plugins/activitypub/build/follow-me/index.js @@ -0,0 +1 @@ +(()=>{"use strict";var e,t={843:(e,t,n)=>{const r=window.wp.blocks,o=window.wp.element,l=window.wp.primitives,a=(0,o.createElement)(l.SVG,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24"},(0,o.createElement)(l.Path,{d:"M15.5 9.5a1 1 0 100-2 1 1 0 000 2zm0 1.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm-2.25 6v-2a2.75 2.75 0 00-2.75-2.75h-4A2.75 2.75 0 003.75 15v2h1.5v-2c0-.69.56-1.25 1.25-1.25h4c.69 0 1.25.56 1.25 1.25v2h1.5zm7-2v2h-1.5v-2c0-.69-.56-1.25-1.25-1.25H15v-1.5h2.5A2.75 2.75 0 0120.25 15zM9.5 8.5a1 1 0 11-2 0 1 1 0 012 0zm1.5 0a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z",fillRule:"evenodd"}));function c(){return c=Object.assign?Object.assign.bind():function(e){for(var t=1;thttps://example.com/yourusernameoryourusername@example.com)","activitypub"),{code:(0,o.createElement)("code",null)})),(0,o.createElement)("div",{className:"apfmd__button-group"},(0,o.createElement)("input",{type:"text",value:E,onKeyDown:e=>{"Enter"===e?.code&&x()},onChange:e=>k(e.target.value)}),(0,o.createElement)(u.Button,{onClick:x},m))))}function z(e){let{selectedUser:t,style:n,backgroundColor:r,id:l,useId:a=!1,profileData:c=!1}=e;const[i,s]=(0,o.useState)(C()),u="site"===t?0:t,p=function(e){return E(".apfmd__button-group .components-button",_(e?.elements?.link?.color?.text)||"#111","#fff",_(e?.elements?.link?.[":hover"]?.color?.text)||"#333")}(n),m=a?{id:l}:{};function v(e){s(C(e))}return(0,o.useEffect)((()=>{if(c)return v(c);(function(e){const t={headers:{Accept:"application/activity+json"},path:`/${O}/users/${e}`};return d()(t)})(u).then(v)}),[u,c]),(0,o.createElement)("div",m,(0,o.createElement)(k,{selector:`#${l}`,style:n,backgroundColor:r}),(0,o.createElement)(S,{profile:i,userId:u,popupStyles:p}))}(0,r.registerBlockType)("activitypub/follow-me",{edit:function(e){let{attributes:t,setAttributes:n}=e;const r=(0,i.useBlockProps)({className:"activitypub-follow-me-block-wrapper"}),l=function(){const e=m?.users?(0,p.useSelect)((e=>e("core").getUsers({who:"authors"}))):[];return(0,o.useMemo)((()=>{if(!e)return[];const t=m?.site?[{label:(0,s.__)("Whole Site","activitypub"),value:"site"}]:[];return e.reduce(((e,t)=>(e.push({label:t.name,value:`${t.id}`}),e)),t)}),[e])}(),{selectedUser:a}=t;return(0,o.useEffect)((()=>{l.length&&(l.find((e=>{let{value:t}=e;return t===a}))||n({selectedUser:l[0].value}))}),[a,l]),(0,o.createElement)("div",r,l.length>1&&(0,o.createElement)(i.InspectorControls,{key:"setting"},(0,o.createElement)(u.PanelBody,{title:(0,s.__)("Followers Options","activitypub")},(0,o.createElement)(u.SelectControl,{label:(0,s.__)("Select User","activitypub"),value:t.selectedUser,options:l,onChange:e=>n({selectedUser:e})}))),(0,o.createElement)(z,c({},t,{id:r.id})))},save:()=>null,icon:a})}},n={};function r(e){var o=n[e];if(void 0!==o)return o.exports;var l=n[e]={exports:{}};return t[e](l,l.exports,r),l.exports}r.m=t,e=[],r.O=(t,n,o,l)=>{if(!n){var a=1/0;for(u=0;uhttps://example.com/yourusernameoryourusername@example.com)","activitypub"),{code:(0,o.createElement)("code",null)})),(0,o.createElement)("div",{className:"apfmd__button-group"},(0,o.createElement)("input",{type:"text",value:k,onKeyDown:e=>{"Enter"===e?.code&&x()},onChange:e=>O(e.target.value)}),(0,o.createElement)(u.Button,{onClick:x},b))))}function S(e){let{selectedUser:t,style:r,backgroundColor:n,id:l,useId:a=!1,profileData:c=!1}=e;const[u,s]=(0,o.useState)(k()),p="site"===t?0:t,m=function(e){return _(".apfmd__button-group .components-button",b(e?.elements?.link?.color?.text)||"#111","#fff",b(e?.elements?.link?.[":hover"]?.color?.text)||"#333")}(r),d=a?{id:l}:{};function v(e){s(k(e))}return(0,o.useEffect)((()=>{if(c)return v(c);(function(e){const t={headers:{Accept:"application/activity+json"},path:`/${E}/users/${e}`};return i()(t)})(p).then(v)}),[p,c]),(0,o.createElement)("div",d,(0,o.createElement)(h,{selector:`#${l}`,style:r,backgroundColor:n}),(0,o.createElement)(O,{profile:u,userId:p,popupStyles:m}))}let $=1;a()((()=>{[].forEach.call(document.querySelectorAll(".activitypub-follow-me-block-wrapper"),(e=>{const t=JSON.parse(e.dataset.attrs);(0,o.render)((0,o.createElement)(S,n({},t,{id:"activitypub-follow-me-block-"+$++,useId:!0})),e)}))}))}},r={};function n(e){var o=r[e];if(void 0!==o)return o.exports;var l=r[e]={exports:{}};return t[e](l,l.exports,n),l.exports}n.m=t,e=[],n.O=(t,r,o,l)=>{if(!r){var a=1/0;for(s=0;s+ * | array + * | 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 + * | Link + * | array + */ + 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' ); + } + } +} diff --git a/wp-content/plugins/activitypub/includes/activity/class-actor.php b/wp-content/plugins/activitypub/includes/activity/class-actor.php new file mode 100644 index 00000000..fabd653c --- /dev/null +++ b/wp-content/plugins/activitypub/includes/activity/class-actor.php @@ -0,0 +1,139 @@ + '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; +} diff --git a/wp-content/plugins/activitypub/includes/activity/class-base-object.php b/wp-content/plugins/activitypub/includes/activity/class-base-object.php new file mode 100644 index 00000000..a75ed16d --- /dev/null +++ b/wp-content/plugins/activitypub/includes/activity/class-base-object.php @@ -0,0 +1,678 @@ + + * | array + * | 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 + * | array + * | 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 + * | array + * | 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 + * | array + * | 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 + * | array + * | 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 + * | array + * | 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 + * | array + * | 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 |null + */ + protected $summary_map; + + /** + * One or more "tags" that have been associated with an objects. + * A tag can be any kind of Object. + * The key difference between attachment and tag is that the former + * implies association by inclusion, while the latter implies + * associated by reference. + * + * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-tag + * + * @var string + * | ObjectType + * | Link + * | array + * | array + * | 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 + * | Link + * | array + * | 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 + * | array + * | 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 + * | array + * | 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 + * | array + * | 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 + * | array + * | 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 ); + } +} diff --git a/wp-content/plugins/activitypub/includes/class-activity-dispatcher.php b/wp-content/plugins/activitypub/includes/class-activity-dispatcher.php index f8abd38c..462a75af 100644 --- a/wp-content/plugins/activitypub/includes/class-activity-dispatcher.php +++ b/wp-content/plugins/activitypub/includes/class-activity-dispatcher.php @@ -1,6 +1,16 @@ 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 ); } } } diff --git a/wp-content/plugins/activitypub/includes/class-activitypub.php b/wp-content/plugins/activitypub/includes/class-activitypub.php index c04aedca..24228f43 100644 --- a/wp-content/plugins/activitypub/includes/class-activitypub.php +++ b/wp-content/plugins/activitypub/includes/class-activitypub.php @@ -1,6 +1,9 @@ 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( + '', + wp_kses( + wpautop( $data['upgrade_notice '] ), + array( + 'p' => array(), + 'a' => array( 'href', 'title' ), + 'strong' => array(), + 'em' => array(), + ) + ) + ); + } } diff --git a/wp-content/plugins/activitypub/includes/class-admin.php b/wp-content/plugins/activitypub/includes/class-admin.php index e98d5479..f8afc8d2 100644 --- a/wp-content/plugins/activitypub/includes/class-admin.php +++ b/wp-content/plugins/activitypub/includes/class-admin.php @@ -1,6 +1,9 @@ \__( '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 ) { - ?> - - 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 ) { diff --git a/wp-content/plugins/activitypub/includes/class-blocks.php b/wp-content/plugins/activitypub/includes/class-blocks.php new file mode 100644 index 00000000..02f96591 --- /dev/null +++ b/wp-content/plugins/activitypub/includes/class-blocks.php @@ -0,0 +1,151 @@ + 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 ''; + } + + 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 = ' '; + if ( $attrs['title'] ) { + $html .= ''; + return $html; + } + + public static function render_follower( $follower ) { + $external_svg = ''; + $template = + ' +' . esc_html( $attrs['title'] ) . '
'; + } + $html .= '- ';
+ foreach ( $follower_data['followers'] as $follower ) {
+ $html .= '
- ' . self::render_follower( $follower ) . ' '; + } + // We are only pagination on the JS side. Could be revisited but we gotta ship! + $html .= '
+ + %s + / + @%s + + %s + '; + + $data = $follower->to_array(); + + return sprintf( + $template, + esc_url( $data['url'] ), + esc_attr( $data['name'] ), + esc_attr( $data['icon']['url'] ), + esc_html( $data['name'] ), + esc_html( $data['preferredUsername'] ), + $external_svg + ); + } +} diff --git a/wp-content/plugins/activitypub/includes/class-debug.php b/wp-content/plugins/activitypub/includes/class-debug.php index 767d4a9c..36f8bda5 100644 --- a/wp-content/plugins/activitypub/includes/class-debug.php +++ b/wp-content/plugins/activitypub/includes/class-debug.php @@ -1,6 +1,9 @@ #is', - $protect, - $the_content - ); - $the_content = preg_replace_callback( - '#<(pre|code|textarea|style)\b[^>]*>.*?]*>#is', - $protect, - $the_content - ); - $the_content = preg_replace_callback( - '#<[^>]+>#i', - $protect, - $the_content + $tag_stack = array(); + $protected_tags = array( + 'pre', + 'code', + 'textarea', + 'style', + 'a', ); + $content_with_links = ''; + $in_protected_tag = false; + foreach ( wp_html_split( $the_content ) as $chunk ) { + if ( preg_match( '#^$#i', $chunk, $m ) ) { + $content_with_links .= $chunk; + continue; + } - $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( '#%s', $link, $tag ); + return \sprintf( '#%s', $link, $tag ); } return '#' . $tag; diff --git a/wp-content/plugins/activitypub/includes/class-health-check.php b/wp-content/plugins/activitypub/includes/class-health-check.php index 26bc808e..74a6f9ec 100644 --- a/wp-content/plugins/activitypub/includes/class-health-check.php +++ b/wp-content/plugins/activitypub/includes/class-health-check.php @@ -1,6 +1,14 @@ \__( '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( + '
%s
', + \esc_html__( 'You seem to use the System Task Scheduler to process WP_Cron tasks.', 'activitypub' ) + ), + 'actions' => '', + 'test' => 'test_system_cron', + ); + + if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) { + return $result; + } + + $result['status'] = 'recommended'; + $result['label'] = \__( 'System Task Scheduler not configured', 'activitypub' ); + $result['badge']['color'] = 'orange'; + $result['description'] = \sprintf( + '%s
', + \__( '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( + '', + __( '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( '%s
', - \__( '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 \__( - 'Your author URL
', + 'Your author URL%swas replaced, this is often done by plugins.%swas 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 \__( - 'Your author URL
', + 'Your author URL%sis not accessible. Please check your WordPress setup or permalink structure. If the setup seems fine, maybe check if a plugin might restrict the access.%sis 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 \__( - 'Your author URL
', + 'Your author URL%sis redirecting to another page, this is often done by SEO plugins like "Yoast SEO".%sis 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 \__( - 'Your author URL
', + 'Your author URL%sdoes not return valid JSON forapplication/activity+json. Please check if your hosting supports alternateAcceptheaders.%sdoes not return valid JSON forapplication/activity+json. Please check if your hosting supports alternateAcceptheaders.', '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%sis not accessible. Please check your WordPress setup or permalink structure.', + 'activitypub' + ), + $allowed + ); + $invalid_response = wp_kses( + // translators: %s: Author URL + \__( + 'Your WebFinger endpoint%sdoes not return valid JSON forapplication/jrd+json.', + 'activitypub' + ), + $allowed + ); + $health_messages = array( 'webfinger_url_not_accessible' => \sprintf( - // translators: %s: Author URL - \__( - 'Your WebFinger endpoint
', - 'activitypub' - ), + $not_accessible, $url->get_error_data() ), 'webfinger_url_invalid_response' => \sprintf( // translators: %s: Author URL - \__( - '%sis not accessible. Please check your WordPress setup or permalink structure.Your WebFinger endpoint
', - '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, + ), ), ); diff --git a/wp-content/plugins/activitypub/includes/class-http.php b/wp-content/plugins/activitypub/includes/class-http.php new file mode 100644 index 00000000..f9140bed --- /dev/null +++ b/wp-content/plugins/activitypub/includes/class-http.php @@ -0,0 +1,111 @@ + 100, + 'limit_response_size' => 1048576, + 'redirection' => 3, + 'user-agent' => "$user_agent; ActivityPub", + 'headers' => array( + 'Accept' => 'application/activity+json', + 'Content-Type' => 'application/activity+json', + 'Digest' => $digest, + 'Signature' => $signature, + 'Date' => $date, + ), + 'body' => $body, + ); + + $response = \wp_safe_remote_post( $url, $args ); + $code = \wp_remote_retrieve_response_code( $response ); + + if ( $code >= 400 ) { + $response = new WP_Error( $code, __( 'Failed HTTP Request', 'activitypub' ), array( 'status' => $code ) ); + } + + \do_action( 'activitypub_safe_remote_post_response', $response, $url, $body, $user_id ); + + return $response; + } + + /** + * Send a GET Request with the needed HTTP Headers + * + * @param string $url The URL endpoint + * @param int $user_id The WordPress User-ID + * + * @return array|WP_Error The GET Response or an WP_ERROR + */ + public static function get( $url ) { + do_action( 'activitypub_pre_http_get', $url ); + + $date = \gmdate( 'D, d M Y H:i:s T' ); + $signature = Signature::generate_signature( Users::APPLICATION_USER_ID, 'get', $url, $date ); + + $wp_version = \get_bloginfo( 'version' ); + + /** + * Filter the HTTP headers user agent. + * + * @param string $user_agent The user agent string. + */ + $user_agent = \apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . \get_bloginfo( 'url' ) ); + + $args = array( + 'timeout' => apply_filters( 'activitypub_remote_get_timeout', 100 ), + 'limit_response_size' => 1048576, + 'redirection' => 3, + 'user-agent' => "$user_agent; ActivityPub", + 'headers' => array( + 'Accept' => 'application/activity+json', + 'Content-Type' => 'application/activity+json', + 'Signature' => $signature, + 'Date' => $date, + ), + ); + + $response = \wp_safe_remote_get( $url, $args ); + $code = \wp_remote_retrieve_response_code( $response ); + + if ( $code >= 400 ) { + $response = new WP_Error( $code, __( 'Failed HTTP Request', 'activitypub' ), array( 'status' => $code ) ); + } + + \do_action( 'activitypub_safe_remote_get_response', $response, $url ); + + return $response; + } +} diff --git a/wp-content/plugins/activitypub/includes/class-mention.php b/wp-content/plugins/activitypub/includes/class-mention.php index 7c8672a4..d55e5f20 100644 --- a/wp-content/plugins/activitypub/includes/class-mention.php +++ b/wp-content/plugins/activitypub/includes/class-mention.php @@ -1,6 +1,9 @@ #is', - $protect, - $the_content - ); - $the_content = preg_replace_callback( - '#<(pre|code|textarea|style)\b[^>]*>.*?]*>#is', - $protect, - $the_content - ); - $the_content = preg_replace_callback( - '#%sdoes not return valid JSON forapplication/jrd+json.
| - - | -
-
|
-
|---|
' . __( 'The following Template Tags are available:', 'activitypub' ) . '
' . '- ' .
'
[ap_title]' .
- '- ' . \wp_kses( __( 'The post\'s title.', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The post\'s title.', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
[ap_content apply_filters="yes"]' .
- '- ' . \wp_kses( __( 'The post\'s content. With
apply_filtersyou can decide if filters should be applied or not (default isyes). The values can beyesorno.apply_filtersattribute is optional.', 'activitypub' ), 'default' ) . ' ' .
+ ' - ' . \wp_kses( __( 'The post\'s content. With
apply_filtersyou can decide if filters (apply_filters( \'the_content\', $content )) should be applied or not (default isyes). The values can beyesorno.apply_filtersattribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
' [ap_excerpt lenght="400"]' .
- '- ' . \wp_kses( __( 'The post\'s excerpt (default 400 chars).
lengthattribute is optional.', 'activitypub' ), 'default' ) . ' ' .
+ ' - ' . \wp_kses( __( 'The post\'s excerpt (default 400 chars).
lengthattribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
' [ap_permalink type="url"]' .
- '- ' . \wp_kses( __( 'The post\'s permalink.
typecan be either:urlorhtml(an <a /> tag).typeattribute is optional.', 'activitypub' ), 'default' ) . ' ' .
+ ' - ' . \wp_kses( __( 'The post\'s permalink.
typecan be either:urlorhtml(an <a /> tag).typeattribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
' [ap_shortlink type="url"]' .
- '- ' . \wp_kses( __( 'The post\'s shortlink.
typecan be eitherurlorhtml(an <a /> tag). I can recommend Hum, to prettify the Shortlinks.typeattribute is optional.', 'activitypub' ), 'default' ) . ' ' .
+ ' - ' . \wp_kses( __( 'The post\'s shortlink.
typecan be eitherurlorhtml(an <a /> tag). I can recommend Hum, to prettify the Shortlinks.typeattribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
' [ap_hashtags]' .
- '- ' . \wp_kses( __( 'The post\'s tags as hashtags.', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The post\'s tags as hashtags.', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
[ap_hashcats]' .
- '- ' . \wp_kses( __( 'The post\'s categories as hashtags.', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The post\'s categories as hashtags.', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
[ap_image type=full]' .
- '- ' . \wp_kses( __( 'The URL for the post\'s featured image, defaults to full size. The type attribute can be any of the following:
thumbnail,medium,large,full.typeattribute is optional.', 'activitypub' ), 'default' ) . ' ' .
+ ' - ' . \wp_kses( __( 'The URL for the post\'s featured image, defaults to full size. The type attribute can be any of the following:
thumbnail,medium,large,full.typeattribute is optional.', 'activitypub' ), array( 'code' => array() ) ) . ' ' .
' [ap_author]' .
- '- ' . \wp_kses( __( 'The author\'s name.', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The author\'s name.', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
[ap_authorurl]' .
- '- ' . \wp_kses( __( 'The URL to the author\'s profile page.', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The URL to the author\'s profile page.', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
[ap_date]' .
- '- ' . \wp_kses( __( 'The post\'s date.', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The post\'s date.', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
[ap_time]' .
- '- ' . \wp_kses( __( 'The post\'s time.', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The post\'s time.', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
[ap_datetime]' .
- '- ' . \wp_kses( __( 'The post\'s date/time formated as "date @ time".', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The post\'s date/time formated as "date @ time".', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
[ap_blogurl]' .
- '- ' . \wp_kses( __( 'The URL to the site.', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The URL to the site.', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
[ap_blogname]' .
- '- ' . \wp_kses( __( 'The name of the site.', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The name of the site.', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
[ap_blogdesc]' .
- '- ' . \wp_kses( __( 'The description of the site.', 'activitypub' ), 'default' ) . ' ' . + '
- ' . \wp_kses( __( 'The description of the site.', 'activitypub' ), array( 'code' => array() ) ) . ' ' . '
' . __( 'You may also use any Shortcode normally available to you on your site, however be aware that Shortcodes may significantly increase the size of your content depending on what they do.', 'activitypub' ) . '
' . '' . __( 'Note: the old Template Tags are now deprecated and automatically converted to the new ones.', 'activitypub' ) . '
' . @@ -48,8 +48,8 @@ \get_current_screen()->add_help_tab( array( - 'id' => 'glossar', - 'title' => \__( 'Glossar', 'activitypub' ), + 'id' => 'glossary', + 'title' => \__( 'Glossary', 'activitypub' ), 'content' => '