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

New user account type "Channel Relay"

Browse Source
This commit is contained in:
Michael
2024-01-06 17:27:42 +00:00
parent 16b12e1545
commit 811a9f01bc
12 changed files with 434 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Protocol/ActivityPub/Processor.php
View File

@@ -1787,7 +1787,7 @@ class Processor
$searchtext = Engagement::getSearchTextForActivity($content, $authorid, $messageTags, $receivers);
$languages = Item::getLanguageArray($content, 1, 0, $authorid);
$language = !empty($languages) ? array_key_first($languages) : '';
return DI::userDefinedChannel()->match($searchtext, $language);
return DI::userDefinedChannel()->match($searchtext, $language, $messageTags, 0);
}
/**

14
src/Protocol/Relay.php
View File

@@ -157,20 +157,16 @@ class Relay
*/
public static function getSubscribedTags(): array
{
$systemTags = [];
$server_tags = DI::config()->get('system', 'relay_server_tags');
foreach (explode(',', mb_strtolower($server_tags)) as $tag) {
$systemTags[] = trim($tag, '# ');
$tags = [];
foreach (explode(',', mb_strtolower(DI::config()->get('system', 'relay_server_tags'))) as $tag) {
$tags[] = trim($tag, '# ');
}
if (DI::config()->get('system', 'relay_user_tags')) {
$userTags = Search::getUserTags();
} else {
$userTags = [];
$tags = array_merge($tags, Search::getUserTags());
}
return array_unique(array_merge($systemTags, $userTags));
return array_unique($tags);
}
/**