Merge pull request #11436 from annando/tag-type

Store the tag type for the post targets

database.sql

@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2022.05-dev (Siberian Iris)
--- DB_UPDATE_VERSION 1458
+-- DB_UPDATE_VERSION 1459
 -- ------------------------------------------
 
 
@@ -232,6 +232,7 @@ CREATE TABLE IF NOT EXISTS `tag` (
 	`id` int unsigned NOT NULL auto_increment COMMENT '',
 	`name` varchar(96) NOT NULL DEFAULT '' COMMENT '',
 	`url` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
+	`type` tinyint unsigned COMMENT 'Type of the tag (Unknown, General Collection, Follower Collection or Account)',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `type_name_url` (`name`,`url`),
 	 INDEX `url` (`url`)
@@ -2235,7 +2236,8 @@ CREATE VIEW `tag-view` AS SELECT
 	`post-tag`.`tid` AS `tid`,
 	`post-tag`.`cid` AS `cid`,
 	CASE `cid` WHEN 0 THEN `tag`.`name` ELSE `contact`.`name` END AS `name`,
-	CASE `cid` WHEN 0 THEN `tag`.`url` ELSE `contact`.`url` END AS `url`
+	CASE `cid` WHEN 0 THEN `tag`.`url` ELSE `contact`.`url` END AS `url`,
+	CASE `cid` WHEN 0 THEN `tag`.`type` ELSE 1 END AS `tag-type`
 	FROM `post-tag`
 			LEFT JOIN `tag` ON `post-tag`.`tid` = `tag`.`id`
 			LEFT JOIN `contact` ON `post-tag`.`cid` = `contact`.`id`;

doc/database/db_tag.md

@@ -7,10 +7,11 @@ Fields
 ------
 
 | Field | Description                                                                   | Type             | Null | Key | Default | Extra          |
-| ----- | ----------- | -------------- | ---- | --- | ------- | -------------- |
+| ----- | ----------------------------------------------------------------------------- | ---------------- | ---- | --- | ------- | -------------- |
 | id    |                                                                               | int unsigned     | NO   | PRI | NULL    | auto_increment |
 | name  |                                                                               | varchar(96)      | NO   |     |         |                |
 | url   |                                                                               | varbinary(255)   | NO   |     |         |                |
+| type  | Type of the tag (Unknown, General Collection, Follower Collection or Account) | tinyint unsigned | YES  |     | NULL    |                |
 
 Indexes
 ------------

src/Model/Tag.php

@@ -29,6 +29,7 @@ use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
@@ -57,6 +58,11 @@ class Tag
 	const BTO = 12;
 	const BCC = 13;
 
+	const ACCOUNT             = 1;
+	const GENERAL_COLLECTION  = 2;
+	const FOLLOWER_COLLECTION = 3;
+	const PUBLIC_COLLECTION   = 4;
+
 	const TAG_CHARACTER = [
 		self::HASHTAG           => '#',
 		self::MENTION           => '@',
@@ -71,8 +77,9 @@ class Tag
 	 * @param integer $type
 	 * @param string  $name
 	 * @param string  $url
+	 * @param integer $target
 	 */
-	public static function store(int $uriid, int $type, string $name, string $url = '')
+	public static function store(int $uriid, int $type, string $name, string $url = '', int $target = null)
 	{
 		if ($type == self::HASHTAG) {
 			// Trim Unicode non-word characters
@@ -108,12 +115,15 @@ class Tag
 			Logger::debug('Got id for contact', ['cid' => $cid, 'url' => $url]);
 
 			if (empty($cid)) {
-				// The contact wasn't found in the system (most likely some dead account)
+				$tag = DBA::selectFirst('tag', ['name', 'type'], ['url' => $url]);
-				// We ensure that we only store a single entry by overwriting the previous name
+				if (!empty($tag)) {
-				Logger::info('URL is not a known contact, updating tag', ['url' => $url, 'name' => $name]);
+					if ($tag['name'] != substr($name, 0, 96)) {
-				if (!DBA::exists('tag', ['name' => substr($name, 0, 96), 'url' => $url])) {
 						DBA::update('tag', ['name' => substr($name, 0, 96)], ['url' => $url]);
 					}
+					if (!empty($target) && ($tag['type'] != $target)) {
+						DBA::update('tag', ['type' => $target], ['url' => $url]);
+					}
+				}
 			}
 		}
 
@@ -126,7 +136,7 @@ class Tag
 				}
 			}
 
-			$tagid = self::getID($name, $url);
+			$tagid = self::getID($name, $url, $target);
 			if (empty($tagid)) {
 				return;
 			}
@@ -148,17 +158,76 @@ class Tag
 		Logger::info('Stored tag/mention', ['uri-id' => $uriid, 'tag-id' => $tagid, 'contact-id' => $cid, 'name' => $name, 'type' => $type, 'callstack' => System::callstack(8)]);
 	}
 
+	/**
+	 * Fetch the target type for the given url
+	 *
+	 * @param string $url
+	 * @param bool   $fetch Fetch information via network operations
+	 * @return null|int
+	 */
+	public static function getTargetType(string $url, bool $fetch = true)
+	{
+		$target = null;
+
+		if (empty($url)) {
+			return $target;
+		}
+
+		$tag = DBA::selectFirst('tag', ['url', 'type'], ['url' => $url]);
+		if (!empty($tag['type'])) {
+			$target = $tag['type'];
+			if ($target != self::GENERAL_COLLECTION) {
+				Logger::debug('Found existing type', ['type' => $tag['type'], 'url' => $url]);
+				return $target;
+			}
+		}
+
+		if ($url == ActivityPub::PUBLIC_COLLECTION) {
+			$target = self::PUBLIC_COLLECTION;
+			Logger::debug('Public collection', ['url' => $url]);
+		} else {
+			if (DBA::exists('apcontact', ['followers' => $url])) {
+				$target = self::FOLLOWER_COLLECTION;
+				Logger::debug('Found collection via existing apcontact', ['url' => $url]);
+			} elseif (Contact::getIdForURL($url, 0, $fetch ? null : false)) {
+				$target = self::ACCOUNT;
+				Logger::debug('URL is an account', ['url' => $url]);
+			} elseif ($fetch && ($target != self::GENERAL_COLLECTION)) {
+				$content = ActivityPub::fetchContent($url);
+				if (!empty($content['type']) && ($content['type'] == 'OrderedCollection')) {
+					$target = self::GENERAL_COLLECTION;
+					Logger::debug('URL is an ordered collection', ['url' => $url]);
+				}
+			}
+		}
+
+		if (!empty($target) && !empty($tag['url']) && empty($tag['type'])) {
+			DBA::update('tag', ['type' => $target], ['url' => $url]);
+		}
+
+		if (empty($target)) {
+			Logger::debug('No type could be detected', ['url' => $url]);
+		}
+
+		return $target;
+	}
+
 	/**
 	 * Get a tag id for a given tag name and url
 	 *
 	 * @param string $name
 	 * @param string $url
+	 * @param int    $type
 	 * @return void
 	 */
-	public static function getID(string $name, string $url = '')
+	public static function getID(string $name, string $url = '', int $type = null)
 	{
 		$fields = ['name' => substr($name, 0, 96), 'url' => $url];
 
+		if (!empty($type)) {
+			$fields['type'] = $type;
+		}
+
 		$tag = DBA::selectFirst('tag', ['id'], $fields);
 		if (DBA::isResult($tag)) {
 			return $tag['id'];
@@ -373,7 +442,7 @@ class Tag
 	public static function getByURIId(int $uri_id, array $type = [self::HASHTAG, self::MENTION, self::EXCLUSIVE_MENTION, self::IMPLICIT_MENTION])
 	{
 		$condition = ['uri-id' => $uri_id, 'type' => $type];
-		return DBA::selectToArray('tag-view', ['type', 'name', 'url'], $condition);
+		return DBA::selectToArray('tag-view', ['type', 'name', 'url', 'tag-type'], $condition);
 	}
 
 	/**

src/Module/PermissionTooltip.php

@@ -192,17 +192,24 @@ class PermissionTooltip extends \Friendica\BaseModule
 				continue;
 			}
 
-			if ($receiver['url'] == ActivityPub::PUBLIC_COLLECTION) {
+			switch (Tag::getTargetType($receiver['url'], false)) {
+				case Tag::PUBLIC_COLLECTION:
 					$receivers[$receiver['type']][] = DI::l10n()->t('Public');
-			} else {
+					break;
+				case Tag::GENERAL_COLLECTION:
+					$receivers[$receiver['type']][] = DI::l10n()->t('Collection (%s)', $receiver['name']);
+					break;
+				case Tag::FOLLOWER_COLLECTION:
 					$apcontact = DBA::selectFirst('apcontact', ['name'], ['followers' => $receiver['url']]);
-				if (!empty($apcontact['name'])) {
+					$receivers[$receiver['type']][] = DI::l10n()->t('Followers (%s)', $apcontact['name'] ?? $receiver['name']);
-					$receivers[$receiver['type']][] = DI::l10n()->t('Followers (%s)', $apcontact['name']);
+					break;
-				} elseif ($apcontact = APContact::getByURL($receiver['url'], false)) {
+				case Tag::ACCOUNT:
-					$receivers[$receiver['type']][] = $apcontact['name'];
+					$apcontact = APContact::getByURL($receiver['url'], false);
-				} else {
+					$receivers[$receiver['type']][] = $apcontact['name'] ?? $receiver['name'];
+					break;
+				default:
 					$receivers[$receiver['type']][] = $receiver['name'];
-				}
+					break;
 			}
 		}
 

src/Protocol/ActivityPub/Processor.php

@@ -941,7 +941,10 @@ class Processor
 					} else {
 						$name = trim(parse_url($receiver, PHP_URL_PATH), '/');
 					}
-					Tag::store($uriid, $type, $name, $receiver);
+
+					$target = Tag::getTargetType($receiver);
+					Logger::debug('Got target type', ['type' => $target, 'url' => $receiver]);
+					Tag::store($uriid, $type, $name, $receiver, $target);
 				}
 			}
 		}

static/dbstructure.config.php

@@ -55,7 +55,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-	define('DB_UPDATE_VERSION', 1458);
+	define('DB_UPDATE_VERSION', 1459);
 }
 
 return [
@@ -289,7 +289,8 @@ return [
 		"fields" => [
 			"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
 			"name" => ["type" => "varchar(96)", "not null" => "1", "default" => "", "comment" => ""],
-			"url" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""]
+			"url" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""],
+			"type" => ["type" => "tinyint unsigned", "comment" => "Type of the tag (Unknown, General Collection, Follower Collection or Account)"],
 		],
 		"indexes" => [
 			"PRIMARY" => ["id"],

static/dbview.config.php

@@ -664,6 +664,7 @@
 			"cid" => ["post-tag", "cid"],
 			"name" => "CASE `cid` WHEN 0 THEN `tag`.`name` ELSE `contact`.`name` END",
 			"url" => "CASE `cid` WHEN 0 THEN `tag`.`url` ELSE `contact`.`url` END",
+			"tag-type" => "CASE `cid` WHEN 0 THEN `tag`.`type` ELSE 1 END",
 		],
 		"query" => "FROM `post-tag`
 			LEFT JOIN `tag` ON `post-tag`.`tid` = `tag`.`id`

view/lang/C/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2022.05-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-20 20:58+0000\n"
+"POT-Creation-Date: 2022-04-23 12:37+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3315,7 +3315,7 @@ msgid "Post to Email"
 msgstr ""
 
 #: src/Core/ACL.php:320 src/Module/PermissionTooltip.php:84
-#: src/Module/PermissionTooltip.php:196
+#: src/Module/PermissionTooltip.php:197
 msgid "Public"
 msgstr ""
 
@@ -8585,25 +8585,30 @@ msgstr ""
 
 #: src/Module/PermissionTooltip.php:200
 #, php-format
+msgid "Collection (%s)"
+msgstr ""
+
+#: src/Module/PermissionTooltip.php:204
+#, php-format
 msgid "Followers (%s)"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:216
-#, php-format
-msgid "%d more"
-msgstr ""
-
-#: src/Module/PermissionTooltip.php:220
-#, php-format
-msgid "<b>To:</b> %s<br>"
-msgstr ""
-
 #: src/Module/PermissionTooltip.php:223
 #, php-format
+msgid "%d more"
+msgstr ""
+
+#: src/Module/PermissionTooltip.php:227
+#, php-format
+msgid "<b>To:</b> %s<br>"
+msgstr ""
+
+#: src/Module/PermissionTooltip.php:230
+#, php-format
 msgid "<b>CC:</b> %s<br>"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:226
+#: src/Module/PermissionTooltip.php:233
 #, php-format
 msgid "<b>BCC:</b> %s<br>"
 msgstr ""