Merge pull request #10450 from annando/discoverable

AP: Support "discoverable"

database.sql

@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2021.06-rc (Siberian Iris)
--- DB_UPDATE_VERSION 1423
+-- DB_UPDATE_VERSION 1424
 -- ------------------------------------------
 
 
@@ -340,6 +340,7 @@ CREATE TABLE IF NOT EXISTS `apcontact` (
 	`outbox` varchar(255) COMMENT '',
 	`sharedinbox` varchar(255) COMMENT '',
 	`manually-approve` boolean COMMENT '',
+	`discoverable` boolean COMMENT 'Mastodon extension: true if profile is published in their directory',
 	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`name` varchar(255) COMMENT '',
 	`about` text COMMENT '',

doc/database/db_apcontact.md

@@ -7,7 +7,7 @@ Fields
 ------
 
 | Field            | Description                                                         | Type           | Null | Key | Default             | Extra |
-| ---------------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- |
+| ---------------- | ------------------------------------------------------------------- | -------------- | ---- | --- | ------------------- | ----- |
 | url              | URL of the contact                                                  | varbinary(255) | NO   | PRI | NULL                |       |
 | uuid             |                                                                     | varchar(255)   | YES  |     | NULL                |       |
 | type             |                                                                     | varchar(20)    | NO   |     | NULL                |       |
@@ -17,6 +17,7 @@ Fields
 | outbox           |                                                                     | varchar(255)   | YES  |     | NULL                |       |
 | sharedinbox      |                                                                     | varchar(255)   | YES  |     | NULL                |       |
 | manually-approve |                                                                     | boolean        | YES  |     | NULL                |       |
+| discoverable     | Mastodon extension: true if profile is published in their directory | boolean        | YES  |     | NULL                |       |
 | nick             |                                                                     | varchar(255)   | NO   |     |                     |       |
 | name             |                                                                     | varchar(255)   | YES  |     | NULL                |       |
 | about            |                                                                     | text           | YES  |     | NULL                |       |

src/Model/APContact.php

@@ -284,6 +284,8 @@ class APContact
 			}
 		}
 
+		$apcontact['discoverable'] = JsonLD::fetchElement($compacted, 'toot:discoverable', '@value');
+
 		// To-Do
 
 		// Unhandled

src/Protocol/ActivityPub.php

@@ -65,9 +65,11 @@ class ActivityPub
 		'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/',
 		'diaspora' => 'https://diasporafoundation.org/ns/',
 		'litepub' => 'http://litepub.social/ns#',
+		'toot' => 'http://joinmastodon.org/ns#',
 		'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
 		'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
-		'directMessage' => 'litepub:directMessage']];
+		'directMessage' => 'litepub:directMessage',
+		'discoverable' => 'toot:discoverable']];
 	const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application', 'Tombstone'];
 	/**
 	 * Checks if the web request is done for the AP protocol
@@ -166,6 +168,10 @@ class ActivityPub
 		$profile['baseurl'] = $apcontact['baseurl'];
 		$profile['gsid'] = $apcontact['gsid'];
 
+		if (!is_null($apcontact['discoverable'])) {
+			$profile['hide'] = !$apcontact['discoverable'];
+		}
+
 		// Remove all "null" fields
 		foreach ($profile as $field => $content) {
 			if (is_null($content)) {

src/Protocol/ActivityPub/Transmitter.php

@@ -325,7 +325,7 @@ class Transmitter
 				return [];
 			}
 
-			$fields = ['locality', 'region', 'country-name'];
+			$fields = ['locality', 'region', 'country-name', 'net-publish'];
 			$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
 			if (!DBA::isResult($profile)) {
 				return [];
@@ -340,7 +340,7 @@ class Transmitter
 			$contact = User::getSystemAccount();
 			$user = ['guid' => '', 'nickname' => $contact['nick'], 'pubkey' => $contact['pubkey'],
 				'account-type' => $contact['contact-type'], 'page-flags' => User::PAGE_FLAGS_NORMAL];
-			$profile = ['locality' => '', 'region' => '', 'country-name' => ''];
+			$profile = ['locality' => '', 'region' => '', 'country-name' => '', 'net-publish' => false];
 		}
 
 		$data = ['@context' => ActivityPub::CONTEXT];
@@ -375,6 +375,7 @@ class Transmitter
 
 		$data['url'] = $contact['url'];
 		$data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
+		$data['discoverable'] = $profile['net-publish'];
 		$data['publicKey'] = ['id' => $contact['url'] . '#main-key',
 			'owner' => $contact['url'],
 			'publicKeyPem' => $user['pubkey']];

static/dbstructure.config.php

@@ -55,7 +55,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-	define('DB_UPDATE_VERSION', 1423);
+	define('DB_UPDATE_VERSION', 1424);
 }
 
 return [
@@ -401,6 +401,7 @@ return [
 			"outbox" => ["type" => "varchar(255)", "comment" => ""],
 			"sharedinbox" => ["type" => "varchar(255)", "comment" => ""],
 			"manually-approve" => ["type" => "boolean", "comment" => ""],
+			"discoverable" => ["type" => "boolean", "comment" => "Mastodon extension: true if profile is published in their directory"],
 			"nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
 			"name" => ["type" => "varchar(255)", "comment" => ""],
 			"about" => ["type" => "text", "comment" => ""],