From b838b594cde9b84fc3ddca2b8750ee39deda0124 Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 19 Oct 2021 22:23:39 +0200 Subject: [PATCH 1/3] contact-relation - Fix DB error --- src/Worker/Contact/RemoveContent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Worker/Contact/RemoveContent.php b/src/Worker/Contact/RemoveContent.php index cc9139c2c8..0fc5db88f4 100644 --- a/src/Worker/Contact/RemoveContent.php +++ b/src/Worker/Contact/RemoveContent.php @@ -76,7 +76,7 @@ class RemoveContent Photo::delete(['contact-id' => $id]); - DBA::delete('contact-relation', ['contact-id = ? OR cid = ?', $id, $id]); + DBA::delete('contact-relation', ['`contact-id` = ? OR `cid` = ?', $id, $id]); DBA::delete('event', ['cid' => $id]); DBA::delete('fsuggest', ['cid' => $id]); DBA::delete('post-tag', ['cid' => $id]); From 29587268044a9d51939d8591ae19b5c76ab16541 Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 19 Oct 2021 22:25:49 +0200 Subject: [PATCH 2/3] Fix salmon selection --- mod/salmon.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/salmon.php b/mod/salmon.php index de8d971334..3d32d3e3a9 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -158,7 +158,7 @@ function salmon_post(App $a, $xml = '') { * */ - $contact = DBA::selectFirst('contact', ["`network` IN (?, ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `uid` = ?", + $contact = DBA::selectFirst('contact', [], ["`network` IN (?, ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `uid` = ?", Protocol::OSTATUS, Protocol::DFRN, Strings::normaliseLink($author_link), $author_link, Strings::normaliseLink($author_link), $importer['uid']]); if (!empty($contact['gsid'])) { From 88825c2520b8955c68a77b99a52618f579de8a6e Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 19 Oct 2021 22:35:57 +0200 Subject: [PATCH 3/3] Split contact-relation deletion --- src/Worker/Contact/RemoveContent.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Worker/Contact/RemoveContent.php b/src/Worker/Contact/RemoveContent.php index 0fc5db88f4..8baa1f0973 100644 --- a/src/Worker/Contact/RemoveContent.php +++ b/src/Worker/Contact/RemoveContent.php @@ -76,7 +76,8 @@ class RemoveContent Photo::delete(['contact-id' => $id]); - DBA::delete('contact-relation', ['`contact-id` = ? OR `cid` = ?', $id, $id]); + DBA::delete('contact-relation', ['contact-id' => $id]); + DBA::delete('contact-relation', ['cid' => $id]); DBA::delete('event', ['cid' => $id]); DBA::delete('fsuggest', ['cid' => $id]); DBA::delete('post-tag', ['cid' => $id]);