jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed query (not all duplicates had been found)

Browse source
This commit is contained in:
Michael Vogel 2019-08-29 06:55:36 +02:00
parent ef02a1cb7b
commit 503a5be06c
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Database/PostUpdate.php
View file

@ -434,10 +434,12 @@ class PostUpdate
Logger::info('Start');
$contacts = DBA::p("SELECT ANY_VALUE(`id`) AS `id` FROM `contact`
$contacts = DBA::p("SELECT ANY_VALUE(`id`) AS `id`, ANY_VALUE(`nurl`) AS `nurl` FROM `contact`
WHERE EXISTS (SELECT `nurl` FROM `contact` AS `c2`
WHERE `c2`.`nurl` = `contact`.`nurl` AND `c2`.`id` != `contact`.`id` AND `c2`.`uid` = `contact`.`uid` AND `c2`.`network` = `contact`.`network`)
AND `network` IN (?, ?, ?) GROUP BY `nurl`", Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB);
WHERE `c2`.`nurl` = `contact`.`nurl` AND `c2`.`id` != `contact`.`id` AND `c2`.`uid` = `contact`.`uid` AND `c2`.`network` IN (?, ?, ?))
AND (`network` IN (?, ?, ?) OR (`uid` = ?)) GROUP BY `nurl`, `uid`",
Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB,
Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB, 0);
while ($contact = DBA::fetch($contacts)) {
Logger::info('Remove duplicates', ['id' => $contact['id']]);

4
src/Model/Contact.php
View file

@ -1929,13 +1929,13 @@ class Contact extends BaseObject
{
$contact = DBA::selectFirst('contact', ['nurl', 'uid', 'id'], ['id' => $contact_id]);
if (!DBA::isResult($contact)) {
return $ret;
return;
}
// Search for duplicated contacts and get rid of them
self::handleDuplicates($contact['nurl'], $contact['uid'], $contact['id']);
return $ret;
return;
}
/**