keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Return more data in the announce object

Browse source
This commit is contained in:
Michael 2019-12-04 09:36:46 +00:00
parent 276d6fddd1
commit 8f4f3e00e2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Protocol/ActivityPub/Transmitter.php
View file

@ -1376,17 +1376,17 @@ class Transmitter
if (empty($announce['comment'])) { if (empty($announce['comment'])) {
// Pure announce, without a quote // Pure announce, without a quote
$data['type'] = 'Announce'; $data['type'] = 'Announce';
$data['object'] = $announce['id']; $data['object'] = $announce['object']['uri'];
return $data; return $data;
} }
// Quote // Quote
$data['type'] = 'Create'; $data['type'] = 'Create';
$item['body'] = $announce['comment'] . "\n" . $id; $item['body'] = $announce['comment'] . "\n" . $announce['object']['plink'];
$data['object'] = self::createNote($item); $data['object'] = self::createNote($item);
/// @todo Finally descide how to implement this in AP. This is a possible way: /// @todo Finally descide how to implement this in AP. This is a possible way:
$data['object']['attachment'][] = ['type' => $type, 'id' => $id]; $data['object']['attachment'][] = self::createNote($announce['object']);
$data['object']['source']['content'] = $orig_body; $data['object']['source']['content'] = $orig_body;
return $data; return $data;
@ -1417,7 +1417,7 @@ class Transmitter
return []; return [];
} }
$reshared_item = Item::selectFirst(['author-link', 'uri', 'network'], ['guid' => $matches[1]]); $reshared_item = Item::selectFirst([], ['guid' => $matches[1]]);
if (!DBA::isResult($reshared_item)) { if (!DBA::isResult($reshared_item)) {
return []; return [];
} }
@ -1431,7 +1431,7 @@ class Transmitter
return []; return [];
} }
return ['id' => $reshared_item['uri'], 'actor' => $profile, 'comment' => trim($comment)]; return ['object' => $reshared_item, 'actor' => $profile, 'comment' => trim($comment)];
} }
/** /**