Event-Federation/wordpress-activitypub
Event-Federation/wordpress-activitypub
7
1
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity Actions 1

Merge pull request #309 from jeherve/update/jetpack-photon-filter

Browse source
This commit is contained in:
Jeremy Herve 2023-05-04 18:02:10 +02:00 committed by GitHub
commit c7dc55047d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
includes/model/class-post.php
View file

@ -305,41 +305,31 @@ class Post {
// get URLs for each image // get URLs for each image
foreach ( $image_ids as $id ) { foreach ( $image_ids as $id ) {
$alt = \get_post_meta( $id, '_wp_attachment_image_alt', true ); $image_size = 'full';
/** /**
* If you use the Jetpack plugin and its Image CDN, aka Photon, * Filter the image URL returned for each post.
* the image strings returned will use the Photon URL.
* We don't want that since Fediverse instances already do caching on their end.
* Let the CDN only be used for visitors of the site.
* *
* Old versions of Jetpack used the Jetpack_Photon class to do this. * @param array|false $thumbnail The image URL, or false if no image is available.
* New versions use the Image_CDN class. * @param int $id The attachment ID.
* Let's handle both. * @param string $image_size The image size to retrieve. Set to 'full' by default.
*/ */
if ( \class_exists( '\Automattic\Jetpack\Image_CDN\Image_CDN' ) ) { $thumbnail = apply_filters(
\remove_filter( 'image_downsize', array( \Automattic\Jetpack\Image_CDN\Image_CDN::instance(), 'filter_image_downsize' ) ); 'activitypub_get_image',
} elseif ( \class_exists( 'Jetpack_Photon' ) ) { $this->get_image( $id, $image_size ),
\remove_filter( 'image_downsize', array( \Jetpack_Photon::instance(), 'filter_image_downsize' ) ); $id,
} $image_size
);
$thumbnail = \wp_get_attachment_image_src( $id, 'full' );
// Re-enable Photon now that the image URL has been built.
if ( \class_exists( '\Automattic\Jetpack\Image_CDN\Image_CDN' ) ) {
\add_filter( 'image_downsize', array( \Automattic\Jetpack\Image_CDN\Image_CDN::instance(), 'filter_image_downsize' ), 10, 3 );
} elseif ( \class_exists( 'Jetpack_Photon' ) ) {
\add_filter( 'image_downsize', array( \Jetpack_Photon::instance(), 'filter_image_downsize' ), 10, 3 );
}
$mimetype = \get_post_mime_type( $id );
if ( $thumbnail ) { if ( $thumbnail ) {
$mimetype = \get_post_mime_type( $id );
$alt = \get_post_meta( $id, '_wp_attachment_image_alt', true );
$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;
} }
@ -352,6 +342,36 @@ class Post {
return $images; return $images;
} }
/**
* Return details about an image attachment.
*
* @param int $id The attachment ID.
* @param string $image_size The image size to retrieve. Set to 'full' by default.
*
* @return array|false Array of image data, or boolean false if no image is available.
*/
public function get_image( $id, $image_size = 'full' ) {
/**
* Hook into the image retrieval process. Before image retrieval.
*
* @param int $id The attachment ID.
* @param string $image_size The image size to retrieve. Set to 'full' by default.
*/
do_action( 'activitypub_get_image_pre', $id, $image_size );
$thumbnail = \wp_get_attachment_image_src( $id, $image_size );
/**
* Hook into the image retrieval process. After image retrieval.
*
* @param int $id The attachment ID.
* @param string $image_size The image size to retrieve. Set to 'full' by default.
*/
do_action( 'activitypub_get_image_pre', $id, $image_size );
return $thumbnail;
}
/** /**
* Returns a list of Tags, used in the Post * Returns a list of Tags, used in the Post
* *

1
readme.txt
View file

@ -115,6 +115,7 @@ Project maintained on GitHub at [automattic/wordpress-activitypub](https://githu
= Next = = Next =
* Compatibility: add hooks to allow modifying images returned in ActivityPub requests.
* Compatibility: indicate that the plugin is compatible and has been tested with the latest version of WordPress, 6.2. * Compatibility: indicate that the plugin is compatible and has been tested with the latest version of WordPress, 6.2.
= 0.17.0 = = 0.17.0 =