X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FRelay.php;h=e7e878a02d7e60634641fedf6ef66d89ec6c5617;hb=0ec7991a20eafe673e4e8bf77bd32c0f6d047a19;hp=ff827625073b831f64df2635d1c114b037889595;hpb=4deee0932c0b6a0d6443438c29dfc5f7781dda79;p=friendica.git diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php index ff82762507..e7e878a02d 100644 --- a/src/Protocol/Relay.php +++ b/src/Protocol/Relay.php @@ -1,6 +1,6 @@ $network, 'url' => $url, 'author' => $authorid, 'tags' => $tags]); + return true; + } + $scope = $config->get('system', 'relay_scope'); if ($scope == self::SCOPE_NONE) { @@ -77,26 +88,23 @@ class Relay return false; } + if (!empty($causerid)) { + $contact = Contact::getById($causerid, ['url']); + $causer = $contact['url'] ?? ''; + } else { + $causer = ''; + } + $body = ActivityPub\Processor::normalizeMentionLinks($body); - $systemTags = []; - $userTags = []; $denyTags = []; if ($scope == self::SCOPE_TAGS) { - $server_tags = $config->get('system', 'relay_server_tags'); - $tagitems = explode(',', mb_strtolower($server_tags)); - foreach ($tagitems as $tag) { - $systemTags[] = trim($tag, '# '); - } - - if ($config->get('system', 'relay_user_tags')) { - $userTags = Search::getUserTags(); - } + $tagList = self::getSubscribedTags(); + } else { + $tagList = []; } - $tagList = array_unique(array_merge($systemTags, $userTags)); - $deny_tags = $config->get('system', 'relay_deny_tags'); $tagitems = explode(',', mb_strtolower($deny_tags)); foreach ($tagitems as $tag) { @@ -110,50 +118,108 @@ class Relay foreach ($tags as $tag) { $tag = mb_strtolower($tag); if (in_array($tag, $denyTags)) { - Logger::info('Unwanted hashtag found - rejected', ['hashtag' => $tag, 'network' => $network, 'url' => $url]); + Logger::info('Unwanted hashtag found - rejected', ['hashtag' => $tag, 'network' => $network, 'url' => $url, 'causer' => $causer]); return false; } if (in_array($tag, $tagList)) { - Logger::info('Subscribed hashtag found - accepted', ['hashtag' => $tag, 'network' => $network, 'url' => $url]); + Logger::info('Subscribed hashtag found - accepted', ['hashtag' => $tag, 'network' => $network, 'url' => $url, 'causer' => $causer]); return true; } // We check with "strpos" for performance issues. Only when this is true, the regular expression check is used // RegExp is taken from here: https://medium.com/@shiba1014/regex-word-boundaries-with-unicode-207794f6e7ed if ((strpos($content, $tag) !== false) && preg_match('/(?<=[\s,.:;"\']|^)' . preg_quote($tag, '/') . '(?=[\s,.:;"\']|$)/', $content)) { - Logger::info('Subscribed hashtag found in content - accepted', ['hashtag' => $tag, 'network' => $network, 'url' => $url]); + Logger::info('Subscribed hashtag found in content - accepted', ['hashtag' => $tag, 'network' => $network, 'url' => $url, 'causer' => $causer]); return true; } } } - $languages = []; - foreach (Item::getLanguageArray($body, 10) as $language => $reliability) { - if ($reliability > 0) { - $languages[] = $language; - } + if (!self::isWantedLanguage($body, 0, $authorid, $languages)) { + Logger::info('Unwanted or Undetected language found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]); + return false; } - Logger::debug('Got languages', ['languages' => $languages, 'body' => $body]); + if ($scope == self::SCOPE_ALL) { + Logger::info('Server accept all posts - accepted', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]); + return true; + } - if (!empty($languages)) { - if (in_array($languages[0], $config->get('system', 'relay_deny_languages'))) { - Logger::info('Unwanted language found - rejected', ['language' => $languages[0], 'network' => $network, 'url' => $url]); - return false; + Logger::info('No matching hashtags found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]); + return false; + } + + /** + * Get a list of subscribed tags by both the users and the tags that are defined by the admin + * + * @return array + */ + 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, '# '); + } + + if (DI::config()->get('system', 'relay_user_tags')) { + $userTags = Search::getUserTags(); + } else { + $userTags = []; + } + + return array_unique(array_merge($systemTags, $userTags)); + } + + /** + * Detect the language of a post and decide if the post should be accepted + * + * @param string $body + * @param int $uri_id + * @param int $author_id + * @param array $languages + * @return boolean + */ + public static function isWantedLanguage(string $body, int $uri_id = 0, int $author_id = 0, array $languages = []) + { + $detected = []; + $quality = DI::config()->get('system', 'relay_language_quality'); + foreach (Item::getLanguageArray($body, DI::config()->get('system', 'relay_languages'), $uri_id, $author_id) as $language => $reliability) { + if (($reliability >= $quality) && ($quality > 0)) { + $detected[] = $language; } - } elseif ($config->get('system', 'relay_deny_undetected_language')) { - Logger::info('Undetected language found - rejected', ['body' => $body, 'network' => $network, 'url' => $url]); - return false; } - if ($scope == self::SCOPE_ALL) { - Logger::info('Server accept all posts - accepted', ['network' => $network, 'url' => $url]); + if (empty($languages) && empty($detected) && (empty($body) || Smilies::isEmojiPost($body))) { + Logger::debug('Empty body or only emojis', ['body' => $body]); return true; } - Logger::info('No matching hashtags found - rejected', ['network' => $network, 'url' => $url]); - return false; + if (!empty($languages) || !empty($detected)) { + $user_languages = User::getLanguages(); + + foreach ($detected as $language) { + if (in_array($language, $user_languages)) { + Logger::debug('Wanted language found in detected languages', ['language' => $language, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]); + return true; + } + } + foreach ($languages as $language) { + if (in_array($language, $user_languages)) { + Logger::debug('Wanted language found in defined languages', ['language' => $language, 'languages' => $languages, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]); + return true; + } + } + Logger::debug('No wanted language found', ['languages' => $languages, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]); + return false; + } elseif (DI::config()->get('system', 'relay_deny_undetected_language')) { + Logger::info('Undetected language found', ['body' => $body]); + return false; + } + + return true; } /** @@ -169,7 +235,7 @@ class Relay if (in_array($gserver['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) { $system = APContact::getByURL($gserver['url'] . '/friendica'); if (!empty($system['sharedinbox'])) { - Logger::info('Sucessfully probed for relay contact', ['server' => $gserver['url']]); + Logger::info('Successfully probed for relay contact', ['server' => $gserver['url']]); $id = Contact::updateFromProbeByURL($system['url']); Logger::info('Updated relay contact', ['server' => $gserver['url'], 'id' => $id]); return; @@ -295,7 +361,7 @@ class Relay DBA::close($tagserver); } - // All adresses with the given id + // All addresses with the given id if (!empty($tagserverlist)) { $servers = DBA::select('gserver', ['id', 'url', 'network'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]); while ($server = DBA::fetch($servers)) { @@ -326,12 +392,12 @@ class Relay * * @param array $fields Field list * @return array List of relay servers - * @throws Exception + * @throws Exception */ public static function getList(array $fields = []): array { return DBA::selectToArray('apcontact', $fields, - ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)", 'Application', 0, Contact::FRIEND]); + ["`type` IN (?, ?) AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)", 'Application', 'Service', 0, Contact::FRIEND]); } /** @@ -375,6 +441,6 @@ class Relay foreach (self::getList() as $server) { $success = ActivityPub\Transmitter::sendRelayFollow($server['url']); Logger::debug('Resubscribed', ['profile' => $server['url'], 'success' => $success]); - } + } } }