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

Some fixes for the inbox code path

Browse Source
This commit is contained in:
Jeremy Dormitzer 2018-09-30 16:39:42 -04:00
parent 188229a7ab
commit 718c7c84a5
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@ function handle_inbox( $actor_slug, $activity ) {
array( 'status' => 400 )
);
}
$object = $activity['object'];
$object = \objects\upsert_object( $object );
if ( is_wp_error( $object ) ) {
return $object;

33
includes/server/inbox.php
View File

@ -33,9 +33,9 @@ function handle_activity( $actor_slug, $activity ) {
);
}
forward_activity( $activity );
$res = persist_activity( $actor_slug, $activity );
if ( is_wp_error( $res ) ) {
return $res;
$activity = persist_activity( $actor_slug, $activity );
if ( is_wp_error( $activity ) ) {
return $activity;
}
switch ( $activity['type'] ) {
case 'Create':
@ -126,18 +126,37 @@ function persist_activity( $actor_slug, $activity ) {
if ( is_wp_error( $activity ) ) {
return $activity;
}
$activity_id = $wpdb->insert_id;
$activity_id = \activities\get_activity_id( $activity['id'] );
if ( !$activity_id ) {
return new \WP_Error(
'db_error',
__( 'Error retrieving activity id', 'pterotype' )
);
}
$actor_id = \actors\get_actor_id( $actor_slug );
$res = $wpdb->insert( 'pterotype_inbox', array(
'actor_id' => $actor_id,
'activity_id' => $activity_id,
$seen_before = $wpdb->get_row( $wpdb->prepare(
'SELECT * FROM pterotype_inbox WHERE actor_id = %d AND activity_id = %d',
$actor_id,
$activity_id
) );
if ( $seen_before ) {
return $activity;
}
$res = $wpdb->insert(
'pterotype_inbox',
array(
'actor_id' => $actor_id,
'activity_id' => $activity_id,
),
'%d'
);
if ( !$res ) {
return new \WP_Error(
'db_error',
__( 'Error persisting inbox record', 'pterotype' )
);
}
return $activity;
}
function get_inbox( $actor_slug ) {

3
includes/server/objects.php
View File

@ -90,6 +90,7 @@ function upsert_object( $object ) {
),
'%s'
);
$row = new \stdClass();
} else {
$res = $wpdb->update(
'pterotype_objects',
@ -102,7 +103,7 @@ function upsert_object( $object ) {
'%s',
'%d'
);
$row = new stdClass();
$row = new \stdClass();
$row->id = $wpdb->insert_id;
$activites_res = $wpdb->query( $wpdb->prepare(
'