keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11436 from annando/tag-type

Browse source 
Store the tag type for the post targets
This commit is contained in:
Hypolite Petovan 2022-04-23 21:12:55 -04:00 committed by GitHub
commit 904ee0ea59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 139 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
database.sql
View file

@ -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`;

11
doc/database/db_tag.md
View file

@ -6,11 +6,12 @@ tags and mentions
Fields
------
| Field | Description | Type | Null | Key | Default | Extra |
| ----- | ----------- | -------------- | ---- | --- | ------- | -------------- |
| id | | int unsigned | NO | PRI | NULL | auto_increment |
| name | | varchar(96) | NO | | | |
| url | | varbinary(255) | NO | | | |
| 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
------------

95
src/Model/Tag.php
View file

@ -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,11 +115,14 @@ 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)
// We ensure that we only store a single entry by overwriting the previous name
Logger::info('URL is not a known contact, updating tag', ['url' => $url, 'name' => $name]);
if (!DBA::exists('tag', ['name' => substr($name, 0, 96), 'url' => $url])) {
DBA::update('tag', ['name' => substr($name, 0, 96)], ['url' => $url]);
$tag = DBA::selectFirst('tag', ['name', 'type'], ['url' => $url]);
if (!empty($tag)) {
if ($tag['name'] != substr($name, 0, 96)) {
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'];
@ -195,7 +264,7 @@ class Tag
/**
* Get tags and mentions from the body
*
*
* @param string $body Body of the post
* @param string $tags Accepted tags
*
@ -216,7 +285,7 @@ class Tag
/**
* Store tags and mentions from the body
*
*
* @param integer $uriid URI-Id
* @param string $body Body of the post
* @param string $tags Accepted tags
@ -242,7 +311,7 @@ class Tag
* Store raw tags (not encapsulated in links) from the body
* This function is needed in the intermediate phase.
* Later we can call item::setHashtags in advance to have all tags converted.
*
*
* @param integer $uriid URI-Id
* @param string $body Body of the post
*/
@ -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);
}
/**
@ -527,7 +596,7 @@ class Tag
/**
* Fetch the blocked tags as SQL
*
* @return string
* @return string
*/
private static function getBlockedSQL()
{

35
src/Module/PermissionTooltip.php
View file

@ -83,15 +83,15 @@ class PermissionTooltip extends \Friendica\BaseModule
case Item::PUBLIC:
$receivers = DI::l10n()->t('Public');
break;
case Item::UNLISTED:
$receivers = DI::l10n()->t('Unlisted');
break;
case Item::PRIVATE:
$receivers = DI::l10n()->t('Limited/Private');
break;
}
}
}
} else {
$receivers = '';
@ -172,7 +172,7 @@ class PermissionTooltip extends \Friendica\BaseModule
* Fetch a list of receivers
*
* @param int $uriId
* @return string
* @return string
*/
private function fetchReceivers(int $uriId):string
{
@ -192,17 +192,24 @@ class PermissionTooltip extends \Friendica\BaseModule
continue;
}
if ($receiver['url'] == ActivityPub::PUBLIC_COLLECTION) {
$receivers[$receiver['type']][] = DI::l10n()->t('Public');
} else {
$apcontact = DBA::selectFirst('apcontact', ['name'], ['followers' => $receiver['url']]);
if (!empty($apcontact['name'])) {
$receivers[$receiver['type']][] = DI::l10n()->t('Followers (%s)', $apcontact['name']);
} elseif ($apcontact = APContact::getByURL($receiver['url'], false)) {
$receivers[$receiver['type']][] = $apcontact['name'];
} else {
switch (Tag::getTargetType($receiver['url'], false)) {
case Tag::PUBLIC_COLLECTION:
$receivers[$receiver['type']][] = DI::l10n()->t('Public');
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']]);
$receivers[$receiver['type']][] = DI::l10n()->t('Followers (%s)', $apcontact['name'] ?? $receiver['name']);
break;
case Tag::ACCOUNT:
$apcontact = APContact::getByURL($receiver['url'], false);
$receivers[$receiver['type']][] = $apcontact['name'] ?? $receiver['name'];
break;
default:
$receivers[$receiver['type']][] = $receiver['name'];
}
break;
}
}

5
src/Protocol/ActivityPub/Processor.php
View file

@ -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);
}
}
}

5
static/dbstructure.config.php
View file

@ -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"],

1
static/dbview.config.php
View file

@ -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`

31
view/lang/C/messages.po
View file

@ -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 ""