keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved function to fetch the contact id

This commit is contained in:
Michael 2022-08-18 10:13:46 +00:00
parent a4f1df68e4
commit 51331ced9b
1 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/Model/Item.php
View File

@ -448,21 +448,40 @@ class Item
*/ */
private static function contactId(array $item): int private static function contactId(array $item): int
{ {
if (!empty($item['contact-id']) && DBA::exists('contact', ['self' => true, 'id' => $item['contact-id']])) { if ($item['uid'] == 0) {
return $item['contact-id'];
} elseif (($item['gravity'] == GRAVITY_PARENT) && !empty($item['uid']) && !empty($item['contact-id']) && Contact::isSharing($item['contact-id'], $item['uid'])) {
return $item['contact-id'];
} elseif (!empty($item['uid']) && !Contact::isSharing($item['author-id'], $item['uid'])) {
return $item['author-id']; return $item['author-id'];
} elseif (!empty($item['contact-id'])) { }
return $item['contact-id']; if (!empty($item['causer-id']) && Contact::isSharing($item['causer-id'], $item['uid'], true)) {
} else { $cdata = Contact::getPublicAndUserContactID($item['causer-id'], $item['uid']);
$contact_id = Contact::getIdForURL($item['author-link'], $item['uid']); if (!empty($cdata['user'])) {
return $cdata['user'];
}
}
if ($item['gravity'] == GRAVITY_PARENT) {
if (Contact::isSharingByURL($item['owner-link'], $item['uid'], true)) {
$contact_id = Contact::getIdForURL($item['owner-link'], $item['uid']);
} else {
$contact_id = Contact::getIdForURL($item['owner-link']);
}
if (!empty($contact_id)) { if (!empty($contact_id)) {
return $contact_id; return $contact_id;
} }
} }
return $item['author-id'];
if (Contact::isSharingByURL($item['author-link'], $item['uid'], true)) {
$contact_id = Contact::getIdForURL($item['author-link'], $item['uid']);
} else {
$contact_id = Contact::getIdForURL($item['author-link']);
}
if (!empty($contact_id)) {
return $contact_id;
}
Logger::warning('contact-id could not be fetched, using self contact instead.', ['uid' => $item['uid'], 'item' => $item]);
$self = Contact::selectFirst(['id'], ['self' => true, 'uid' => $item['uid']]);
return $self['id'];
} }
/** /**
@ -911,8 +930,9 @@ class Item
Contact::checkAvatarCache($item['author-id']); Contact::checkAvatarCache($item['author-id']);
Contact::checkAvatarCache($item['owner-id']); Contact::checkAvatarCache($item['owner-id']);
// The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes if (!Contact::isSharing($item['contact-id'], $item['uid'])) {
$item['contact-id'] = self::contactId($item); $item['contact-id'] = self::contactId($item);
}
if (!empty($item['direction']) && in_array($item['direction'], [Conversation::PUSH, Conversation::RELAY]) && if (!empty($item['direction']) && in_array($item['direction'], [Conversation::PUSH, Conversation::RELAY]) &&
empty($item['origin']) && self::isTooOld($item)) { empty($item['origin']) && self::isTooOld($item)) {
@ -1660,34 +1680,7 @@ class Item
$item['origin'] = 0; $item['origin'] = 0;
$item['wall'] = 0; $item['wall'] = 0;
if (!empty($item['causer-id']) && Contact::isSharing($item['causer-id'], $uid, true)) { $item['contact-id'] = self::contactId($item);
$cdata = Contact::getPublicAndUserContactID($item['causer-id'], $uid);
$contact_id = $cdata['user'] ?? 0;
}
if (empty($contact_id)) {
if ($item['gravity'] == GRAVITY_PARENT) {
if (Contact::isSharingByURL($item['owner-link'], $uid, true)) {
$contact_id = Contact::getIdForURL($item['owner-link'], $uid);
} else {
$contact_id = Contact::getIdForURL($item['owner-link']);
}
} else {
if (Contact::isSharingByURL($item['author-link'], $uid, true)) {
$contact_id = Contact::getIdForURL($item['author-link'], $uid);
} else {
$contact_id = Contact::getIdForURL($item['author-link']);
}
}
}
if (empty($contact_id)) {
Logger::warning('contact-id could not be fetched, using self contact instead.', ['uid' => $uid, 'item' => $item]);
$self = Contact::selectFirst(['id'], ['self' => true, 'uid' => $uid]);
$contact_id = $self['id'];
}
$item['contact-id'] = $contact_id;
$notify = false; $notify = false;
if ($item['gravity'] == GRAVITY_PARENT) { if ($item['gravity'] == GRAVITY_PARENT) {