bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #13330 from annando/relay-tags

Browse source 
Fix the tag detection for relay posts
This commit is contained in:
Tobias Diekershoff 2023-08-03 06:27:49 +02:00 committed by GitHub
commit d9ab0bb60d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1658,7 +1658,7 @@ class Processor
$tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []); $tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []);
if (!empty($tags)) { if (!empty($tags)) {
foreach ($tags as $tag) { foreach ($tags as $tag) {
if ($tag['type'] != 'Hashtag') { if (($tag['type'] != 'Hashtag') && !strpos($tag['type'], ':Hashtag')) {
continue; continue;
} }
$messageTags[] = ltrim(mb_strtolower($tag['name']), '#'); $messageTags[] = ltrim(mb_strtolower($tag['name']), '#');

6
src/Protocol/Relay.php
View file

@ -136,16 +136,16 @@ class Relay
} }
if (!self::isWantedLanguage($body)) { if (!self::isWantedLanguage($body)) {
Logger::info('Unwanted or Undetected language found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer]); Logger::info('Unwanted or Undetected language found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]);
return false; return false;
} }
if ($scope == self::SCOPE_ALL) { if ($scope == self::SCOPE_ALL) {
Logger::info('Server accept all posts - accepted', ['network' => $network, 'url' => $url, 'causer' => $causer]); Logger::info('Server accept all posts - accepted', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]);
return true; return true;
} }
Logger::info('No matching hashtags found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer]); Logger::info('No matching hashtags found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]);
return false; return false;
} }