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

Additional direction for fetching content

Browse source
This commit is contained in:
Michael 2020-09-21 15:17:33 +00:00
parent c082109ff9
commit 11d2b027ec
4 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/conversation.php
View file

@ -767,7 +767,10 @@ function conversation_fetch_comments($thread_items, $pinned) {
case Item::PT_RELAY: case Item::PT_RELAY:
$row['direction'] = ['direction' => 10, 'title' => DI::l10n()->t('Relay')]; $row['direction'] = ['direction' => 10, 'title' => DI::l10n()->t('Relay')];
break; break;
} case Item::PT_FETCHED:
$row['direction'] = ['direction' => 2, 'title' => DI::l10n()->t('Fetched')];
break;
}
if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id']) && if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id']) &&
!Contact::isSharing($row['author-id'], $row['uid'])) { !Contact::isSharing($row['author-id'], $row['uid'])) {

1
src/Model/Item.php
View file

@ -68,6 +68,7 @@ class Item
const PT_STORED = 72; const PT_STORED = 72;
const PT_GLOBAL = 73; const PT_GLOBAL = 73;
const PT_RELAY = 74; const PT_RELAY = 74;
const PT_FETCHED = 75;
const PT_PERSONAL_NOTE = 128; const PT_PERSONAL_NOTE = 128;
// Field list that is used to display the items // Field list that is used to display the items

18
src/Protocol/ActivityPub/Processor.php
View file

@ -521,8 +521,12 @@ class Processor
$item['post-type'] = Item::PT_ARTICLE; $item['post-type'] = Item::PT_ARTICLE;
} }
if (in_array($item['post-type'], [Item::PT_GLOBAL, Item::PT_ARTICLE]) && !empty($activity['from-relay'])) { if (in_array($item['post-type'], [Item::PT_COMMENT, Item::PT_GLOBAL, Item::PT_ARTICLE])) {
$item['post-type'] = Item::PT_RELAY; if (!empty($activity['from-relay'])) {
$item['post-type'] = Item::PT_RELAY;
} elseif (!empty($activity['thread-completion'])) {
$item['post-type'] = Item::PT_FETCHED;
}
} }
if ($item['isForum'] ?? false) { if ($item['isForum'] ?? false) {
@ -692,13 +696,13 @@ class Processor
/** /**
* Fetches missing posts * Fetches missing posts
* *
* @param string $url message URL * @param string $url message URL
* @param array $child activity array with the child of this message * @param array $child activity array with the child of this message
* @param bool $relaymode Posts arrived via relay * @param string $actor Relay actor
* @return string fetched message URL * @return string fetched message URL
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function fetchMissingActivity(string $url, array $child = [], bool $relaymode = false) public static function fetchMissingActivity(string $url, array $child = [], string $actor = '')
{ {
if (!empty($child['receiver'])) { if (!empty($child['receiver'])) {
$uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']); $uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
@ -757,7 +761,7 @@ class Processor
$ldactivity = JsonLD::compact($activity); $ldactivity = JsonLD::compact($activity);
$ldactivity['thread-completion'] = true; $ldactivity['thread-completion'] = true;
$ldactivity['from-relay'] = $relaymode; $ldactivity['from-relay'] = !empty($actor);
ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, $signer); ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, $signer);

9
src/Protocol/ActivityPub/Receiver.php
View file

@ -100,7 +100,7 @@ class Receiver
$apcontact = APContact::getByURL($actor); $apcontact = APContact::getByURL($actor);
if (!empty($apcontact) && ($apcontact['type'] == 'Application') && ($apcontact['nick'] == 'relay')) { if (!empty($apcontact) && ($apcontact['type'] == 'Application') && ($apcontact['nick'] == 'relay')) {
self::processRelayPost($ldactivity); self::processRelayPost($ldactivity, $actor);
return; return;
} }
@ -150,10 +150,11 @@ class Receiver
/** /**
* Process incoming posts from relays * Process incoming posts from relays
* *
* @param array $activity * @param array $activity
* @param string $actor
* @return void * @return void
*/ */
private static function processRelayPost(array $activity) private static function processRelayPost(array $activity, string $actor)
{ {
$type = JsonLD::fetchElement($activity, '@type'); $type = JsonLD::fetchElement($activity, '@type');
if (!$type) { if (!$type) {
@ -180,7 +181,7 @@ class Receiver
return; return;
} }
Processor::fetchMissingActivity($object_id, [], true); Processor::fetchMissingActivity($object_id, [], $actor);
$item_id = Item::searchByLink($object_id); $item_id = Item::searchByLink($object_id);
if ($item_id) { if ($item_id) {