WordPress/wordpress-activitypub
1
0
Fork 0
mirror of https://github.com/Automattic/wordpress-activitypub synced 2024-10-18 11:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'trunk' into improve/actor-mode

Browse source
This commit is contained in:
Matthias Pfefferle 2024-10-11 13:30:42 +02:00 committed by GitHub
commit 41e6f51da4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
activitypub.php
View file

@ -29,6 +29,7 @@ require_once __DIR__ . '/includes/functions.php';
*/
\defined( 'ACTIVITYPUB_REST_NAMESPACE' ) || \define( 'ACTIVITYPUB_REST_NAMESPACE', 'activitypub/1.0' );
\defined( 'ACTIVITYPUB_EXCERPT_LENGTH' ) || \define( 'ACTIVITYPUB_EXCERPT_LENGTH', 400 );
\defined( 'ACTIVITYPUB_NOTE_LENGTH' ) || \define( 'ACTIVITYPUB_NOTE_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)|(?<=<p>)|(?<=<br>)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))' );

2
includes/rest/class-collection.php
View file

@ -218,7 +218,7 @@ class Collection {
if ( ! is_single_user() && User_Collection::BLOG_USER_ID === $user->get__id() ) {
$posts = array();
} elseif ( $sticky_posts ) {
} elseif ( is_array( $sticky_posts ) ) {
$args = array(
'post__in' => $sticky_posts,
'ignore_sticky_posts' => 1,

10
includes/transformer/class-post.php
View file

@ -642,9 +642,15 @@ class Post extends Base {
return \ucfirst( $post_format_setting );
}
$has_title = post_type_supports( $this->wp_object->post_type, 'title' );
$has_title = \post_type_supports( $this->wp_object->post_type, 'title' );
$content = \wp_strip_all_tags( $this->wp_object->post_content );
if ( ! $has_title ) {
// Check if the post has a title.
if (
! $has_title ||
! $this->wp_object->post_title ||
\strlen( $content ) <= ACTIVITYPUB_NOTE_LENGTH
) {
return 'Note';
}