Merge pull request #13727 from annando/threads-logo

[friendica.git] / src / Protocol / Relay.php

diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php
index c4432e59a3817dbd470c751dd4b72fca7b209f77..e7e878a02d7e60634641fedf6ef66d89ec6c5617 100644 (file)
--- a/src/Protocol/Relay.php
+++ b/src/Protocol/Relay.php
@@ -21,7 +21,9 @@
 
 namespace Friendica\Protocol;
 
+use Friendica\Content\Smilies;
 use Friendica\Content\Text\BBCode;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -33,6 +35,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Search;
 use Friendica\Model\Tag;
+use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
@@ -50,16 +53,24 @@ class Relay
        /**
         * Check if a post is wanted
         *
-        * @param array $tags
+        * @param array  $tags
         * @param string $body
-        * @param int $authorid
+        * @param int    $authorid
         * @param string $url
+        * @param string $network
+        * @param int    $causerid
+        * @param array  $languages
         * @return boolean "true" is the post is wanted by the system
         */
-       public static function isSolicitedPost(array $tags, string $body, int $authorid, string $url, string $network = '', int $causerid = 0): bool
+       public static function isSolicitedPost(array $tags, string $body, int $authorid, string $url, string $network = '', int $causerid = 0, array $languages = []): bool
        {
                $config = DI::config();
 
+               if (Contact::hasFollowers($authorid)) {
+                       Logger::info('Author has got followers on this server - accepted', ['network' => $network, 'url' => $url, 'author' => $authorid, 'tags' => $tags]);
+                       return true;
+               }
+
                $scope = $config->get('system', 'relay_scope');
 
                if ($scope == self::SCOPE_NONE) {
@@ -125,7 +136,7 @@ class Relay
                        }
                }
 
-               if (!self::isWantedLanguage($body, 0, $authorid)) {
+               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;
                }
@@ -168,24 +179,41 @@ class Relay
         * @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)
+       public static function isWantedLanguage(string $body, int $uri_id = 0, int $author_id = 0, array $languages = [])
        {
-               $languages = [];
-               foreach (Item::getLanguageArray($body, 10, $uri_id, $author_id) as $language => $reliability) {
-                       if ($reliability > 0) {
-                               $languages[] = $language;
+               $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;
                        }
                }
 
-               Logger::debug('Got languages', ['languages' => $languages, 'body' => $body]);
+               if (empty($languages) && empty($detected) && (empty($body) || Smilies::isEmojiPost($body))) {
+                       Logger::debug('Empty body or only emojis', ['body' => $body]);
+                       return true;
+               }
 
-               if (!empty($languages)) {
-                       if (in_array($languages[0], DI::config()->get('system', 'relay_deny_languages'))) {
-                               Logger::info('Unwanted language found', ['language' => $languages[0]]);
-                               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;