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

Rework Module/Objects

Browse source 
- Merge two item queries into one
- Add ETag check
- Use Router parameter
This commit is contained in:
Hypolite Petovan 2020-04-05 18:00:46 -04:00
parent f96d1fbd0b
commit 1e32f74b0b
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/display.php
View file

@ -42,7 +42,7 @@ use Friendica\Util\Strings;
function display_init(App $a) function display_init(App $a)
{ {
if (ActivityPub::isRequest()) { if (ActivityPub::isRequest()) {
Objects::rawContent(); Objects::rawContent(['guid' => $a->argv[1] ?? null]);
} }
if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {

40
src/Module/Objects.php
View file

@ -22,10 +22,13 @@
namespace Friendica\Module; namespace Friendica\Module;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Network\HTTPException;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
use Friendica\Util\Network;
/** /**
* ActivityPub Objects * ActivityPub Objects
@ -34,10 +37,8 @@ class Objects extends BaseModule
{ {
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
$a = DI::app(); if (empty($parameters['guid'])) {
throw new HTTPException\BadRequestException();
if (empty($a->argv[1])) {
throw new \Friendica\Network\HTTPException\NotFoundException();
} }
if (!ActivityPub::isRequest()) { if (!ActivityPub::isRequest()) {
@ -47,31 +48,34 @@ 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);
// At first we try the original post with that guid $item = Item::selectFirst(
// @TODO: Replace with parameter from router ['id', 'origin', 'author-link', 'changed'],
$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => [item::PUBLIC, Item::UNLISTED]]); [
if (!DBA::isResult($item)) { 'guid' => $parameters['guid'],
// If no original post could be found, it could possibly be a forum post, there we remove the "origin" field. 'private' => [Item::PUBLIC, Item::UNLISTED]
// @TODO: Replace with parameter from router ],
$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => [item::PUBLIC, Item::UNLISTED]]); ['order' => ['origin' => true]]
if (!DBA::isResult($item) || !strstr($item['author-link'], DI::baseUrl()->get())) { );
throw new \Friendica\Network\HTTPException\NotFoundException(); // Valid items are original post or posted from this node (including in the case of a forum)
} if (!DBA::isResult($item) || !$item['origin'] && !strstr($item['author-link'], DI::baseUrl()->get())) {
throw new HTTPException\NotFoundException();
} }
$etag = md5($parameters['guid'] . '-' . $item['changed']);
$last_modified = $item['changed'];
Network::checkEtagModified($etag, $last_modified);
$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true); $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
$activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type']; $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
// Only display "Create" activity objects here, no reshares or anything else // Only display "Create" activity objects here, no reshares or anything else
if (empty($activity['object']) || ($activity['type'] != 'Create')) { if (empty($activity['object']) || ($activity['type'] != 'Create')) {
throw new \Friendica\Network\HTTPException\NotFoundException(); throw new HTTPException\NotFoundException();
} }
$data = ['@context' => ActivityPub::CONTEXT]; $data = ['@context' => ActivityPub::CONTEXT];
$data = array_merge($data, $activity['object']); $data = array_merge($data, $activity['object']);
header('Content-Type: application/activity+json'); System::jsonExit($data, 'application/activity+json');
echo json_encode($data);
exit();
} }
} }