Merge pull request #8095 from annando/local-delivery

[friendica.git] / src / Protocol / ActivityPub / Transmitter.php

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index d5dfc14fc08f8ab47adb5dee38c64bc3fd41b5b2..dbfd67cb0dc2474b868a4a7f878ccb995009f35c 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -7,7 +7,7 @@ namespace Friendica\Protocol\ActivityPub;
 use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -819,7 +819,7 @@ class Transmitter
                $cachekey = 'APDelivery:createActivity:' . $item_id;
 
                if (!$force) {
-                       $data = Cache::get($cachekey);
+                       $data = DI::cache()->get($cachekey);
                        if (!is_null($data)) {
                                return $data;
                        }
@@ -827,7 +827,7 @@ class Transmitter
 
                $data = ActivityPub\Transmitter::createActivityFromItem($item_id);
 
-               Cache::set($cachekey, $data, Cache::QUARTER_HOUR);
+               DI::cache()->set($cachekey, $data, Cache::QUARTER_HOUR);
                return $data;
        }
 
@@ -1304,12 +1304,17 @@ class Transmitter
                        $data['content'] = BBCode::convert($body, false, 9);
                }
 
-               $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
-               $richbody = preg_replace_callback($regexp, ['self', 'mentionCallback'], $item['body']);
-               $richbody = BBCode::removeAttachment($richbody);
+               // The regular "content" field does contain a minimized HTML. This is done since systems like
+               // Mastodon has got problems with - for example - embedded pictures.
+               // The contentMap does contain the unmodified HTML.
+               $language = self::getLanguage($item);
+               if (!empty($language)) {
+                       $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
+                       $richbody = preg_replace_callback($regexp, ['self', 'mentionCallback'], $item['body']);
+                       $richbody = BBCode::removeAttachment($richbody);
 
-               $data['contentMap']['text/html'] = BBCode::convert($richbody, false);
-               $data['contentMap']['text/markdown'] = BBCode::toMarkdown($item["body"]);
+                       $data['contentMap'][$language] = BBCode::convert($richbody, false);
+               }
 
                $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
 
@@ -1333,6 +1338,35 @@ class Transmitter
                return $data;
        }
 
+       /**
+        * Fetches the language from the post, the user or the system.
+        *
+        * @param array $item
+        *
+        * @return string language string
+        */
+       private static function getLanguage(array $item)
+       {
+               // Try to fetch the language from the post itself
+               if (!empty($item['language'])) {
+                       $languages = array_keys(json_decode($item['language'], true));
+                       if (!empty($languages[0])) {
+                               return $languages[0];
+                       }
+               }
+
+               // Otherwise use the user's language
+               if (!empty($item['uid'])) {
+                       $user = DBA::selectFirst('user', ['language'], ['uid' => $item['uid']]);
+                       if (!empty($user['language'])) {
+                               return $user['language'];
+                       }
+               }
+
+               // And finally just use the system language
+               return Config::get('system', 'language');
+       }
+
        /**
         * Creates an an "add tag" entry
         *