friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Delivery of reshares

This commit is contained in:
Michael 2019-12-06 06:39:50 +00:00
parent 4b2acb74d5
commit 41f8796ffc
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Protocol/ActivityPub/Transmitter.php
View File

@ -363,7 +363,7 @@ class Transmitter
}
}
if (Config::get('debug', 'total_ap_delivery')) {
if (self::isAnnounce($item) || Config::get('debug', 'total_ap_delivery')) {
// Will be activated in a later step
$networks = Protocol::FEDERATED;
} else {
@ -1423,6 +1423,23 @@ class Transmitter
return ['object' => $reshared_item, 'actor' => $profile, 'comment' => $reshared['comment']];
}
/**
* Checks if the provided item array is an announce
*
* @param array $item
*
* @return boolean
*/
public static function isAnnounce($item)
{
$announce = self::getAnnounceArray($item);
if (empty($announce)) {
return false;
}
return empty($announce['comment']);
}
/**
* Creates an activity id for a given contact id
*

11
src/Worker/Delivery.php
View File

@ -251,6 +251,17 @@ class Delivery extends BaseObject
*/
private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
{
/*
if (Diaspora::isReshare($target_item['body'])) {
// Transmit Diaspora reshares only via Diaspora
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;
}
if (ActivityPub\Transmitter::::isAnnounce($target_item) && getby) {
return;
}
*/
Logger::info('Deliver ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' via DFRN to ' . (($contact['addr'] ?? '') ?: $contact['url']));
if ($cmd == self::MAIL) {