more chances to support delete

This commit is contained in:
Matthias Pfefferle 2020-05-14 21:37:59 +02:00
parent b8feca2d9f
commit 4798b75f37
3 changed files with 67 additions and 63 deletions

View file

@ -10,7 +10,7 @@ namespace Activitypub;
*/ */
class Activity_Dispatcher { class Activity_Dispatcher {
/** /**
* Initialize the class, registering WordPress hooks * Initialize the class, registering WordPress hooks.
*/ */
public static function init() { public static function init() {
\add_action( 'activitypub_send_post_activity', array( '\Activitypub\Activity_Dispatcher', 'send_post_activity' ) ); \add_action( 'activitypub_send_post_activity', array( '\Activitypub\Activity_Dispatcher', 'send_post_activity' ) );
@ -19,22 +19,14 @@ class Activity_Dispatcher {
} }
/** /**
* Send "create" activities * Send "create" activities.
* *
* @param int $post_id * @param \Activitypub\Model\Post $activitypub_post
*/ */
public static function send_post_activity( $post ) { public static function send_post_activity( $activitypub_post ) {
if ( \is_object( $post ) ) {
$post_id = $post->ID;
} else {
$post_id = $post;
}
// get latest version of post // get latest version of post
$post = \get_post( $post ); $user_id = $activitypub_post->get_post_author();
$user_id = $post->post_author;
$activitypub_post = new \Activitypub\Model\Post( $post );
$activitypub_activity = new \Activitypub\Model\Activity( 'Create', \Activitypub\Model\Activity::TYPE_FULL ); $activitypub_activity = new \Activitypub\Model\Activity( 'Create', \Activitypub\Model\Activity::TYPE_FULL );
$activitypub_activity->from_post( $activitypub_post->to_array() ); $activitypub_activity->from_post( $activitypub_post->to_array() );
@ -47,22 +39,14 @@ class Activity_Dispatcher {
} }
/** /**
* Send "update" activities * Send "update" activities.
* *
* @param int $post_id * @param \Activitypub\Model\Post $activitypub_post
*/ */
public static function send_update_activity( $post ) { public static function send_update_activity( $activitypub_post ) {
if ( \is_object( $post ) ) {
$post_id = $post->ID;
} else {
$post_id = $post;
}
// get latest version of post // get latest version of post
$post = \get_post( $post ); $user_id = $activitypub_post->get_post_author();
$user_id = $post->post_author;
$activitypub_post = new \Activitypub\Model\Post( $post );
$activitypub_activity = new \Activitypub\Model\Activity( 'Update', \Activitypub\Model\Activity::TYPE_FULL ); $activitypub_activity = new \Activitypub\Model\Activity( 'Update', \Activitypub\Model\Activity::TYPE_FULL );
$activitypub_activity->from_post( $activitypub_post->to_array() ); $activitypub_activity->from_post( $activitypub_post->to_array() );
@ -75,14 +59,14 @@ class Activity_Dispatcher {
} }
/** /**
* Send "delete" activities * Send "delete" activities.
* *
* @param int $post_id * @param \Activitypub\Model\Post $activitypub_post
*/ */
public static function send_delete_activity( $post ) { public static function send_delete_activity( $activitypub_post ) {
$user_id = $post->post_author; // get latest version of post
$user_id = $activitypub_post->get_post_author();
$activitypub_post = new \Activitypub\Model\Post( $post );
$activitypub_activity = new \Activitypub\Model\Activity( 'Delete', \Activitypub\Model\Activity::TYPE_FULL ); $activitypub_activity = new \Activitypub\Model\Activity( 'Delete', \Activitypub\Model\Activity::TYPE_FULL );
$activitypub_activity->from_post( $activitypub_post->to_array() ); $activitypub_activity->from_post( $activitypub_post->to_array() );

View file

@ -113,12 +113,14 @@ class Activitypub {
return; return;
} }
$activitypub_post = new \Activitypub\Model\Post( $post );
if ( 'publish' === $new_status && 'publish' !== $old_status ) { if ( 'publish' === $new_status && 'publish' !== $old_status ) {
\wp_schedule_single_event( \time(), 'activitypub_send_post_activity', array( $post ) ); \wp_schedule_single_event( \time(), 'activitypub_send_post_activity', array( $activitypub_post ) );
} elseif ( 'publish' === $new_status ) { } elseif ( 'publish' === $new_status ) {
\wp_schedule_single_event( \time(), 'activitypub_send_update_activity', array( $post ) ); \wp_schedule_single_event( \time(), 'activitypub_send_update_activity', array( $activitypub_post ) );
} elseif ( 'trash' === $new_status ) { } elseif ( 'trash' === $new_status ) {
\wp_schedule_single_event( \time(), 'activitypub_send_delete_activity', array( $post ) ); \wp_schedule_single_event( \time(), 'activitypub_send_delete_activity', array( $activitypub_post ) );
} }
} }

View file

@ -8,6 +8,12 @@ namespace Activitypub\Model;
*/ */
class Post { class Post {
private $post; private $post;
private $post_author;
private $permalink;
private $summary;
private $content;
private $attachments;
private $object_type;
/** /**
* Initialize the class, registering WordPress hooks * Initialize the class, registering WordPress hooks
@ -19,34 +25,46 @@ class Post {
public function __construct( $post = null ) { public function __construct( $post = null ) {
$this->post = \get_post( $post ); $this->post = \get_post( $post );
$this->post_author = $this->post->post_author();
$this->permalink = $this->generate_permalink();
$this->summary = $this->generate_the_title();
$this->content = $this->generate_the_content();
$this->attachments = $this->generate_attachments();
$this->tags = $this->generate_tags();
$this->object_type = $this->generate_object_type();
} }
public function get_post() { public function __call( $method, $params ) {
return $this->post; $var = \strtolower( \substr( $method, 4 ) );
}
public function get_post_author() { if ( \strncasecmp( $method, 'get', 3 ) === 0 ) {
return $this->post->post_author; return $this->$var;
}
if ( \strncasecmp( $method, 'set', 3 ) === 0 ) {
$this->$var = $params[0];
}
} }
public function to_array() { public function to_array() {
$post = $this->post; $post = $this->post;
$array = array( $array = array(
'id' => $this->get_permalink(), 'id' => $this->permalink,
'type' => $this->get_object_type(), 'type' => $this->object_type,
'published' => \date( 'Y-m-d\TH:i:s\Z', \strtotime( $post->post_date ) ), 'published' => \date( 'Y-m-d\TH:i:s\Z', \strtotime( $post->post_date ) ),
'attributedTo' => \get_author_posts_url( $post->post_author ), 'attributedTo' => \get_author_posts_url( $post->post_author ),
'summary' => $this->get_the_title(), 'summary' => $this->summary,
'inReplyTo' => null, 'inReplyTo' => null,
'content' => $this->get_the_content(), 'content' => $this->content,
'contentMap' => array( 'contentMap' => array(
\strstr( \get_locale(), '_', true ) => $this->get_the_content(), \strstr( \get_locale(), '_', true ) => $this->content,
), ),
'to' => array( 'https://www.w3.org/ns/activitystreams#Public' ), 'to' => array( 'https://www.w3.org/ns/activitystreams#Public' ),
'cc' => array( 'https://www.w3.org/ns/activitystreams#Public' ), 'cc' => array( 'https://www.w3.org/ns/activitystreams#Public' ),
'attachment' => $this->get_attachments(), 'attachment' => $this->attachments,
'tag' => $this->get_tags(), 'tag' => $this->tags,
); );
return \apply_filters( 'activitypub_post', $array ); return \apply_filters( 'activitypub_post', $array );
@ -56,16 +74,16 @@ class Post {
return \wp_json_encode( $this->to_array(), \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT ); return \wp_json_encode( $this->to_array(), \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_QUOT );
} }
public function get_permalink() { public function generate_permalink() {
$post = $this->post; $post = $this->post;
$permalink = \get_permalink( $post ); $permalink = \generate_permalink( $post );
// replace 'trashed' for delete activity // replace 'trashed' for delete activity
return \str_replace( '__trashed', '', $permalink ); return \str_replace( '__trashed', '', $permalink );
} }
public function get_attachments() { public function generate_attachments() {
$max_images = \apply_filters( 'activitypub_max_images', 3 ); $max_images = \apply_filters( 'activitypub_max_images', 3 );
$images = array(); $images = array();
@ -113,7 +131,7 @@ class Post {
$image = array( $image = array(
'type' => 'Image', 'type' => 'Image',
'url' => $thumbnail[0], 'url' => $thumbnail[0],
'mediaType' => $mimetype 'mediaType' => $mimetype,
); );
if ( $alt ) { if ( $alt ) {
$image['name'] = $alt; $image['name'] = $alt;
@ -125,7 +143,7 @@ class Post {
return $images; return $images;
} }
public function get_tags() { public function generate_tags() {
$tags = array(); $tags = array();
$post_tags = \get_the_tags( $this->post->ID ); $post_tags = \get_the_tags( $this->post->ID );
@ -151,7 +169,7 @@ class Post {
* *
* @return string the object-type * @return string the object-type
*/ */
public function get_object_type() { public function generate_object_type() {
if ( 'wordpress-post-format' !== \get_option( 'activitypub_object_type', 'note' ) ) { if ( 'wordpress-post-format' !== \get_option( 'activitypub_object_type', 'note' ) ) {
return \ucfirst( \get_option( 'activitypub_object_type', 'note' ) ); return \ucfirst( \get_option( 'activitypub_object_type', 'note' ) );
} }
@ -208,21 +226,21 @@ class Post {
return $object_type; return $object_type;
} }
public function get_the_content() { public function generate_the_content() {
if ( 'excerpt' === \get_option( 'activitypub_post_content_type', 'content' ) ) { if ( 'excerpt' === \get_option( 'activitypub_post_content_type', 'content' ) ) {
return $this->get_the_post_summary(); return $this->generate_the_post_summary();
} }
if ( 'title' === \get_option( 'activitypub_post_content_type', 'content' ) ) { if ( 'title' === \get_option( 'activitypub_post_content_type', 'content' ) ) {
return $this->get_the_title(); return $this->generate_the_title();
} }
return $this->get_the_post_content(); return $this->generate_the_post_content();
} }
public function get_the_title() { public function generate_the_title() {
if ( 'Article' === $this->get_object_type() ) { if ( 'Article' === $this->generate_object_type() ) {
$title = \get_the_title( $this->post ); $title = \generate_the_title( $this->post );
return \html_entity_decode( $title, \ENT_QUOTES, 'UTF-8' ); return \html_entity_decode( $title, \ENT_QUOTES, 'UTF-8' );
} }
@ -237,7 +255,7 @@ class Post {
* *
* @return string The excerpt. * @return string The excerpt.
*/ */
public function get_the_post_excerpt( $excerpt_length = 400 ) { public function generate_the_post_excerpt( $excerpt_length = 400 ) {
$post = $this->post; $post = $this->post;
$excerpt = \get_post_field( 'post_excerpt', $post ); $excerpt = \get_post_field( 'post_excerpt', $post );
@ -272,7 +290,7 @@ class Post {
* *
* @return string The content. * @return string The content.
*/ */
public function get_the_post_content() { public function generate_the_post_content() {
$post = $this->post; $post = $this->post;
$content = \get_post_field( 'post_content', $post ); $content = \get_post_field( 'post_content', $post );
@ -294,8 +312,8 @@ class Post {
* *
* @return string The excerpt. * @return string The excerpt.
*/ */
public function get_the_post_summary( $summary_length = 400 ) { public function generate_the_post_summary( $summary_length = 400 ) {
$summary = $this->get_the_post_excerpt( $summary_length ); $summary = $this->generate_the_post_excerpt( $summary_length );
$filtered_summary = \apply_filters( 'the_excerpt', $summary ); $filtered_summary = \apply_filters( 'the_excerpt', $summary );
$filtered_summary = \apply_filters( 'activitypub_the_summary', $filtered_summary, $this->post ); $filtered_summary = \apply_filters( 'activitypub_the_summary', $filtered_summary, $this->post );
@ -321,7 +339,7 @@ class Post {
if ( \get_option( 'activitypub_use_shortlink', 0 ) ) { if ( \get_option( 'activitypub_use_shortlink', 0 ) ) {
$link = \esc_url( \wp_get_shortlink( $post->ID ) ); $link = \esc_url( \wp_get_shortlink( $post->ID ) );
} else { } else {
$link = \esc_url( \get_permalink( $post->ID ) ); $link = \esc_url( \generate_permalink( $post->ID ) );
} }
return $content . '<p><a href="' . $link . '">' . $link . '</a></p>'; return $content . '<p><a href="' . $link . '">' . $link . '</a></p>';