clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use different collections

This commit is contained in:
Michael 2022-04-23 12:32:29 +00:00
parent 0a3c5cc40c
commit 4af6e730d3
2 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Model/Tag.php
View File

@ -58,8 +58,10 @@ class Tag
const BTO = 12; const BTO = 12;
const BCC = 13; const BCC = 13;
const ACCOUNT = 1; const ACCOUNT = 1;
const COLLECTION = 2; const GENERAL_COLLECTION = 2;
const FOLLOWER_COLLECTION = 3;
const PUBLIC_COLLECTION = 4;
const TAG_CHARACTER = [ const TAG_CHARACTER = [
self::HASHTAG => '#', self::HASHTAG => '#',
@ -160,36 +162,40 @@ class Tag
* Fetch the target type for the given url * Fetch the target type for the given url
* *
* @param string $url * @param string $url
* @param bool $fetch Fetch information via network operations
* @return null|int * @return null|int
*/ */
public static function getTargetType(string $url) public static function getTargetType(string $url, bool $fetch = true)
{ {
$target = null;
if (empty($url)) { if (empty($url)) {
return null; return $target;
} }
$tag = DBA::selectFirst('tag', ['url', 'type'], ['url' => $url]); $tag = DBA::selectFirst('tag', ['url', 'type'], ['url' => $url]);
if (!empty($tag['type'])) { if (!empty($tag['type'])) {
Logger::debug('Found existing type', ['type' => $tag['type'], 'url' => $url]); $target = $tag['type'];
return $tag['type']; if ($target != self::GENERAL_COLLECTION) {
Logger::debug('Found existing type', ['type' => $tag['type'], 'url' => $url]);
return $target;
}
} }
$target = null;
if ($url == ActivityPub::PUBLIC_COLLECTION) { if ($url == ActivityPub::PUBLIC_COLLECTION) {
$target = Tag::COLLECTION; $target = self::PUBLIC_COLLECTION;
Logger::debug('Public collection', ['url' => $url]); Logger::debug('Public collection', ['url' => $url]);
} else { } else {
if (DBA::exists('apcontact', ['followers' => $url])) { if (DBA::exists('apcontact', ['followers' => $url])) {
$target = Tag::COLLECTION; $target = self::FOLLOWER_COLLECTION;
Logger::debug('Found collection via existing apcontact', ['url' => $url]); Logger::debug('Found collection via existing apcontact', ['url' => $url]);
} elseif (Contact::getIdForURL($url, 0)) { } elseif (Contact::getIdForURL($url, 0, $fetch ? null : false)) {
$target = Tag::ACCOUNT; $target = self::ACCOUNT;
Logger::debug('URL is an account', ['url' => $url]); Logger::debug('URL is an account', ['url' => $url]);
} else { } elseif ($fetch && ($target != self::GENERAL_COLLECTION)) {
$content = ActivityPub::fetchContent($url); $content = ActivityPub::fetchContent($url);
if (!empty($content['type']) && ($content['type'] == 'OrderedCollection')) { if (!empty($content['type']) && ($content['type'] == 'OrderedCollection')) {
$target = Tag::COLLECTION; $target = self::GENERAL_COLLECTION;
Logger::debug('URL is an ordered collection', ['url' => $url]); Logger::debug('URL is an ordered collection', ['url' => $url]);
} }
} }

27
src/Module/PermissionTooltip.php
View File

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