Preparation for switching the connect mechanism from DFRN to AP

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 770c7070b44fea2ad68df07da10f1e568783ee3c..97d19f1b71babd53956b24cb1d3917bdc32d2a46 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -24,6 +24,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
@@ -143,6 +144,14 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                        $network = $contact['network'];
                }
 
+               // an empty DFRN-ID tells us that it had been a request via AP from a Friendica contact
+               if (($network === Protocol::DFRN) && empty($dfrn_id) && !empty($contact['hub-verify'])) {
+                       $apcontact = APContact::getByURL($contact['url']);
+                       if (!empty($apcontact)) {
+                               $network = Protocol::ACTIVITYPUB;
+                       }
+               }
+
                if ($network === Protocol::DFRN) {
                        /*
                         * Generate a key pair for all further communications with this person.