From 3917c8ab5dcc045206a2add9927c4e01b235a724 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 25 Feb 2021 05:21:47 +0000 Subject: [PATCH] Partly revert the contact-relation sruff --- src/Model/Contact/Relation.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Model/Contact/Relation.php b/src/Model/Contact/Relation.php index 4d57fe2502..f0f24774ef 100644 --- a/src/Model/Contact/Relation.php +++ b/src/Model/Contact/Relation.php @@ -137,16 +137,14 @@ class Relation $actor = Contact::getIdForURL($contact); if (!empty($actor)) { if (in_array($contact, $followers)) { - $condition = ['cid' => $target, 'relation-cid' => $actor]; - DBA::insert('contact-relation', $condition, Database::INSERT_IGNORE); - DBA::update('contact-relation', ['follows' => true, 'follow-updated' => DateTimeFormat::utcNow()], $condition); + $fields = ['cid' => $target, 'relation-cid' => $actor, 'follows' => true, 'follow-updated' => DateTimeFormat::utcNow()]; + DBA::insert('contact-relation', $fields, Database::INSERT_UPDATE); $follower_counter++; } if (in_array($contact, $followings)) { - $condition = ['cid' => $actor, 'relation-cid' => $target]; - DBA::insert('contact-relation', $condition, Database::INSERT_IGNORE); - DBA::update('contact-relation', ['follows' => true, 'follow-updated' => DateTimeFormat::utcNow()], $condition); + $fields = ['cid' => $actor, 'relation-cid' => $target, 'follows' => true, 'follow-updated' => DateTimeFormat::utcNow()]; + DBA::insert('contact-relation', $fields, Database::INSERT_UPDATE); $following_counter++; } }