Fix compatibility with WebFinger and NodeInfo plugin
This commit is contained in:
parent
12b6750c94
commit
fd6cb84ba3
8 changed files with 131 additions and 79 deletions
|
@ -3,7 +3,7 @@
|
||||||
**Tags:** OStatus, fediverse, activitypub, activitystream
|
**Tags:** OStatus, fediverse, activitypub, activitystream
|
||||||
**Requires at least:** 4.7
|
**Requires at least:** 4.7
|
||||||
**Tested up to:** 6.3
|
**Tested up to:** 6.3
|
||||||
**Stable tag:** 1.0.4
|
**Stable tag:** 1.0.5
|
||||||
**Requires PHP:** 5.6
|
**Requires PHP:** 5.6
|
||||||
**License:** MIT
|
**License:** MIT
|
||||||
**License URI:** http://opensource.org/licenses/MIT
|
**License URI:** http://opensource.org/licenses/MIT
|
||||||
|
@ -105,6 +105,10 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
|
||||||
|
|
||||||
Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
|
Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
|
||||||
|
|
||||||
|
### 1.0.5 ###
|
||||||
|
|
||||||
|
* Fixed: compatibility with WebFinger and NodeInfo plugin
|
||||||
|
|
||||||
### 1.0.4 ###
|
### 1.0.4 ###
|
||||||
|
|
||||||
* Fixed: Constants were not loaded early enough, resulting in a race condition
|
* Fixed: Constants were not loaded early enough, resulting in a race condition
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* Plugin Name: ActivityPub
|
* Plugin Name: ActivityPub
|
||||||
* Plugin URI: https://github.com/pfefferle/wordpress-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.
|
* Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
|
||||||
* Version: 1.0.4
|
* Version: 1.0.5
|
||||||
* Author: Matthias Pfefferle & Automattic
|
* Author: Matthias Pfefferle & Automattic
|
||||||
* Author URI: https://automattic.com/
|
* Author URI: https://automattic.com/
|
||||||
* License: MIT
|
* License: MIT
|
||||||
|
@ -82,6 +82,12 @@ function plugin_init() {
|
||||||
require_once $debug_file;
|
require_once $debug_file;
|
||||||
Debug::init();
|
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' );
|
\add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_init' );
|
||||||
|
|
||||||
|
|
|
@ -18,9 +18,6 @@ class Nodeinfo {
|
||||||
*/
|
*/
|
||||||
public static function init() {
|
public static function init() {
|
||||||
self::register_routes();
|
self::register_routes();
|
||||||
|
|
||||||
\add_filter( 'nodeinfo_data', array( self::class, 'add_nodeinfo_discovery' ), 10, 2 );
|
|
||||||
\add_filter( 'nodeinfo2_data', array( self::class, 'add_nodeinfo2_discovery' ), 10 );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -194,36 +191,4 @@ class Nodeinfo {
|
||||||
|
|
||||||
return new \WP_REST_Response( $discovery, 200 );
|
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,9 +20,6 @@ class Webfinger {
|
||||||
*/
|
*/
|
||||||
public static function init() {
|
public static function init() {
|
||||||
self::register_routes();
|
self::register_routes();
|
||||||
|
|
||||||
\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 );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -81,44 +78,6 @@ class Webfinger {
|
||||||
return $params;
|
return $params;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 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 self::get_profile( $resource );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the WebFinger profile.
|
* Get the WebFinger profile.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,7 +1,15 @@
|
||||||
<?php
|
<?php
|
||||||
namespace Activitypub\Integration;
|
namespace Activitypub\Integration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compatibility with the BuddyPress plugin
|
||||||
|
*
|
||||||
|
* @see https://buddypress.org/
|
||||||
|
*/
|
||||||
class Buddypress {
|
class Buddypress {
|
||||||
|
/**
|
||||||
|
* Initialize the class, registering WordPress hooks
|
||||||
|
*/
|
||||||
public static function init() {
|
public static function init() {
|
||||||
\add_filter( 'activitypub_json_author_array', array( self::class, 'add_user_metadata' ), 11, 2 );
|
\add_filter( 'activitypub_json_author_array', array( self::class, 'add_user_metadata' ), 11, 2 );
|
||||||
}
|
}
|
||||||
|
|
49
integration/class-nodeinfo.php
Normal file
49
integration/class-nodeinfo.php
Normal file
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
57
integration/class-webfinger.php
Normal file
57
integration/class-webfinger.php
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
<?php
|
||||||
|
namespace Activitypub\Integration;
|
||||||
|
|
||||||
|
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 self::get_profile( $resource );
|
||||||
|
}
|
||||||
|
}
|
|
@ -3,7 +3,7 @@ Contributors: automattic, pfefferle, mediaformat, mattwiebe, akirk, jeherve, nur
|
||||||
Tags: OStatus, fediverse, activitypub, activitystream
|
Tags: OStatus, fediverse, activitypub, activitystream
|
||||||
Requires at least: 4.7
|
Requires at least: 4.7
|
||||||
Tested up to: 6.3
|
Tested up to: 6.3
|
||||||
Stable tag: 1.0.4
|
Stable tag: 1.0.5
|
||||||
Requires PHP: 5.6
|
Requires PHP: 5.6
|
||||||
License: MIT
|
License: MIT
|
||||||
License URI: http://opensource.org/licenses/MIT
|
License URI: http://opensource.org/licenses/MIT
|
||||||
|
@ -105,6 +105,10 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
|
||||||
|
|
||||||
Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
|
Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
|
||||||
|
|
||||||
|
= 1.0.5 =
|
||||||
|
|
||||||
|
* Fixed: compatibility with WebFinger and NodeInfo plugin
|
||||||
|
|
||||||
= 1.0.4 =
|
= 1.0.4 =
|
||||||
|
|
||||||
* Fixed: Constants were not loaded early enough, resulting in a race condition
|
* Fixed: Constants were not loaded early enough, resulting in a race condition
|
||||||
|
|
Loading…
Reference in a new issue