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

Merge pull request #9206 from annando/global-direction

Browse source 
We now set the "global" direction
This commit is contained in:
Hypolite Petovan 2020-09-14 14:04:59 -04:00 • committed by GitHub
commit 87e0ba2af6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\APContact;
@ -207,9 +206,6 @@ class Processor
} else {
$item['gravity'] = GRAVITY_COMMENT;
$item['object-type'] = Activity\ObjectType::COMMENT;
// Ensure that the comment reaches all receivers of the referring post
$activity['receiver'] = self::addReceivers($activity);
}
if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Item::exists(['uri' => $activity['reply-to-id']])) {
@ -331,35 +327,6 @@ class Processor
}
}
/**
* Add users to the receiver list of the given public activity.
* This is used to ensure that the activity will be stored in every thread.
*
* @param array $activity Activity array
* @return array Modified receiver list
*/
private static function addReceivers(array $activity)
{
if (!in_array(0, $activity['receiver'])) {
// Private activities will not be modified
return $activity['receiver'];
}
// Add all owners of the referring item to the receivers
$original = $receivers = $activity['receiver'];
$items = Item::select(['uid'], ['uri' => $activity['object_id']]);
while ($item = DBA::fetch($items)) {
$receivers['uid:' . $item['uid']] = $item['uid'];
}
DBA::close($items);
if (count($original) != count($receivers)) {
Logger::info('Improved data', ['id' => $activity['id'], 'object' => $activity['object_id'], 'original' => $original, 'improved' => $receivers, 'callstack' => System::callstack()]);
}
return $receivers;
}
/**
* Prepare the item array for an activity
*
@ -378,8 +345,6 @@ class Processor
$item['diaspora_signed_text'] = $activity['diaspora:like'] ?? '';
$activity['receiver'] = self::addReceivers($activity);
self::postItem($activity, $item);
}
@ -548,6 +513,9 @@ class Processor
case Receiver::TARGET_ANSWER:
$item['post-type'] = Item::PT_COMMENT;
break;
case Receiver::TARGET_GLOBAL:
$item['post-type'] = Item::PT_GLOBAL;
break;
default:
$item['post-type'] = Item::PT_ARTICLE;
}