mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Fetch contact via uri-id to improve performance

Browse source
This commit is contained in:
Michael 2022-05-03 08:19:35 +00:00
parent 3163760343
commit 632a98965c
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -938,7 +938,7 @@ class Receiver
// Fetch the receivers for the public and the followers collection // Fetch the receivers for the public and the followers collection
if ((($receiver == $followers) || (($receiver == self::PUBLIC_COLLECTION) && !$is_forum)) && !empty($actor)) { if ((($receiver == $followers) || (($receiver == self::PUBLIC_COLLECTION) && !$is_forum)) && !empty($actor)) {
$receivers = self::getReceiverForActor($actor, $tags, $receivers, $follower_target); $receivers = self::getReceiverForActor($actor, $tags, $receivers, $follower_target, $profile);
continue; continue;
} }
@ -1000,33 +1000,46 @@ class Receiver
* @param array $tags * @param array $tags
* @param array $receivers * @param array $receivers
* @param integer $target_type * @param integer $target_type
* @param array $profile
* *
* @return array with receivers (user id) * @return array with receivers (user id)
* @throws \Exception * @throws \Exception
*/ */
private static function getReceiverForActor($actor, $tags, $receivers, $target_type) private static function getReceiverForActor($actor, $tags, $receivers, $target_type, $profile)
{ {
$basecondition = ['rel' => [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER], $basecondition = ['rel' => [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER],
'network' => Protocol::FEDERATED, 'archive' => false, 'pending' => false]; 'network' => Protocol::FEDERATED, 'archive' => false, 'pending' => false];
$condition = DBA::mergeConditions($basecondition, ["`nurl` = ? AND `uid` != ?", Strings::normaliseLink($actor), 0]); if (!empty($profile['uri-id'])) {
$contacts = DBA::select('contact', ['uid', 'rel'], $condition); $condition = DBA::mergeConditions($basecondition, ["`uri-id` = ? AND `uid` != ?", $profile['uri-id'], 0]);
while ($contact = DBA::fetch($contacts)) { $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) { while ($contact = DBA::fetch($contacts)) {
$receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type]; if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
$receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
}
} }
} DBA::close($contacts);
DBA::close($contacts); } else {
// This part will only be called while post update 1426 wasn't finished
$condition = DBA::mergeConditions($basecondition, ["`nurl` = ? AND `uid` != ?", Strings::normaliseLink($actor), 0]);
$contacts = DBA::select('contact', ['uid', 'rel'], $condition);
while ($contact = DBA::fetch($contacts)) {
if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
$receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
}
}
DBA::close($contacts);
// The queries are split because of performance issues // The queries are split because of performance issues
$condition = DBA::mergeConditions($basecondition, ["`alias` IN (?, ?) AND `uid` != ?", Strings::normaliseLink($actor), $actor, 0]); $condition = DBA::mergeConditions($basecondition, ["`alias` IN (?, ?) AND `uid` != ?", Strings::normaliseLink($actor), $actor, 0]);
$contacts = DBA::select('contact', ['uid', 'rel'], $condition); $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
while ($contact = DBA::fetch($contacts)) { while ($contact = DBA::fetch($contacts)) {
if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) { if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
$receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type]; $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
}
} }
DBA::close($contacts);
} }
DBA::close($contacts);
return $receivers; return $receivers;
} }