jdormit/pterotype
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compact actor before delivery; improve excerpt generation

Browse Source
This commit is contained in:
Jeremy Dormitzer 2019-03-13 22:55:47 -04:00
parent 6a8a3fed3b
commit 02fe7d600a
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
includes/client/posts.php
View File

@ -48,14 +48,11 @@ function post_to_object( $post ) {
return;
}
setup_postdata( $post );
$GLOBALS['post'] = $post;
$permalink = get_permalink( $post );
$summary = null;
if ( $post->post_content ) {
$summary = \html_entity_decode(
get_the_excerpt( $post ),
ENT_QUOTES,
'UTF-8'
);
$summary = apply_filters( 'get_the_excerpt', get_post_field( 'post_excerpt', $post->ID ) );
}
$matches = array();
if ( preg_match( '/(.+)__trashed\/$/', $permalink, $matches ) ) {

2
includes/server/activities/create.php
View File

@ -102,7 +102,7 @@ function make_create( $actor_slug, $object ) {
$activity = array(
'@context' => array( 'https://www.w3.org/ns/activitystreams' ),
'type' => 'Create',
'actor' => $actor,
'actor' => $actor['id'],
'object' => $object
);
return $activity;

2
includes/server/activities/delete.php
View File

@ -92,7 +92,7 @@ function make_delete( $actor_slug, $object ) {
return array(
'@context' => array( 'https://www.w3.org/ns/activitystreams' ),
'type' => 'Delete',
'actor' => $actor,
'actor' => $actor['id'],
'object' => $object
);
}

3
includes/server/activities/follow.php
View File

@ -79,10 +79,11 @@ function make_accept( $actor_slug, $follow ) {
array( 'status' => 400 )
);
}
$actor = \pterotype\actors\get_actor_by_slug( $actor_slug );
$accept = array(
'@context' => array( 'https://www.w3.org/ns/activitystreams' ),
'type' => 'Accept',
'actor' => \pterotype\actors\get_actor_by_slug( $actor_slug ),
'actor' => $actor['id'],
'object' => $follow,
'to' => $follow['actor'],
);

2
includes/server/activities/update.php
View File

@ -107,7 +107,7 @@ function make_update( $actor_slug, $object ) {
return array(
'@context' => array( 'https://www.w3.org/ns/activitystreams' ),
'type' => 'Update',
'actor' => $actor,
'actor' => $actor['id'],
'object' => $object
);
}

7
includes/server/deliver.php
View File

@ -125,7 +125,12 @@ function get_recipient_urls( $object, $depth, $acc ) {
}
function post_activity_to_inboxes( $actor_id, $activity, $recipients, $deliver_locally = true ) {
$activity = \pterotype\util\decompact_object( $activity, array( 'actor', 'object' ) );
$activity = \pterotype\util\decompact_object( $activity, array( 'object' ) );
if ( array_key_exists( 'actor', $activity ) &&
is_array( $activity['actor'] ) &&
array_key_exists( 'id', $activity['actor'] ) ) {
$activity['actor'] = $activity['actor']['id'];
}
foreach ( $recipients as $inbox ) {
if ( $inbox === 'https://www.w3.org/ns/activitystreams#Public' ) {
continue;