strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fetchting the original post at first, then the other way is dafer.

Browse source
This commit is contained in:
Michael 2019-01-26 12:09:38 +00:00
parent ad782b55ef
commit 9f2e9dfc1b
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Module/Objects.php
View file

@ -31,13 +31,14 @@ class Objects extends BaseModule
/// @todo Add Authentication to enable fetching of non public content /// @todo Add Authentication to enable fetching of non public content
// $requester = HTTPSignature::getSigner('', $_SERVER); // $requester = HTTPSignature::getSigner('', $_SERVER);
$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]); // At first we try the original post with that guid
$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => false]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
// If no original post could be found, it could possibly be a forum post, there we remove the "origin" field.
$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
if (!DBA::isResult($item) || !strstr($item['author-link'], System::baseUrl())) {
System::httpExit(404); System::httpExit(404);
} }
if (!strstr($item['author-link'], System::baseUrl())) {
System::httpExit(404);
} }
$data = ActivityPub\Transmitter::createObjectFromItemID($item['id']); $data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);