mirror of
https://github.com/friendica/friendica
synced 2024-11-10 05:02:58 +00:00
Fetch contact via uri-id to improve performance
This commit is contained in:
parent
3163760343
commit
632a98965c
1 changed files with 29 additions and 16 deletions
|
@ -938,7 +938,7 @@ class Receiver
|
|||
|
||||
// Fetch the receivers for the public and the followers collection
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -1000,15 +1000,27 @@ class Receiver
|
|||
* @param array $tags
|
||||
* @param array $receivers
|
||||
* @param integer $target_type
|
||||
* @param array $profile
|
||||
*
|
||||
* @return array with receivers (user id)
|
||||
* @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],
|
||||
'network' => Protocol::FEDERATED, 'archive' => false, 'pending' => false];
|
||||
|
||||
if (!empty($profile['uri-id'])) {
|
||||
$condition = DBA::mergeConditions($basecondition, ["`uri-id` = ? AND `uid` != ?", $profile['uri-id'], 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);
|
||||
} 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)) {
|
||||
|
@ -1027,6 +1039,7 @@ class Receiver
|
|||
}
|
||||
}
|
||||
DBA::close($contacts);
|
||||
}
|
||||
return $receivers;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue