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

Reduce the amount of "UpdateContact" worker calls

Browse source
This commit is contained in:
Michael 2022-12-28 14:56:12 +00:00
parent 4bb0fdc9a9
commit e0e2e45b91
6 changed files with 89 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Protocol/ActivityPub/Delivery.php
View file

@ -205,9 +205,15 @@ class Delivery
*/
private static function setSuccess(array $receivers, bool $success)
{
$gsid = null;
$gsid = null;
$update_counter = 0;
foreach ($receivers as $receiver) {
// Only update the first 10 receivers to avoid flooding the remote system with requests
if ($success && ($update_counter < 10) && Contact::updateByIdIfNeeded($receiver)) {
$update_counter++;
}
$contact = Contact::getById($receiver);
if (empty($contact)) {
continue;

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

@ -1530,6 +1530,12 @@ class Processor
$ldactivity['recursion-depth'] = !empty($child['recursion-depth']) ? $child['recursion-depth'] + 1 : 0;
if ($object_actor != $actor) {
Contact::updateByUrlIfNeeded($object_actor);
}
Contact::updateByUrlIfNeeded($actor);
if (!empty($relay_actor)) {
$ldactivity['thread-completion'] = $ldactivity['from-relay'] = Contact::getIdForURL($relay_actor);
$ldactivity['completion-mode'] = Receiver::COMPLETION_RELAY;

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

@ -315,12 +315,15 @@ class Receiver
$object_type = JsonLD::fetchElement($activity['as:object'], '@type');
}
$fetched = false;
if (!empty($id) && !$trust_source) {
$fetch_uid = $uid ?: self::getBestUserForActivity($activity);
$fetched_activity = Processor::fetchCachedActivity($fetch_id, $fetch_uid);
if (!empty($fetched_activity)) {
$object = JsonLD::compact($fetched_activity);
$fetched = true;
$object = JsonLD::compact($fetched_activity);
$fetched_id = JsonLD::fetchElement($object, '@id');
$fetched_type = JsonLD::fetchElement($object, '@type');
@ -351,7 +354,7 @@ class Receiver
$type = JsonLD::fetchElement($activity, '@type');
// Fetch all receivers from to, cc, bto and bcc
$receiverdata = self::getReceivers($activity, $actor);
$receiverdata = self::getReceivers($activity, $actor, [], false, $push || $fetched);
$receivers = $reception_types = [];
foreach ($receiverdata as $key => $data) {
$receivers[$key] = $data['uid'];
@ -1029,7 +1032,7 @@ class Receiver
$uid = 0;
$actor = JsonLD::fetchElement($activity, 'as:actor', '@id') ?? '';
$receivers = self::getReceivers($activity, $actor);
$receivers = self::getReceivers($activity, $actor, [], false, false);
foreach ($receivers as $receiver) {
if ($receiver['type'] == self::TARGET_GLOBAL) {
return 0;
@ -1076,14 +1079,15 @@ class Receiver
* Fetch the receiver list from an activity array
*
* @param array $activity
* @param string $actor
* @param array $tags
* @param boolean $fetch_unlisted
* @param string $actor
* @param array $tags
* @param bool $fetch_unlisted
* @param bool $push
*
* @return array with receivers (user id)
* @throws \Exception
*/
private static function getReceivers(array $activity, string $actor, array $tags = [], bool $fetch_unlisted = false): array
private static function getReceivers(array $activity, string $actor, array $tags, bool $fetch_unlisted, bool $push): array
{
$reply = $receivers = $profile = [];
@ -1117,6 +1121,9 @@ class Receiver
$profile = APContact::getByURL($actor);
$followers = $profile['followers'] ?? '';
$is_forum = ($actor['type'] ?? '') == 'Group';
if ($push) {
Contact::updateByUrlIfNeeded($actor);
}
Logger::info('Got actor and followers', ['actor' => $actor, 'followers' => $followers]);
} else {
Logger::info('Empty actor', ['activity' => $activity]);
@ -2006,7 +2013,7 @@ class Receiver
$object_data['question'] = self::processQuestion($object);
}
$receiverdata = self::getReceivers($object, $object_data['actor'] ?? '', $object_data['tags'], true);
$receiverdata = self::getReceivers($object, $object_data['actor'] ?? '', $object_data['tags'], true, false);
$receivers = $reception_types = [];
foreach ($receiverdata as $key => $data) {
$receivers[$key] = $data['uid'];