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

Push/Pull indicator

This commit is contained in:
Michael 2020-02-27 05:01:43 +00:00
parent 357c0072bd
commit acd99b9010
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Protocol/ActivityPub/Processor.php
View File

@ -474,6 +474,15 @@ class Processor
return; return;
} }
if (isset($activity['push'])) {
$push_app = $activity['push'] ? '📨' : '🚜';
if (!empty($item['app'])) {
$item['app'] .= ' (' . $push_app . ')';
} else {
$item['app'] .= $push_app;
}
}
$item['plink'] = $activity['alternate-url'] ?? $item['uri']; $item['plink'] = $activity['alternate-url'] ?? $item['uri'];
$item = self::constructAttachList($activity, $item); $item = self::constructAttachList($activity, $item);

11
src/Protocol/ActivityPub/Receiver.php
View File

@ -127,7 +127,7 @@ class Receiver
$trust_source = false; $trust_source = false;
} }
self::processActivity($ldactivity, $body, $uid, $trust_source); self::processActivity($ldactivity, $body, $uid, $trust_source, true);
} }
/** /**
@ -183,7 +183,7 @@ class Receiver
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
private static function prepareObjectData($activity, $uid, &$trust_source) private static function prepareObjectData($activity, $uid, $push, &$trust_source)
{ {
$actor = JsonLD::fetchElement($activity, 'as:actor', '@id'); $actor = JsonLD::fetchElement($activity, 'as:actor', '@id');
if (empty($actor)) { if (empty($actor)) {
@ -225,13 +225,16 @@ class Receiver
if (in_array($type, ['as:Create', 'as:Update', 'as:Announce'])) { if (in_array($type, ['as:Create', 'as:Update', 'as:Announce'])) {
if ($type == 'as:Announce') { if ($type == 'as:Announce') {
$trust_source = false; $trust_source = false;
$push = false;
} }
$object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source, $uid); $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source, $uid);
if (empty($object_data)) { if (empty($object_data)) {
Logger::log("Object data couldn't be processed", Logger::DEBUG); Logger::log("Object data couldn't be processed", Logger::DEBUG);
return []; return [];
} }
$object_data['object_id'] = $object_id; $object_data['object_id'] = $object_id;
$object_data['push'] = $push;
// Test if it is an answer to a mail // Test if it is an answer to a mail
if (DBA::exists('mail', ['uri' => $object_data['reply-to-id']])) { if (DBA::exists('mail', ['uri' => $object_data['reply-to-id']])) {
@ -339,7 +342,7 @@ class Receiver
* @param boolean $trust_source Do we trust the source? * @param boolean $trust_source Do we trust the source?
* @throws \Exception * @throws \Exception
*/ */
public static function processActivity($activity, $body = '', $uid = null, $trust_source = false) public static function processActivity($activity, $body = '', $uid = null, $trust_source = false, $push = false)
{ {
$type = JsonLD::fetchElement($activity, '@type'); $type = JsonLD::fetchElement($activity, '@type');
if (!$type) { if (!$type) {
@ -369,7 +372,7 @@ class Receiver
} }
// $trust_source is called by reference and is set to true if the content was retrieved successfully // $trust_source is called by reference and is set to true if the content was retrieved successfully
$object_data = self::prepareObjectData($activity, $uid, $trust_source); $object_data = self::prepareObjectData($activity, $uid, $push, $trust_source);
if (empty($object_data)) { if (empty($object_data)) {
Logger::log('No object data found', Logger::DEBUG); Logger::log('No object data found', Logger::DEBUG);
return; return;