The follow confirmation process is now separated between DFRN and the rest

mod/dfrn_confirm.php

@@ -28,8 +28,6 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
-use Friendica\Protocol\Diaspora;
-use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -136,17 +134,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 		$site_pubkey  = $contact['site-pubkey'];
 		$dfrn_confirm = $contact['confirm'];
 		$aes_allow    = $contact['aes_allow'];
-
-		// an empty DFRN-ID tells us that it had been a request via AP from a Friendica contact
-		if (!empty($contact['protocol'])) {
-			$protocol = $contact['protocol'];
-		} elseif (($contact['network'] === Protocol::DFRN) && empty($dfrn_id)) {
-			$protocol = Contact::getProtocol($contact['url'], $contact['network']);
-		} else {
 		$protocol     = $contact['network'];
-		}
 
-		if ($protocol === Protocol::DFRN) {
 		/*
 		 * Generate a key pair for all further communications with this person.
 		 * We have a keypair for every contact, and a site key for unknown people.
@@ -293,9 +282,6 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 		if ($status != 0) {
 			return;
 		}
-		} else {
-			DBA::update('contact', ['protocol' => $protocol], ['id' => $contact_id]);
-		}
 
 		/*
 		 * We have now established a relationship with the other site.
@@ -308,7 +294,6 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
 		Logger::log('dfrn_confirm: confirm - imported photos');
 
-		if ($protocol === Protocol::DFRN) {
 		$new_relation = Contact::FOLLOWER;
 
 		if (($relation == Contact::SHARING) || ($duplex)) {
@@ -336,70 +321,12 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			DBA::escape(Protocol::DFRN),
 			intval($contact_id)
 		);
-		} else {
-			if ($protocol == Protocol::ACTIVITYPUB) {
-				ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid);
-				// Setting "pending" to true on a bidirectional contact request could create a problem when it isn't accepted on the other side
-				// Then we have got a situation where - although one direction is accepted - the contact still appears as pending.
-				// Possibly we need two different "pending" fields, one for incoming, one for outgoing?
-				// This has to be thought over, but for now this here is a better solution.
-				// $pending = $duplex;
-				$pending = false;
-			} else {
-				$pending = false;
-			}
-
-			$arr = Probe::uri($contact['url'], $protocol);
-
-			$notify  = defaults($contact, 'notify' , $arr['notify']);
-			$poll    = defaults($contact, 'poll'   , $arr['poll']);
-
-			$addr = $arr['addr'];
-
-			$new_relation = $contact['rel'];
-			$writable = $contact['writable'];
-
-			if (in_array($protocol, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
-				if ($duplex) {
-					$new_relation = Contact::FRIEND;
-				} else {
-					$new_relation = Contact::FOLLOWER;
-				}
-
-				if ($new_relation != Contact::FOLLOWER) {
-					$writable = 1;
-				}
-			}
-
-			DBA::delete('intro', ['id' => $intro_id]);
-
-			$fields = ['name-date' => DateTimeFormat::utcNow(),
-				'uri-date' => DateTimeFormat::utcNow(), 'addr' => $addr,
-				'notify' => $notify, 'poll' => $poll, 'blocked' => false,
-				'pending' => $pending, 'protocol' => $protocol,
-				'writable' => $writable, 'hidden' => $hidden, 'rel' => $new_relation];
-			DBA::update('contact', $fields, ['id' => $contact_id]);
-		}
-
-		if (!DBA::isResult($r)) {
-			notice(L10n::t('Unable to set contact photo.') . EOL);
-		}
 
 		// reload contact info
 		$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
-		if (isset($new_relation) && ($new_relation == Contact::FRIEND)) {
-			if (DBA::isResult($contact) && ($contact['network'] === Protocol::DIASPORA)) {
-				$ret = Diaspora::sendShare($user, $contact);
-				Logger::log('share returns: ' . $ret);
-			}
-		}
 
 		Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']);
 
-		if (($protocol == Protocol::ACTIVITYPUB) && $duplex) {
-			ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
-		}
-
 		// Let's send our user to the contact editor in case they want to
 		// do anything special with this new friend.
 		if ($handsfree === null) {

mod/notifications.php

@@ -223,6 +223,14 @@ function notifications_content(App $a)
 						'$as_fan'      => (($notif['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
 					]);
 
+					$contact = DBA::selectFirst('contact', ['network', 'protocol'], ['id' => $notif['contact_id']]);
+
+					if (($contact['network'] != Protocol::DFRN) || ($contact['protocol'] == Protocol::ACTIVITYPUB)) {
+						$action = 'follow_confirm';
+					} else {
+						$action = 'dfrn_confirm';
+					}
+
 					$header = $notif['name'];
 
 					if ($notif['addr'] != '') {
@@ -270,6 +278,7 @@ function notifications_content(App $a)
 						'$note'        => $notif['note'],
 						'$ignore'      => L10n::t('Ignore'),
 						'$discard'     => $discard,
+						'$action'      => $action,
 					]);
 					break;
 			}

src/App/Router.php

@@ -110,6 +110,7 @@ class Router
 			$collector->addRoute(['GET'], '/{guid}/reshare',                     Module\Diaspora\Fetch::class);
 		});
 		$this->routeCollector->addRoute(['GET'],         '/filer[/{id:\d+}]',    Module\Filer::class);
+		$this->routeCollector->addRoute(['GET', 'POST'], '/follow_confirm',      Module\FollowConfirm::class);
 		$this->routeCollector->addRoute(['GET'],         '/followers/{owner}',   Module\Followers::class);
 		$this->routeCollector->addRoute(['GET'],         '/following/{owner}',   Module\Following::class);
 		$this->routeCollector->addGroup('/group', function (RouteCollector $collector) {

src/Module/FollowConfirm.php

@@ -0,0 +1,93 @@
+<?php
+namespace Friendica\Module;
+
+use Friendica\App;
+use Friendica\BaseModule;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Util\DateTimeFormat;
+
+class FollowConfirm extends BaseModule
+{
+	public static function post()
+	{
+		$a = self::getApp();
+
+		$uid = local_user();
+		if (!$uid) {
+			notice(L10n::t('Permission denied.') . EOL);
+			return;
+		}
+
+		$intro_id = intval(defaults($_POST, 'intro_id'  , 0));
+		$duplex   = intval(defaults($_POST, 'duplex'    , 0));
+		$cid      = intval(defaults($_POST, 'contact_id', 0));
+		$hidden   = intval(defaults($_POST, 'hidden'    , 0));
+
+		if (empty($cid)) {
+			notice(L10n::t('No given contact.') . EOL);
+			return;
+		}
+
+		Logger::log('Confirming follower with contact_id: ' . $cid);
+
+		$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => $uid]);
+		if (!DBA::isResult($contact)) {
+			Logger::log('Contact not found in DB.');
+			notice(L10n::t('Contact not found.') . EOL);
+			return;
+		}
+
+		$relation = $contact['rel'];
+		$new_relation = $contact['rel'];
+		$writable = $contact['writable'];
+
+		if (!empty($contact['protocol'])) {
+			$protocol = $contact['protocol'];
+		} else {
+			$protocol = $contact['network'];
+		}
+
+		if ($protocol == Protocol::ACTIVITYPUB) {
+			ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid);
+		}
+
+		if (in_array($protocol, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
+			if ($duplex) {
+				$new_relation = Contact::FRIEND;
+			} else {
+				$new_relation = Contact::FOLLOWER;
+			}
+
+			if ($new_relation != Contact::FOLLOWER) {
+				$writable = 1;
+			}
+		}
+
+		$fields = ['name-date' => DateTimeFormat::utcNow(),
+			'uri-date' => DateTimeFormat::utcNow(),
+			'blocked' => false, 'pending' => false, 'protocol' => $protocol,
+			'writable' => $writable, 'hidden' => $hidden, 'rel' => $new_relation];
+		DBA::update('contact', $fields, ['id' => $cid]);
+
+		if ($new_relation == Contact::FRIEND) {
+			if ($protocol == Protocol::DIASPORA) {
+				$user = DBA::selectFirst('user', [], ['uid' => $uid]);
+				$contact = DBA::select('contact', [], ['id' => $cid]);
+				$ret = Diaspora::sendShare($user, $contact);
+				Logger::log('share returns: ' . $ret);
+			} elseif ($protocol == Protocol::ACTIVITYPUB) {
+				ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
+			}
+		}
+
+		DBA::delete('intro', ['id' => $intro_id]);
+
+		$a->internalRedirect('contact/' . intval($cid));
+	}
+}

view/templates/intros.tpl

@@ -18,7 +18,7 @@
 </form>
 <div class="intro-form-end"></div>
 
-<form class="intro-approve-form" action="dfrn_confirm" method="post">
+<form class="intro-approve-form" action="{{$action}}" method="post">
 {{include file="field_checkbox.tpl" field=$hidden}}
 <input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >
 <input type="hidden" name="intro_id" value="{{$intro_id}}" >

view/theme/frio/templates/intros.tpl

@@ -52,7 +52,7 @@
 		<div id="intro-approve-wrapper-{{$intro_id}}" style="display: none;">
 
 			<h3 class="heading">{{$fullname}}{{if $addr}}&nbsp;({{$addr}}){{/if}}</h3>
-			<form class="intro-approve-form" {{if $request}}action="{{$request}}" method="get"{{else}}action="dfrn_confirm" method="post"{{/if}}>
+			<form class="intro-approve-form" {{if $request}}action="{{$request}}" method="get"{{else}}action="{{$action}}" method="post"{{/if}}>
 				{{include file="field_checkbox.tpl" field=$hidden}}
 				{{if $type != "friend_suggestion"}}
 				<input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >