Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 09:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show if a post arrived via relay

Browse source
This commit is contained in:
Michael 2020-09-21 12:31:20 +00:00
parent b8f3c4b065
commit c082109ff9
6 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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