updated plugin ActivityPub version 5.8.0
This commit is contained in:
Gitium
@ -10,10 +10,12 @@ namespace Activitypub\Transformer;
|
||||
use Activitypub\Webfinger;
|
||||
use Activitypub\Comment as Comment_Utils;
|
||||
use Activitypub\Model\Blog;
|
||||
use Activitypub\Collection\Users;
|
||||
use Activitypub\Collection\Actors;
|
||||
use Activitypub\Collection\Replies;
|
||||
|
||||
use function Activitypub\is_single_user;
|
||||
use function Activitypub\get_rest_url_by_path;
|
||||
use function Activitypub\was_comment_received;
|
||||
use function Activitypub\get_comment_ancestors;
|
||||
|
||||
/**
|
||||
@ -28,43 +30,30 @@ use function Activitypub\get_comment_ancestors;
|
||||
*/
|
||||
class Comment extends Base {
|
||||
/**
|
||||
* Returns the User-ID of the WordPress Comment.
|
||||
* The User as Actor Object.
|
||||
*
|
||||
* @return int The User-ID of the WordPress Comment
|
||||
* @var \Activitypub\Activity\Actor
|
||||
*/
|
||||
public function get_wp_user_id() {
|
||||
return $this->wp_object->user_id;
|
||||
}
|
||||
|
||||
/**
|
||||
* Change the User-ID of the WordPress Comment.
|
||||
*
|
||||
* @param int $user_id The new user ID.
|
||||
*/
|
||||
public function change_wp_user_id( $user_id ) {
|
||||
$this->wp_object->user_id = $user_id;
|
||||
}
|
||||
private $actor_object = null;
|
||||
|
||||
/**
|
||||
* Transforms the WP_Comment object to an ActivityPub Object.
|
||||
*
|
||||
* @see \Activitypub\Activity\Base_Object
|
||||
*
|
||||
* @return \Activitypub\Activity\Base_Object The ActivityPub Object.
|
||||
*/
|
||||
public function to_object() {
|
||||
$comment = $this->wp_object;
|
||||
$comment = $this->item;
|
||||
$object = parent::to_object();
|
||||
|
||||
$object->set_url( $this->get_id() );
|
||||
$object->set_type( 'Note' );
|
||||
|
||||
$published = \strtotime( $comment->comment_date_gmt );
|
||||
$object->set_published( \gmdate( 'Y-m-d\TH:i:s\Z', $published ) );
|
||||
$object->set_published( \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, $published ) );
|
||||
|
||||
$updated = \get_comment_meta( $comment->comment_ID, 'activitypub_comment_modified', true );
|
||||
if ( $updated > $published ) {
|
||||
$object->set_updated( \gmdate( 'Y-m-d\TH:i:s\Z', $updated ) );
|
||||
$object->set_updated( \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, $updated ) );
|
||||
}
|
||||
|
||||
$object->set_content_map(
|
||||
@ -72,18 +61,38 @@ class Comment extends Base {
|
||||
$this->get_locale() => $this->get_content(),
|
||||
)
|
||||
);
|
||||
$path = sprintf( 'actors/%d/followers', intval( $comment->comment_author ) );
|
||||
|
||||
$object->set_to(
|
||||
array(
|
||||
'https://www.w3.org/ns/activitystreams#Public',
|
||||
get_rest_url_by_path( $path ),
|
||||
)
|
||||
);
|
||||
|
||||
return $object;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the content visibility.
|
||||
*
|
||||
* @return string The content visibility.
|
||||
*/
|
||||
public function get_content_visibility() {
|
||||
if ( $this->content_visibility ) {
|
||||
return $this->content_visibility;
|
||||
}
|
||||
|
||||
$comment = $this->item;
|
||||
$post = \get_post( $comment->comment_post_ID );
|
||||
|
||||
if ( ! $post ) {
|
||||
return ACTIVITYPUB_CONTENT_VISIBILITY_PUBLIC;
|
||||
}
|
||||
|
||||
$content_visibility = \get_post_meta( $post->ID, 'activitypub_content_visibility', true );
|
||||
|
||||
if ( ! $content_visibility ) {
|
||||
return ACTIVITYPUB_CONTENT_VISIBILITY_PUBLIC;
|
||||
}
|
||||
|
||||
$this->content_visibility = $content_visibility;
|
||||
|
||||
return $this->content_visibility;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the User-URL of the Author of the Post.
|
||||
*
|
||||
@ -92,12 +101,12 @@ class Comment extends Base {
|
||||
* @return string The User-URL.
|
||||
*/
|
||||
protected function get_attributed_to() {
|
||||
if ( is_single_user() ) {
|
||||
$user = new Blog();
|
||||
return $user->get_url();
|
||||
// If the comment was received via ActivityPub, return the author URL.
|
||||
if ( was_comment_received( $this->item ) ) {
|
||||
return $this->item->comment_author_url;
|
||||
}
|
||||
|
||||
return Users::get_by_id( $this->wp_object->user_id )->get_url();
|
||||
return $this->get_actor_object()->get_id();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -108,8 +117,19 @@ class Comment extends Base {
|
||||
* @return string The content.
|
||||
*/
|
||||
protected function get_content() {
|
||||
$comment = $this->wp_object;
|
||||
$content = $comment->comment_content;
|
||||
$comment = $this->item;
|
||||
$content = $comment->comment_content;
|
||||
$mentions = '';
|
||||
|
||||
foreach ( $this->extract_reply_context() as $acct => $url ) {
|
||||
$mentions .= sprintf(
|
||||
'<a rel="mention" class="u-url mention" href="%1$s" title="%2$s">%3$s</a> ',
|
||||
esc_url( $url ),
|
||||
esc_attr( $acct ),
|
||||
esc_html( '@' . strtok( $acct, '@' ) )
|
||||
);
|
||||
}
|
||||
$content = $mentions . $content;
|
||||
|
||||
/**
|
||||
* Filter the content of the comment.
|
||||
@ -141,7 +161,7 @@ class Comment extends Base {
|
||||
* @return false|string|null The URL of the in-reply-to.
|
||||
*/
|
||||
protected function get_in_reply_to() {
|
||||
$comment = $this->wp_object;
|
||||
$comment = $this->item;
|
||||
$parent_comment = null;
|
||||
|
||||
if ( $comment->comment_parent ) {
|
||||
@ -169,53 +189,37 @@ class Comment extends Base {
|
||||
* @return string ActivityPub URI for comment
|
||||
*/
|
||||
protected function get_id() {
|
||||
$comment = $this->wp_object;
|
||||
$comment = $this->item;
|
||||
return Comment_Utils::generate_id( $comment );
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a list of Mentions, used in the Comment.
|
||||
* Returns the User-Object of the Author of the Post.
|
||||
*
|
||||
* @see https://docs.joinmastodon.org/spec/activitypub/#Mention
|
||||
* If `single_user` mode is enabled, the Blog-User is returned.
|
||||
*
|
||||
* @return array The list of Mentions.
|
||||
* @return \Activitypub\Activity\Actor The User-Object.
|
||||
*/
|
||||
protected function get_cc() {
|
||||
$cc = array();
|
||||
|
||||
$mentions = $this->get_mentions();
|
||||
if ( $mentions ) {
|
||||
foreach ( $mentions as $url ) {
|
||||
$cc[] = $url;
|
||||
}
|
||||
protected function get_actor_object() {
|
||||
if ( $this->actor_object ) {
|
||||
return $this->actor_object;
|
||||
}
|
||||
|
||||
return array_unique( $cc );
|
||||
}
|
||||
$blog_user = new Blog();
|
||||
$this->actor_object = $blog_user;
|
||||
|
||||
/**
|
||||
* Returns a list of Tags, used in the Comment.
|
||||
*
|
||||
* This includes Hash-Tags and Mentions.
|
||||
*
|
||||
* @return array The list of Tags.
|
||||
*/
|
||||
protected function get_tag() {
|
||||
$tags = array();
|
||||
|
||||
$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;
|
||||
}
|
||||
if ( is_single_user() ) {
|
||||
return $blog_user;
|
||||
}
|
||||
|
||||
return \array_unique( $tags, SORT_REGULAR );
|
||||
$user = Actors::get_by_id( $this->item->user_id );
|
||||
|
||||
if ( $user && ! is_wp_error( $user ) ) {
|
||||
$this->actor_object = $user;
|
||||
return $user;
|
||||
}
|
||||
|
||||
return $blog_user;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -235,7 +239,7 @@ class Comment extends Base {
|
||||
*
|
||||
* @return array The filtered list of mentions.
|
||||
*/
|
||||
return apply_filters( 'activitypub_extract_mentions', array(), $this->wp_object->comment_content, $this->wp_object );
|
||||
return apply_filters( 'activitypub_extract_mentions', array(), $this->item->comment_content, $this->item );
|
||||
}
|
||||
|
||||
/**
|
||||
@ -244,7 +248,7 @@ class Comment extends Base {
|
||||
* @return array The list of ancestors.
|
||||
*/
|
||||
protected function get_comment_ancestors() {
|
||||
$ancestors = get_comment_ancestors( $this->wp_object );
|
||||
$ancestors = get_comment_ancestors( $this->item );
|
||||
|
||||
// Now that we have the full tree of ancestors, only return the ones received from the fediverse.
|
||||
return array_filter(
|
||||
@ -259,13 +263,13 @@ class Comment extends Base {
|
||||
* Collect all other Users that participated in this comment-thread
|
||||
* to send them a notification about the new reply.
|
||||
*
|
||||
* @param array $mentions The already mentioned ActivityPub users.
|
||||
* @param array $mentions Optional. The already mentioned ActivityPub users. Default empty array.
|
||||
*
|
||||
* @return array The list of all Repliers.
|
||||
*/
|
||||
public function extract_reply_context( $mentions ) {
|
||||
// Check if `$this->wp_object` is a WP_Comment.
|
||||
if ( 'WP_Comment' !== get_class( $this->wp_object ) ) {
|
||||
public function extract_reply_context( $mentions = array() ) {
|
||||
// Check if `$this->item` is a WP_Comment.
|
||||
if ( 'WP_Comment' !== get_class( $this->item ) ) {
|
||||
return $mentions;
|
||||
}
|
||||
|
||||
@ -289,23 +293,69 @@ class Comment extends Base {
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the locale of the post.
|
||||
* Returns the updated date of the comment.
|
||||
*
|
||||
* @return string The locale of the post.
|
||||
* @return string|null The updated date of the comment.
|
||||
*/
|
||||
public function get_locale() {
|
||||
$comment_id = $this->wp_object->ID;
|
||||
$lang = \strtolower( \strtok( \get_locale(), '_-' ) );
|
||||
public function get_updated() {
|
||||
$updated = \get_comment_meta( $this->item->comment_ID, 'activitypub_comment_modified', true );
|
||||
$published = \get_comment_meta( $this->item->comment_ID, 'activitypub_comment_published', true );
|
||||
|
||||
/**
|
||||
* Filter the locale of the comment.
|
||||
*
|
||||
* @param string $lang The locale of the comment.
|
||||
* @param int $comment_id The comment ID.
|
||||
* @param \WP_Post $post The comment object.
|
||||
*
|
||||
* @return string The filtered locale of the comment.
|
||||
*/
|
||||
return apply_filters( 'activitypub_comment_locale', $lang, $comment_id, $this->wp_object );
|
||||
if ( $updated > $published ) {
|
||||
return \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, $updated );
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the published date of the comment.
|
||||
*
|
||||
* @return string The published date of the comment.
|
||||
*/
|
||||
public function get_published() {
|
||||
return \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, \strtotime( $this->item->comment_date_gmt ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the URL of the comment.
|
||||
*
|
||||
* @return string The URL of the comment.
|
||||
*/
|
||||
public function get_url() {
|
||||
return $this->get_id();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the type of the comment.
|
||||
*
|
||||
* @return string The type of the comment.
|
||||
*/
|
||||
public function get_type() {
|
||||
return 'Note';
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the context of the post.
|
||||
*
|
||||
* @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-context
|
||||
*
|
||||
* @return string The context of the post.
|
||||
*/
|
||||
protected function get_context() {
|
||||
if ( $this->item->comment_post_ID ) {
|
||||
return get_rest_url_by_path( sprintf( 'posts/%d/context', $this->item->comment_post_ID ) );
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the replies Collection.
|
||||
*
|
||||
* @return array|null The replies collection on success or null on failure.
|
||||
*/
|
||||
public function get_replies() {
|
||||
return Replies::get_collection( $this->item );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user