we now have got an uri-id field for the contact table

database.sql

@@ -126,6 +126,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the contact url',
 	`addr` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`alias` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`pubkey` text COMMENT 'RSA public key 4096 bit',
@@ -202,7 +203,9 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	 INDEX `uid_self_contact-type` (`uid`,`self`,`contact-type`),
 	 INDEX `self_network_uid` (`self`,`network`,`uid`),
 	 INDEX `gsid` (`gsid`),
+	 INDEX `uri-id` (`uri-id`),
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`gsid`) REFERENCES `gserver` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='contact table';
 

doc/database/db_contact.md

@@ -7,7 +7,7 @@ Fields
 ------
 
 | Field                     | Description                                                  | Type               | Null | Key | Default             | Extra          |
-| ------------------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| ------------------------- | ------------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |
 | id                        | sequential ID                                                | int unsigned       | NO   | PRI | NULL                | auto_increment |
 | uid                       | Owner User id                                                | mediumint unsigned | NO   |     | 0                   |                |
 | created                   |                                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
@@ -36,6 +36,7 @@ Fields
 | dfrn-id                   |                                                              | varchar(255)       | NO   |     |                     |                |
 | url                       |                                                              | varchar(255)       | NO   |     |                     |                |
 | nurl                      |                                                              | varchar(255)       | NO   |     |                     |                |
+| uri-id                    | Id of the item-uri table entry that contains the contact url | int unsigned       | YES  |     | NULL                |                |
 | addr                      |                                                              | varchar(255)       | NO   |     |                     |                |
 | alias                     |                                                              | varchar(255)       | NO   |     |                     |                |
 | pubkey                    | RSA public key 4096 bit                                      | text               | YES  |     | NULL                |                |
@@ -118,6 +119,7 @@ Indexes
 | uid_self_contact-type       | uid, self, contact-type              |
 | self_network_uid            | self, network, uid                   |
 | gsid                        | gsid                                 |
+| uri-id                      | uri-id                               |
 
 Foreign Keys
 ------------
@@ -125,6 +127,7 @@ Foreign Keys
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
 | uid | [user](help/database/db_user) | uid |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 | gsid | [gserver](help/database/db_gserver) | id |
 
 Return to [database documentation](help/database)

src/Model/Contact.php

@@ -185,6 +185,12 @@ class Contact
 			$fields['gsid'] = GServer::getID($fields['baseurl'], true);
 		}
 
+		if (!empty($fields['url']) && !empty($fields['guid'])) {
+			$fields['uri-id'] = ItemURI::insert(['uri' => $fields['url'], 'guid' => $fields['guid']]);
+		} elseif (!empty($fields['url'])) {
+			$fields['uri-id'] = ItemURI::getIdByURI($fields['url']);
+		}
+
 		if (empty($fields['created'])) {
 			$fields['created'] = DateTimeFormat::utcNow();
 		}
@@ -2145,6 +2151,7 @@ class Contact
 		}
 
 		$ret['nurl']    = Strings::normaliseLink($ret['url']);
+		$ret['uri-id']  = ItemURI::getIdByURI($ret['url']);
 		$ret['updated'] = $updated;
 		$ret['failed']  = false;
 

src/Object/Api/Mastodon/Account.php

@@ -111,7 +111,7 @@ class Account extends BaseDataTransferObject
 		$created = $userContactCreated < $publicContactCreated && ($userContactCreated != DBA::NULL_DATETIME) ? $userContactCreated : $publicContactCreated;
 		$this->created_at      = DateTimeFormat::utc($created, DateTimeFormat::JSON);
 
-		$this->note            = BBCode::convert($publicContact['about'], false);
+		$this->note            = BBCode::convertForItem($publicContact['uri-id'] ?? 0, $publicContact['about'], BBCode::API);
 		$this->url             = $publicContact['url'];
 		$this->avatar          = Contact::getAvatarUrlForId($userContact['id'] ?? 0 ?: $publicContact['id'], Proxy::SIZE_SMALL, $userContact['updated'] ?? '' ?: $publicContact['updated']);
 		$this->avatar_static   = $this->avatar;

static/dbstructure.config.php

@@ -183,6 +183,7 @@ return [
 			"dfrn-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
 			"url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
 			"nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+			"uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the contact url"],
 			"addr" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
 			"alias" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
 			"pubkey" => ["type" => "text", "comment" => "RSA public key 4096 bit"],
@@ -260,7 +261,8 @@ return [
 			"uid_contact-type" => ["uid", "contact-type"],
 			"uid_self_contact-type" => ["uid", "self", "contact-type"],
 			"self_network_uid" => ["self", "network", "uid"],
-			"gsid" => ["gsid"]
+			"gsid" => ["gsid"],
+			"uri-id" => ["uri-id"],
 		]
 	],
 	"item-uri" => [