Get rid of zombie introductions that reappear automatically

diff --git a/mod/notifications.php b/mod/notifications.php
index 3276e65491dc9060541c2dd3e5ca7c46569b0862..cd572895f14b3abd23e83ca56c9558f04c0aa784 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -49,11 +49,15 @@ function notifications_post(App $a)
                if ($_POST['submit'] == L10n::t('Discard')) {
                        DBA::delete('intro', ['id' => $intro_id]);
                        if (!$fid) {
-                               // The check for pending is in case the friendship was already approved
-                               // and we just want to get rid of the pending contact
+                               // When the contact entry had been created just for that intro, we want to get rid of it now
                                $condition = ['id' => $contact_id, 'uid' => local_user(),
                                        'self' => false, 'pending' => true, 'rel' => [0, Contact::FOLLOWER]];
-                               if (DBA::exists('contact', $condition)) {
+                               $contact_pending = DBA::exists('contact', $condition);
+
+                               // Remove the "pending" to stop the reappearing in any case
+                               DBA::update('contact', ['pending' => false], ['id' => $contact_id]);
+
+                               if ($contact_pending) {
                                        Contact::remove($contact_id);
                                }
                        }

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index ba489717478ada36c7452fc3ad12913e3381a0ab..1bc3ccd0a751b91582abc37bfd8de45c5cc98f4f 100644 (file)
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -304,8 +304,11 @@ class CronJobs
                /// - set contact-id in item when not present
 
                // Add intro entries for pending contacts
+               // We don't do this for DFRN entries since such revived contact requests seem to mostly fail.
                $pending_contacts = DBA::p("SELECT `uid`, `id`, `url`, `network`, `created` FROM `contact`
-                       WHERE `pending` AND `rel` IN (?, ?) AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)", 0, Contact::FOLLOWER);
+                       WHERE `pending` AND `rel` IN (?, ?) AND `network` != ?
+                               AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)",
+                       0, Contact::FOLLOWER, Protocol::DFRN);
                while ($contact = DBA::fetch($pending_contacts)) {
                        DBA::insert('intro', ['uid' => $contact['uid'], 'contact-id' => $contact['id'], 'blocked' => false,
                                'hash' => Strings::getRandomHex(), 'datetime' => $contact['created']]);