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

The uri-id is now in all contact tables

Browse source
This commit is contained in:
Michael 2021-07-09 07:09:33 +00:00
parent c63d3f4604
commit 6e79da0b0c
7 changed files with 51 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Model/APContact.php
View file

@ -349,6 +349,12 @@ class APContact
$apcontact['alias'] = null;
}
if (empty($apcontact['uuid'])) {
$apcontact['uri-id'] = ItemURI::getIdByURI($apcontact['url']);
} else {
$apcontact['uri-id'] = ItemURI::insert(['uri' => $apcontact['uri'], 'guid' => $apcontact['uuid']]);
}
$apcontact['updated'] = DateTimeFormat::utcNow();
// We delete the old entry when the URL is changed

8
src/Model/Contact.php
View file

@ -185,11 +185,7 @@ class Contact
$fields['gsid'] = GServer::getID($fields['baseurl'], true);
}
if (!empty($fields['url']) && !empty($fields['guid'])) {
$fields['uri-id'] = ItemURI::insert(['uri' => $fields['url'], 'guid' => $fields['guid']]);
} elseif (!empty($fields['url'])) {
$fields['uri-id'] = ItemURI::getIdByURI($fields['url']);
}
$fields['uri-id'] = ItemURI::getIdByURI($fields['url']);
if (empty($fields['created'])) {
$fields['created'] = DateTimeFormat::utcNow();
@ -2161,7 +2157,7 @@ class Contact
if (empty($guid)) {
$ret['uri-id'] = ItemURI::getIdByURI($ret['url']);
} else {
$ret['uri-id'] = ItemURI::insert(['uri' => $ret['uri'], 'guid' => $guid]);
$ret['uri-id'] = ItemURI::insert(['uri' => $ret['uri'], 'guid' => $guid]);
}
$ret['nurl'] = Strings::normaliseLink($ret['url']);

1
src/Model/FContact.php
View file

@ -100,6 +100,7 @@ class FContact
'batch' => $arr["batch"], 'notify' => $arr["notify"],
'poll' => $arr["poll"], 'confirm' => $arr["confirm"],
'alias' => $arr["alias"], 'pubkey' => $arr["pubkey"],
'uri-id' => ItemURI::insert(['uri' => $arr['url'], 'guid' => $arr['guid']]),
'updated' => DateTimeFormat::utcNow()];
$condition = ['url' => $arr["url"], 'network' => $arr["network"]];